Add With postfix to nested builder methods in ClientBuilder and Trans…

…portConfigBuilder

examples/src/main/java/com/hivemq/client/mqtt/examples/Mqtt5Features.java

@@ -40,7 +40,7 @@ public static void main(final String[] args)throws InterruptedException {
 
         final Mqtt5AsyncClient client = Mqtt5Client.builder()
                 .serverHost("broker.hivemq.com")
-                .automaticReconnectWithDefaultConfig()
+                .automaticReconnect()
                 .buildAsync();
 
         final Mqtt5ConnAck connAck = client.toBlocking().connectWith()

examples/src/main/java/com/hivemq/client/mqtt/examples/ReconnectStrategy.java

@@ -42,15 +42,15 @@ public static void defaultReconnect() {
 
         final Mqtt5BlockingClient client1 = Mqtt5Client.builder()
                 .serverHost("broker.hivemq.com")
-                .automaticReconnectWithDefaultConfig() // exponential backoff, 1s initial, doubled up to 2min, random delays +-25%
+                .automaticReconnect() // exponential backoff, 1s initial, doubled up to 2min, random delays +-25%
                 .buildBlocking();
     }
 
     public static void customizedReconnect() throws InterruptedException {
 
         final Mqtt5BlockingClient client2 = Mqtt5Client.builder()
                 .serverHost("broker.hivemq.com")
-                .automaticReconnect()
+                .automaticReconnectWith()
                     .initialDelay(3, TimeUnit.SECONDS)
                     .maxDelay(10, TimeUnit.SECONDS)
                     .applyAutomaticReconnect()

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

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

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

@@ -97,21 +97,19 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase<?> clie
         return super.serverPort(port);
     }
 
-    @Override
-    public @NotNull B tlsWithDefaultConfig() {
+    public @NotNull B tls() {
         transportConfig = null;
-        return super.tlsWithDefaultConfig();
+        return super.tls();
     }
 
     @Override
     public @NotNull B tlsConfig(final @Nullable MqttTlsConfig tlsConfig) {
         return super.tlsConfig(tlsConfig);
     }
 
-    @Override
-    public @NotNull B webSocketWithDefaultConfig() {
+    public @NotNull B webSocket() {
         transportConfig = null;
-        return super.webSocketWithDefaultConfig();
+        return super.webSocket();
     }
 
     @Override
@@ -127,7 +125,7 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase<?> clie
         return self();
     }
 
-    public MqttTransportConfigImplBuilder.@NotNull Nested<B> transportConfig() {
+    public MqttTransportConfigImplBuilder.@NotNull Nested<B> transportConfigWith() {
         return new MqttTransportConfigImplBuilder.Nested<>(this, this::transportConfig);
     }
 
@@ -136,11 +134,11 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase<?> clie
         return self();
     }
 
-    public MqttExecutorConfigImplBuilder.@NotNull Nested<B> executorConfig() {
+    public MqttExecutorConfigImplBuilder.@NotNull Nested<B> executorConfigWith() {
         return new MqttExecutorConfigImplBuilder.Nested<>(executorConfig, this::executorConfig);
     }
 
-    public @NotNull B automaticReconnectWithDefaultConfig() {
+    public @NotNull B automaticReconnect() {
         this.autoReconnect = MqttAutoReconnectImpl.DEFAULT;
         return self();
     }
@@ -151,7 +149,7 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase<?> clie
         return self();
     }
 
-    public MqttAutoReconnectImplBuilder.@NotNull Nested<B> automaticReconnect() {
+    public MqttAutoReconnectImplBuilder.@NotNull Nested<B> automaticReconnectWith() {
         return new MqttAutoReconnectImplBuilder.Nested<>(autoReconnect, this::automaticReconnect);
     }
 
@@ -198,9 +196,8 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase<?> clie
         if (autoReconnect == null) {
             return disconnectedListenersBuilder.build();
         }
-        return ImmutableList.<MqttDisconnectedListener>builder().add(autoReconnect)
-                .addAll(disconnectedListenersBuilder.build())
-                .build();
+        return ImmutableList.<MqttDisconnectedListener>builder(disconnectedListenersBuilder.getSize() + 1).add(
+                autoReconnect).addAll(disconnectedListenersBuilder.build()).build();
     }
 
     protected @NotNull MqttClientConfig buildClientConfig(

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

@@ -178,7 +178,7 @@ private int getLocalPort() {
         return self();
     }
 
-    public @NotNull B tlsWithDefaultConfig() {
+    public @NotNull B tls() {
         this.tlsConfig = MqttTlsConfigImpl.DEFAULT;
         return self();
     }
@@ -188,11 +188,11 @@ private int getLocalPort() {
         return self();
     }
 
-    public MqttTlsConfigImplBuilder.@NotNull Nested<B> tlsConfig() {
+    public MqttTlsConfigImplBuilder.@NotNull Nested<B> tlsConfigWith() {
         return new MqttTlsConfigImplBuilder.Nested<>(tlsConfig, this::tlsConfig);
     }
 
-    public @NotNull B webSocketWithDefaultConfig() {
+    public @NotNull B webSocket() {
         this.webSocketConfig = MqttWebSocketConfigImpl.DEFAULT;
         return self();
     }
@@ -203,7 +203,7 @@ private int getLocalPort() {
         return self();
     }
 
-    public MqttWebSocketConfigImplBuilder.@NotNull Nested<B> webSocketConfig() {
+    public MqttWebSocketConfigImplBuilder.@NotNull Nested<B> webSocketConfigWith() {
         return new MqttWebSocketConfigImplBuilder.Nested<>(webSocketConfig, this::webSocketConfig);
     }
 
@@ -212,7 +212,7 @@ private int getLocalPort() {
         return self();
     }
 
-    public MqttProxyConfigImplBuilder.@NotNull Nested<B> proxyConfig() {
+    public MqttProxyConfigImplBuilder.@NotNull Nested<B> proxyConfigWith() {
         return new MqttProxyConfigImplBuilder.Nested<>(proxyConfig, this::proxyConfig);
     }
 

src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewBuilder.java

@@ -55,7 +55,7 @@ public Mqtt3RxClientViewBuilder(final @NotNull MqttRxClientBuilderBase<?> client
     }
 
     @Override
-    public Mqtt3SimpleAuthViewBuilder.@NotNull Nested<Mqtt3RxClientViewBuilder> simpleAuth() {
+    public Mqtt3SimpleAuthViewBuilder.@NotNull Nested<Mqtt3RxClientViewBuilder> simpleAuthWith() {
         return new Mqtt3SimpleAuthViewBuilder.Nested<>(this::simpleAuth);
     }
 
@@ -67,7 +67,7 @@ public Mqtt3RxClientViewBuilder(final @NotNull MqttRxClientBuilderBase<?> client
     }
 
     @Override
-    public Mqtt3PublishViewBuilder.@NotNull WillNested<Mqtt3RxClientViewBuilder> willPublish() {
+    public Mqtt3PublishViewBuilder.@NotNull WillNested<Mqtt3RxClientViewBuilder> willPublishWith() {
         return new Mqtt3PublishViewBuilder.WillNested<>(this::willPublish);
     }
 

src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java

@@ -107,7 +107,7 @@ public interface MqttClientBuilderBase<B extends MqttClientBuilderBase<B>> {
      * @since 1.1
      */
     @CheckReturnValue
-    @NotNull B tlsWithDefaultConfig();
+    @NotNull B tls();
 
     /**
      * Sets the optional {@link MqttClientConfig#getTlsConfig() transport layer security configuration}.
@@ -131,7 +131,7 @@ public interface MqttClientBuilderBase<B extends MqttClientBuilderBase<B>> {
      * @since 1.1
      */
     @CheckReturnValue
-    MqttTlsConfigBuilder.@NotNull Nested<? extends B> tlsConfig();
+    MqttTlsConfigBuilder.@NotNull Nested<? extends B> tlsConfigWith();
 
     /**
      * Sets the {@link MqttClientConfig#getWebSocketConfig() WebSocket transport configuration} to the default
@@ -141,7 +141,7 @@ public interface MqttClientBuilderBase<B extends MqttClientBuilderBase<B>> {
      * @since 1.1
      */
     @CheckReturnValue
-    @NotNull B webSocketWithDefaultConfig();
+    @NotNull B webSocket();
 
     /**
      * Sets the optional {@link MqttClientConfig#getWebSocketConfig() WebSocket transport configuration}.
@@ -165,7 +165,7 @@ public interface MqttClientBuilderBase<B extends MqttClientBuilderBase<B>> {
      * @since 1.1
      */
     @CheckReturnValue
-    MqttWebSocketConfigBuilder.@NotNull Nested<? extends B> webSocketConfig();
+    MqttWebSocketConfigBuilder.@NotNull Nested<? extends B> webSocketConfigWith();
 
     /**
      * Sets the {@link MqttClientConfig#getTransportConfig() transport configuration}.
@@ -188,7 +188,7 @@ public interface MqttClientBuilderBase<B extends MqttClientBuilderBase<B>> {
      * @since 1.1
      */
     @CheckReturnValue
-    MqttTransportConfigBuilder.@NotNull Nested<? extends B> transportConfig();
+    MqttTransportConfigBuilder.@NotNull Nested<? extends B> transportConfigWith();
 
     /**
      * Sets the {@link MqttClientConfig#getExecutorConfig() executor configuration}.
@@ -209,7 +209,7 @@ public interface MqttClientBuilderBase<B extends MqttClientBuilderBase<B>> {
      * @see #executorConfig(MqttExecutorConfig)
      */
     @CheckReturnValue
-    MqttExecutorConfigBuilder.@NotNull Nested<? extends B> executorConfig();
+    MqttExecutorConfigBuilder.@NotNull Nested<? extends B> executorConfigWith();
 
     /**
      * Uses automatic reconnect with the default configuration.
@@ -218,7 +218,7 @@ public interface MqttClientBuilderBase<B extends MqttClientBuilderBase<B>> {
      * @since 1.1
      */
     @CheckReturnValue
-    @NotNull B automaticReconnectWithDefaultConfig();
+    @NotNull B automaticReconnect();
 
     /**
      * Sets the optional {@link MqttClientConfig#getAutomaticReconnect() automatic reconnect strategy}.
@@ -242,7 +242,7 @@ public interface MqttClientBuilderBase<B extends MqttClientBuilderBase<B>> {
      * @since 1.1
      */
     @CheckReturnValue
-    MqttAutoReconnectBuilder.@NotNull Nested<? extends B> automaticReconnect();
+    MqttAutoReconnectBuilder.@NotNull Nested<? extends B> automaticReconnectWith();
 
     /**
      * Adds a listener which is notified when the client is connected (a successful ConnAck message is received).

src/main/java/com/hivemq/client/mqtt/MqttTransportConfigBuilderBase.java

@@ -126,7 +126,7 @@ public interface MqttTransportConfigBuilderBase<B extends MqttTransportConfigBui
      * @return the builder.
      */
     @CheckReturnValue
-    @NotNull B tlsWithDefaultConfig();
+    @NotNull B tls();
 
     /**
      * Sets the optional {@link MqttTransportConfig#getTlsConfig() transport layer security configuration}.
@@ -148,7 +148,7 @@ public interface MqttTransportConfigBuilderBase<B extends MqttTransportConfigBui
      * @see #tlsConfig(MqttTlsConfig)
      */
     @CheckReturnValue
-    MqttTlsConfigBuilder.@NotNull Nested<? extends B> tlsConfig();
+    MqttTlsConfigBuilder.@NotNull Nested<? extends B> tlsConfigWith();
 
     /**
      * Sets the {@link MqttTransportConfig#getWebSocketConfig() WebSocket transport configuration} to the default
@@ -157,7 +157,7 @@ public interface MqttTransportConfigBuilderBase<B extends MqttTransportConfigBui
      * @return the builder.
      */
     @CheckReturnValue
-    @NotNull B webSocketWithDefaultConfig();
+    @NotNull B webSocket();
 
     /**
      * Sets the optional {@link MqttTransportConfig#getWebSocketConfig() WebSocket transport configuration}.
@@ -179,7 +179,7 @@ public interface MqttTransportConfigBuilderBase<B extends MqttTransportConfigBui
      * @see #webSocketConfig(MqttWebSocketConfig)
      */
     @CheckReturnValue
-    MqttWebSocketConfigBuilder.@NotNull Nested<? extends B> webSocketConfig();
+    MqttWebSocketConfigBuilder.@NotNull Nested<? extends B> webSocketConfigWith();
 
     /**
      * Sets the optional {@link MqttTransportConfig#getProxyConfig() proxy configuration}.
@@ -203,7 +203,7 @@ public interface MqttTransportConfigBuilderBase<B extends MqttTransportConfigBui
      * @since 1.2
      */
     @CheckReturnValue
-    MqttProxyConfigBuilder.@NotNull Nested<? extends B> proxyConfig();
+    MqttProxyConfigBuilder.@NotNull Nested<? extends B> proxyConfigWith();
 
     /**
      * Sets the {@link MqttTransportConfig#getSocketConnectTimeoutMs() timeout for connecting the socket to the

src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientBuilder.java

@@ -59,7 +59,7 @@ public interface Mqtt3ClientBuilder extends MqttClientBuilderBase<Mqtt3ClientBui
      * @since 1.1
      */
     @CheckReturnValue
-    Mqtt3SimpleAuthBuilder.@NotNull Nested<? extends Mqtt3ClientBuilder> simpleAuth();
+    Mqtt3SimpleAuthBuilder.@NotNull Nested<? extends Mqtt3ClientBuilder> simpleAuthWith();
 
     /**
      * Sets the optional {@link Mqtt3ClientConfig#getWillPublish() Will Publish}.
@@ -83,7 +83,7 @@ public interface Mqtt3ClientBuilder extends MqttClientBuilderBase<Mqtt3ClientBui
      * @since 1.1
      */
     @CheckReturnValue
-    Mqtt3WillPublishBuilder.@NotNull Nested<? extends Mqtt3ClientBuilder> willPublish();
+    Mqtt3WillPublishBuilder.@NotNull Nested<? extends Mqtt3ClientBuilder> willPublishWith();
 
     /**
      * Builds the {@link Mqtt3Client}.

src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientBuilder.java

@@ -57,7 +57,7 @@ public interface Mqtt5ClientBuilder extends MqttClientBuilderBase<Mqtt5ClientBui
      * @see #advancedConfig(Mqtt5AdvancedConfig)
      */
     @CheckReturnValue
-    Mqtt5AdvancedConfigBuilder.@NotNull Nested<? extends Mqtt5ClientBuilder> advancedConfig();
+    Mqtt5AdvancedConfigBuilder.@NotNull Nested<? extends Mqtt5ClientBuilder> advancedConfigWith();
 
     /**
      * Sets the optional {@link Mqtt5ClientConfig#getSimpleAuth() simple authentication and/or authorization related
@@ -83,7 +83,7 @@ public interface Mqtt5ClientBuilder extends MqttClientBuilderBase<Mqtt5ClientBui
      * @since 1.1
      */
     @CheckReturnValue
-    Mqtt5SimpleAuthBuilder.@NotNull Nested<? extends Mqtt5ClientBuilder> simpleAuth();
+    Mqtt5SimpleAuthBuilder.@NotNull Nested<? extends Mqtt5ClientBuilder> simpleAuthWith();
 
     /**
      * Sets the {@link Mqtt5ClientConfig#getEnhancedAuthMechanism() enhanced authentication and/or authorization
@@ -119,7 +119,7 @@ public interface Mqtt5ClientBuilder extends MqttClientBuilderBase<Mqtt5ClientBui
      * @since 1.1
      */
     @CheckReturnValue
-    Mqtt5WillPublishBuilder.@NotNull Nested<? extends Mqtt5ClientBuilder> willPublish();
+    Mqtt5WillPublishBuilder.@NotNull Nested<? extends Mqtt5ClientBuilder> willPublishWith();
 
     /**
      * Builds the {@link Mqtt5Client}.