MqttClientTlsConfig -> MqttTlsConfig

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

@@ -104,7 +104,7 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase<?> clie
     }
 
     @Override
-    public @NotNull B tlsConfig(final @Nullable MqttClientTlsConfig tlsConfig) {
+    public @NotNull B tlsConfig(final @Nullable MqttTlsConfig tlsConfig) {
         return super.tlsConfig(tlsConfig);
     }
 

src/main/java/com/hivemq/client/internal/mqtt/MqttClientTlsConfigImpl.java → src/main/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImpl.java

@@ -17,7 +17,7 @@
 package com.hivemq.client.internal.mqtt;
 
 import com.hivemq.client.internal.util.collections.ImmutableList;
-import com.hivemq.client.mqtt.MqttClientTlsConfig;
+import com.hivemq.client.mqtt.MqttTlsConfig;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -30,7 +30,7 @@
  * @author David Katz
  * @author Silvio Giebl
  */
-public class MqttClientTlsConfigImpl implements MqttClientTlsConfig {
+public class MqttTlsConfigImpl implements MqttTlsConfig {
 
     static final @Nullable HostnameVerifier DEFAULT_HOSTNAME_VERIFIER;
 
@@ -44,8 +44,8 @@ public class MqttClientTlsConfigImpl implements MqttClientTlsConfig {
         DEFAULT_HOSTNAME_VERIFIER = hostnameVerifier;
     }
 
-    static final @NotNull MqttClientTlsConfigImpl DEFAULT =
-            new MqttClientTlsConfigImpl(null, null, null, null, (int) DEFAULT_HANDSHAKE_TIMEOUT_MS,
+    static final @NotNull MqttTlsConfigImpl DEFAULT =
+            new MqttTlsConfigImpl(null, null, null, null, (int) DEFAULT_HANDSHAKE_TIMEOUT_MS,
                     DEFAULT_HOSTNAME_VERIFIER);
 
     private final @Nullable KeyManagerFactory keyManagerFactory;
@@ -55,7 +55,7 @@ public class MqttClientTlsConfigImpl implements MqttClientTlsConfig {
     private final int handshakeTimeoutMs;
     private final @Nullable HostnameVerifier hostnameVerifier;
 
-    MqttClientTlsConfigImpl(
+    MqttTlsConfigImpl(
             final @Nullable KeyManagerFactory keyManagerFactory,
             final @Nullable TrustManagerFactory trustManagerFactory,
             final @Nullable ImmutableList<String> cipherSuites,
@@ -122,19 +122,19 @@ public long getHandshakeTimeoutMs() {
     }
 
     @Override
-    public MqttClientTlsConfigImplBuilder.@NotNull Default extend() {
-        return new MqttClientTlsConfigImplBuilder.Default(this);
+    public MqttTlsConfigImplBuilder.@NotNull Default extend() {
+        return new MqttTlsConfigImplBuilder.Default(this);
     }
 
     @Override
     public boolean equals(final @Nullable Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof MqttClientTlsConfigImpl)) {
+        if (!(o instanceof MqttTlsConfigImpl)) {
             return false;
         }
-        final MqttClientTlsConfigImpl that = (MqttClientTlsConfigImpl) o;
+        final MqttTlsConfigImpl that = (MqttTlsConfigImpl) o;
 
         return Objects.equals(keyManagerFactory, that.keyManagerFactory) &&
                 Objects.equals(trustManagerFactory, that.trustManagerFactory) &&

src/main/java/com/hivemq/client/internal/mqtt/MqttClientTlsConfigImplBuilder.java → src/main/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImplBuilder.java

@@ -18,7 +18,7 @@
 
 import com.hivemq.client.internal.util.Checks;
 import com.hivemq.client.internal.util.collections.ImmutableList;
-import com.hivemq.client.mqtt.MqttClientTlsConfigBuilder;
+import com.hivemq.client.mqtt.MqttTlsConfigBuilder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -32,18 +32,18 @@
 /**
  * @author Silvio Giebl
  */
-public abstract class MqttClientTlsConfigImplBuilder<B extends MqttClientTlsConfigImplBuilder<B>> {
+public abstract class MqttTlsConfigImplBuilder<B extends MqttTlsConfigImplBuilder<B>> {
 
     private @Nullable KeyManagerFactory keyManagerFactory;
     private @Nullable TrustManagerFactory trustManagerFactory;
     private @Nullable ImmutableList<String> cipherSuites;
     private @Nullable ImmutableList<String> protocols;
-    private int handshakeTimeoutMs = (int) MqttClientTlsConfigImpl.DEFAULT_HANDSHAKE_TIMEOUT_MS;
-    private @Nullable HostnameVerifier hostnameVerifier = MqttClientTlsConfigImpl.DEFAULT_HOSTNAME_VERIFIER;
+    private int handshakeTimeoutMs = (int) MqttTlsConfigImpl.DEFAULT_HANDSHAKE_TIMEOUT_MS;
+    private @Nullable HostnameVerifier hostnameVerifier = MqttTlsConfigImpl.DEFAULT_HOSTNAME_VERIFIER;
 
-    MqttClientTlsConfigImplBuilder() {}
+    MqttTlsConfigImplBuilder() {}
 
-    MqttClientTlsConfigImplBuilder(final @Nullable MqttClientTlsConfigImpl tlsConfig) {
+    MqttTlsConfigImplBuilder(final @Nullable MqttTlsConfigImpl tlsConfig) {
         if (tlsConfig != null) {
             keyManagerFactory = tlsConfig.getRawKeyManagerFactory();
             trustManagerFactory = tlsConfig.getRawTrustManagerFactory();
@@ -85,20 +85,20 @@ public abstract class MqttClientTlsConfigImplBuilder<B extends MqttClientTlsConf
 
     public @NotNull B hostnameVerifier(final @Nullable HostnameVerifier hostnameVerifier) {
         this.hostnameVerifier =
-                (hostnameVerifier == null) ? MqttClientTlsConfigImpl.DEFAULT_HOSTNAME_VERIFIER : hostnameVerifier;
+                (hostnameVerifier == null) ? MqttTlsConfigImpl.DEFAULT_HOSTNAME_VERIFIER : hostnameVerifier;
         return self();
     }
 
-    public @NotNull MqttClientTlsConfigImpl build() {
-        return new MqttClientTlsConfigImpl(
+    public @NotNull MqttTlsConfigImpl build() {
+        return new MqttTlsConfigImpl(
                 keyManagerFactory, trustManagerFactory, cipherSuites, protocols, handshakeTimeoutMs, hostnameVerifier);
     }
 
-    public static class Default extends MqttClientTlsConfigImplBuilder<Default> implements MqttClientTlsConfigBuilder {
+    public static class Default extends MqttTlsConfigImplBuilder<Default> implements MqttTlsConfigBuilder {
 
         public Default() {}
 
-        Default(final @Nullable MqttClientTlsConfigImpl tlsConfig) {
+        Default(final @Nullable MqttTlsConfigImpl tlsConfig) {
             super(tlsConfig);
         }
 
@@ -108,14 +108,14 @@ public Default() {}
         }
     }
 
-    public static class Nested<P> extends MqttClientTlsConfigImplBuilder<Nested<P>>
-            implements MqttClientTlsConfigBuilder.Nested<P> {
+    public static class Nested<P> extends MqttTlsConfigImplBuilder<Nested<P>>
+            implements MqttTlsConfigBuilder.Nested<P> {
 
-        private final @NotNull Function<? super MqttClientTlsConfigImpl, P> parentConsumer;
+        private final @NotNull Function<? super MqttTlsConfigImpl, P> parentConsumer;
 
         Nested(
-                final @Nullable MqttClientTlsConfigImpl tlsConfig,
-                final @NotNull Function<? super MqttClientTlsConfigImpl, P> parentConsumer) {
+                final @Nullable MqttTlsConfigImpl tlsConfig,
+                final @NotNull Function<? super MqttTlsConfigImpl, P> parentConsumer) {
 
             super(tlsConfig);
             this.parentConsumer = parentConsumer;

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

@@ -17,8 +17,8 @@
 package com.hivemq.client.internal.mqtt;
 
 import com.hivemq.client.internal.util.InetSocketAddressUtil;
-import com.hivemq.client.mqtt.MqttClientTlsConfig;
 import com.hivemq.client.mqtt.MqttProxyConfig;
+import com.hivemq.client.mqtt.MqttTlsConfig;
 import com.hivemq.client.mqtt.MqttTransportConfig;
 import com.hivemq.client.mqtt.MqttWebSocketConfig;
 import org.jetbrains.annotations.NotNull;
@@ -39,7 +39,7 @@ public class MqttTransportConfigImpl implements MqttTransportConfig {
 
     private final @NotNull InetSocketAddress serverAddress;
     private final @Nullable InetSocketAddress localAddress;
-    private final @Nullable MqttClientTlsConfigImpl tlsConfig;
+    private final @Nullable MqttTlsConfigImpl tlsConfig;
     private final @Nullable MqttWebSocketConfigImpl webSocketConfig;
     private final @Nullable MqttProxyConfigImpl proxyConfig;
     private final int socketConnectTimeoutMs;
@@ -48,7 +48,7 @@ public class MqttTransportConfigImpl implements MqttTransportConfig {
     MqttTransportConfigImpl(
             final @NotNull InetSocketAddress serverAddress,
             final @Nullable InetSocketAddress localAddress,
-            final @Nullable MqttClientTlsConfigImpl tlsConfig,
+            final @Nullable MqttTlsConfigImpl tlsConfig,
             final @Nullable MqttWebSocketConfigImpl webSocketConfig,
             final @Nullable MqttProxyConfigImpl proxyConfig,
             final int socketConnectTimeoutMs,
@@ -82,11 +82,11 @@ public class MqttTransportConfigImpl implements MqttTransportConfig {
     }
 
     @Override
-    public @NotNull Optional<MqttClientTlsConfig> getTlsConfig() {
+    public @NotNull Optional<MqttTlsConfig> getTlsConfig() {
         return Optional.ofNullable(tlsConfig);
     }
 
-    public @Nullable MqttClientTlsConfigImpl getRawTlsConfig() {
+    public @Nullable MqttTlsConfigImpl getRawTlsConfig() {
         return tlsConfig;
     }
 

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

@@ -18,8 +18,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.MqttProxyConfig;
+import com.hivemq.client.mqtt.MqttTlsConfig;
 import com.hivemq.client.mqtt.MqttTransportConfigBuilder;
 import com.hivemq.client.mqtt.MqttWebSocketConfig;
 import org.jetbrains.annotations.NotNull;
@@ -39,7 +39,7 @@ public abstract class MqttTransportConfigImplBuilder<B extends MqttTransportConf
     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 MqttTlsConfigImpl tlsConfig;
     private @Nullable MqttWebSocketConfigImpl webSocketConfig;
     private @Nullable MqttProxyConfigImpl proxyConfig;
     private int socketConnectTimeoutMs = MqttTransportConfigImpl.DEFAULT_SOCKET_CONNECT_TIMEOUT_MS;
@@ -176,17 +176,17 @@ private int getLocalPort() {
     }
 
     public @NotNull B tlsWithDefaultConfig() {
-        this.tlsConfig = MqttClientTlsConfigImpl.DEFAULT;
+        this.tlsConfig = MqttTlsConfigImpl.DEFAULT;
         return self();
     }
 
-    public @NotNull B tlsConfig(final @Nullable MqttClientTlsConfig tlsConfig) {
-        this.tlsConfig = Checks.notImplementedOrNull(tlsConfig, MqttClientTlsConfigImpl.class, "TLS config");
+    public @NotNull B tlsConfig(final @Nullable MqttTlsConfig tlsConfig) {
+        this.tlsConfig = Checks.notImplementedOrNull(tlsConfig, MqttTlsConfigImpl.class, "TLS config");
         return self();
     }
 
-    public MqttClientTlsConfigImplBuilder.@NotNull Nested<B> tlsConfig() {
-        return new MqttClientTlsConfigImplBuilder.Nested<>(tlsConfig, this::tlsConfig);
+    public MqttTlsConfigImplBuilder.@NotNull Nested<B> tlsConfig() {
+        return new MqttTlsConfigImplBuilder.Nested<>(tlsConfig, this::tlsConfig);
     }
 
     public @NotNull B webSocketWithDefaultConfig() {

src/main/java/com/hivemq/client/internal/mqtt/handler/MqttChannelInitializer.java

@@ -17,8 +17,8 @@
 package com.hivemq.client.internal.mqtt.handler;
 
 import com.hivemq.client.internal.mqtt.MqttClientConfig;
-import com.hivemq.client.internal.mqtt.MqttClientTlsConfigImpl;
 import com.hivemq.client.internal.mqtt.MqttProxyConfigImpl;
+import com.hivemq.client.internal.mqtt.MqttTlsConfigImpl;
 import com.hivemq.client.internal.mqtt.MqttWebSocketConfigImpl;
 import com.hivemq.client.internal.mqtt.codec.encoder.MqttEncoder;
 import com.hivemq.client.internal.mqtt.handler.auth.MqttAuthHandler;
@@ -114,7 +114,7 @@ private void initProxy(final @NotNull Channel channel) {
     }
 
     private void initTls(final @NotNull Channel channel) {
-        final MqttClientTlsConfigImpl tlsConfig = clientConfig.getCurrentTransportConfig().getRawTlsConfig();
+        final MqttTlsConfigImpl tlsConfig = clientConfig.getCurrentTransportConfig().getRawTlsConfig();
         if (tlsConfig == null) {
             initWebsocket(channel);
         } else {

src/main/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsInitializer.java

@@ -17,7 +17,7 @@
 package com.hivemq.client.internal.mqtt.handler.tls;
 
 import com.hivemq.client.internal.mqtt.MqttClientConfig;
-import com.hivemq.client.internal.mqtt.MqttClientTlsConfigImpl;
+import com.hivemq.client.internal.mqtt.MqttTlsConfigImpl;
 import com.hivemq.client.internal.util.collections.ImmutableList;
 import io.netty.channel.Channel;
 import io.netty.handler.ssl.SslContext;
@@ -44,7 +44,7 @@ public final class MqttTlsInitializer {
     public static void initChannel(
             final @NotNull Channel channel,
             final @NotNull MqttClientConfig clientConfig,
-            final @NotNull MqttClientTlsConfigImpl tlsConfig,
+            final @NotNull MqttTlsConfigImpl tlsConfig,
             final @NotNull Consumer<Channel> onSuccess,
             final @NotNull BiConsumer<Channel, Throwable> onError) {
 
@@ -79,7 +79,7 @@ public static void initChannel(
         channel.pipeline().addLast(SSL_HANDLER_NAME, sslHandler).addLast(MqttTlsAdapterHandler.NAME, tlsAdapterHandler);
     }
 
-    static @NotNull SslContext createSslContext(final @NotNull MqttClientTlsConfigImpl tlsConfig) throws SSLException {
+    static @NotNull SslContext createSslContext(final @NotNull MqttTlsConfigImpl tlsConfig) throws SSLException {
         final ImmutableList<String> protocols = tlsConfig.getRawProtocols();
 
         return SslContextBuilder.forClient()

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

@@ -116,20 +116,20 @@ public interface MqttClientBuilderBase<B extends MqttClientBuilderBase<B>> {
      * @since 1.1
      */
     @CheckReturnValue
-    @NotNull B tlsConfig(@Nullable MqttClientTlsConfig tlsConfig);
+    @NotNull B tlsConfig(@Nullable MqttTlsConfig tlsConfig);
 
     /**
-     * Fluent counterpart of {@link #tlsConfig(MqttClientTlsConfig)}.
+     * Fluent counterpart of {@link #tlsConfig(MqttTlsConfig)}.
      * <p>
-     * Calling {@link MqttClientTlsConfigBuilder.Nested#applyTlsConfig()} on the returned builder has the effect of
-     * extending the current transport layer security configuration.
+     * Calling {@link MqttTlsConfigBuilder.Nested#applyTlsConfig()} on the returned builder has the effect of extending
+     * the current transport layer security configuration.
      *
      * @return the fluent builder for the transport layer security configuration.
-     * @see #tlsConfig(MqttClientTlsConfig)
+     * @see #tlsConfig(MqttTlsConfig)
      * @since 1.1
      */
     @CheckReturnValue
-    MqttClientTlsConfigBuilder.@NotNull Nested<? extends B> tlsConfig();
+    MqttTlsConfigBuilder.@NotNull Nested<? extends B> tlsConfig();
 
     /**
      * Sets the {@link MqttClientConfig#getWebSocketConfig() WebSocket transport configuration} to the default

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

@@ -75,7 +75,7 @@ default int getServerPort() {
     /**
      * @return the optional transport layer security configuration of the client.
      */
-    default @NotNull Optional<MqttClientTlsConfig> getTlsConfig() {
+    default @NotNull Optional<MqttTlsConfig> getTlsConfig() {
         return getTransportConfig().getTlsConfig();
     }
 

src/main/java/com/hivemq/client/mqtt/MqttClientTlsConfig.java → src/main/java/com/hivemq/client/mqtt/MqttTlsConfig.java

@@ -18,7 +18,7 @@
 
 import com.hivemq.client.annotations.DoNotImplement;
 import com.hivemq.client.annotations.Immutable;
-import com.hivemq.client.internal.mqtt.MqttClientTlsConfigImplBuilder;
+import com.hivemq.client.internal.mqtt.MqttTlsConfigImplBuilder;
 import org.jetbrains.annotations.NotNull;
 
 import javax.net.ssl.HostnameVerifier;
@@ -35,7 +35,7 @@
  * @since 1.0
  */
 @DoNotImplement
-public interface MqttClientTlsConfig {
+public interface MqttTlsConfig {
 
     /**
      * The default TLS handshake timeout in milliseconds.
@@ -47,8 +47,8 @@ public interface MqttClientTlsConfig {
      *
      * @return the created builder for a transport layer security configuration.
      */
-    static @NotNull MqttClientTlsConfigBuilder builder() {
-        return new MqttClientTlsConfigImplBuilder.Default();
+    static @NotNull MqttTlsConfigBuilder builder() {
+        return new MqttTlsConfigImplBuilder.Default();
     }
 
     /**
@@ -94,5 +94,5 @@ public interface MqttClientTlsConfig {
      * @return the created builder.
      * @since 1.1
      */
-    @NotNull MqttClientTlsConfigBuilder extend();
+    @NotNull MqttTlsConfigBuilder extend();
 }

src/main/java/com/hivemq/client/mqtt/MqttClientTlsConfigBuilder.java → src/main/java/com/hivemq/client/mqtt/MqttTlsConfigBuilder.java

@@ -21,34 +21,34 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Builder for a {@link MqttClientTlsConfig}.
+ * Builder for a {@link MqttTlsConfig}.
  *
  * @author Silvio Giebl
  * @since 1.0
  */
 @DoNotImplement
-public interface MqttClientTlsConfigBuilder extends MqttClientTlsConfigBuilderBase<MqttClientTlsConfigBuilder> {
+public interface MqttTlsConfigBuilder extends MqttTlsConfigBuilderBase<MqttTlsConfigBuilder> {
 
     /**
-     * Builds the {@link MqttClientTlsConfig}.
+     * Builds the {@link MqttTlsConfig}.
      *
-     * @return the built {@link MqttClientTlsConfig}.
+     * @return the built {@link MqttTlsConfig}.
      */
     @CheckReturnValue
-    @NotNull MqttClientTlsConfig build();
+    @NotNull MqttTlsConfig build();
 
     /**
-     * Builder for a {@link MqttClientTlsConfig} that is applied to a parent.
+     * Builder for a {@link MqttTlsConfig} that is applied to a parent.
      *
-     * @param <P> the type of the result when the built {@link MqttClientTlsConfig} is applied to the parent.
+     * @param <P> the type of the result when the built {@link MqttTlsConfig} is applied to the parent.
      */
     @DoNotImplement
-    interface Nested<P> extends MqttClientTlsConfigBuilderBase<Nested<P>> {
+    interface Nested<P> extends MqttTlsConfigBuilderBase<Nested<P>> {
 
         /**
-         * Builds the {@link MqttClientTlsConfig} and applies it to the parent.
+         * Builds the {@link MqttTlsConfig} and applies it to the parent.
          *
-         * @return the result when the built {@link MqttClientTlsConfig} is applied to the parent.
+         * @return the result when the built {@link MqttTlsConfig} is applied to the parent.
          */
         @NotNull P applyTlsConfig();
     }