Replace CheckReturnValue with jetbrains annotations

hivemq · Nov 15, 2023 · 742a532 · 742a532
1 parent ed6c4dc
commit 742a532
Show file tree

Hide file tree

Showing 78 changed files with 77 additions and 134 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
 
 /**