Cleaned up annotation placement for nested classes

Author: SgtSilvio

src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java

@@ -117,7 +117,7 @@ public class MqttAsyncClient implements Mqtt5AsyncClient {
     }
 
     @Override
-    public @NotNull MqttConnectBuilder.Send<CompletableFuture<Mqtt5ConnAck>> connectWith() {
+    public MqttConnectBuilder.@NotNull Send<CompletableFuture<Mqtt5ConnAck>> connectWith() {
         return new MqttConnectBuilder.Send<>(this::connect);
     }
 
@@ -232,7 +232,7 @@ public void publishes(
     }
 
     @Override
-    public @NotNull MqttUnsubscribeBuilder.Send<CompletableFuture<Mqtt5UnsubAck>> unsubscribeWith() {
+    public MqttUnsubscribeBuilder.@NotNull Send<CompletableFuture<Mqtt5UnsubAck>> unsubscribeWith() {
         return new MqttUnsubscribeBuilder.Send<>(this::unsubscribe);
     }
 
@@ -244,7 +244,7 @@ public void publishes(
     }
 
     @Override
-    public @NotNull MqttPublishBuilder.Send<CompletableFuture<Mqtt5PublishResult>> publishWith() {
+    public MqttPublishBuilder.@NotNull Send<CompletableFuture<Mqtt5PublishResult>> publishWith() {
         return new MqttPublishBuilder.Send<>(this::publish);
     }
 
@@ -266,7 +266,7 @@ public void publishes(
     }
 
     @Override
-    public @NotNull MqttDisconnectBuilder.Send<CompletableFuture<Void>> disconnectWith() {
+    public MqttDisconnectBuilder.@NotNull Send<CompletableFuture<Void>> disconnectWith() {
         return new MqttDisconnectBuilder.Send<>(this::disconnect);
     }
 

src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java

@@ -103,7 +103,7 @@ public class MqttBlockingClient implements Mqtt5BlockingClient {
     }
 
     @Override
-    public @NotNull MqttConnectBuilder.Send<Mqtt5ConnAck> connectWith() {
+    public MqttConnectBuilder.@NotNull Send<Mqtt5ConnAck> connectWith() {
         return new MqttConnectBuilder.Send<>(this::connect);
     }
 
@@ -121,7 +121,7 @@ public class MqttBlockingClient implements Mqtt5BlockingClient {
     }
 
     @Override
-    public @NotNull MqttSubscribeBuilder.Send<Mqtt5SubAck> subscribeWith() {
+    public MqttSubscribeBuilder.@NotNull Send<Mqtt5SubAck> subscribeWith() {
         return new MqttSubscribeBuilder.Send<>(this::subscribe);
     }
 
@@ -153,7 +153,7 @@ public class MqttBlockingClient implements Mqtt5BlockingClient {
     }
 
     @Override
-    public @NotNull MqttUnsubscribeBuilder.Send<Mqtt5UnsubAck> unsubscribeWith() {
+    public MqttUnsubscribeBuilder.@NotNull Send<Mqtt5UnsubAck> unsubscribeWith() {
         return new MqttUnsubscribeBuilder.Send<>(this::unsubscribe);
     }
 
@@ -168,7 +168,7 @@ public class MqttBlockingClient implements Mqtt5BlockingClient {
     }
 
     @Override
-    public @NotNull MqttPublishBuilder.Send<Mqtt5PublishResult> publishWith() {
+    public MqttPublishBuilder.@NotNull Send<Mqtt5PublishResult> publishWith() {
         return new MqttPublishBuilder.Send<>(this::publish);
     }
 
@@ -197,7 +197,7 @@ public void disconnect(final @NotNull Mqtt5Disconnect disconnect) {
     }
 
     @Override
-    public @NotNull MqttDisconnectBuilder.SendVoid disconnectWith() {
+    public MqttDisconnectBuilder.@NotNull SendVoid disconnectWith() {
         return new MqttDisconnectBuilder.SendVoid(this::disconnect);
     }
 

src/main/java/com/hivemq/client/internal/mqtt/MqttClientExecutorConfigImpl.java

@@ -73,7 +73,7 @@ public int getRawNettyThreads() {
     }
 
     @Override
-    public @NotNull MqttClientExecutorConfigImplBuilder.Default extend() {
+    public MqttClientExecutorConfigImplBuilder.@NotNull Default extend() {
         return new MqttClientExecutorConfigImplBuilder.Default(this);
     }
 

src/main/java/com/hivemq/client/internal/mqtt/MqttClientSslConfigImpl.java

@@ -122,7 +122,7 @@ public long getHandshakeTimeoutMs() {
     }
 
     @Override
-    public @NotNull MqttClientSslConfigImplBuilder.Default extend() {
+    public MqttClientSslConfigImplBuilder.@NotNull Default extend() {
         return new MqttClientSslConfigImplBuilder.Default(this);
     }
 

src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImpl.java

@@ -116,7 +116,7 @@ public int getMqttConnectTimeoutMs() {
     }
 
     @Override
-    public @NotNull MqttClientTransportConfigImplBuilder.Default extend() {
+    public MqttClientTransportConfigImplBuilder.@NotNull Default extend() {
         return new MqttClientTransportConfigImplBuilder.Default(this);
     }
 

src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImplBuilder.java

@@ -187,7 +187,7 @@ private int getLocalPort() {
         return self();
     }
 
-    public @NotNull MqttClientSslConfigImplBuilder.Nested<B> sslConfig() {
+    public MqttClientSslConfigImplBuilder.@NotNull Nested<B> sslConfig() {
         return new MqttClientSslConfigImplBuilder.Nested<>(sslConfig, this::sslConfig);
     }
 
@@ -202,7 +202,7 @@ private int getLocalPort() {
         return self();
     }
 
-    public @NotNull MqttWebSocketConfigImplBuilder.Nested<B> webSocketConfig() {
+    public MqttWebSocketConfigImplBuilder.@NotNull Nested<B> webSocketConfig() {
         return new MqttWebSocketConfigImplBuilder.Nested<>(webSocketConfig, this::webSocketConfig);
     }
 
@@ -211,7 +211,7 @@ private int getLocalPort() {
         return self();
     }
 
-    public @NotNull MqttProxyConfigImplBuilder.Nested<B> proxyConfig() {
+    public MqttProxyConfigImplBuilder.@NotNull Nested<B> proxyConfig() {
         return new MqttProxyConfigImplBuilder.Nested<>(proxyConfig, this::proxyConfig);
     }
 

src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImpl.java

@@ -84,7 +84,7 @@ public int getHandshakeTimeoutMs() {
     }
 
     @Override
-    public @NotNull MqttProxyConfigImplBuilder.Default extend() {
+    public MqttProxyConfigImplBuilder.@NotNull Default extend() {
         return new MqttProxyConfigImplBuilder.Default(this);
     }
 

src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java

@@ -90,7 +90,7 @@ public MqttRxClient(final @NotNull MqttClientConfig clientConfig) {
     }
 
     @Override
-    public @NotNull MqttConnectBuilder.Nested<Single<Mqtt5ConnAck>> connectWith() {
+    public MqttConnectBuilder.@NotNull Nested<Single<Mqtt5ConnAck>> connectWith() {
         return new MqttConnectBuilder.Nested<>(this::connect);
     }
 
@@ -108,7 +108,7 @@ public MqttRxClient(final @NotNull MqttClientConfig clientConfig) {
     }
 
     @Override
-    public @NotNull MqttSubscribeBuilder.Nested<Single<Mqtt5SubAck>> subscribeWith() {
+    public MqttSubscribeBuilder.@NotNull Nested<Single<Mqtt5SubAck>> subscribeWith() {
         return new MqttSubscribeBuilder.Nested<>(this::subscribe);
     }
 
@@ -120,7 +120,7 @@ public MqttRxClient(final @NotNull MqttClientConfig clientConfig) {
     }
 
     @Override
-    public @NotNull MqttSubscribeBuilder.Nested<FlowableWithSingle<Mqtt5Publish, Mqtt5SubAck>> subscribeStreamWith() {
+    public MqttSubscribeBuilder.@NotNull Nested<FlowableWithSingle<Mqtt5Publish, Mqtt5SubAck>> subscribeStreamWith() {
         return new MqttSubscribeBuilder.Nested<>(this::subscribeStream);
     }
 
@@ -191,7 +191,7 @@ public MqttRxClient(final @NotNull MqttClientConfig clientConfig) {
     }
 
     @Override
-    public @NotNull MqttUnsubscribeBuilder.Nested<Single<Mqtt5UnsubAck>> unsubscribeWith() {
+    public MqttUnsubscribeBuilder.@NotNull Nested<Single<Mqtt5UnsubAck>> unsubscribeWith() {
         return new MqttUnsubscribeBuilder.Nested<>(this::unsubscribe);
     }
 
@@ -261,7 +261,7 @@ public MqttRxClient(final @NotNull MqttClientConfig clientConfig) {
     }
 
     @Override
-    public @NotNull MqttDisconnectBuilder.Nested<Completable> disconnectWith() {
+    public MqttDisconnectBuilder.@NotNull Nested<Completable> disconnectWith() {
         return new MqttDisconnectBuilder.Nested<>(this::disconnect);
     }
 

src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilder.java

@@ -61,7 +61,7 @@ public MqttRxClientBuilder() {}
     }
 
     @Override
-    public @NotNull MqttClientAdvancedConfigBuilder.Nested<MqttRxClientBuilder> advancedConfig() {
+    public MqttClientAdvancedConfigBuilder.@NotNull Nested<MqttRxClientBuilder> advancedConfig() {
         return new MqttClientAdvancedConfigBuilder.Nested<>(advancedConfig, this::advancedConfig);
     }
 
@@ -72,7 +72,7 @@ public MqttRxClientBuilder() {}
     }
 
     @Override
-    public @NotNull MqttSimpleAuthBuilder.Nested<MqttRxClientBuilder> simpleAuth() {
+    public MqttSimpleAuthBuilder.@NotNull Nested<MqttRxClientBuilder> simpleAuth() {
         return new MqttSimpleAuthBuilder.Nested<>(this::simpleAuth);
     }
 
@@ -90,7 +90,7 @@ public MqttRxClientBuilder() {}
     }
 
     @Override
-    public @NotNull MqttPublishBuilder.WillNested<MqttRxClientBuilder> willPublish() {
+    public MqttPublishBuilder.@NotNull WillNested<MqttRxClientBuilder> willPublish() {
         return new MqttPublishBuilder.WillNested<>(this::willPublish);
     }
 

src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java

@@ -46,8 +46,8 @@ public abstract class MqttRxClientBuilderBase<B extends MqttRxClientBuilderBase<
     private @Nullable MqttClientTransportConfigImpl transportConfig = MqttClientTransportConfigImpl.DEFAULT;
     private @NotNull MqttClientExecutorConfigImpl executorConfig = MqttClientExecutorConfigImpl.DEFAULT;
     private @Nullable MqttClientAutoReconnectImpl autoReconnect;
-    private @Nullable ImmutableList.Builder<MqttClientConnectedListener> connectedListenersBuilder;
-    private @Nullable ImmutableList.Builder<MqttClientDisconnectedListener> disconnectedListenersBuilder;
+    private ImmutableList.@Nullable Builder<MqttClientConnectedListener> connectedListenersBuilder;
+    private ImmutableList.@Nullable Builder<MqttClientDisconnectedListener> disconnectedListenersBuilder;
 
     protected MqttRxClientBuilderBase() {}
 
@@ -127,7 +127,7 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase<?> clie
         return self();
     }
 
-    public @NotNull MqttClientTransportConfigImplBuilder.Nested<B> transportConfig() {
+    public MqttClientTransportConfigImplBuilder.@NotNull Nested<B> transportConfig() {
         return new MqttClientTransportConfigImplBuilder.Nested<>(this, this::transportConfig);
     }
 
@@ -137,7 +137,7 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase<?> clie
         return self();
     }
 
-    public @NotNull MqttClientExecutorConfigImplBuilder.Nested<B> executorConfig() {
+    public MqttClientExecutorConfigImplBuilder.@NotNull Nested<B> executorConfig() {
         return new MqttClientExecutorConfigImplBuilder.Nested<>(executorConfig, this::executorConfig);
     }
 
@@ -152,7 +152,7 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase<?> clie
         return self();
     }
 
-    public @NotNull MqttClientAutoReconnectImplBuilder.Nested<B> automaticReconnect() {
+    public MqttClientAutoReconnectImplBuilder.@NotNull Nested<B> automaticReconnect() {
         return new MqttClientAutoReconnectImplBuilder.Nested<>(autoReconnect, this::automaticReconnect);
     }