MqttClientTransportConfig -> MqttTransportConfig

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

@@ -51,7 +51,7 @@ public class MqttClientConfig implements Mqtt5ClientConfig {
 
     private final @NotNull MqttVersion mqttVersion;
     private volatile @NotNull MqttClientIdentifierImpl clientIdentifier;
-    private final @NotNull MqttClientTransportConfigImpl transportConfig;
+    private final @NotNull MqttTransportConfigImpl transportConfig;
     private final @NotNull MqttClientExecutorConfigImpl executorConfig;
     private final @NotNull MqttClientAdvancedConfig advancedConfig;
     private final @NotNull ConnectDefaults connectDefaults;
@@ -66,15 +66,15 @@ public class MqttClientConfig implements Mqtt5ClientConfig {
 
     private final @NotNull AtomicReference<@NotNull MqttClientState> state;
     private volatile @Nullable MqttClientConnectionConfig connectionConfig;
-    private @NotNull MqttClientTransportConfigImpl currentTransportConfig;
+    private @NotNull MqttTransportConfigImpl currentTransportConfig;
     private @Nullable SslContext currentSslContext;
     private boolean resubscribeIfSessionExpired;
     private boolean republishIfSessionExpired;
 
     public MqttClientConfig(
             final @NotNull MqttVersion mqttVersion,
             final @NotNull MqttClientIdentifierImpl clientIdentifier,
-            final @NotNull MqttClientTransportConfigImpl transportConfig,
+            final @NotNull MqttTransportConfigImpl transportConfig,
             final @NotNull MqttClientExecutorConfigImpl executorConfig,
             final @NotNull MqttClientAdvancedConfig advancedConfig,
             final @NotNull ConnectDefaults connectDefaults,
@@ -116,7 +116,7 @@ public void setClientIdentifier(final @NotNull MqttClientIdentifierImpl clientId
     }
 
     @Override
-    public @NotNull MqttClientTransportConfigImpl getTransportConfig() {
+    public @NotNull MqttTransportConfigImpl getTransportConfig() {
         return transportConfig;
     }
 
@@ -236,11 +236,11 @@ public void setConnectionConfig(final @Nullable MqttClientConnectionConfig conne
         this.connectionConfig = connectionConfig;
     }
 
-    public @NotNull MqttClientTransportConfigImpl getCurrentTransportConfig() {
+    public @NotNull MqttTransportConfigImpl getCurrentTransportConfig() {
         return currentTransportConfig;
     }
 
-    public void setCurrentTransportConfig(final @NotNull MqttClientTransportConfigImpl currentTransportConfig) {
+    public void setCurrentTransportConfig(final @NotNull MqttTransportConfigImpl currentTransportConfig) {
         if (!this.currentTransportConfig.equals(currentTransportConfig)) {
             this.currentTransportConfig = currentTransportConfig;
             currentSslContext = null;

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

@@ -48,7 +48,7 @@ public class MqttClientConnectionConfig
     private static final int FLAG_CLEAN_START = 1 << 8;
     private static final int FLAG_CLEAN_STOP = 1 << 9;
 
-    private final @NotNull MqttClientTransportConfigImpl transportConfig;
+    private final @NotNull MqttTransportConfigImpl transportConfig;
     private final short keepAlive;
     private volatile int sessionExpiryInterval;
     private final @Nullable Mqtt5EnhancedAuthMechanism enhancedAuthMechanism;
@@ -63,7 +63,7 @@ public class MqttClientConnectionConfig
     private final int flags;
 
     public MqttClientConnectionConfig(
-            final @NotNull MqttClientTransportConfigImpl transportConfig,
+            final @NotNull MqttTransportConfigImpl transportConfig,
             final int keepAlive,
             final boolean cleanStart,
             final boolean cleanStop,
@@ -135,7 +135,7 @@ public MqttClientConnectionConfig(
     }
 
     @Override
-    public @NotNull MqttClientTransportConfigImpl getTransportConfig() {
+    public @NotNull MqttTransportConfigImpl getTransportConfig() {
         return transportConfig;
     }
 

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

@@ -39,11 +39,11 @@
  * @author Silvio Giebl
  */
 public abstract class MqttRxClientBuilderBase<B extends MqttRxClientBuilderBase<B>>
-        extends MqttClientTransportConfigImplBuilder<B> {
+        extends MqttTransportConfigImplBuilder<B> {
 
     private @NotNull MqttClientIdentifierImpl identifier =
             MqttClientIdentifierImpl.REQUEST_CLIENT_IDENTIFIER_FROM_SERVER;
-    private @Nullable MqttClientTransportConfigImpl transportConfig = MqttClientTransportConfigImpl.DEFAULT;
+    private @Nullable MqttTransportConfigImpl transportConfig = MqttTransportConfigImpl.DEFAULT;
     private @NotNull MqttClientExecutorConfigImpl executorConfig = MqttClientExecutorConfigImpl.DEFAULT;
     private @Nullable MqttClientAutoReconnectImpl autoReconnect;
     private ImmutableList.@Nullable Builder<MqttClientConnectedListener> connectedListenersBuilder;
@@ -120,15 +120,15 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase<?> clie
         return super.webSocketConfig(webSocketConfig);
     }
 
-    public @NotNull B transportConfig(final @Nullable MqttClientTransportConfig transportConfig) {
+    public @NotNull B transportConfig(final @Nullable MqttTransportConfig transportConfig) {
         this.transportConfig =
-                Checks.notImplemented(transportConfig, MqttClientTransportConfigImpl.class, "Transport config");
+                Checks.notImplemented(transportConfig, MqttTransportConfigImpl.class, "Transport config");
         set(this.transportConfig);
         return self();
     }
 
-    public MqttClientTransportConfigImplBuilder.@NotNull Nested<B> transportConfig() {
-        return new MqttClientTransportConfigImplBuilder.Nested<>(this, this::transportConfig);
+    public MqttTransportConfigImplBuilder.@NotNull Nested<B> transportConfig() {
+        return new MqttTransportConfigImplBuilder.Nested<>(this, this::transportConfig);
     }
 
     public @NotNull B executorConfig(final @Nullable MqttClientExecutorConfig executorConfig) {
@@ -175,7 +175,7 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase<?> clie
     }
 
     @Override
-    @NotNull MqttClientTransportConfigImpl buildTransportConfig() {
+    @NotNull MqttTransportConfigImpl buildTransportConfig() {
         if (transportConfig == null) {
             return super.buildTransportConfig();
         }

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

@@ -18,8 +18,8 @@
 
 import com.hivemq.client.internal.util.InetSocketAddressUtil;
 import com.hivemq.client.mqtt.MqttClientTlsConfig;
-import com.hivemq.client.mqtt.MqttClientTransportConfig;
 import com.hivemq.client.mqtt.MqttProxyConfig;
+import com.hivemq.client.mqtt.MqttTransportConfig;
 import com.hivemq.client.mqtt.MqttWebSocketConfig;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -31,11 +31,11 @@
 /**
  * @author Silvio Giebl
  */
-public class MqttClientTransportConfigImpl implements MqttClientTransportConfig {
+public class MqttTransportConfigImpl implements MqttTransportConfig {
 
-    public static final @NotNull MqttClientTransportConfigImpl DEFAULT =
-            new MqttClientTransportConfigImpl(InetSocketAddressUtil.create(DEFAULT_SERVER_HOST, DEFAULT_SERVER_PORT),
-                    null, null, null, null, DEFAULT_SOCKET_CONNECT_TIMEOUT_MS, DEFAULT_MQTT_CONNECT_TIMEOUT_MS);
+    public static final @NotNull MqttTransportConfigImpl DEFAULT =
+            new MqttTransportConfigImpl(InetSocketAddressUtil.create(DEFAULT_SERVER_HOST, DEFAULT_SERVER_PORT), null,
+                    null, null, null, DEFAULT_SOCKET_CONNECT_TIMEOUT_MS, DEFAULT_MQTT_CONNECT_TIMEOUT_MS);
 
     private final @NotNull InetSocketAddress serverAddress;
     private final @Nullable InetSocketAddress localAddress;
@@ -45,7 +45,7 @@ public class MqttClientTransportConfigImpl implements MqttClientTransportConfig
     private final int socketConnectTimeoutMs;
     private final int mqttConnectTimeoutMs;
 
-    MqttClientTransportConfigImpl(
+    MqttTransportConfigImpl(
             final @NotNull InetSocketAddress serverAddress,
             final @Nullable InetSocketAddress localAddress,
             final @Nullable MqttClientTlsConfigImpl tlsConfig,
@@ -119,19 +119,19 @@ public int getMqttConnectTimeoutMs() {
     }
 
     @Override
-    public MqttClientTransportConfigImplBuilder.@NotNull Default extend() {
-        return new MqttClientTransportConfigImplBuilder.Default(this);
+    public MqttTransportConfigImplBuilder.@NotNull Default extend() {
+        return new MqttTransportConfigImplBuilder.Default(this);
     }
 
     @Override
     public boolean equals(final @Nullable Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof MqttClientTransportConfigImpl)) {
+        if (!(o instanceof MqttTransportConfigImpl)) {
             return false;
         }
-        final MqttClientTransportConfigImpl that = (MqttClientTransportConfigImpl) o;
+        final MqttTransportConfigImpl that = (MqttTransportConfigImpl) o;
 
         return serverAddress.equals(that.serverAddress) && Objects.equals(localAddress, that.localAddress) &&
                 Objects.equals(tlsConfig, that.tlsConfig) && Objects.equals(webSocketConfig, that.webSocketConfig) &&

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

@@ -19,8 +19,8 @@
 import com.hivemq.client.internal.util.Checks;
 import com.hivemq.client.internal.util.InetSocketAddressUtil;
 import com.hivemq.client.mqtt.MqttClientTlsConfig;
-import com.hivemq.client.mqtt.MqttClientTransportConfigBuilder;
 import com.hivemq.client.mqtt.MqttProxyConfig;
+import com.hivemq.client.mqtt.MqttTransportConfigBuilder;
 import com.hivemq.client.mqtt.MqttWebSocketConfig;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -33,25 +33,25 @@
 /**
  * @author Silvio Giebl
  */
-public abstract class MqttClientTransportConfigImplBuilder<B extends MqttClientTransportConfigImplBuilder<B>> {
+public abstract class MqttTransportConfigImplBuilder<B extends MqttTransportConfigImplBuilder<B>> {
 
     private @Nullable InetSocketAddress serverAddress;
-    private @NotNull Object serverHost = MqttClientTransportConfigImpl.DEFAULT_SERVER_HOST; // String or InetAddress
+    private @NotNull Object serverHost = MqttTransportConfigImpl.DEFAULT_SERVER_HOST; // String or InetAddress
     private int serverPort = -1;
     private @Nullable InetSocketAddress localAddress;
     private @Nullable MqttClientTlsConfigImpl tlsConfig;
     private @Nullable MqttWebSocketConfigImpl webSocketConfig;
     private @Nullable MqttProxyConfigImpl proxyConfig;
-    private int socketConnectTimeoutMs = MqttClientTransportConfigImpl.DEFAULT_SOCKET_CONNECT_TIMEOUT_MS;
-    private int mqttConnectTimeoutMs = MqttClientTransportConfigImpl.DEFAULT_MQTT_CONNECT_TIMEOUT_MS;
+    private int socketConnectTimeoutMs = MqttTransportConfigImpl.DEFAULT_SOCKET_CONNECT_TIMEOUT_MS;
+    private int mqttConnectTimeoutMs = MqttTransportConfigImpl.DEFAULT_MQTT_CONNECT_TIMEOUT_MS;
 
-    MqttClientTransportConfigImplBuilder() {}
+    MqttTransportConfigImplBuilder() {}
 
-    MqttClientTransportConfigImplBuilder(final @NotNull MqttClientTransportConfigImpl transportConfig) {
+    MqttTransportConfigImplBuilder(final @NotNull MqttTransportConfigImpl transportConfig) {
         set(transportConfig);
     }
 
-    MqttClientTransportConfigImplBuilder(final @NotNull MqttClientTransportConfigImplBuilder<?> builder) {
+    MqttTransportConfigImplBuilder(final @NotNull MqttTransportConfigImplBuilder<?> builder) {
         serverAddress = builder.serverAddress;
         serverHost = builder.serverHost;
         serverPort = builder.serverPort;
@@ -63,7 +63,7 @@ public abstract class MqttClientTransportConfigImplBuilder<B extends MqttClientT
         mqttConnectTimeoutMs = builder.mqttConnectTimeoutMs;
     }
 
-    void set(final @NotNull MqttClientTransportConfigImpl transportConfig) {
+    void set(final @NotNull MqttTransportConfigImpl transportConfig) {
         serverAddress = transportConfig.getServerAddress();
         localAddress = transportConfig.getRawLocalAddress();
         tlsConfig = transportConfig.getRawTlsConfig();
@@ -243,27 +243,26 @@ private int getServerPort() {
         }
         if (tlsConfig == null) {
             if (webSocketConfig == null) {
-                return MqttClientTransportConfigImpl.DEFAULT_SERVER_PORT;
+                return MqttTransportConfigImpl.DEFAULT_SERVER_PORT;
             }
-            return MqttClientTransportConfigImpl.DEFAULT_SERVER_PORT_WEBSOCKET;
+            return MqttTransportConfigImpl.DEFAULT_SERVER_PORT_WEBSOCKET;
         }
         if (webSocketConfig == null) {
-            return MqttClientTransportConfigImpl.DEFAULT_SERVER_PORT_TLS;
+            return MqttTransportConfigImpl.DEFAULT_SERVER_PORT_TLS;
         }
-        return MqttClientTransportConfigImpl.DEFAULT_SERVER_PORT_WEBSOCKET_TLS;
+        return MqttTransportConfigImpl.DEFAULT_SERVER_PORT_WEBSOCKET_TLS;
     }
 
-    @NotNull MqttClientTransportConfigImpl buildTransportConfig() {
-        return new MqttClientTransportConfigImpl(getServerAddress(), localAddress, tlsConfig, webSocketConfig,
-                proxyConfig, socketConnectTimeoutMs, mqttConnectTimeoutMs);
+    @NotNull MqttTransportConfigImpl buildTransportConfig() {
+        return new MqttTransportConfigImpl(getServerAddress(), localAddress, tlsConfig, webSocketConfig, proxyConfig,
+                socketConnectTimeoutMs, mqttConnectTimeoutMs);
     }
 
-    public static class Default extends MqttClientTransportConfigImplBuilder<Default>
-            implements MqttClientTransportConfigBuilder {
+    public static class Default extends MqttTransportConfigImplBuilder<Default> implements MqttTransportConfigBuilder {
 
         public Default() {}
 
-        Default(final @NotNull MqttClientTransportConfigImpl transportConfig) {
+        Default(final @NotNull MqttTransportConfigImpl transportConfig) {
             super(transportConfig);
         }
 
@@ -273,27 +272,27 @@ public Default() {}
         }
 
         @Override
-        public @NotNull MqttClientTransportConfigImpl build() {
+        public @NotNull MqttTransportConfigImpl build() {
             return buildTransportConfig();
         }
     }
 
-    public static class Nested<P> extends MqttClientTransportConfigImplBuilder<Nested<P>>
-            implements MqttClientTransportConfigBuilder.Nested<P> {
+    public static class Nested<P> extends MqttTransportConfigImplBuilder<Nested<P>>
+            implements MqttTransportConfigBuilder.Nested<P> {
 
-        private final @NotNull Function<? super MqttClientTransportConfigImpl, P> parentConsumer;
+        private final @NotNull Function<? super MqttTransportConfigImpl, P> parentConsumer;
 
         public Nested(
-                final @NotNull MqttClientTransportConfigImpl transportConfig,
-                final @NotNull Function<? super MqttClientTransportConfigImpl, P> parentConsumer) {
+                final @NotNull MqttTransportConfigImpl transportConfig,
+                final @NotNull Function<? super MqttTransportConfigImpl, P> parentConsumer) {
 
             super(transportConfig);
             this.parentConsumer = parentConsumer;
         }
 
         Nested(
-                final @NotNull MqttClientTransportConfigImplBuilder<?> builder,
-                final @NotNull Function<? super MqttClientTransportConfigImpl, P> parentConsumer) {
+                final @NotNull MqttTransportConfigImplBuilder<?> builder,
+                final @NotNull Function<? super MqttTransportConfigImpl, P> parentConsumer) {
 
             super(builder);
             this.parentConsumer = parentConsumer;

src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java

@@ -19,7 +19,7 @@
 import com.hivemq.client.internal.logging.InternalLogger;
 import com.hivemq.client.internal.logging.InternalLoggerFactory;
 import com.hivemq.client.internal.mqtt.MqttClientConfig;
-import com.hivemq.client.internal.mqtt.MqttClientTransportConfigImpl;
+import com.hivemq.client.internal.mqtt.MqttTransportConfigImpl;
 import com.hivemq.client.internal.mqtt.exceptions.MqttClientStateExceptions;
 import com.hivemq.client.internal.mqtt.lifecycle.MqttClientDisconnectedContextImpl;
 import com.hivemq.client.internal.mqtt.lifecycle.MqttClientReconnector;
@@ -85,7 +85,7 @@ private static void connect(
                     .build()
                     .bootstrap();
 
-            final MqttClientTransportConfigImpl transportConfig = clientConfig.getCurrentTransportConfig();
+            final MqttTransportConfigImpl transportConfig = clientConfig.getCurrentTransportConfig();
 
             bootstrap.group(eventLoop)
                     .connect(transportConfig.getRemoteAddress(), transportConfig.getRawLocalAddress())

src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java

@@ -17,7 +17,7 @@
 package com.hivemq.client.internal.mqtt.handler.websocket;
 
 import com.hivemq.client.internal.mqtt.MqttClientConfig;
-import com.hivemq.client.internal.mqtt.MqttClientTransportConfigImpl;
+import com.hivemq.client.internal.mqtt.MqttTransportConfigImpl;
 import com.hivemq.client.internal.mqtt.MqttWebSocketConfigImpl;
 import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger;
 import com.hivemq.client.internal.mqtt.ioc.ConnectionScope;
@@ -61,7 +61,7 @@ public void initChannel(
 
         final URI uri;
         try {
-            final MqttClientTransportConfigImpl transportConfig = clientConfig.getCurrentTransportConfig();
+            final MqttTransportConfigImpl transportConfig = clientConfig.getCurrentTransportConfig();
             final InetSocketAddress serverAddress = transportConfig.getServerAddress();
             uri = new URI((transportConfig.getRawTlsConfig() == null) ? "ws" : "wss", null,
                     serverAddress.getHostString(), serverAddress.getPort(), "/" + webSocketConfig.getServerPath(),