From 742a5325f5473add6c1c237427808fd01a7b1497 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Wed, 15 Nov 2023 18:23:19 +0100 Subject: [PATCH] Replace CheckReturnValue with jetbrains annotations --- gradle/libs.versions.toml | 2 +- .../mqtt3/reactor/Mqtt3ReactorClient.java | 2 +- .../mqtt5/reactor/Mqtt5ReactorClient.java | 2 +- .../client2/annotations/CheckReturnValue.java | 29 ------------------- .../client2/mqtt/MqttClientBuilder.java | 2 +- .../client2/mqtt/MqttClientBuilderBase.java | 2 +- .../mqtt/MqttExecutorConfigBuilder.java | 2 +- .../mqtt/MqttExecutorConfigBuilderBase.java | 6 +--- .../client2/mqtt/MqttProxyConfigBuilder.java | 2 +- .../mqtt/MqttProxyConfigBuilderBase.java | 2 +- .../client2/mqtt/MqttTlsConfigBuilder.java | 2 +- .../mqtt/MqttTlsConfigBuilderBase.java | 2 +- .../mqtt/MqttTransportConfigBuilder.java | 2 +- .../mqtt/MqttTransportConfigBuilderBase.java | 6 +--- .../mqtt/MqttWebSocketConfigBuilder.java | 2 +- .../mqtt/MqttWebSocketConfigBuilderBase.java | 2 +- .../MqttSharedTopicFilterBuilder.java | 2 +- .../mqtt/datatypes/MqttTopicBuilder.java | 2 +- .../mqtt/datatypes/MqttTopicBuilderBase.java | 2 +- .../datatypes/MqttTopicFilterBuilder.java | 2 +- .../datatypes/MqttTopicFilterBuilderBase.java | 2 +- .../lifecycle/MqttAutoReconnectBuilder.java | 2 +- .../MqttAutoReconnectBuilderBase.java | 2 +- .../mqtt/lifecycle/MqttReconnector.java | 6 +--- .../client2/mqtt/mqtt3/Mqtt3AsyncClient.java | 2 +- .../mqtt/mqtt3/Mqtt3BlockingClient.java | 2 +- .../client2/mqtt/mqtt3/Mqtt3Client.java | 2 +- .../mqtt/mqtt3/Mqtt3ClientBuilder.java | 2 +- .../client2/mqtt/mqtt3/Mqtt3RxClient.java | 2 +- .../mqtt3/lifecycle/Mqtt3Reconnector.java | 2 +- .../message/auth/Mqtt3SimpleAuthBuilder.java | 2 +- .../auth/Mqtt3SimpleAuthBuilderBase.java | 2 +- .../message/connect/Mqtt3ConnectBuilder.java | 2 +- .../connect/Mqtt3ConnectBuilderBase.java | 6 +--- .../message/publish/Mqtt3PublishBuilder.java | 2 +- .../publish/Mqtt3PublishBuilderBase.java | 2 +- .../publish/Mqtt3WillPublishBuilder.java | 2 +- .../subscribe/Mqtt3SubscribeBuilder.java | 2 +- .../subscribe/Mqtt3SubscribeBuilderBase.java | 2 +- .../subscribe/Mqtt3SubscriptionBuilder.java | 2 +- .../Mqtt3SubscriptionBuilderBase.java | 2 +- .../unsubscribe/Mqtt3UnsubscribeBuilder.java | 2 +- .../Mqtt3UnsubscribeBuilderBase.java | 2 +- .../client2/mqtt/mqtt5/Mqtt5AsyncClient.java | 2 +- .../mqtt/mqtt5/Mqtt5BlockingClient.java | 2 +- .../client2/mqtt/mqtt5/Mqtt5Client.java | 2 +- .../mqtt/mqtt5/Mqtt5ClientBuilder.java | 2 +- .../client2/mqtt/mqtt5/Mqtt5RxClient.java | 2 +- .../advanced/Mqtt5AdvancedConfigBuilder.java | 2 +- .../Mqtt5AdvancedConfigBuilderBase.java | 2 +- .../Mqtt5ClientInterceptorsBuilder.java | 2 +- .../Mqtt5ClientInterceptorsBuilderBase.java | 2 +- .../datatypes/Mqtt5UserPropertiesBuilder.java | 2 +- .../Mqtt5UserPropertiesBuilderBase.java | 2 +- .../mqtt5/lifecycle/Mqtt5Reconnector.java | 2 +- .../mqtt5/message/auth/Mqtt5AuthBuilder.java | 2 +- .../message/auth/Mqtt5SimpleAuthBuilder.java | 2 +- .../auth/Mqtt5SimpleAuthBuilderBase.java | 2 +- .../message/connect/Mqtt5ConnectBuilder.java | 2 +- .../connect/Mqtt5ConnectBuilderBase.java | 6 +--- .../Mqtt5ConnectRestrictionsBuilder.java | 2 +- .../Mqtt5ConnectRestrictionsBuilderBase.java | 2 +- .../disconnect/Mqtt5DisconnectBuilder.java | 2 +- .../Mqtt5DisconnectBuilderBase.java | 6 +--- .../message/publish/Mqtt5PubAckBuilder.java | 2 +- .../message/publish/Mqtt5PubCompBuilder.java | 2 +- .../message/publish/Mqtt5PubRecBuilder.java | 2 +- .../message/publish/Mqtt5PubRelBuilder.java | 2 +- .../message/publish/Mqtt5PublishBuilder.java | 2 +- .../publish/Mqtt5PublishBuilderBase.java | 6 +--- .../publish/Mqtt5WillPublishBuilder.java | 2 +- .../subscribe/Mqtt5SubscribeBuilder.java | 2 +- .../subscribe/Mqtt5SubscribeBuilderBase.java | 2 +- .../subscribe/Mqtt5SubscriptionBuilder.java | 2 +- .../Mqtt5SubscriptionBuilderBase.java | 2 +- .../unsubscribe/Mqtt5UnsubscribeBuilder.java | 2 +- .../Mqtt5UnsubscribeBuilderBase.java | 2 +- .../hivemq/client2/rx/FlowableWithSingle.java | 2 +- 78 files changed, 77 insertions(+), 134 deletions(-) delete mode 100644 src/main/java/com/hivemq/client2/annotations/CheckReturnValue.java diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 98aee928f..bf18b987b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ dagger = "2.48.1" equalsverifier = "3.15.3" guava = "32.1.3-jre" jctools = "4.0.1" -jetbrains-annotations = "24.0.1" +jetbrains-annotations = "24.1.0" junit-jupiter = "5.10.1" mockito = "4.11.0" netty = "4.1.101.Final" diff --git a/reactor/src/main/java/com/hivemq/client2/mqtt/mqtt3/reactor/Mqtt3ReactorClient.java b/reactor/src/main/java/com/hivemq/client2/mqtt/mqtt3/reactor/Mqtt3ReactorClient.java index e26467802..1f066b9c9 100644 --- a/reactor/src/main/java/com/hivemq/client2/mqtt/mqtt3/reactor/Mqtt3ReactorClient.java +++ b/reactor/src/main/java/com/hivemq/client2/mqtt/mqtt3/reactor/Mqtt3ReactorClient.java @@ -16,7 +16,6 @@ package com.hivemq.client2.mqtt.mqtt3.reactor; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.internal.mqtt.mqtt3.reactor.Mqtt3ReactorClientView; import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; import com.hivemq.client2.mqtt.mqtt3.Mqtt3Client; @@ -33,6 +32,7 @@ import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; import com.hivemq.client2.rx.reactor.FluxWithSingle; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; diff --git a/reactor/src/main/java/com/hivemq/client2/mqtt/mqtt5/reactor/Mqtt5ReactorClient.java b/reactor/src/main/java/com/hivemq/client2/mqtt/mqtt5/reactor/Mqtt5ReactorClient.java index 038e61fd2..7733ce2de 100644 --- a/reactor/src/main/java/com/hivemq/client2/mqtt/mqtt5/reactor/Mqtt5ReactorClient.java +++ b/reactor/src/main/java/com/hivemq/client2/mqtt/mqtt5/reactor/Mqtt5ReactorClient.java @@ -16,7 +16,6 @@ package com.hivemq.client2.mqtt.mqtt5.reactor; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.internal.mqtt.reactor.MqttReactorClient; import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; import com.hivemq.client2.mqtt.mqtt5.Mqtt5Client; @@ -35,6 +34,7 @@ import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubscribeBuilder; import com.hivemq.client2.rx.reactor.FluxWithSingle; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; diff --git a/src/main/java/com/hivemq/client2/annotations/CheckReturnValue.java b/src/main/java/com/hivemq/client2/annotations/CheckReturnValue.java deleted file mode 100644 index 70e697dfe..000000000 --- a/src/main/java/com/hivemq/client2/annotations/CheckReturnValue.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2018-present HiveMQ and the HiveMQ Community - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.hivemq.client2.annotations; - -import java.lang.annotation.*; - -/** - * Documents that the return value of a method should not be ignored. - * - * @author Silvio Giebl - */ -@Documented -@Retention(RetentionPolicy.CLASS) -@Target(ElementType.METHOD) -public @interface CheckReturnValue {} diff --git a/src/main/java/com/hivemq/client2/mqtt/MqttClientBuilder.java b/src/main/java/com/hivemq/client2/mqtt/MqttClientBuilder.java index 825cc789b..ad6ab10bf 100644 --- a/src/main/java/com/hivemq/client2/mqtt/MqttClientBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/MqttClientBuilder.java @@ -16,10 +16,10 @@ package com.hivemq.client2.mqtt; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.mqtt3.Mqtt3ClientBuilder; import com.hivemq.client2.mqtt.mqtt5.Mqtt5ClientBuilder; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/MqttClientBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/MqttClientBuilderBase.java index 7cbeb83fd..ad7191ab9 100644 --- a/src/main/java/com/hivemq/client2/mqtt/MqttClientBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/MqttClientBuilderBase.java @@ -16,13 +16,13 @@ package com.hivemq.client2.mqtt; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.datatypes.MqttClientIdentifier; import com.hivemq.client2.mqtt.lifecycle.MqttAutoReconnect; import com.hivemq.client2.mqtt.lifecycle.MqttAutoReconnectBuilder; import com.hivemq.client2.mqtt.lifecycle.MqttConnectedListener; import com.hivemq.client2.mqtt.lifecycle.MqttDisconnectedListener; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client2/mqtt/MqttExecutorConfigBuilder.java b/src/main/java/com/hivemq/client2/mqtt/MqttExecutorConfigBuilder.java index b8e62fb52..3de1986cc 100644 --- a/src/main/java/com/hivemq/client2/mqtt/MqttExecutorConfigBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/MqttExecutorConfigBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/MqttExecutorConfigBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/MqttExecutorConfigBuilderBase.java index a6282179e..8d414bfa2 100644 --- a/src/main/java/com/hivemq/client2/mqtt/MqttExecutorConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/MqttExecutorConfigBuilderBase.java @@ -16,12 +16,8 @@ package com.hivemq.client2.mqtt; -import com.hivemq.client2.annotations.CheckReturnValue; import io.reactivex.rxjava3.core.Scheduler; -import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.Range; +import org.jetbrains.annotations.*; import java.util.concurrent.Executor; diff --git a/src/main/java/com/hivemq/client2/mqtt/MqttProxyConfigBuilder.java b/src/main/java/com/hivemq/client2/mqtt/MqttProxyConfigBuilder.java index 46e44906c..b5c87076c 100644 --- a/src/main/java/com/hivemq/client2/mqtt/MqttProxyConfigBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/MqttProxyConfigBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/MqttProxyConfigBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/MqttProxyConfigBuilderBase.java index f784761a8..fba4d54ef 100644 --- a/src/main/java/com/hivemq/client2/mqtt/MqttProxyConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/MqttProxyConfigBuilderBase.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client2/mqtt/MqttTlsConfigBuilder.java b/src/main/java/com/hivemq/client2/mqtt/MqttTlsConfigBuilder.java index ba74fbc5a..f38a72ace 100644 --- a/src/main/java/com/hivemq/client2/mqtt/MqttTlsConfigBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/MqttTlsConfigBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/MqttTlsConfigBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/MqttTlsConfigBuilderBase.java index 026371840..95aa36c14 100644 --- a/src/main/java/com/hivemq/client2/mqtt/MqttTlsConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/MqttTlsConfigBuilderBase.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client2/mqtt/MqttTransportConfigBuilder.java b/src/main/java/com/hivemq/client2/mqtt/MqttTransportConfigBuilder.java index 89bfe3aca..317c4f880 100644 --- a/src/main/java/com/hivemq/client2/mqtt/MqttTransportConfigBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/MqttTransportConfigBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/MqttTransportConfigBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/MqttTransportConfigBuilderBase.java index 37f97a23d..6dc9feb84 100644 --- a/src/main/java/com/hivemq/client2/mqtt/MqttTransportConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/MqttTransportConfigBuilderBase.java @@ -16,12 +16,8 @@ package com.hivemq.client2.mqtt; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.internal.util.UnsignedDataTypes; -import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.Range; +import org.jetbrains.annotations.*; import java.net.InetAddress; import java.net.InetSocketAddress; diff --git a/src/main/java/com/hivemq/client2/mqtt/MqttWebSocketConfigBuilder.java b/src/main/java/com/hivemq/client2/mqtt/MqttWebSocketConfigBuilder.java index beb52ecfd..d23e25fcf 100644 --- a/src/main/java/com/hivemq/client2/mqtt/MqttWebSocketConfigBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/MqttWebSocketConfigBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/MqttWebSocketConfigBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/MqttWebSocketConfigBuilderBase.java index 2093b2271..dc61ea403 100644 --- a/src/main/java/com/hivemq/client2/mqtt/MqttWebSocketConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/MqttWebSocketConfigBuilderBase.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/com/hivemq/client2/mqtt/datatypes/MqttSharedTopicFilterBuilder.java b/src/main/java/com/hivemq/client2/mqtt/datatypes/MqttSharedTopicFilterBuilder.java index adfb082fb..20501e1dc 100644 --- a/src/main/java/com/hivemq/client2/mqtt/datatypes/MqttSharedTopicFilterBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/datatypes/MqttSharedTopicFilterBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.datatypes; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/datatypes/MqttTopicBuilder.java b/src/main/java/com/hivemq/client2/mqtt/datatypes/MqttTopicBuilder.java index 7a21ae885..b91047d09 100644 --- a/src/main/java/com/hivemq/client2/mqtt/datatypes/MqttTopicBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/datatypes/MqttTopicBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.datatypes; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/datatypes/MqttTopicBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/datatypes/MqttTopicBuilderBase.java index ae3f8d5a3..6dd96f227 100644 --- a/src/main/java/com/hivemq/client2/mqtt/datatypes/MqttTopicBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/datatypes/MqttTopicBuilderBase.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.datatypes; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/datatypes/MqttTopicFilterBuilder.java b/src/main/java/com/hivemq/client2/mqtt/datatypes/MqttTopicFilterBuilder.java index 2d056f4d7..9e5a37000 100644 --- a/src/main/java/com/hivemq/client2/mqtt/datatypes/MqttTopicFilterBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/datatypes/MqttTopicFilterBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.datatypes; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/datatypes/MqttTopicFilterBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/datatypes/MqttTopicFilterBuilderBase.java index 7f8dc1a2d..79c7d0182 100644 --- a/src/main/java/com/hivemq/client2/mqtt/datatypes/MqttTopicFilterBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/datatypes/MqttTopicFilterBuilderBase.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.datatypes; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/lifecycle/MqttAutoReconnectBuilder.java b/src/main/java/com/hivemq/client2/mqtt/lifecycle/MqttAutoReconnectBuilder.java index ce46e135f..983f2710f 100644 --- a/src/main/java/com/hivemq/client2/mqtt/lifecycle/MqttAutoReconnectBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/lifecycle/MqttAutoReconnectBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.lifecycle; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/lifecycle/MqttAutoReconnectBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/lifecycle/MqttAutoReconnectBuilderBase.java index 07c263b5b..4355dd9bf 100644 --- a/src/main/java/com/hivemq/client2/mqtt/lifecycle/MqttAutoReconnectBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/lifecycle/MqttAutoReconnectBuilderBase.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.lifecycle; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client2/mqtt/lifecycle/MqttReconnector.java b/src/main/java/com/hivemq/client2/mqtt/lifecycle/MqttReconnector.java index f2944e871..9daa00ccc 100644 --- a/src/main/java/com/hivemq/client2/mqtt/lifecycle/MqttReconnector.java +++ b/src/main/java/com/hivemq/client2/mqtt/lifecycle/MqttReconnector.java @@ -16,13 +16,9 @@ package com.hivemq.client2.mqtt.lifecycle; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.MqttTransportConfig; import com.hivemq.client2.mqtt.MqttTransportConfigBuilder; -import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.Range; +import org.jetbrains.annotations.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3AsyncClient.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3AsyncClient.java index 1887bf8d7..9d6a77924 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3AsyncClient.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3AsyncClient.java @@ -16,7 +16,6 @@ package com.hivemq.client2.mqtt.mqtt3; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3ConnAck; import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3Connect; @@ -31,6 +30,7 @@ import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3BlockingClient.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3BlockingClient.java index 97951b0ed..08eb05982 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3BlockingClient.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3BlockingClient.java @@ -16,7 +16,6 @@ package com.hivemq.client2.mqtt.mqtt3; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3ConnAck; import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3Connect; @@ -31,6 +30,7 @@ import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import java.util.Optional; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3Client.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3Client.java index 0a7d08d3d..4cc4bf14f 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3Client.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3Client.java @@ -16,10 +16,10 @@ package com.hivemq.client2.mqtt.mqtt3; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.internal.mqtt.mqtt3.Mqtt3RxClientViewBuilder; import com.hivemq.client2.mqtt.MqttClient; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3ClientBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3ClientBuilder.java index 5e7d5fe4c..04817e458 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3ClientBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3ClientBuilder.java @@ -16,13 +16,13 @@ package com.hivemq.client2.mqtt.mqtt3; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.MqttClientBuilderBase; import com.hivemq.client2.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; import com.hivemq.client2.mqtt.mqtt3.message.auth.Mqtt3SimpleAuthBuilder; import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3Publish; import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3WillPublishBuilder; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3RxClient.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3RxClient.java index d0ef944e4..42e801420 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3RxClient.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3RxClient.java @@ -16,7 +16,6 @@ package com.hivemq.client2.mqtt.mqtt3; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3ConnAck; import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3Connect; @@ -34,6 +33,7 @@ import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.core.Single; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Publisher; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt3/lifecycle/Mqtt3Reconnector.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/lifecycle/Mqtt3Reconnector.java index b02ea1539..b43605409 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt3/lifecycle/Mqtt3Reconnector.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/lifecycle/Mqtt3Reconnector.java @@ -16,13 +16,13 @@ package com.hivemq.client2.mqtt.mqtt3.lifecycle; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.MqttTransportConfig; import com.hivemq.client2.mqtt.MqttTransportConfigBuilder; import com.hivemq.client2.mqtt.lifecycle.MqttReconnector; import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3Connect; import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3ConnectBuilder; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilder.java index 139bd1fff..59383c767 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.mqtt3.message.auth; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilderBase.java index 66dc985b5..8cd21d81e 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilderBase.java @@ -16,9 +16,9 @@ package com.hivemq.client2.mqtt.mqtt3.message.auth; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import java.nio.ByteBuffer; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilder.java index 7f1a9e86e..2d082e956 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.mqtt3.message.connect; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java index 15884717f..60b26660e 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java @@ -16,16 +16,12 @@ package com.hivemq.client2.mqtt.mqtt3.message.connect; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.internal.util.UnsignedDataTypes; import com.hivemq.client2.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; import com.hivemq.client2.mqtt.mqtt3.message.auth.Mqtt3SimpleAuthBuilder; import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3Publish; import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3WillPublishBuilder; -import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.Range; +import org.jetbrains.annotations.*; /** * Builder base for a {@link Mqtt3Connect}. diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PublishBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PublishBuilder.java index 35a664596..a2f45f991 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PublishBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PublishBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.mqtt3.message.publish; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PublishBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PublishBuilderBase.java index 436ea9f4e..f004cae5c 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PublishBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PublishBuilderBase.java @@ -16,11 +16,11 @@ package com.hivemq.client2.mqtt.mqtt3.message.publish; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.datatypes.MqttQos; import com.hivemq.client2.mqtt.datatypes.MqttTopic; import com.hivemq.client2.mqtt.datatypes.MqttTopicBuilder; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import java.nio.ByteBuffer; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3WillPublishBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3WillPublishBuilder.java index 6cb092ce6..5b18dd12e 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3WillPublishBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3WillPublishBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.mqtt3.message.publish; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java index 054f32773..5fef5db3e 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.mqtt3.message.subscribe; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java index 6ff4b1ed0..b1ec25001 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.mqtt3.message.subscribe; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import java.util.Collection; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilder.java index d6fc076d5..8b655d8c9 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.mqtt3.message.subscribe; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilderBase.java index 98ab6c48b..35d76f407 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilderBase.java @@ -16,11 +16,11 @@ package com.hivemq.client2.mqtt.mqtt3.message.subscribe; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.datatypes.MqttQos; import com.hivemq.client2.mqtt.datatypes.MqttTopicFilter; import com.hivemq.client2.mqtt.datatypes.MqttTopicFilterBuilder; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilder.java index de2e24fb1..c2a910343 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.mqtt3.message.unsubscribe; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java index c9a24258f..9882ee2b7 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java @@ -16,11 +16,11 @@ package com.hivemq.client2.mqtt.mqtt3.message.unsubscribe; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.datatypes.MqttTopicFilter; import com.hivemq.client2.mqtt.datatypes.MqttTopicFilterBuilder; import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import java.util.Collection; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5AsyncClient.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5AsyncClient.java index 5bafc0950..25d90b9ea 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5AsyncClient.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5AsyncClient.java @@ -16,7 +16,6 @@ package com.hivemq.client2.mqtt.mqtt5; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect; @@ -33,6 +32,7 @@ import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubscribeBuilder; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5BlockingClient.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5BlockingClient.java index 9fce7773b..139f67e50 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5BlockingClient.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5BlockingClient.java @@ -16,7 +16,6 @@ package com.hivemq.client2.mqtt.mqtt5; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect; @@ -33,6 +32,7 @@ import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubscribeBuilder; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import java.util.Optional; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5Client.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5Client.java index b5f65eb8e..8e662a97a 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5Client.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5Client.java @@ -16,10 +16,10 @@ package com.hivemq.client2.mqtt.mqtt5; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.internal.mqtt.MqttRxClientBuilder; import com.hivemq.client2.mqtt.MqttClient; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5ClientBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5ClientBuilder.java index eac5b6057..c38a1662f 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5ClientBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5ClientBuilder.java @@ -16,7 +16,6 @@ package com.hivemq.client2.mqtt.mqtt5; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.MqttClientBuilderBase; import com.hivemq.client2.mqtt.mqtt5.advanced.Mqtt5AdvancedConfig; import com.hivemq.client2.mqtt.mqtt5.advanced.Mqtt5AdvancedConfigBuilder; @@ -26,6 +25,7 @@ import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5WillPublishBuilder; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5RxClient.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5RxClient.java index 465e6ccbd..4484b81e1 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5RxClient.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5RxClient.java @@ -16,7 +16,6 @@ package com.hivemq.client2.mqtt.mqtt5; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect; @@ -36,6 +35,7 @@ import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.core.Single; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Publisher; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilder.java index 6addfc126..eed73f082 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.mqtt5.advanced; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java index 5d378ee9c..b6ba2b017 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java @@ -16,10 +16,10 @@ package com.hivemq.client2.mqtt.mqtt5.advanced; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.Mqtt5ClientInterceptors; import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.Mqtt5ClientInterceptorsBuilder; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilder.java index f0ad6e64f..903ab6bb4 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.mqtt5.advanced.interceptor; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilderBase.java index 40fb9f5bf..21c531057 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilderBase.java @@ -16,12 +16,12 @@ package com.hivemq.client2.mqtt.mqtt5.advanced.interceptor; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5InboundQos1Interceptor; import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5OutboundQos1Interceptor; import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5InboundQos2Interceptor; import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutboundQos2Interceptor; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilder.java index 049cb22db..4625edbef 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.mqtt5.datatypes; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilderBase.java index ec4f64d1e..21335ee5a 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilderBase.java @@ -16,9 +16,9 @@ package com.hivemq.client2.mqtt.mqtt5.datatypes; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import java.util.Collection; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/lifecycle/Mqtt5Reconnector.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/lifecycle/Mqtt5Reconnector.java index bf9efe81e..7d4d8bf17 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/lifecycle/Mqtt5Reconnector.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/lifecycle/Mqtt5Reconnector.java @@ -16,13 +16,13 @@ package com.hivemq.client2.mqtt.mqtt5.lifecycle; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.MqttTransportConfig; import com.hivemq.client2.mqtt.MqttTransportConfigBuilder; import com.hivemq.client2.mqtt.lifecycle.MqttReconnector; import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect; import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnectBuilder; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5AuthBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5AuthBuilder.java index ce79834a5..cdad68797 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5AuthBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5AuthBuilder.java @@ -16,11 +16,11 @@ package com.hivemq.client2.mqtt.mqtt5.message.auth; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilder.java index ecf0ea461..a8fc4d329 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.mqtt5.message.auth; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilderBase.java index a5aa8fc9f..deffd9d64 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilderBase.java @@ -16,9 +16,9 @@ package com.hivemq.client2.mqtt.mqtt5.message.auth; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import java.nio.ByteBuffer; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilder.java index 0bd8feab1..eaf2868aa 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.mqtt5.message.connect; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilderBase.java index 026707eb2..1b1d25429 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilderBase.java @@ -16,7 +16,6 @@ package com.hivemq.client2.mqtt.mqtt5.message.connect; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.internal.util.UnsignedDataTypes; import com.hivemq.client2.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; @@ -25,10 +24,7 @@ import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5SimpleAuthBuilder; import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5WillPublishBuilder; -import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.Range; +import org.jetbrains.annotations.*; /** * Builder base for a {@link Mqtt5Connect}. diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilder.java index 32236222f..187140a7a 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.mqtt5.message.connect; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilderBase.java index fed328434..3d26f2d6f 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilderBase.java @@ -16,10 +16,10 @@ package com.hivemq.client2.mqtt.mqtt5.message.connect; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; import com.hivemq.client2.internal.util.UnsignedDataTypes; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilder.java index 1b2a36f44..5864ea0cc 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.mqtt5.message.disconnect; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilderBase.java index f2886a7c3..4bb00a3ba 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilderBase.java @@ -16,15 +16,11 @@ package com.hivemq.client2.mqtt.mqtt5.message.disconnect; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.internal.util.UnsignedDataTypes; import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; -import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.Range; +import org.jetbrains.annotations.*; /** * Builder base for a {@link Mqtt5Disconnect}. diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubAckBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubAckBuilder.java index 6ef0fc1ea..623bc65b2 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubAckBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubAckBuilder.java @@ -16,11 +16,11 @@ package com.hivemq.client2.mqtt.mqtt5.message.publish; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubCompBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubCompBuilder.java index 5e949d1fb..6e8992412 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubCompBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubCompBuilder.java @@ -16,11 +16,11 @@ package com.hivemq.client2.mqtt.mqtt5.message.publish; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubRecBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubRecBuilder.java index 0965ed6cf..301aa009d 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubRecBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubRecBuilder.java @@ -16,11 +16,11 @@ package com.hivemq.client2.mqtt.mqtt5.message.publish; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubRelBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubRelBuilder.java index 966f14441..cfedeab63 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubRelBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubRelBuilder.java @@ -16,11 +16,11 @@ package com.hivemq.client2.mqtt.mqtt5.message.publish; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PublishBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PublishBuilder.java index cb834c141..7ce39df9d 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PublishBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PublishBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.mqtt5.message.publish; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PublishBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PublishBuilderBase.java index fbca25aff..93e7a6df9 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PublishBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PublishBuilderBase.java @@ -16,7 +16,6 @@ package com.hivemq.client2.mqtt.mqtt5.message.publish; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.internal.util.UnsignedDataTypes; import com.hivemq.client2.mqtt.datatypes.MqttQos; import com.hivemq.client2.mqtt.datatypes.MqttTopic; @@ -24,10 +23,7 @@ import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; -import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.Range; +import org.jetbrains.annotations.*; import java.nio.ByteBuffer; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5WillPublishBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5WillPublishBuilder.java index 9b96188c6..77ac1ede8 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5WillPublishBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5WillPublishBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.mqtt5.message.publish; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilder.java index 4550337f7..81bcbbdb2 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.mqtt5.message.subscribe; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilderBase.java index 7824ebe91..a305bec2d 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilderBase.java @@ -16,10 +16,10 @@ package com.hivemq.client2.mqtt.mqtt5.message.subscribe; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import java.util.Collection; diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilder.java index c463c77fa..2cd97df80 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.mqtt5.message.subscribe; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilderBase.java index 5d314945c..06b2c312f 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilderBase.java @@ -16,11 +16,11 @@ package com.hivemq.client2.mqtt.mqtt5.message.subscribe; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.datatypes.MqttQos; import com.hivemq.client2.mqtt.datatypes.MqttTopicFilter; import com.hivemq.client2.mqtt.datatypes.MqttTopicFilterBuilder; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilder.java index b544ee7aa..26ce00767 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client2.mqtt.mqtt5.message.unsubscribe; -import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilderBase.java index b4cbe08d5..910609551 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilderBase.java @@ -16,13 +16,13 @@ package com.hivemq.client2.mqtt.mqtt5.message.unsubscribe; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.mqtt.datatypes.MqttTopicFilter; import com.hivemq.client2.mqtt.datatypes.MqttTopicFilterBuilder; import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import java.util.Collection; diff --git a/src/main/java/com/hivemq/client2/rx/FlowableWithSingle.java b/src/main/java/com/hivemq/client2/rx/FlowableWithSingle.java index 5bcf4538a..0d9657a9a 100644 --- a/src/main/java/com/hivemq/client2/rx/FlowableWithSingle.java +++ b/src/main/java/com/hivemq/client2/rx/FlowableWithSingle.java @@ -16,7 +16,6 @@ package com.hivemq.client2.rx; -import com.hivemq.client2.annotations.CheckReturnValue; import com.hivemq.client2.internal.rx.WithSingleStrictSubscriber; import com.hivemq.client2.internal.rx.operators.FlowableWithSingleMap; import com.hivemq.client2.internal.rx.operators.FlowableWithSingleMapError; @@ -32,6 +31,7 @@ import io.reactivex.rxjava3.functions.Action; import io.reactivex.rxjava3.functions.Consumer; import io.reactivex.rxjava3.functions.Function; +import org.jetbrains.annotations.CheckReturnValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reactivestreams.Subscriber;