From feec2a7516b0e476ddc744b0a3865ade4337f7e8 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Thu, 12 Nov 2020 20:51:26 +0100 Subject: [PATCH 01/62] Removed deprecated methods --- .../client/internal/mqtt/MqttRxClient.java | 12 ---- .../mqtt/mqtt3/Mqtt3RxClientView.java | 12 ---- .../client/mqtt/MqttClientBuilderBase.java | 68 ------------------- .../client/mqtt/mqtt3/Mqtt3RxClient.java | 19 ------ .../client/mqtt/mqtt5/Mqtt5RxClient.java | 19 ------ .../client/example/Mqtt3ClientExample.java | 24 ++++--- 6 files changed, 13 insertions(+), 141 deletions(-) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java index c9fa963ea..a2bd51010 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java @@ -112,18 +112,6 @@ public MqttRxClient(final @NotNull MqttClientConfig clientConfig) { return new MqttSubscribeBuilder.Nested<>(this::subscribe); } - @Override - public @NotNull FlowableWithSingle subscribeStream( - final @NotNull Mqtt5Subscribe subscribe) { - - return subscribePublishes(subscribe); - } - - @Override - public MqttSubscribeBuilder.@NotNull Nested> subscribeStreamWith() { - return new MqttSubscribeBuilder.Nested<>(this::subscribeStream); - } - @Override public @NotNull FlowableWithSingle subscribePublishes( final @Nullable Mqtt5Subscribe subscribe) { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java index b85701b6f..00d7b0127 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java @@ -118,18 +118,6 @@ public class Mqtt3RxClientView implements Mqtt3RxClient { return new Mqtt3SubscribeViewBuilder.Nested<>(this::subscribe); } - @Override - public @NotNull FlowableWithSingle subscribeStream( - final @NotNull Mqtt3Subscribe subscribe) { - - return subscribePublishes(subscribe); - } - - @Override - public Mqtt3SubscribeViewBuilder.@NotNull Nested> subscribeStreamWith() { - return new Mqtt3SubscribeViewBuilder.Nested<>(this::subscribeStream); - } - @Override public @NotNull FlowableWithSingle subscribePublishes( final @Nullable Mqtt3Subscribe subscribe) { diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java index c954888e7..b8620adb6 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java @@ -95,17 +95,6 @@ public interface MqttClientBuilderBase> { @CheckReturnValue @NotNull B serverPort(int port); - /** - * Use {@link #sslWithDefaultConfig()}. - * - * @return use {@link #sslWithDefaultConfig()}. - * @deprecated use {@link #sslWithDefaultConfig()}. - */ - @Deprecated - default @NotNull B useSslWithDefaultConfig() { - return sslWithDefaultConfig(); - } - /** * Sets the {@link MqttClientConfig#getSslConfig() secure transport configuration} to the default configuration. *

@@ -117,18 +106,6 @@ public interface MqttClientBuilderBase> { @CheckReturnValue @NotNull B sslWithDefaultConfig(); - /** - * Use {@link #sslConfig(MqttClientSslConfig)}. - * - * @param sslConfig use {@link #sslConfig(MqttClientSslConfig)}. - * @return use {@link #sslConfig(MqttClientSslConfig)}. - * @deprecated use {@link #sslConfig(MqttClientSslConfig)}. - */ - @Deprecated - default @NotNull B useSsl(final @Nullable MqttClientSslConfig sslConfig) { - return sslConfig(sslConfig); - } - /** * Sets the optional {@link MqttClientConfig#getSslConfig() secure transport configuration}. * @@ -140,17 +117,6 @@ public interface MqttClientBuilderBase> { @CheckReturnValue @NotNull B sslConfig(@Nullable MqttClientSslConfig sslConfig); - /** - * Use {@link #sslConfig()}. - * - * @return use {@link #sslConfig()}. - * @deprecated use {@link #sslConfig()}. - */ - @Deprecated - default MqttClientSslConfigBuilder.@NotNull Nested useSsl() { - return sslConfig(); - } - /** * Fluent counterpart of {@link #sslConfig(MqttClientSslConfig)}. *

@@ -164,17 +130,6 @@ public interface MqttClientBuilderBase> { @CheckReturnValue MqttClientSslConfigBuilder.@NotNull Nested sslConfig(); - /** - * Use {@link #webSocketWithDefaultConfig()}. - * - * @return use {@link #webSocketWithDefaultConfig()}. - * @deprecated use {@link #webSocketWithDefaultConfig()}. - */ - @Deprecated - default @NotNull B useWebSocketWithDefaultConfig() { - return webSocketWithDefaultConfig(); - } - /** * Sets the {@link MqttClientConfig#getWebSocketConfig() WebSocket transport configuration} to the default * configuration. @@ -185,18 +140,6 @@ public interface MqttClientBuilderBase> { @CheckReturnValue @NotNull B webSocketWithDefaultConfig(); - /** - * Use {@link #webSocketConfig(MqttWebSocketConfig)}. - * - * @param webSocketConfig use {@link #webSocketConfig(MqttWebSocketConfig)}. - * @return use {@link #webSocketConfig(MqttWebSocketConfig)}. - * @deprecated use {@link #webSocketConfig(MqttWebSocketConfig)}. - */ - @Deprecated - default @NotNull B useWebSocket(final @Nullable MqttWebSocketConfig webSocketConfig) { - return webSocketConfig(webSocketConfig); - } - /** * Sets the optional {@link MqttClientConfig#getWebSocketConfig() WebSocket transport configuration}. * @@ -208,17 +151,6 @@ public interface MqttClientBuilderBase> { @CheckReturnValue @NotNull B webSocketConfig(@Nullable MqttWebSocketConfig webSocketConfig); - /** - * Use {@link #webSocketConfig()}. - * - * @return use {@link #webSocketConfig()}. - * @deprecated use {@link #webSocketConfig()}. - */ - @Deprecated - default MqttWebSocketConfigBuilder.@NotNull Nested useWebSocket() { - return webSocketConfig(); - } - /** * Fluent counterpart of {@link #webSocketConfig(MqttWebSocketConfig)}. *

diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java index 380bbd564..866bc3578 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java @@ -123,25 +123,6 @@ public interface Mqtt3RxClient extends Mqtt3Client { @CheckReturnValue Mqtt3SubscribeBuilder.Nested.@NotNull Start> subscribeWith(); - /** - * Use {@link #subscribePublishes(Mqtt3Subscribe)}. - * - * @param subscribe use {@link #subscribePublishes(Mqtt3Subscribe)}. - * @return use {@link #subscribePublishes(Mqtt3Subscribe)}. - * @deprecated use {@link #subscribePublishes(Mqtt3Subscribe)}. - */ - @Deprecated - @NotNull FlowableWithSingle subscribeStream(@NotNull Mqtt3Subscribe subscribe); - - /** - * Use {@link #subscribePublishesWith()}. - * - * @return use {@link #subscribePublishesWith()}. - * @deprecated use {@link #subscribePublishesWith()}. - */ - @Deprecated - Mqtt3SubscribeBuilder.Nested.@NotNull Start> subscribeStreamWith(); - /** * Creates a {@link FlowableWithSingle} for subscribing this client with the given Subscribe message. *

diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java index 9fae6f419..8e2172bc6 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java @@ -126,25 +126,6 @@ public interface Mqtt5RxClient extends Mqtt5Client { @CheckReturnValue Mqtt5SubscribeBuilder.Nested.@NotNull Start> subscribeWith(); - /** - * Use {@link #subscribePublishes(Mqtt5Subscribe)}. - * - * @param subscribe use {@link #subscribePublishes(Mqtt5Subscribe)}. - * @return use {@link #subscribePublishes(Mqtt5Subscribe)}. - * @deprecated use {@link #subscribePublishes(Mqtt5Subscribe)}. - */ - @Deprecated - @NotNull FlowableWithSingle subscribeStream(@NotNull Mqtt5Subscribe subscribe); - - /** - * Use {@link #subscribePublishesWith()}. - * - * @return use {@link #subscribePublishesWith()}. - * @deprecated use {@link #subscribePublishesWith()}. - */ - @Deprecated - Mqtt5SubscribeBuilder.Nested.@NotNull Start> subscribeStreamWith(); - /** * Creates a {@link FlowableWithSingle} for subscribing this client with the given Subscribe message. *

diff --git a/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java b/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java index 1517ab22d..8389022a3 100644 --- a/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java +++ b/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java @@ -92,17 +92,19 @@ Completable subscribeTo( .build(); // define what to do with the publishes that match the subscription. This does not subscribe until rxJava's subscribe is called // NOTE: you can also subscribe without the stream, and then handle the incoming publishes on client.allPublishes() - final Flowable subscribeScenario = client.subscribeStream(subscribeMessage).doOnSingle(subAck -> { - subscribedLatch.countDown(); - System.out.println("subscribed to " + topic + ": return codes: " + subAck.getReturnCodes()); - }).doOnNext(publish -> { - if (publish.getPayload().isPresent()) { - final int receivedCount = this.receivedCount.incrementAndGet(); - final String message = new String(publish.getPayloadAsBytes()); - System.out.println("received message with payload '" + message + "' on topic '" + publish.getTopic() + - "' received count: " + receivedCount); - } else { - System.out.println("received message without payload on topic '" + publish.getTopic() + "'"); + final Flowable subscribeScenario = + client.subscribePublishes(subscribeMessage).doOnSingle(subAck -> { + subscribedLatch.countDown(); + System.out.println("subscribed to " + topic + ": return codes: " + subAck.getReturnCodes()); + }).doOnNext(publish -> { + if (publish.getPayload().isPresent()) { + final int receivedCount = this.receivedCount.incrementAndGet(); + final String message = new String(publish.getPayloadAsBytes()); + System.out.println( + "received message with payload '" + message + "' on topic '" + publish.getTopic() + + "' received count: " + receivedCount); + } else { + System.out.println("received message without payload on topic '" + publish.getTopic() + "'"); } }); From 12b58537f4d290991e130bea1359cbbb0192a662 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Thu, 12 Nov 2020 21:03:57 +0100 Subject: [PATCH 02/62] RxClient.publish(Flowable) -> (Publisher) --- .../client/internal/mqtt/MqttRxClient.java | 16 +++++++++------- .../internal/mqtt/mqtt3/Mqtt3RxClientView.java | 7 ++++--- .../hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java | 5 +++-- .../hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java | 5 +++-- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java index a2bd51010..c682e80d8 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java @@ -57,6 +57,7 @@ import io.reactivex.internal.fuseable.ScalarCallable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.reactivestreams.Publisher; /** * @author Silvio Giebl @@ -192,19 +193,19 @@ public MqttRxClient(final @NotNull MqttClientConfig clientConfig) { } @Override - public @NotNull Flowable publish(final @Nullable Flowable publishFlowable) { - Checks.notNull(publishFlowable, "Publish flowable"); + public @NotNull Flowable publish(final @NotNull Publisher publisher) { + Checks.notNull(publisher, "Publisher"); - return publish(publishFlowable, PUBLISH_MAPPER); + return publish(publisher, PUBLISH_MAPPER); } public

@NotNull Flowable publish( - final @NotNull Flowable

publishFlowable, final @NotNull Function publishMapper) { + final @NotNull Publisher

publisher, final @NotNull Function publishMapper) { final Scheduler applicationScheduler = clientConfig.getExecutorConfig().getApplicationScheduler(); - if (publishFlowable instanceof ScalarCallable) { + if (publisher instanceof ScalarCallable) { //noinspection unchecked - final P publish = ((ScalarCallable

) publishFlowable).call(); + final P publish = ((ScalarCallable

) publisher).call(); if (publish == null) { return Flowable.empty(); } @@ -217,7 +218,8 @@ public MqttRxClient(final @NotNull MqttClientConfig clientConfig) { return new MqttAckSingleFlowable(clientConfig, mqttPublish).observeOn(applicationScheduler, true); } return new MqttAckFlowable( - clientConfig, publishFlowable.subscribeOn(applicationScheduler).map(publishMapper)).observeOn( + clientConfig, + Flowable.fromPublisher(publisher).subscribeOn(applicationScheduler).map(publishMapper)).observeOn( applicationScheduler, true); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java index 00d7b0127..815a7153c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java @@ -53,6 +53,7 @@ import io.reactivex.functions.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.reactivestreams.Publisher; /** * @author Silvio Giebl @@ -170,10 +171,10 @@ public class Mqtt3RxClientView implements Mqtt3RxClient { } @Override - public @NotNull Flowable publish(final @Nullable Flowable publishFlowable) { - Checks.notNull(publishFlowable, "Publish flowable"); + public @NotNull Flowable publish(final @NotNull Publisher publisher) { + Checks.notNull(publisher, "Publisher"); - return delegate.publish(publishFlowable, PUBLISH_MAPPER) + return delegate.publish(publisher, PUBLISH_MAPPER) .onErrorResumeNext(EXCEPTION_MAPPER_FLOWABLE_PUBLISH_RESULT) .map(Mqtt3PublishResultView.MAPPER); } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java index 866bc3578..b5eecadc2 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java @@ -34,6 +34,7 @@ import io.reactivex.Flowable; import io.reactivex.Single; import org.jetbrains.annotations.NotNull; +import org.reactivestreams.Publisher; /** * Reactive API of an {@link Mqtt3Client}. @@ -278,7 +279,7 @@ public interface Mqtt3RxClient extends Mqtt3Client { * Publishing is performed lazy and asynchronous. When subscribing (in terms of Reactive Streams) to the returned * {@link Flowable} the client subscribes (in terms of Reactive Streams) to the given {@link Flowable}. * - * @param publishFlowable the source of the Publish messages to publish. + * @param publisher the source of the Publish messages to publish. * @return the {@link Flowable} which *

    *
  • emits {@link Mqtt3PublishResult}s each corresponding to a Publish message, @@ -289,7 +290,7 @@ public interface Mqtt3RxClient extends Mqtt3Client { *
*/ @CheckReturnValue - @NotNull Flowable publish(@NotNull Flowable publishFlowable); + @NotNull Flowable publish(@NotNull Publisher publisher); /** * Creates a {@link Completable} for disconnecting this client. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java index 8e2172bc6..24cda939f 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java @@ -37,6 +37,7 @@ import io.reactivex.Flowable; import io.reactivex.Single; import org.jetbrains.annotations.NotNull; +import org.reactivestreams.Publisher; /** * Reactive API of an {@link Mqtt5Client}. @@ -285,7 +286,7 @@ public interface Mqtt5RxClient extends Mqtt5Client { * Publishing is performed lazy and asynchronous. When subscribing (in terms of Reactive Streams) to the returned * {@link Flowable} the client subscribes (in terms of Reactive Streams) to the given {@link Flowable}. * - * @param publishFlowable the source of the Publish messages to publish. + * @param publisher the source of the Publish messages to publish. * @return the {@link Flowable} which *
    *
  • emits {@link Mqtt5PublishResult}s each corresponding to a Publish message, @@ -296,7 +297,7 @@ public interface Mqtt5RxClient extends Mqtt5Client { *
*/ @CheckReturnValue - @NotNull Flowable publish(@NotNull Flowable publishFlowable); + @NotNull Flowable publish(@NotNull Publisher publisher); /** * Creates a {@link Completable} for re-authenticating this client. From e3ecf954bfea619fc080331d84866b913a38eb66 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Thu, 12 Nov 2020 21:13:00 +0100 Subject: [PATCH 03/62] Moved default constants from MqttClient -> TransportConfig --- .../mqtt/MqttClientTransportConfigImpl.java | 11 ++++++---- .../MqttClientTransportConfigImplBuilder.java | 12 +++++------ .../com/hivemq/client/mqtt/MqttClient.java | 21 ------------------- .../mqtt/MqttClientTransportConfig.java | 20 ++++++++++++++++++ 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImpl.java index fa2489853..e576e594f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImpl.java @@ -17,7 +17,10 @@ package com.hivemq.client.internal.mqtt; import com.hivemq.client.internal.util.InetSocketAddressUtil; -import com.hivemq.client.mqtt.*; +import com.hivemq.client.mqtt.MqttClientSslConfig; +import com.hivemq.client.mqtt.MqttClientTransportConfig; +import com.hivemq.client.mqtt.MqttProxyConfig; +import com.hivemq.client.mqtt.MqttWebSocketConfig; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -30,9 +33,9 @@ */ public class MqttClientTransportConfigImpl implements MqttClientTransportConfig { - public static final @NotNull MqttClientTransportConfigImpl DEFAULT = new MqttClientTransportConfigImpl( - InetSocketAddressUtil.create(MqttClient.DEFAULT_SERVER_HOST, MqttClient.DEFAULT_SERVER_PORT), null, null, - null, null, DEFAULT_SOCKET_CONNECT_TIMEOUT_MS, DEFAULT_MQTT_CONNECT_TIMEOUT_MS); + 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); private final @NotNull InetSocketAddress serverAddress; private final @Nullable InetSocketAddress localAddress; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImplBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImplBuilder.java index 69aa1186d..8f5d4dda8 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImplBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImplBuilder.java @@ -30,15 +30,13 @@ import java.util.concurrent.TimeUnit; import java.util.function.Function; -import static com.hivemq.client.mqtt.MqttClient.*; - /** * @author Silvio Giebl */ public abstract class MqttClientTransportConfigImplBuilder> { private @Nullable InetSocketAddress serverAddress; - private @NotNull Object serverHost = DEFAULT_SERVER_HOST; // String or InetAddress + private @NotNull Object serverHost = MqttClientTransportConfigImpl.DEFAULT_SERVER_HOST; // String or InetAddress private int serverPort = -1; private @Nullable InetSocketAddress localAddress; private @Nullable MqttClientSslConfigImpl sslConfig; @@ -245,14 +243,14 @@ private int getServerPort() { } if (sslConfig == null) { if (webSocketConfig == null) { - return DEFAULT_SERVER_PORT; + return MqttClientTransportConfigImpl.DEFAULT_SERVER_PORT; } - return DEFAULT_SERVER_PORT_WEBSOCKET; + return MqttClientTransportConfigImpl.DEFAULT_SERVER_PORT_WEBSOCKET; } if (webSocketConfig == null) { - return DEFAULT_SERVER_PORT_SSL; + return MqttClientTransportConfigImpl.DEFAULT_SERVER_PORT_SSL; } - return DEFAULT_SERVER_PORT_WEBSOCKET_SSL; + return MqttClientTransportConfigImpl.DEFAULT_SERVER_PORT_WEBSOCKET_SSL; } @NotNull MqttClientTransportConfigImpl buildTransportConfig() { diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClient.java b/src/main/java/com/hivemq/client/mqtt/MqttClient.java index 62ff7dba6..449f9dc18 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClient.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClient.java @@ -29,27 +29,6 @@ @DoNotImplement public interface MqttClient { - /** - * The default server host. - */ - @NotNull String DEFAULT_SERVER_HOST = "localhost"; - /** - * The default server port. - */ - int DEFAULT_SERVER_PORT = 1883; - /** - * The default server port when using SSL/TLS. - */ - int DEFAULT_SERVER_PORT_SSL = 8883; - /** - * The default server port when using WebSocket. - */ - int DEFAULT_SERVER_PORT_WEBSOCKET = 80; - /** - * The default server port when using SSL/TLS and WebSocket. - */ - int DEFAULT_SERVER_PORT_WEBSOCKET_SSL = 443; - /** * Creates a builder for an MQTT client. * diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfig.java index f2e2a8233..29b72549c 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfig.java @@ -32,6 +32,26 @@ @DoNotImplement public interface MqttClientTransportConfig { + /** + * The default server host. + */ + @NotNull String DEFAULT_SERVER_HOST = "localhost"; + /** + * The default server port. + */ + int DEFAULT_SERVER_PORT = 1883; + /** + * The default server port when using SSL/TLS. + */ + int DEFAULT_SERVER_PORT_SSL = 8883; + /** + * The default server port when using WebSocket. + */ + int DEFAULT_SERVER_PORT_WEBSOCKET = 80; + /** + * The default server port when using SSL/TLS and WebSocket. + */ + int DEFAULT_SERVER_PORT_WEBSOCKET_SSL = 443; /** * The default timeout for connecting the socket to the server in milliseconds. * From eff5897785044abd22893b910e6886ac07f55649 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Thu, 12 Nov 2020 21:26:15 +0100 Subject: [PATCH 04/62] BlockingClient.Mqtt3/5Publishes -> Publishes --- .../internal/mqtt/MqttBlockingClient.java | 10 +++++----- .../mqtt/mqtt3/Mqtt3BlockingClientView.java | 12 ++++++------ .../client/mqtt/mqtt3/Mqtt3BlockingClient.java | 18 ++++++++---------- .../client/mqtt/mqtt5/Mqtt5BlockingClient.java | 18 ++++++++---------- 4 files changed, 27 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java index 2103c73da..db775c190 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java @@ -126,17 +126,17 @@ public class MqttBlockingClient implements Mqtt5BlockingClient { } @Override - public @NotNull Mqtt5Publishes publishes(final @Nullable MqttGlobalPublishFilter filter) { + public @NotNull Publishes publishes(final @Nullable MqttGlobalPublishFilter filter) { return publishes(filter, false); } @Override - public @NotNull Mqtt5Publishes publishes( + public @NotNull Publishes publishes( final @Nullable MqttGlobalPublishFilter filter, final boolean manualAcknowledgement) { Checks.notNull(filter, "Global publish filter"); - return new MqttPublishes(delegate.publishesUnsafe(filter, manualAcknowledgement)); + return new Publishes(delegate.publishesUnsafe(filter, manualAcknowledgement)); } @Override @@ -216,14 +216,14 @@ public void disconnect(final @NotNull Mqtt5Disconnect disconnect) { return delegate.toAsync(); } - private static class MqttPublishes implements Mqtt5Publishes, FlowableSubscriber { + private static class Publishes implements Mqtt5BlockingClient.Publishes, FlowableSubscriber { private final @NotNull AtomicReference<@Nullable Subscription> subscription = new AtomicReference<>(); private final @NotNull LinkedList entries = new LinkedList<>(); private @Nullable Mqtt5Publish queuedPublish; private @Nullable Throwable error; - MqttPublishes(final @NotNull Flowable publishes) { + Publishes(final @NotNull Flowable publishes) { publishes.subscribe(this); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java index 2b732b470..da317230e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java @@ -101,17 +101,17 @@ public class Mqtt3BlockingClientView implements Mqtt3BlockingClient { } @Override - public @NotNull Mqtt3Publishes publishes(final @Nullable MqttGlobalPublishFilter filter) { + public @NotNull PublishesView publishes(final @Nullable MqttGlobalPublishFilter filter) { return publishes(filter, false); } @Override - public @NotNull Mqtt3Publishes publishes( + public @NotNull PublishesView publishes( final @Nullable MqttGlobalPublishFilter filter, final boolean manualAcknowledgement) { Checks.notNull(filter, "Global publish filter"); - return new Mqtt3PublishesView(delegate.publishes(filter, manualAcknowledgement)); + return new PublishesView(delegate.publishes(filter, manualAcknowledgement)); } @Override @@ -168,11 +168,11 @@ public void disconnect() { return new Mqtt3AsyncClientView(delegate.toAsync()); } - private static class Mqtt3PublishesView implements Mqtt3Publishes { + private static class PublishesView implements Publishes { - private final @NotNull Mqtt5BlockingClient.Mqtt5Publishes delegate; + private final @NotNull Mqtt5BlockingClient.Publishes delegate; - Mqtt3PublishesView(final @NotNull Mqtt5BlockingClient.Mqtt5Publishes delegate) { + PublishesView(final @NotNull Mqtt5BlockingClient.Publishes delegate) { this.delegate = delegate; } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java index 3dd6ddc81..91e19e870 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java @@ -102,23 +102,21 @@ public interface Mqtt3BlockingClient extends Mqtt3Client { * Globally consumes all incoming Publish messages matching the given filter. * * @param filter the filter with which all incoming Publish messages are filtered. - * @return a {@link Mqtt3Publishes} instance that can be used to receive the Publish messages on the calling - * thread. + * @return a {@link Publishes} instance that can be used to receive the Publish messages on the calling thread. * @see #publishes(MqttGlobalPublishFilter, boolean) */ - @NotNull Mqtt3Publishes publishes(final @NotNull MqttGlobalPublishFilter filter); + @NotNull Publishes publishes(final @NotNull MqttGlobalPublishFilter filter); /** * Globally consumes all incoming Publish messages matching the given filter. * * @param filter the filter with which all incoming Publish messages are filtered. * @param manualAcknowledgement whether the Publish messages are acknowledged manually. - * @return a {@link Mqtt3Publishes} instance that can be used to receive the Publish messages on the calling - * thread. + * @return a {@link Publishes} instance that can be used to receive the Publish messages on the calling thread. * @see #publishes(MqttGlobalPublishFilter) * @since 1.2 */ - @NotNull Mqtt3Publishes publishes(@NotNull MqttGlobalPublishFilter filter, boolean manualAcknowledgement); + @NotNull Publishes publishes(@NotNull MqttGlobalPublishFilter filter, boolean manualAcknowledgement); /** * Unsubscribes this client with the given Unsubscribe message. @@ -173,12 +171,12 @@ public interface Mqtt3BlockingClient extends Mqtt3Client { * Resource which queues incoming Publish messages until they are received. */ @DoNotImplement - interface Mqtt3Publishes extends AutoCloseable { + interface Publishes extends AutoCloseable { /** * Receives the next incoming Publish message. *
    - *
  • Might return immediately if there is already a Publish message queued in this {@link Mqtt3Publishes} + *
  • Might return immediately if there is already a Publish message queued in this {@link Publishes} * instance. *
  • Otherwise blocks the calling thread until a Publish message is received. *
@@ -192,7 +190,7 @@ interface Mqtt3Publishes extends AutoCloseable { /** * Receives the next incoming Publish message. *
    - *
  • Might return immediately if there is already a Publish message queued in this {@link Mqtt3Publishes} + *
  • Might return immediately if there is already a Publish message queued in this {@link Publishes} * instance. *
  • Otherwise blocks the calling thread until a Publish message is received or the given timeout applies. *
@@ -208,7 +206,7 @@ interface Mqtt3Publishes extends AutoCloseable { throws InterruptedException; /** - * Receives the next incoming Publish message if it is already queued in this {@link Mqtt3Publishes} instance. + * Receives the next incoming Publish message if it is already queued in this {@link Publishes} instance. * * @return an {@link Optional} containing the already queued Publish message, or empty if no Publish message was * already queued. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5BlockingClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5BlockingClient.java index 50e228347..bd65d86e2 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5BlockingClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5BlockingClient.java @@ -106,23 +106,21 @@ public interface Mqtt5BlockingClient extends Mqtt5Client { * Globally consumes all incoming Publish messages matching the given filter. * * @param filter the filter with which all incoming Publish messages are filtered. - * @return a {@link Mqtt5Publishes} instance that can be used to receive the Publish messages on the calling - * thread. + * @return a {@link Publishes} instance that can be used to receive the Publish messages on the calling thread. * @see #publishes(MqttGlobalPublishFilter, boolean) */ - @NotNull Mqtt5Publishes publishes(final @NotNull MqttGlobalPublishFilter filter); + @NotNull Publishes publishes(final @NotNull MqttGlobalPublishFilter filter); /** * Globally consumes all incoming Publish messages matching the given filter. * * @param filter the filter with which all incoming Publish messages are filtered. * @param manualAcknowledgement whether the Publish messages are acknowledged manually. - * @return a {@link Mqtt5Publishes} instance that can be used to receive the Publish messages on the calling - * thread. + * @return a {@link Publishes} instance that can be used to receive the Publish messages on the calling thread. * @see #publishes(MqttGlobalPublishFilter) * @since 1.2 */ - @NotNull Mqtt5Publishes publishes(@NotNull MqttGlobalPublishFilter filter, boolean manualAcknowledgement); + @NotNull Publishes publishes(@NotNull MqttGlobalPublishFilter filter, boolean manualAcknowledgement); /** * Unsubscribes this client with the given Unsubscribe message. @@ -216,12 +214,12 @@ public interface Mqtt5BlockingClient extends Mqtt5Client { * Resource which queues incoming Publish messages until they are received. */ @DoNotImplement - interface Mqtt5Publishes extends AutoCloseable { + interface Publishes extends AutoCloseable { /** * Receives the next incoming Publish message. *
    - *
  • Might return immediately if there is already a Publish message queued in this {@link Mqtt5Publishes} + *
  • Might return immediately if there is already a Publish message queued in this {@link Publishes} * instance. *
  • Otherwise blocks the calling thread until a Publish message is received. *
@@ -235,7 +233,7 @@ interface Mqtt5Publishes extends AutoCloseable { /** * Receives the next incoming Publish message. *
    - *
  • Might return immediately if there is already a Publish message queued in this {@link Mqtt5Publishes} + *
  • Might return immediately if there is already a Publish message queued in this {@link Publishes} * instance. *
  • Otherwise blocks the calling thread until a Publish message is received or the given timeout applies. *
@@ -251,7 +249,7 @@ interface Mqtt5Publishes extends AutoCloseable { throws InterruptedException; /** - * Receives the next incoming Publish message if it is already queued in this {@link Mqtt5Publishes} instance. + * Receives the next incoming Publish message if it is already queued in this {@link Publishes} instance. * * @return an {@link Optional} containing the already queued Publish message, or empty if no Publish message was * already queued. From 380e37b73b5bc595526da610143beb7dfa0eb6d4 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Thu, 12 Nov 2020 21:33:19 +0100 Subject: [PATCH 05/62] FlowableWithSingle.observeOnBoth -> observeBothOn --- .../client/internal/mqtt/MqttAsyncClient.java | 2 +- .../client/internal/mqtt/MqttRxClient.java | 2 +- .../hivemq/client/rx/FlowableWithSingle.java | 10 +++--- .../client/rx/FlowableWithSingleTest.java | 32 +++++++++---------- 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java index e9c768431..00d1e0328 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java @@ -169,7 +169,7 @@ public class MqttAsyncClient implements Mqtt5AsyncClient { Checks.notNull(executor, "Executor"); return handleSubAck(delegate.subscribePublishesUnsafe(mqttSubscribe, manualAcknowledgement) - .observeOnBoth(Schedulers.from(executor), true) + .observeBothOn(Schedulers.from(executor), true) .subscribeSingleFuture(new CallbackSubscriber(callback)), mqttSubscribe); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java index c682e80d8..971c15f71 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java @@ -130,7 +130,7 @@ public MqttRxClient(final @NotNull MqttClientConfig clientConfig) { @NotNull FlowableWithSingle subscribePublishes( final @NotNull MqttSubscribe subscribe, final boolean manualAcknowledgement) { - return subscribePublishesUnsafe(subscribe, manualAcknowledgement).observeOnBoth( + return subscribePublishesUnsafe(subscribe, manualAcknowledgement).observeBothOn( clientConfig.getExecutorConfig().getApplicationScheduler(), true); } diff --git a/src/main/java/com/hivemq/client/rx/FlowableWithSingle.java b/src/main/java/com/hivemq/client/rx/FlowableWithSingle.java index 5eb5de2be..d5454f073 100644 --- a/src/main/java/com/hivemq/client/rx/FlowableWithSingle.java +++ b/src/main/java/com/hivemq/client/rx/FlowableWithSingle.java @@ -62,8 +62,8 @@ public abstract class FlowableWithSingle extends Flowable implements Pu @CheckReturnValue @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.CUSTOM) - public final @NotNull FlowableWithSingle observeOnBoth(final @NotNull Scheduler scheduler) { - return observeOnBoth(scheduler, false, bufferSize()); + public final @NotNull FlowableWithSingle observeBothOn(final @NotNull Scheduler scheduler) { + return observeBothOn(scheduler, false, bufferSize()); } /** @@ -79,10 +79,10 @@ public abstract class FlowableWithSingle extends Flowable implements Pu @CheckReturnValue @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.CUSTOM) - public final @NotNull FlowableWithSingle observeOnBoth( + public final @NotNull FlowableWithSingle observeBothOn( final @NotNull Scheduler scheduler, final boolean delayError) { - return observeOnBoth(scheduler, delayError, bufferSize()); + return observeBothOn(scheduler, delayError, bufferSize()); } /** @@ -100,7 +100,7 @@ public abstract class FlowableWithSingle extends Flowable implements Pu @CheckReturnValue @BackpressureSupport(BackpressureKind.FULL) @SchedulerSupport(SchedulerSupport.CUSTOM) - public final @NotNull FlowableWithSingle observeOnBoth( + public final @NotNull FlowableWithSingle observeBothOn( final @NotNull Scheduler scheduler, final boolean delayError, final int bufferSize) { Checks.notNull(scheduler, "Scheduler"); diff --git a/src/test/java/com/hivemq/client/rx/FlowableWithSingleTest.java b/src/test/java/com/hivemq/client/rx/FlowableWithSingleTest.java index 1ea70e94d..0fc3b0474 100644 --- a/src/test/java/com/hivemq/client/rx/FlowableWithSingleTest.java +++ b/src/test/java/com/hivemq/client/rx/FlowableWithSingleTest.java @@ -65,12 +65,12 @@ void doOnSingle(final @NotNull FlowableWithSingle flowabl @MethodSource("singleNext3") @ParameterizedTest - void observeOnBoth(final @NotNull FlowableWithSingle flowableWithSingle) { + void observeBothOn(final @NotNull FlowableWithSingle flowableWithSingle) { final ExecutorService executorService = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setNameFormat("test_thread").build()); final AtomicInteger count = new AtomicInteger(); - flowableWithSingle.observeOnBoth(Schedulers.from(executorService)).doOnSingle(stringBuilder -> { + flowableWithSingle.observeBothOn(Schedulers.from(executorService)).doOnSingle(stringBuilder -> { assertEquals("single", stringBuilder.toString()); assertEquals("test_thread", Thread.currentThread().getName()); }).doOnNext(string -> { @@ -83,7 +83,7 @@ void observeOnBoth(final @NotNull FlowableWithSingle flow } @Test - void observeOnBoth_request() { + void observeBothOn_request() { final ExecutorService executorService = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setNameFormat("test_thread").build()); @@ -93,7 +93,7 @@ void observeOnBoth_request() { final AtomicInteger count = new AtomicInteger(); // bufferSize 4 -> requests 3 -> checks if request for single item leads to request 2 upstream - flowableWithSingle.observeOnBoth(Schedulers.from(executorService), false, 4).doOnSingle(stringBuilder -> { + flowableWithSingle.observeBothOn(Schedulers.from(executorService), false, 4).doOnSingle(stringBuilder -> { assertEquals("single", stringBuilder.toString()); assertEquals("test_thread", Thread.currentThread().getName()); }).doOnNext(string -> { @@ -125,7 +125,7 @@ void observeOn(final @NotNull FlowableWithSingle flowable } @Test - void observeOnBoth_delayError() throws InterruptedException { + void observeBothOn_delayError() throws InterruptedException { final Flowable flowable = Flowable.fromArray(new StringBuilder("single"), "next0", "next1", "next2") .concatWith(Flowable.error(new IllegalArgumentException("test"))) @@ -137,7 +137,7 @@ void observeOnBoth_delayError() throws InterruptedException { Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setNameFormat("test_thread").build()); final AtomicInteger count = new AtomicInteger(); - flowableWithSingle.observeOnBoth(Schedulers.from(executorService), true) + flowableWithSingle.observeBothOn(Schedulers.from(executorService), true) .doOnSingle(stringBuilder -> { assertEquals("single", stringBuilder.toString()); assertEquals("test_thread", Thread.currentThread().getName()); @@ -163,7 +163,7 @@ void observeOnBoth_delayError() throws InterruptedException { } @Test - void observeOnBoth_delayError_bufferSize() throws InterruptedException { + void observeBothOn_delayError_bufferSize() throws InterruptedException { final Flowable flowable = Flowable.just(new StringBuilder("single")).concatWith( Flowable.range(0, 1024).zipWith(Flowable.just("next").repeat(1024), (i, s) -> s + i)) @@ -176,7 +176,7 @@ void observeOnBoth_delayError_bufferSize() throws InterruptedException { Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setNameFormat("test_thread").build()); final AtomicInteger count = new AtomicInteger(); - flowableWithSingle.observeOnBoth(Schedulers.from(executorService), true, 1024) + flowableWithSingle.observeBothOn(Schedulers.from(executorService), true, 1024) .doOnSingle(stringBuilder -> { assertEquals("single", stringBuilder.toString()); assertEquals("test_thread", Thread.currentThread().getName()); @@ -202,7 +202,7 @@ void observeOnBoth_delayError_bufferSize() throws InterruptedException { } @Test - void observeOnBoth_delayError_bufferSize_2() { + void observeBothOn_delayError_bufferSize_2() { final Flowable flowable = Flowable.just(new StringBuilder("single")).concatWith( Flowable.range(0, 1024).zipWith(Flowable.just("next").repeat(1024), (i, s) -> s + i)) @@ -218,7 +218,7 @@ void observeOnBoth_delayError_bufferSize_2() { final AtomicReference single = new AtomicReference<>(); final AtomicReference error = new AtomicReference<>(); // @formatter:off - flowableWithSingle.observeOnBoth(Schedulers.from(executorService), true, 1024) + flowableWithSingle.observeBothOn(Schedulers.from(executorService), true, 1024) .doOnSingle(stringBuilder -> { single.set(stringBuilder); assertEquals("test_thread", Thread.currentThread().getName()); @@ -284,12 +284,10 @@ void doOnSingle_multiple(final @NotNull FlowableWithSingle { assertEquals(1, counter.incrementAndGet()); assertNotEquals("test_thread", Thread.currentThread().getName()); - }) - .doOnSingle(stringBuilder -> { - assertEquals(2, counter.incrementAndGet()); - assertNotEquals("test_thread", Thread.currentThread().getName()); - }) - .observeOnBoth(Schedulers.from(executorService)) + }).doOnSingle(stringBuilder -> { + assertEquals(2, counter.incrementAndGet()); + assertNotEquals("test_thread", Thread.currentThread().getName()); + }).observeBothOn(Schedulers.from(executorService)) .doOnSingle(stringBuilder -> { assertEquals(3, counter.incrementAndGet()); assertEquals("test_thread", Thread.currentThread().getName()); @@ -329,7 +327,7 @@ void mapBoth_multiple(final @NotNull FlowableWithSingle f assertEquals(2, singleCounter.incrementAndGet()); assertNotEquals("test_thread", Thread.currentThread().getName()); return stringBuilder.append("-2"); - }).observeOnBoth(Schedulers.from(executorService)).mapBoth(s -> { + }).observeBothOn(Schedulers.from(executorService)).mapBoth(s -> { nextCounter.incrementAndGet(); assertEquals("test_thread", Thread.currentThread().getName()); return s + "-3"; From 53bcd178c431d3b7c1933b17ac387c3cdaa529f2 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Thu, 12 Nov 2020 22:06:49 +0100 Subject: [PATCH 06/62] Subscription.getQos -> getMaxQos SubscriptionBuilderBase.qos -> maxQos --- .../encoder/mqtt3/Mqtt3SubscribeEncoder.java | 2 +- .../MqttSubscribedPublishFlowTree.java | 6 +- .../subscribe/MqttSubscribeBuilder.java | 4 +- .../message/subscribe/MqttSubscription.java | 20 +++---- .../subscribe/MqttSubscriptionBuilder.java | 10 ++-- .../mqtt3/Mqtt3SubscribeViewBuilder.java | 4 +- .../mqtt3/Mqtt3SubscriptionView.java | 10 ++-- .../mqtt3/Mqtt3SubscriptionViewBuilder.java | 10 ++-- .../message/subscribe/Mqtt3Subscription.java | 4 +- .../Mqtt3SubscriptionBuilderBase.java | 6 +- .../message/subscribe/Mqtt5Subscription.java | 4 +- .../Mqtt5SubscriptionBuilderBase.java | 6 +- .../client/example/Mqtt3ClientExample.java | 2 +- .../subscribe/MqttSubscribeBuilderTest.java | 58 +++++++++---------- .../subscribe/MqttSubscriptionTest.java | 2 +- .../mqtt3/Mqtt3SubscribeViewBuilderTest.java | 58 +++++++++---------- .../Mqtt3RxClientViewExceptionsTest.java | 4 +- 17 files changed, 105 insertions(+), 105 deletions(-) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3SubscribeEncoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3SubscribeEncoder.java index 9d8030b9c..6a974aa9f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3SubscribeEncoder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3SubscribeEncoder.java @@ -74,7 +74,7 @@ private void encodePayload(final @NotNull MqttStatefulSubscribe message, final @ for (int i = 0; i < subscriptions.size(); i++) { final MqttSubscription subscription = subscriptions.get(i); subscription.getTopicFilter().encode(out); - out.writeByte(subscription.getQos().getCode()); + out.writeByte(subscription.getMaxQos().getCode()); } } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTree.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTree.java index 8309955da..f12a5f8a2 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTree.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTree.java @@ -569,8 +569,8 @@ private static void getSubscriptions( final MqttTopicFilterImpl topicFilter = MqttTopicLevel.toFilter(entry.topicFilterPrefix, topicLevels, multiLevelWildcard); assert topicFilter != null : "reconstructed topic filter must be valid"; - final MqttQos qos = MqttSubscription.decodeQos(entry.subscriptionOptions); - assert qos != null : "reconstructed qos must be valid"; + final MqttQos maxQos = MqttSubscription.decodeMaxQos(entry.subscriptionOptions); + assert maxQos != null : "reconstructed maxQos must be valid"; final boolean noLocal = MqttSubscription.decodeNoLocal(entry.subscriptionOptions); final Mqtt5RetainHandling retainHandling = MqttSubscription.decodeRetainHandling(entry.subscriptionOptions); @@ -578,7 +578,7 @@ private static void getSubscriptions( final boolean retainAsPublished = MqttSubscription.decodeRetainAsPublished(entry.subscriptionOptions); final MqttSubscription subscription = - new MqttSubscription(topicFilter, qos, noLocal, retainHandling, retainAsPublished); + new MqttSubscription(topicFilter, maxQos, noLocal, retainHandling, retainAsPublished); map.computeIfAbsent(entry.subscriptionIdentifier, k -> new LinkedList<>()).add(subscription); } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilder.java index 0bff4c02a..22fd7e71f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilder.java @@ -133,8 +133,8 @@ private void buildFirstSubscription() { return new MqttTopicFilterImplBuilder.Nested<>(this::topicFilter); } - public @NotNull B qos(final @Nullable MqttQos qos) { - getFirstSubscriptionBuilder().qos(qos); + public @NotNull B maxQos(final @Nullable MqttQos maxQos) { + getFirstSubscriptionBuilder().maxQos(maxQos); return self(); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscription.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscription.java index fab965266..8c35efd44 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscription.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscription.java @@ -31,20 +31,20 @@ public class MqttSubscription implements Mqtt5Subscription { private final @NotNull MqttTopicFilterImpl topicFilter; - private final @NotNull MqttQos qos; + private final @NotNull MqttQos maxQos; private final boolean noLocal; private final @NotNull Mqtt5RetainHandling retainHandling; private final boolean retainAsPublished; public MqttSubscription( final @NotNull MqttTopicFilterImpl topicFilter, - final @NotNull MqttQos qos, + final @NotNull MqttQos maxQos, final boolean noLocal, final @NotNull Mqtt5RetainHandling retainHandling, final boolean retainAsPublished) { this.topicFilter = topicFilter; - this.qos = qos; + this.maxQos = maxQos; this.noLocal = noLocal; this.retainHandling = retainHandling; this.retainAsPublished = retainAsPublished; @@ -56,8 +56,8 @@ public MqttSubscription( } @Override - public @NotNull MqttQos getQos() { - return qos; + public @NotNull MqttQos getMaxQos() { + return maxQos; } @Override @@ -81,7 +81,7 @@ public boolean isRetainAsPublished() { } private @NotNull String toAttributeString() { - return "topicFilter=" + topicFilter + ", qos=" + qos + ", noLocal=" + noLocal + ", retainHandling=" + + return "topicFilter=" + topicFilter + ", maxQos=" + maxQos + ", noLocal=" + noLocal + ", retainHandling=" + retainHandling + ", retainAsPublished=" + retainAsPublished; } @@ -100,14 +100,14 @@ public boolean equals(final @Nullable Object o) { } final MqttSubscription that = (MqttSubscription) o; - return topicFilter.equals(that.topicFilter) && (qos == that.qos) && (noLocal == that.noLocal) && + return topicFilter.equals(that.topicFilter) && (maxQos == that.maxQos) && (noLocal == that.noLocal) && (retainHandling == that.retainHandling) && (retainAsPublished == that.retainAsPublished); } @Override public int hashCode() { int result = topicFilter.hashCode(); - result = 31 * result + qos.hashCode(); + result = 31 * result + maxQos.hashCode(); result = 31 * result + Boolean.hashCode(noLocal); result = 31 * result + retainHandling.hashCode(); result = 31 * result + Boolean.hashCode(retainAsPublished); @@ -123,11 +123,11 @@ public byte encodeSubscriptionOptions() { if (noLocal) { subscriptionOptions |= 0b0000_0100; } - subscriptionOptions |= qos.getCode(); + subscriptionOptions |= maxQos.getCode(); return subscriptionOptions; } - public static @Nullable MqttQos decodeQos(final byte subscriptionOptions) { + public static @Nullable MqttQos decodeMaxQos(final byte subscriptionOptions) { return MqttQos.fromCode(subscriptionOptions & 0b0000_0011); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscriptionBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscriptionBuilder.java index 176bdadd1..085e9024e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscriptionBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscriptionBuilder.java @@ -36,7 +36,7 @@ public abstract class MqttSubscriptionBuilder> { private @Nullable MqttTopicFilterImpl topicFilter; - private @NotNull MqttQos qos = MqttSubscription.DEFAULT_QOS; + private @NotNull MqttQos maxQos = MqttSubscription.DEFAULT_QOS; private boolean noLocal = MqttSubscription.DEFAULT_NO_LOCAL; private @NotNull Mqtt5RetainHandling retainHandling = MqttSubscription.DEFAULT_RETAIN_HANDLING; private boolean retainAsPublished = MqttSubscription.DEFAULT_RETAIN_AS_PUBLISHED; @@ -45,7 +45,7 @@ public abstract class MqttSubscriptionBuilder(this::topicFilter); } - public @NotNull B qos(final @Nullable MqttQos qos) { - this.qos = Checks.notNull(qos, "QoS"); + public @NotNull B maxQos(final @Nullable MqttQos maxQos) { + this.maxQos = Checks.notNull(maxQos, "Maximum QoS"); return self(); } @@ -92,7 +92,7 @@ public abstract class MqttSubscriptionBuilder implements Mqtt5SubscriptionBuilder.Complete { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java index 818f2fbf9..d0d755551 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java @@ -120,8 +120,8 @@ private void buildFirstSubscription() { return new MqttTopicFilterImplBuilder.Nested<>(this::topicFilter); } - public @NotNull B qos(final @Nullable MqttQos qos) { - getFirstSubscriptionBuilder().qos(qos); + public @NotNull B maxQos(final @Nullable MqttQos maxQos) { + getFirstSubscriptionBuilder().maxQos(maxQos); return self(); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionView.java index 9e9c02388..7be68d4eb 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionView.java @@ -31,9 +31,9 @@ public class Mqtt3SubscriptionView implements Mqtt3Subscription { private static @NotNull MqttSubscription delegate( - final @NotNull MqttTopicFilterImpl topicFilter, final @NotNull MqttQos qos) { + final @NotNull MqttTopicFilterImpl topicFilter, final @NotNull MqttQos maxQos) { - return new MqttSubscription(topicFilter, qos, false, Mqtt5RetainHandling.SEND, false); + return new MqttSubscription(topicFilter, maxQos, false, Mqtt5RetainHandling.SEND, false); } static @NotNull Mqtt3SubscriptionView of( @@ -58,8 +58,8 @@ private Mqtt3SubscriptionView(final @NotNull MqttSubscription delegate) { } @Override - public @NotNull MqttQos getQos() { - return delegate.getQos(); + public @NotNull MqttQos getMaxQos() { + return delegate.getMaxQos(); } public @NotNull MqttSubscription getDelegate() { @@ -72,7 +72,7 @@ private Mqtt3SubscriptionView(final @NotNull MqttSubscription delegate) { } private @NotNull String toAttributeString() { - return "topicFilter=" + getTopicFilter() + ", qos=" + getQos(); + return "topicFilter=" + getTopicFilter() + ", maxQos=" + getMaxQos(); } @Override diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewBuilder.java index 495c11fc3..08cf4309f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewBuilder.java @@ -36,14 +36,14 @@ public abstract class Mqtt3SubscriptionViewBuilder> { private @Nullable MqttTopicFilterImpl topicFilter; - private @NotNull MqttQos qos = Mqtt3SubscriptionView.DEFAULT_QOS; + private @NotNull MqttQos maxQos = Mqtt3SubscriptionView.DEFAULT_QOS; Mqtt3SubscriptionViewBuilder() {} Mqtt3SubscriptionViewBuilder(final @NotNull Mqtt3SubscriptionView subscription) { final MqttSubscription delegate = subscription.getDelegate(); topicFilter = delegate.getTopicFilter(); - qos = delegate.getQos(); + maxQos = delegate.getMaxQos(); } abstract @NotNull B self(); @@ -62,14 +62,14 @@ public abstract class Mqtt3SubscriptionViewBuilder(this::topicFilter); } - public @NotNull B qos(final @Nullable MqttQos qos) { - this.qos = Checks.notNull(qos, "QoS"); + public @NotNull B maxQos(final @Nullable MqttQos maxQos) { + this.maxQos = Checks.notNull(maxQos, "Maximum QoS"); return self(); } public @NotNull Mqtt3SubscriptionView build() { Checks.notNull(topicFilter, "Topic filter"); - return Mqtt3SubscriptionView.of(topicFilter, qos); + return Mqtt3SubscriptionView.of(topicFilter, maxQos); } public static class Default extends Mqtt3SubscriptionViewBuilder diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3Subscription.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3Subscription.java index 279104057..14194375b 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3Subscription.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3Subscription.java @@ -52,9 +52,9 @@ public interface Mqtt3Subscription { @NotNull MqttTopicFilter getTopicFilter(); /** - * @return the QoS of this Subscription. + * @return the maximum QoS of this Subscription. */ - @NotNull MqttQos getQos(); + @NotNull MqttQos getMaxQos(); /** * Creates a builder for extending this Subscription. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilderBase.java index ed8172ded..360293319 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilderBase.java @@ -73,12 +73,12 @@ public interface Mqtt3SubscriptionBuilderBase> extends Mqtt3SubscriptionBuilderBase { /** - * Sets the {@link Mqtt3Subscription#getQos() QoS}. + * Sets the {@link Mqtt3Subscription#getMaxQos() maximum QoS}. * - * @param qos the QoS. + * @param maxQos the maximum QoS. * @return the builder. */ @CheckReturnValue - @NotNull C qos(@NotNull MqttQos qos); + @NotNull C maxQos(@NotNull MqttQos maxQos); } } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5Subscription.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5Subscription.java index 88e7e4a8e..8fe4bf6e8 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5Subscription.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5Subscription.java @@ -64,9 +64,9 @@ public interface Mqtt5Subscription { @NotNull MqttTopicFilter getTopicFilter(); /** - * @return the QoS of this Subscription. + * @return the maximum QoS of this Subscription. */ - @NotNull MqttQos getQos(); + @NotNull MqttQos getMaxQos(); /** * @return whether the client must not receive messages published by itself. The default is {@link diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilderBase.java index de53418e2..fccf9a76e 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilderBase.java @@ -73,13 +73,13 @@ public interface Mqtt5SubscriptionBuilderBase> extends Mqtt5SubscriptionBuilderBase { /** - * Sets the {@link Mqtt5Subscription#getQos() QoS}. + * Sets the {@link Mqtt5Subscription#getMaxQos() maximum QoS}. * - * @param qos the QoS. + * @param maxQos the maximum QoS. * @return the builder. */ @CheckReturnValue - @NotNull C qos(@NotNull MqttQos qos); + @NotNull C maxQos(@NotNull MqttQos maxQos); /** * Sets whether the subscription is {@link Mqtt5Subscription#isNoLocal() not local}. diff --git a/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java b/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java index 8389022a3..d1d244a73 100644 --- a/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java +++ b/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java @@ -88,7 +88,7 @@ Completable subscribeTo( // create a SUBSCRIBE message for the topic with QoS final Mqtt3Subscribe subscribeMessage = Mqtt3Subscribe.builder() - .addSubscription(Mqtt3Subscription.builder().topicFilter(topic).qos(qos).build()) + .addSubscription(Mqtt3Subscription.builder().topicFilter(topic).maxQos(qos).build()) .build(); // define what to do with the publishes that match the subscription. This does not subscribe until rxJava's subscribe is called // NOTE: you can also subscribe without the stream, and then handle the incoming publishes on client.allPublishes() diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilderTest.java index f17efb344..06ed580a0 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilderTest.java @@ -61,7 +61,7 @@ void addSubscription_correct_subscription_default_properties() { final Mqtt5Subscription mqtt5Subscription = subscriptions.get(0); assertEquals("test", mqtt5Subscription.getTopicFilter().toString()); - assertEquals(MqttQos.EXACTLY_ONCE, mqtt5Subscription.getQos()); + assertEquals(MqttQos.EXACTLY_ONCE, mqtt5Subscription.getMaxQos()); assertFalse(mqtt5Subscription.isNoLocal()); assertFalse(mqtt5Subscription.isRetainAsPublished()); assertEquals(Mqtt5RetainHandling.SEND, mqtt5Subscription.getRetainHandling()); @@ -72,7 +72,7 @@ void addSubscription_correct_subscription_custom_properties() { final Mqtt5Subscription subscription = Mqtt5Subscription.builder() .topicFilter("test") - .qos(MqttQos.AT_LEAST_ONCE) + .maxQos(MqttQos.AT_LEAST_ONCE) .noLocal(true) .retainAsPublished(true) .retainHandling(Mqtt5RetainHandling.DO_NOT_SEND) @@ -86,7 +86,7 @@ void addSubscription_correct_subscription_custom_properties() { final Mqtt5Subscription mqtt5Subscription = subscriptions.get(0); assertEquals("test", mqtt5Subscription.getTopicFilter().toString()); - assertEquals(MqttQos.AT_LEAST_ONCE, mqtt5Subscription.getQos()); + assertEquals(MqttQos.AT_LEAST_ONCE, mqtt5Subscription.getMaxQos()); assertTrue(mqtt5Subscription.isNoLocal()); assertTrue(mqtt5Subscription.isRetainAsPublished()); assertEquals(Mqtt5RetainHandling.DO_NOT_SEND, mqtt5Subscription.getRetainHandling()); @@ -96,7 +96,7 @@ void addSubscription_correct_subscription_custom_properties() { void addSubscription_fluent_subscription_is_finished_if_addSubscription_is_used() { final Mqtt5Subscription subscription = - Mqtt5Subscription.builder().topicFilter("test").qos(MqttQos.AT_LEAST_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("test").maxQos(MqttQos.AT_LEAST_ONCE).build(); final Mqtt5SubscribeBuilder.Start subscribeBuilder = Mqtt5Subscribe.builder(); subscribeBuilder.topicFilter("fluent"); @@ -112,10 +112,10 @@ void addSubscription_fluent_subscription_is_finished_if_addSubscription_is_used( void addSubscription_fluent_subscription_is_finished_if_addSubscription_is_used_second_time() { final Mqtt5Subscription subscription = - Mqtt5Subscription.builder().topicFilter("test").qos(MqttQos.AT_LEAST_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("test").maxQos(MqttQos.AT_LEAST_ONCE).build(); final Mqtt5Subscription subscription2 = - Mqtt5Subscription.builder().topicFilter("test2").qos(MqttQos.AT_MOST_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("test2").maxQos(MqttQos.AT_MOST_ONCE).build(); final Mqtt5SubscribeBuilder.Start subscribeBuilder = Mqtt5Subscribe.builder(); subscribeBuilder.topicFilter("fluent"); @@ -171,7 +171,7 @@ void addSubscriptions_error_when_list_is_empty() { void addSubscriptions_error_when_subscription_is_implemented() { final Mqtt5Subscription subscription = - Mqtt5Subscription.builder().topicFilter("test").qos(MqttQos.AT_LEAST_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("test").maxQos(MqttQos.AT_LEAST_ONCE).build(); final List subscriptions = new ArrayList<>(); subscriptions.add(subscription); @@ -185,13 +185,13 @@ void addSubscriptions_error_when_subscription_is_implemented() { void addSubscriptions_correct_use_list() { final Mqtt5Subscription subscription = - Mqtt5Subscription.builder().topicFilter("test").qos(MqttQos.AT_LEAST_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("test").maxQos(MqttQos.AT_LEAST_ONCE).build(); final Mqtt5Subscription subscription2 = - Mqtt5Subscription.builder().topicFilter("multiple").qos(MqttQos.AT_MOST_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("multiple").maxQos(MqttQos.AT_MOST_ONCE).build(); final Mqtt5Subscription subscription3 = - Mqtt5Subscription.builder().topicFilter("subscriptions").qos(MqttQos.EXACTLY_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("subscriptions").maxQos(MqttQos.EXACTLY_ONCE).build(); final List subscriptions = new ArrayList<>(); subscriptions.add(subscription); @@ -211,13 +211,13 @@ void addSubscriptions_correct_use_list() { void addSubscriptions_correct_use_set() { final Mqtt5Subscription subscription = - Mqtt5Subscription.builder().topicFilter("test").qos(MqttQos.AT_LEAST_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("test").maxQos(MqttQos.AT_LEAST_ONCE).build(); final Mqtt5Subscription subscription2 = - Mqtt5Subscription.builder().topicFilter("multiple").qos(MqttQos.AT_MOST_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("multiple").maxQos(MqttQos.AT_MOST_ONCE).build(); final Mqtt5Subscription subscription3 = - Mqtt5Subscription.builder().topicFilter("subscriptions").qos(MqttQos.EXACTLY_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("subscriptions").maxQos(MqttQos.EXACTLY_ONCE).build(); final Set subscriptions = new HashSet<>(); subscriptions.add(subscription); @@ -233,13 +233,13 @@ void addSubscriptions_correct_use_set() { void addSubscriptions_correct_use_map() { final Mqtt5Subscription subscription = - Mqtt5Subscription.builder().topicFilter("test").qos(MqttQos.AT_LEAST_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("test").maxQos(MqttQos.AT_LEAST_ONCE).build(); final Mqtt5Subscription subscription2 = - Mqtt5Subscription.builder().topicFilter("multiple").qos(MqttQos.AT_MOST_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("multiple").maxQos(MqttQos.AT_MOST_ONCE).build(); final Mqtt5Subscription subscription3 = - Mqtt5Subscription.builder().topicFilter("subscriptions").qos(MqttQos.EXACTLY_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("subscriptions").maxQos(MqttQos.EXACTLY_ONCE).build(); final Map subscriptions = new LinkedHashMap<>(); subscriptions.put("1", subscription); @@ -255,13 +255,13 @@ void addSubscriptions_correct_use_map() { void addSubscriptions_correct_use_array() { final Mqtt5Subscription subscription = - Mqtt5Subscription.builder().topicFilter("test").qos(MqttQos.AT_LEAST_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("test").maxQos(MqttQos.AT_LEAST_ONCE).build(); final Mqtt5Subscription subscription2 = - Mqtt5Subscription.builder().topicFilter("multiple").qos(MqttQos.AT_MOST_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("multiple").maxQos(MqttQos.AT_MOST_ONCE).build(); final Mqtt5Subscription subscription3 = - Mqtt5Subscription.builder().topicFilter("subscriptions").qos(MqttQos.EXACTLY_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("subscriptions").maxQos(MqttQos.EXACTLY_ONCE).build(); final Mqtt5Subscription[] subscriptions = new Mqtt5Subscription[]{ subscription, subscription2, subscription3 @@ -284,7 +284,7 @@ void addSubscriptions_correct_use_stream() { .addSubscriptions(subscriptions.stream() .map(topicFilter -> Mqtt5Subscription.builder() .topicFilter(topicFilter) - .qos(MqttQos.AT_LEAST_ONCE) + .maxQos(MqttQos.AT_LEAST_ONCE) .build())) .build(); @@ -299,13 +299,13 @@ void addSubscriptions_correct_use_stream() { void addSubscriptions_fluent_subscription_is_finished_if_addSubscriptions_is_used() { final Mqtt5Subscription subscription = - Mqtt5Subscription.builder().topicFilter("test").qos(MqttQos.AT_LEAST_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("test").maxQos(MqttQos.AT_LEAST_ONCE).build(); final Mqtt5Subscription subscription2 = - Mqtt5Subscription.builder().topicFilter("multiple").qos(MqttQos.AT_MOST_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("multiple").maxQos(MqttQos.AT_MOST_ONCE).build(); final Mqtt5Subscription subscription3 = - Mqtt5Subscription.builder().topicFilter("subscriptions").qos(MqttQos.EXACTLY_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("subscriptions").maxQos(MqttQos.EXACTLY_ONCE).build(); final ImmutableList subscriptions = ImmutableList.of(subscription, subscription2, subscription3); @@ -326,13 +326,13 @@ void addSubscriptions_fluent_subscription_is_finished_if_addSubscriptions_is_use void addSubscriptions_fluent_subscription_is_finished_if_addSubscriptions_is_used_second_time() { final Mqtt5Subscription subscription = - Mqtt5Subscription.builder().topicFilter("test").qos(MqttQos.AT_LEAST_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("test").maxQos(MqttQos.AT_LEAST_ONCE).build(); final Mqtt5Subscription subscription2 = - Mqtt5Subscription.builder().topicFilter("multiple").qos(MqttQos.AT_MOST_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("multiple").maxQos(MqttQos.AT_MOST_ONCE).build(); final Mqtt5Subscription subscription3 = - Mqtt5Subscription.builder().topicFilter("subscriptions").qos(MqttQos.EXACTLY_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("subscriptions").maxQos(MqttQos.EXACTLY_ONCE).build(); final List subscriptions = new LinkedList<>(); subscriptions.add(subscription); @@ -360,13 +360,13 @@ void addSubscriptions_fluent_subscription_is_finished_if_addSubscriptions_is_use void addSubscriptions_fluent_subscription_and_addSubscription() { final Mqtt5Subscription subscription = - Mqtt5Subscription.builder().topicFilter("test").qos(MqttQos.AT_LEAST_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("test").maxQos(MqttQos.AT_LEAST_ONCE).build(); final Mqtt5Subscription subscription2 = - Mqtt5Subscription.builder().topicFilter("multiple").qos(MqttQos.AT_MOST_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("multiple").maxQos(MqttQos.AT_MOST_ONCE).build(); final Mqtt5Subscription subscription3 = - Mqtt5Subscription.builder().topicFilter("subscriptions").qos(MqttQos.EXACTLY_ONCE).build(); + Mqtt5Subscription.builder().topicFilter("subscriptions").maxQos(MqttQos.EXACTLY_ONCE).build(); final List subscriptions = new ArrayList<>(); subscriptions.add(subscription); diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscriptionTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscriptionTest.java index 562b52632..cf73f3c95 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscriptionTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscriptionTest.java @@ -30,7 +30,7 @@ class MqttSubscriptionTest { void equals() { EqualsVerifier.forClass(MqttSubscription.class) .withIgnoredAnnotations(NotNull.class) // EqualsVerifier thinks @NotNull Optional is @NotNull - .withNonnullFields("topicFilter", "qos", "retainHandling") + .withNonnullFields("topicFilter", "maxQos", "retainHandling") .suppress(Warning.STRICT_INHERITANCE) .verify(); } diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilderTest.java index c2e1ffae3..af3d3f48b 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilderTest.java @@ -60,14 +60,14 @@ void addSubscription_correct_subscription_default_properties() { final Mqtt3Subscription mqtt3Subscription = subscriptions.get(0); assertEquals("test", mqtt3Subscription.getTopicFilter().toString()); - assertEquals(MqttQos.EXACTLY_ONCE, mqtt3Subscription.getQos()); + assertEquals(MqttQos.EXACTLY_ONCE, mqtt3Subscription.getMaxQos()); } @Test void addSubscription_correct_subscription_custom_properties() { final Mqtt3Subscription subscription = - Mqtt3Subscription.builder().topicFilter("test").qos(MqttQos.AT_LEAST_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("test").maxQos(MqttQos.AT_LEAST_ONCE).build(); final Mqtt3Subscribe subscribe = Mqtt3Subscribe.builder().addSubscription(subscription).build(); @@ -77,14 +77,14 @@ void addSubscription_correct_subscription_custom_properties() { final Mqtt3Subscription mqtt3Subscription = subscriptions.get(0); assertEquals("test", mqtt3Subscription.getTopicFilter().toString()); - assertEquals(MqttQos.AT_LEAST_ONCE, mqtt3Subscription.getQos()); + assertEquals(MqttQos.AT_LEAST_ONCE, mqtt3Subscription.getMaxQos()); } @Test void addSubscription_fluent_subscription_is_finished_if_addSubscription_is_used() { final Mqtt3Subscription subscription = - Mqtt3Subscription.builder().topicFilter("test").qos(MqttQos.AT_LEAST_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("test").maxQos(MqttQos.AT_LEAST_ONCE).build(); final Mqtt3SubscribeBuilder.Start subscribeBuilder = Mqtt3Subscribe.builder(); subscribeBuilder.topicFilter("fluent"); @@ -100,10 +100,10 @@ void addSubscription_fluent_subscription_is_finished_if_addSubscription_is_used( void addSubscription_fluent_subscription_is_finished_if_addSubscription_is_used_second_time() { final Mqtt3Subscription subscription = - Mqtt3Subscription.builder().topicFilter("test").qos(MqttQos.AT_LEAST_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("test").maxQos(MqttQos.AT_LEAST_ONCE).build(); final Mqtt3Subscription subscription2 = - Mqtt3Subscription.builder().topicFilter("test2").qos(MqttQos.AT_MOST_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("test2").maxQos(MqttQos.AT_MOST_ONCE).build(); final Mqtt3SubscribeBuilder.Start subscribeBuilder = Mqtt3Subscribe.builder(); subscribeBuilder.topicFilter("fluent"); @@ -159,7 +159,7 @@ void addSubscriptions_error_when_list_is_empty() { void addSubscriptions_error_when_subscription_is_implemented() { final Mqtt3Subscription subscription = - Mqtt3Subscription.builder().topicFilter("test").qos(MqttQos.AT_LEAST_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("test").maxQos(MqttQos.AT_LEAST_ONCE).build(); final List subscriptions = new ArrayList<>(); subscriptions.add(subscription); @@ -173,13 +173,13 @@ void addSubscriptions_error_when_subscription_is_implemented() { void addSubscriptions_correct_use_list() { final Mqtt3Subscription subscription = - Mqtt3Subscription.builder().topicFilter("test").qos(MqttQos.AT_LEAST_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("test").maxQos(MqttQos.AT_LEAST_ONCE).build(); final Mqtt3Subscription subscription2 = - Mqtt3Subscription.builder().topicFilter("multiple").qos(MqttQos.AT_MOST_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("multiple").maxQos(MqttQos.AT_MOST_ONCE).build(); final Mqtt3Subscription subscription3 = - Mqtt3Subscription.builder().topicFilter("subscriptions").qos(MqttQos.EXACTLY_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("subscriptions").maxQos(MqttQos.EXACTLY_ONCE).build(); final List subscriptions = new ArrayList<>(); subscriptions.add(subscription); @@ -195,13 +195,13 @@ void addSubscriptions_correct_use_list() { void addSubscriptions_correct_use_set() { final Mqtt3Subscription subscription = - Mqtt3Subscription.builder().topicFilter("test").qos(MqttQos.AT_LEAST_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("test").maxQos(MqttQos.AT_LEAST_ONCE).build(); final Mqtt3Subscription subscription2 = - Mqtt3Subscription.builder().topicFilter("multiple").qos(MqttQos.AT_MOST_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("multiple").maxQos(MqttQos.AT_MOST_ONCE).build(); final Mqtt3Subscription subscription3 = - Mqtt3Subscription.builder().topicFilter("subscriptions").qos(MqttQos.EXACTLY_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("subscriptions").maxQos(MqttQos.EXACTLY_ONCE).build(); final Set subscriptions = new HashSet<>(); subscriptions.add(subscription); @@ -217,13 +217,13 @@ void addSubscriptions_correct_use_set() { void addSubscriptions_correct_use_map() { final Mqtt3Subscription subscription = - Mqtt3Subscription.builder().topicFilter("test").qos(MqttQos.AT_LEAST_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("test").maxQos(MqttQos.AT_LEAST_ONCE).build(); final Mqtt3Subscription subscription2 = - Mqtt3Subscription.builder().topicFilter("multiple").qos(MqttQos.AT_MOST_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("multiple").maxQos(MqttQos.AT_MOST_ONCE).build(); final Mqtt3Subscription subscription3 = - Mqtt3Subscription.builder().topicFilter("subscriptions").qos(MqttQos.EXACTLY_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("subscriptions").maxQos(MqttQos.EXACTLY_ONCE).build(); final Map subscriptions = new LinkedHashMap<>(); subscriptions.put("1", subscription); @@ -239,13 +239,13 @@ void addSubscriptions_correct_use_map() { void addSubscriptions_correct_use_array() { final Mqtt3Subscription subscription = - Mqtt3Subscription.builder().topicFilter("test").qos(MqttQos.AT_LEAST_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("test").maxQos(MqttQos.AT_LEAST_ONCE).build(); final Mqtt3Subscription subscription2 = - Mqtt3Subscription.builder().topicFilter("multiple").qos(MqttQos.AT_MOST_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("multiple").maxQos(MqttQos.AT_MOST_ONCE).build(); final Mqtt3Subscription subscription3 = - Mqtt3Subscription.builder().topicFilter("subscriptions").qos(MqttQos.EXACTLY_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("subscriptions").maxQos(MqttQos.EXACTLY_ONCE).build(); final Mqtt3Subscription[] subscriptions = new Mqtt3Subscription[]{ subscription, subscription2, subscription3 @@ -268,7 +268,7 @@ void addSubscriptions_correct_use_stream() { .addSubscriptions(subscriptions.stream() .map(topicFilter -> Mqtt3Subscription.builder() .topicFilter(topicFilter) - .qos(MqttQos.AT_LEAST_ONCE) + .maxQos(MqttQos.AT_LEAST_ONCE) .build())) .build(); @@ -283,13 +283,13 @@ void addSubscriptions_correct_use_stream() { void addSubscriptions_fluent_subscription_is_finished_if_addSubscriptions_is_used() { final Mqtt3Subscription subscription = - Mqtt3Subscription.builder().topicFilter("test").qos(MqttQos.AT_LEAST_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("test").maxQos(MqttQos.AT_LEAST_ONCE).build(); final Mqtt3Subscription subscription2 = - Mqtt3Subscription.builder().topicFilter("multiple").qos(MqttQos.AT_MOST_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("multiple").maxQos(MqttQos.AT_MOST_ONCE).build(); final Mqtt3Subscription subscription3 = - Mqtt3Subscription.builder().topicFilter("subscriptions").qos(MqttQos.EXACTLY_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("subscriptions").maxQos(MqttQos.EXACTLY_ONCE).build(); final List subscriptions = new ArrayList<>(); subscriptions.add(subscription); @@ -312,13 +312,13 @@ void addSubscriptions_fluent_subscription_is_finished_if_addSubscriptions_is_use void addSubscriptions_fluent_subscription_is_finished_if_addSubscriptions_is_used_second_time() { final Mqtt3Subscription subscription = - Mqtt3Subscription.builder().topicFilter("test").qos(MqttQos.AT_LEAST_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("test").maxQos(MqttQos.AT_LEAST_ONCE).build(); final Mqtt3Subscription subscription2 = - Mqtt3Subscription.builder().topicFilter("multiple").qos(MqttQos.AT_MOST_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("multiple").maxQos(MqttQos.AT_MOST_ONCE).build(); final Mqtt3Subscription subscription3 = - Mqtt3Subscription.builder().topicFilter("subscriptions").qos(MqttQos.EXACTLY_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("subscriptions").maxQos(MqttQos.EXACTLY_ONCE).build(); final ImmutableList subscriptions = ImmutableList.of(subscription, subscription2); @@ -344,13 +344,13 @@ void addSubscriptions_fluent_subscription_is_finished_if_addSubscriptions_is_use void addSubscriptions_fluent_subscription_and_addSubscription() { final Mqtt3Subscription subscription = - Mqtt3Subscription.builder().topicFilter("test").qos(MqttQos.AT_LEAST_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("test").maxQos(MqttQos.AT_LEAST_ONCE).build(); final Mqtt3Subscription subscription2 = - Mqtt3Subscription.builder().topicFilter("multiple").qos(MqttQos.AT_MOST_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("multiple").maxQos(MqttQos.AT_MOST_ONCE).build(); final Mqtt3Subscription subscription3 = - Mqtt3Subscription.builder().topicFilter("subscriptions").qos(MqttQos.EXACTLY_ONCE).build(); + Mqtt3Subscription.builder().topicFilter("subscriptions").maxQos(MqttQos.EXACTLY_ONCE).build(); final List subscriptions = new LinkedList<>(); subscriptions.add(subscription); diff --git a/src/test/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewExceptionsTest.java b/src/test/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewExceptionsTest.java index 1b2a9fb41..b89c8a30e 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewExceptionsTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewExceptionsTest.java @@ -78,7 +78,7 @@ void subscribe() { given(mqtt5Client.subscribe(any())).willReturn(Single.error(mqtt5MessageException)); final Mqtt3Subscribe subscribe = Mqtt3Subscribe.builder() - .addSubscription(Mqtt3Subscription.builder().topicFilter("topic").qos(MqttQos.AT_LEAST_ONCE).build()) + .addSubscription(Mqtt3Subscription.builder().topicFilter("topic").maxQos(MqttQos.AT_LEAST_ONCE).build()) .build(); assertMqtt3Exception(() -> mqtt3Client.subscribe(subscribe).ignoreElement().blockingAwait(), mqtt5MessageException); @@ -93,7 +93,7 @@ void subscribeWithStream() { Mqtt5SubAck.class)); final Mqtt3Subscribe subscribe = Mqtt3Subscribe.builder() - .addSubscription(Mqtt3Subscription.builder().topicFilter("topic").qos(MqttQos.AT_LEAST_ONCE).build()) + .addSubscription(Mqtt3Subscription.builder().topicFilter("topic").maxQos(MqttQos.AT_LEAST_ONCE).build()) .build(); assertMqtt3Exception( () -> mqtt3Client.subscribePublishes(subscribe, false).blockingSubscribe(), mqtt5MessageException); From a0275db143dfb2e5e2387ecdccaa877d82027a70 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Thu, 12 Nov 2020 23:12:16 +0100 Subject: [PATCH 07/62] ssl -> tls --- ...Impl.java => MqttClientTlsConfigImpl.java} | 18 +++--- ...va => MqttClientTlsConfigImplBuilder.java} | 56 +++++++++---------- .../mqtt/MqttClientTransportConfigImpl.java | 20 +++---- .../MqttClientTransportConfigImplBuilder.java | 28 +++++----- .../mqtt/MqttRxClientBuilderBase.java | 8 +-- .../mqtt/handler/MqttChannelInitializer.java | 18 +++--- .../MqttTlsAdapterHandler.java} | 6 +- .../MqttTlsInitializer.java} | 34 +++++------ .../websocket/MqttWebSocketInitializer.java | 2 +- .../client/mqtt/MqttClientBuilderBase.java | 25 +++++---- .../hivemq/client/mqtt/MqttClientConfig.java | 6 +- ...slConfig.java => MqttClientTlsConfig.java} | 22 ++++---- ...r.java => MqttClientTlsConfigBuilder.java} | 22 ++++---- ...va => MqttClientTlsConfigBuilderBase.java} | 18 +++--- .../mqtt/MqttClientTransportConfig.java | 12 ++-- .../MqttClientTransportConfigBuilderBase.java | 24 ++++---- .../client/example/Mqtt3ClientExample.java | 4 +- ....java => MqttClientTlsConfigImplTest.java} | 4 +- .../MqttTlsInitializerTest.java} | 22 ++++---- ...va => MqttClientTlsConfigBuilderTest.java} | 30 +++++----- 20 files changed, 190 insertions(+), 189 deletions(-) rename src/main/java/com/hivemq/client/internal/mqtt/{MqttClientSslConfigImpl.java => MqttClientTlsConfigImpl.java} (90%) rename src/main/java/com/hivemq/client/internal/mqtt/{MqttClientSslConfigImplBuilder.java => MqttClientTlsConfigImplBuilder.java} (69%) rename src/main/java/com/hivemq/client/internal/mqtt/handler/{ssl/MqttSslAdapterHandler.java => tls/MqttTlsAdapterHandler.java} (96%) rename src/main/java/com/hivemq/client/internal/mqtt/handler/{ssl/MqttSslInitializer.java => tls/MqttTlsInitializer.java} (74%) rename src/main/java/com/hivemq/client/mqtt/{MqttClientSslConfig.java => MqttClientTlsConfig.java} (77%) rename src/main/java/com/hivemq/client/mqtt/{MqttClientSslConfigBuilder.java => MqttClientTlsConfigBuilder.java} (62%) rename src/main/java/com/hivemq/client/mqtt/{MqttClientSslConfigBuilderBase.java => MqttClientTlsConfigBuilderBase.java} (83%) rename src/test/java/com/hivemq/client/internal/mqtt/{MqttClientSslConfigImplTest.java => MqttClientTlsConfigImplTest.java} (94%) rename src/test/java/com/hivemq/client/internal/mqtt/handler/{ssl/MqttSslInitializerTest.java => tls/MqttTlsInitializerTest.java} (90%) rename src/test/java/com/hivemq/client/mqtt/{MqttClientSslConfigBuilderTest.java => MqttClientTlsConfigBuilderTest.java} (62%) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientSslConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTlsConfigImpl.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttClientSslConfigImpl.java rename to src/main/java/com/hivemq/client/internal/mqtt/MqttClientTlsConfigImpl.java index d0f02d20a..de6fd7b9a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientSslConfigImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTlsConfigImpl.java @@ -17,7 +17,7 @@ package com.hivemq.client.internal.mqtt; import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.MqttClientSslConfig; +import com.hivemq.client.mqtt.MqttClientTlsConfig; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -30,7 +30,7 @@ * @author David Katz * @author Silvio Giebl */ -public class MqttClientSslConfigImpl implements MqttClientSslConfig { +public class MqttClientTlsConfigImpl implements MqttClientTlsConfig { static final @Nullable HostnameVerifier DEFAULT_HOSTNAME_VERIFIER; @@ -44,8 +44,8 @@ public class MqttClientSslConfigImpl implements MqttClientSslConfig { DEFAULT_HOSTNAME_VERIFIER = hostnameVerifier; } - static final @NotNull MqttClientSslConfigImpl DEFAULT = - new MqttClientSslConfigImpl(null, null, null, null, (int) DEFAULT_HANDSHAKE_TIMEOUT_MS, + static final @NotNull MqttClientTlsConfigImpl DEFAULT = + new MqttClientTlsConfigImpl(null, null, null, null, (int) DEFAULT_HANDSHAKE_TIMEOUT_MS, DEFAULT_HOSTNAME_VERIFIER); private final @Nullable KeyManagerFactory keyManagerFactory; @@ -55,7 +55,7 @@ public class MqttClientSslConfigImpl implements MqttClientSslConfig { private final int handshakeTimeoutMs; private final @Nullable HostnameVerifier hostnameVerifier; - MqttClientSslConfigImpl( + MqttClientTlsConfigImpl( final @Nullable KeyManagerFactory keyManagerFactory, final @Nullable TrustManagerFactory trustManagerFactory, final @Nullable ImmutableList cipherSuites, @@ -122,8 +122,8 @@ public long getHandshakeTimeoutMs() { } @Override - public MqttClientSslConfigImplBuilder.@NotNull Default extend() { - return new MqttClientSslConfigImplBuilder.Default(this); + public MqttClientTlsConfigImplBuilder.@NotNull Default extend() { + return new MqttClientTlsConfigImplBuilder.Default(this); } @Override @@ -131,10 +131,10 @@ public boolean equals(final @Nullable Object o) { if (this == o) { return true; } - if (!(o instanceof MqttClientSslConfigImpl)) { + if (!(o instanceof MqttClientTlsConfigImpl)) { return false; } - final MqttClientSslConfigImpl that = (MqttClientSslConfigImpl) o; + final MqttClientTlsConfigImpl that = (MqttClientTlsConfigImpl) o; return Objects.equals(keyManagerFactory, that.keyManagerFactory) && Objects.equals(trustManagerFactory, that.trustManagerFactory) && diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientSslConfigImplBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTlsConfigImplBuilder.java similarity index 69% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttClientSslConfigImplBuilder.java rename to src/main/java/com/hivemq/client/internal/mqtt/MqttClientTlsConfigImplBuilder.java index f5fa63816..9dab2aa96 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientSslConfigImplBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTlsConfigImplBuilder.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.MqttClientSslConfigBuilder; +import com.hivemq.client.mqtt.MqttClientTlsConfigBuilder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -32,25 +32,25 @@ /** * @author Silvio Giebl */ -public abstract class MqttClientSslConfigImplBuilder> { +public abstract class MqttClientTlsConfigImplBuilder> { private @Nullable KeyManagerFactory keyManagerFactory; private @Nullable TrustManagerFactory trustManagerFactory; private @Nullable ImmutableList cipherSuites; private @Nullable ImmutableList protocols; - private int handshakeTimeoutMs = (int) MqttClientSslConfigImpl.DEFAULT_HANDSHAKE_TIMEOUT_MS; - private @Nullable HostnameVerifier hostnameVerifier = MqttClientSslConfigImpl.DEFAULT_HOSTNAME_VERIFIER; - - MqttClientSslConfigImplBuilder() {} - - MqttClientSslConfigImplBuilder(final @Nullable MqttClientSslConfigImpl sslConfig) { - if (sslConfig != null) { - keyManagerFactory = sslConfig.getRawKeyManagerFactory(); - trustManagerFactory = sslConfig.getRawTrustManagerFactory(); - cipherSuites = sslConfig.getRawCipherSuites(); - protocols = sslConfig.getRawProtocols(); - handshakeTimeoutMs = (int) sslConfig.getHandshakeTimeoutMs(); - hostnameVerifier = sslConfig.getRawHostnameVerifier(); + private int handshakeTimeoutMs = (int) MqttClientTlsConfigImpl.DEFAULT_HANDSHAKE_TIMEOUT_MS; + private @Nullable HostnameVerifier hostnameVerifier = MqttClientTlsConfigImpl.DEFAULT_HOSTNAME_VERIFIER; + + MqttClientTlsConfigImplBuilder() {} + + MqttClientTlsConfigImplBuilder(final @Nullable MqttClientTlsConfigImpl tlsConfig) { + if (tlsConfig != null) { + keyManagerFactory = tlsConfig.getRawKeyManagerFactory(); + trustManagerFactory = tlsConfig.getRawTrustManagerFactory(); + cipherSuites = tlsConfig.getRawCipherSuites(); + protocols = tlsConfig.getRawProtocols(); + handshakeTimeoutMs = (int) tlsConfig.getHandshakeTimeoutMs(); + hostnameVerifier = tlsConfig.getRawHostnameVerifier(); } } @@ -85,21 +85,21 @@ public abstract class MqttClientSslConfigImplBuilder implements MqttClientSslConfigBuilder { + public static class Default extends MqttClientTlsConfigImplBuilder implements MqttClientTlsConfigBuilder { public Default() {} - Default(final @Nullable MqttClientSslConfigImpl sslConfig) { - super(sslConfig); + Default(final @Nullable MqttClientTlsConfigImpl tlsConfig) { + super(tlsConfig); } @Override @@ -108,16 +108,16 @@ public Default() {} } } - public static class Nested

extends MqttClientSslConfigImplBuilder> - implements MqttClientSslConfigBuilder.Nested

{ + public static class Nested

extends MqttClientTlsConfigImplBuilder> + implements MqttClientTlsConfigBuilder.Nested

{ - private final @NotNull Function parentConsumer; + private final @NotNull Function parentConsumer; Nested( - final @Nullable MqttClientSslConfigImpl sslConfig, - final @NotNull Function parentConsumer) { + final @Nullable MqttClientTlsConfigImpl tlsConfig, + final @NotNull Function parentConsumer) { - super(sslConfig); + super(tlsConfig); this.parentConsumer = parentConsumer; } @@ -127,7 +127,7 @@ public static class Nested

extends MqttClientSslConfigImplBuilder> } @Override - public @NotNull P applySslConfig() { + public @NotNull P applyTlsConfig() { return parentConsumer.apply(build()); } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImpl.java index e576e594f..ada280e41 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImpl.java @@ -17,7 +17,7 @@ package com.hivemq.client.internal.mqtt; import com.hivemq.client.internal.util.InetSocketAddressUtil; -import com.hivemq.client.mqtt.MqttClientSslConfig; +import com.hivemq.client.mqtt.MqttClientTlsConfig; import com.hivemq.client.mqtt.MqttClientTransportConfig; import com.hivemq.client.mqtt.MqttProxyConfig; import com.hivemq.client.mqtt.MqttWebSocketConfig; @@ -39,7 +39,7 @@ public class MqttClientTransportConfigImpl implements MqttClientTransportConfig private final @NotNull InetSocketAddress serverAddress; private final @Nullable InetSocketAddress localAddress; - private final @Nullable MqttClientSslConfigImpl sslConfig; + private final @Nullable MqttClientTlsConfigImpl tlsConfig; private final @Nullable MqttWebSocketConfigImpl webSocketConfig; private final @Nullable MqttProxyConfigImpl proxyConfig; private final int socketConnectTimeoutMs; @@ -48,7 +48,7 @@ public class MqttClientTransportConfigImpl implements MqttClientTransportConfig MqttClientTransportConfigImpl( final @NotNull InetSocketAddress serverAddress, final @Nullable InetSocketAddress localAddress, - final @Nullable MqttClientSslConfigImpl sslConfig, + final @Nullable MqttClientTlsConfigImpl tlsConfig, final @Nullable MqttWebSocketConfigImpl webSocketConfig, final @Nullable MqttProxyConfigImpl proxyConfig, final int socketConnectTimeoutMs, @@ -56,7 +56,7 @@ public class MqttClientTransportConfigImpl implements MqttClientTransportConfig this.serverAddress = serverAddress; this.localAddress = localAddress; - this.sslConfig = sslConfig; + this.tlsConfig = tlsConfig; this.webSocketConfig = webSocketConfig; this.proxyConfig = proxyConfig; this.socketConnectTimeoutMs = socketConnectTimeoutMs; @@ -82,12 +82,12 @@ public class MqttClientTransportConfigImpl implements MqttClientTransportConfig } @Override - public @NotNull Optional getSslConfig() { - return Optional.ofNullable(sslConfig); + public @NotNull Optional getTlsConfig() { + return Optional.ofNullable(tlsConfig); } - public @Nullable MqttClientSslConfigImpl getRawSslConfig() { - return sslConfig; + public @Nullable MqttClientTlsConfigImpl getRawTlsConfig() { + return tlsConfig; } @Override @@ -134,7 +134,7 @@ public boolean equals(final @Nullable Object o) { final MqttClientTransportConfigImpl that = (MqttClientTransportConfigImpl) o; return serverAddress.equals(that.serverAddress) && Objects.equals(localAddress, that.localAddress) && - Objects.equals(sslConfig, that.sslConfig) && Objects.equals(webSocketConfig, that.webSocketConfig) && + Objects.equals(tlsConfig, that.tlsConfig) && Objects.equals(webSocketConfig, that.webSocketConfig) && Objects.equals(proxyConfig, that.proxyConfig) && (socketConnectTimeoutMs == that.socketConnectTimeoutMs) && (mqttConnectTimeoutMs == that.mqttConnectTimeoutMs); @@ -144,7 +144,7 @@ public boolean equals(final @Nullable Object o) { public int hashCode() { int result = serverAddress.hashCode(); result = 31 * result + Objects.hashCode(localAddress); - result = 31 * result + Objects.hashCode(sslConfig); + result = 31 * result + Objects.hashCode(tlsConfig); result = 31 * result + Objects.hashCode(webSocketConfig); result = 31 * result + Objects.hashCode(proxyConfig); result = 31 * result + Integer.hashCode(socketConnectTimeoutMs); diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImplBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImplBuilder.java index 8f5d4dda8..5b28dad17 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImplBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImplBuilder.java @@ -18,7 +18,7 @@ import com.hivemq.client.internal.util.Checks; import com.hivemq.client.internal.util.InetSocketAddressUtil; -import com.hivemq.client.mqtt.MqttClientSslConfig; +import com.hivemq.client.mqtt.MqttClientTlsConfig; import com.hivemq.client.mqtt.MqttClientTransportConfigBuilder; import com.hivemq.client.mqtt.MqttProxyConfig; import com.hivemq.client.mqtt.MqttWebSocketConfig; @@ -39,7 +39,7 @@ public abstract class MqttClientTransportConfigImplBuilder sslConfig() { - return new MqttClientSslConfigImplBuilder.Nested<>(sslConfig, this::sslConfig); + public MqttClientTlsConfigImplBuilder.@NotNull Nested tlsConfig() { + return new MqttClientTlsConfigImplBuilder.Nested<>(tlsConfig, this::tlsConfig); } public @NotNull B webSocketWithDefaultConfig() { @@ -241,20 +241,20 @@ private int getServerPort() { if (serverPort != -1) { return serverPort; } - if (sslConfig == null) { + if (tlsConfig == null) { if (webSocketConfig == null) { return MqttClientTransportConfigImpl.DEFAULT_SERVER_PORT; } return MqttClientTransportConfigImpl.DEFAULT_SERVER_PORT_WEBSOCKET; } if (webSocketConfig == null) { - return MqttClientTransportConfigImpl.DEFAULT_SERVER_PORT_SSL; + return MqttClientTransportConfigImpl.DEFAULT_SERVER_PORT_TLS; } - return MqttClientTransportConfigImpl.DEFAULT_SERVER_PORT_WEBSOCKET_SSL; + return MqttClientTransportConfigImpl.DEFAULT_SERVER_PORT_WEBSOCKET_TLS; } @NotNull MqttClientTransportConfigImpl buildTransportConfig() { - return new MqttClientTransportConfigImpl(getServerAddress(), localAddress, sslConfig, webSocketConfig, + return new MqttClientTransportConfigImpl(getServerAddress(), localAddress, tlsConfig, webSocketConfig, proxyConfig, socketConnectTimeoutMs, mqttConnectTimeoutMs); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java index 0fd42b948..5dac72153 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java @@ -98,14 +98,14 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase clie } @Override - public @NotNull B sslWithDefaultConfig() { + public @NotNull B tlsWithDefaultConfig() { transportConfig = null; - return super.sslWithDefaultConfig(); + return super.tlsWithDefaultConfig(); } @Override - public @NotNull B sslConfig(final @Nullable MqttClientSslConfig sslConfig) { - return super.sslConfig(sslConfig); + public @NotNull B tlsConfig(final @Nullable MqttClientTlsConfig tlsConfig) { + return super.tlsConfig(tlsConfig); } @Override diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttChannelInitializer.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttChannelInitializer.java index 8c39895cb..1c09011be 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttChannelInitializer.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttChannelInitializer.java @@ -17,7 +17,7 @@ package com.hivemq.client.internal.mqtt.handler; import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.MqttClientSslConfigImpl; +import com.hivemq.client.internal.mqtt.MqttClientTlsConfigImpl; import com.hivemq.client.internal.mqtt.MqttProxyConfigImpl; import com.hivemq.client.internal.mqtt.MqttWebSocketConfigImpl; import com.hivemq.client.internal.mqtt.codec.encoder.MqttEncoder; @@ -27,7 +27,7 @@ import com.hivemq.client.internal.mqtt.handler.connect.MqttConnectHandler; import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectHandler; import com.hivemq.client.internal.mqtt.handler.proxy.MqttProxyInitializer; -import com.hivemq.client.internal.mqtt.handler.ssl.MqttSslInitializer; +import com.hivemq.client.internal.mqtt.handler.tls.MqttTlsInitializer; import com.hivemq.client.internal.mqtt.handler.websocket.MqttWebSocketInitializer; import com.hivemq.client.internal.mqtt.ioc.ConnectionScope; import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; @@ -46,7 +46,7 @@ * Initializes: *

    *
  • the proxy handlers (optional) - *
  • the SSL/TLS handlers (optional) + *
  • the TLS handlers (optional) *
  • the WebSocket handlers (optional) *
  • the basic MQTT handlers: Encoder, AuthHandler, ConnectHandler, DisconnectHandler *
@@ -107,18 +107,18 @@ public void handlerAdded(final @NotNull ChannelHandlerContext ctx) { private void initProxy(final @NotNull Channel channel) { final MqttProxyConfigImpl proxyConfig = clientConfig.getCurrentTransportConfig().getRawProxyConfig(); if (proxyConfig == null) { - initSsl(channel); + initTls(channel); } else { - MqttProxyInitializer.initChannel(channel, clientConfig, proxyConfig, this::initSsl, this::onError); + MqttProxyInitializer.initChannel(channel, clientConfig, proxyConfig, this::initTls, this::onError); } } - private void initSsl(final @NotNull Channel channel) { - final MqttClientSslConfigImpl sslConfig = clientConfig.getCurrentTransportConfig().getRawSslConfig(); - if (sslConfig == null) { + private void initTls(final @NotNull Channel channel) { + final MqttClientTlsConfigImpl tlsConfig = clientConfig.getCurrentTransportConfig().getRawTlsConfig(); + if (tlsConfig == null) { initWebsocket(channel); } else { - MqttSslInitializer.initChannel(channel, clientConfig, sslConfig, this::initWebsocket, this::onError); + MqttTlsInitializer.initChannel(channel, clientConfig, tlsConfig, this::initWebsocket, this::onError); } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/ssl/MqttSslAdapterHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsAdapterHandler.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/ssl/MqttSslAdapterHandler.java rename to src/main/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsAdapterHandler.java index 143e8b95f..77b990581 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/ssl/MqttSslAdapterHandler.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsAdapterHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.ssl; +package com.hivemq.client.internal.mqtt.handler.tls; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; @@ -32,7 +32,7 @@ /** * @author Silvio Giebl */ -class MqttSslAdapterHandler extends ChannelInboundHandlerAdapter { +class MqttTlsAdapterHandler extends ChannelInboundHandlerAdapter { public static final @NotNull String NAME = "ssl.adapter"; @@ -43,7 +43,7 @@ class MqttSslAdapterHandler extends ChannelInboundHandlerAdapter { private final @NotNull BiConsumer onError; private boolean handshakeDone = false; - public MqttSslAdapterHandler( + public MqttTlsAdapterHandler( final @NotNull SslHandler sslHandler, final @NotNull String host, final @Nullable HostnameVerifier hostnameVerifier, diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/ssl/MqttSslInitializer.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsInitializer.java similarity index 74% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/ssl/MqttSslInitializer.java rename to src/main/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsInitializer.java index dfdd808b6..2dd8a0731 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/ssl/MqttSslInitializer.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsInitializer.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.ssl; +package com.hivemq.client.internal.mqtt.handler.tls; import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.MqttClientSslConfigImpl; +import com.hivemq.client.internal.mqtt.MqttClientTlsConfigImpl; import com.hivemq.client.internal.util.collections.ImmutableList; import io.netty.channel.Channel; import io.netty.handler.ssl.SslContext; @@ -37,14 +37,14 @@ * @author Christoph Schäbel * @author Silvio Giebl */ -public final class MqttSslInitializer { +public final class MqttTlsInitializer { - private static final @NotNull String SSL_HANDLER_NAME = "ssl"; + private static final @NotNull String SSL_HANDLER_NAME = "tls"; public static void initChannel( final @NotNull Channel channel, final @NotNull MqttClientConfig clientConfig, - final @NotNull MqttClientSslConfigImpl sslConfig, + final @NotNull MqttClientTlsConfigImpl tlsConfig, final @NotNull Consumer onSuccess, final @NotNull BiConsumer onError) { @@ -54,7 +54,7 @@ public static void initChannel( try { SslContext sslContext = clientConfig.getCurrentSslContext(); if (sslContext == null) { - sslContext = createSslContext(sslConfig); + sslContext = createSslContext(tlsConfig); clientConfig.setCurrentSslContext(sslContext); } sslHandler = sslContext.newHandler(channel.alloc(), serverAddress.getHostString(), serverAddress.getPort()); @@ -63,32 +63,32 @@ public static void initChannel( return; } - sslHandler.setHandshakeTimeoutMillis(sslConfig.getHandshakeTimeoutMs()); + sslHandler.setHandshakeTimeoutMillis(tlsConfig.getHandshakeTimeoutMs()); - final HostnameVerifier hostnameVerifier = sslConfig.getRawHostnameVerifier(); + final HostnameVerifier hostnameVerifier = tlsConfig.getRawHostnameVerifier(); if (hostnameVerifier == null) { final SSLParameters sslParameters = sslHandler.engine().getSSLParameters(); sslParameters.setEndpointIdentificationAlgorithm("HTTPS"); sslHandler.engine().setSSLParameters(sslParameters); } - final MqttSslAdapterHandler sslAdapterHandler = - new MqttSslAdapterHandler(sslHandler, serverAddress.getHostString(), hostnameVerifier, onSuccess, + final MqttTlsAdapterHandler tlsAdapterHandler = + new MqttTlsAdapterHandler(sslHandler, serverAddress.getHostString(), hostnameVerifier, onSuccess, onError); - channel.pipeline().addLast(SSL_HANDLER_NAME, sslHandler).addLast(MqttSslAdapterHandler.NAME, sslAdapterHandler); + channel.pipeline().addLast(SSL_HANDLER_NAME, sslHandler).addLast(MqttTlsAdapterHandler.NAME, tlsAdapterHandler); } - static @NotNull SslContext createSslContext(final @NotNull MqttClientSslConfigImpl sslConfig) throws SSLException { - final ImmutableList protocols = sslConfig.getRawProtocols(); + static @NotNull SslContext createSslContext(final @NotNull MqttClientTlsConfigImpl tlsConfig) throws SSLException { + final ImmutableList protocols = tlsConfig.getRawProtocols(); return SslContextBuilder.forClient() - .trustManager(sslConfig.getRawTrustManagerFactory()) - .keyManager(sslConfig.getRawKeyManagerFactory()) + .trustManager(tlsConfig.getRawTrustManagerFactory()) + .keyManager(tlsConfig.getRawKeyManagerFactory()) .protocols((protocols == null) ? null : protocols.toArray(new String[0])) - .ciphers(sslConfig.getRawCipherSuites(), SupportedCipherSuiteFilter.INSTANCE) + .ciphers(tlsConfig.getRawCipherSuites(), SupportedCipherSuiteFilter.INSTANCE) .build(); } - private MqttSslInitializer() {} + private MqttTlsInitializer() {} } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java index ed1c4c3f4..2ac97c63e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java @@ -63,7 +63,7 @@ public void initChannel( try { final MqttClientTransportConfigImpl transportConfig = clientConfig.getCurrentTransportConfig(); final InetSocketAddress serverAddress = transportConfig.getServerAddress(); - uri = new URI((transportConfig.getRawSslConfig() == null) ? "ws" : "wss", null, + uri = new URI((transportConfig.getRawTlsConfig() == null) ? "ws" : "wss", null, serverAddress.getHostString(), serverAddress.getPort(), "/" + webSocketConfig.getServerPath(), webSocketConfig.getQueryString(), null); } catch (final URISyntaxException e) { diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java index b8620adb6..20aeddab2 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java @@ -96,7 +96,8 @@ public interface MqttClientBuilderBase> { @NotNull B serverPort(int port); /** - * Sets the {@link MqttClientConfig#getSslConfig() secure transport configuration} to the default configuration. + * Sets the {@link MqttClientConfig#getTlsConfig() transport layer security configuration} to the default + * configuration. *

* This means that the systems default trust store, ciphers and protocols are used. * @@ -104,31 +105,31 @@ public interface MqttClientBuilderBase> { * @since 1.1 */ @CheckReturnValue - @NotNull B sslWithDefaultConfig(); + @NotNull B tlsWithDefaultConfig(); /** - * Sets the optional {@link MqttClientConfig#getSslConfig() secure transport configuration}. + * Sets the optional {@link MqttClientConfig#getTlsConfig() transport layer security configuration}. * - * @param sslConfig the secure transport configuration or null to remove any previously set secure - * transport configuration. + * @param tlsConfig the transport layer security configuration or null to remove any previously set + * transport layer security configuration. * @return the builder. * @since 1.1 */ @CheckReturnValue - @NotNull B sslConfig(@Nullable MqttClientSslConfig sslConfig); + @NotNull B tlsConfig(@Nullable MqttClientTlsConfig tlsConfig); /** - * Fluent counterpart of {@link #sslConfig(MqttClientSslConfig)}. + * Fluent counterpart of {@link #tlsConfig(MqttClientTlsConfig)}. *

- * Calling {@link MqttClientSslConfigBuilder.Nested#applySslConfig()} on the returned builder has the effect of - * extending the current secure transport configuration. + * Calling {@link MqttClientTlsConfigBuilder.Nested#applyTlsConfig()} on the returned builder has the effect of + * extending the current transport layer security configuration. * - * @return the fluent builder for the secure transport configuration. - * @see #sslConfig(MqttClientSslConfig) + * @return the fluent builder for the transport layer security configuration. + * @see #tlsConfig(MqttClientTlsConfig) * @since 1.1 */ @CheckReturnValue - MqttClientSslConfigBuilder.@NotNull Nested sslConfig(); + MqttClientTlsConfigBuilder.@NotNull Nested tlsConfig(); /** * Sets the {@link MqttClientConfig#getWebSocketConfig() WebSocket transport configuration} to the default diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java index f7b8c58ff..1d723c7c0 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java @@ -73,10 +73,10 @@ default int getServerPort() { } /** - * @return the optional secure transport configuration of the client. + * @return the optional transport layer security configuration of the client. */ - default @NotNull Optional getSslConfig() { - return getTransportConfig().getSslConfig(); + default @NotNull Optional getTlsConfig() { + return getTransportConfig().getTlsConfig(); } /** diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientSslConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttClientTlsConfig.java similarity index 77% rename from src/main/java/com/hivemq/client/mqtt/MqttClientSslConfig.java rename to src/main/java/com/hivemq/client/mqtt/MqttClientTlsConfig.java index 8aa5f67a8..8611a1856 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientSslConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientTlsConfig.java @@ -18,7 +18,7 @@ import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.annotations.Immutable; -import com.hivemq.client.internal.mqtt.MqttClientSslConfigImplBuilder; +import com.hivemq.client.internal.mqtt.MqttClientTlsConfigImplBuilder; import org.jetbrains.annotations.NotNull; import javax.net.ssl.HostnameVerifier; @@ -28,27 +28,27 @@ import java.util.Optional; /** - * Configuration for a secure transport to use by {@link MqttClient MQTT clients}. + * Configuration for transport layer security to use by {@link MqttClient MQTT clients}. * * @author Christoph Schäbel * @author Silvio Giebl * @since 1.0 */ @DoNotImplement -public interface MqttClientSslConfig { +public interface MqttClientTlsConfig { /** - * The default SSL/TLS handshake timeout in milliseconds. + * The default TLS handshake timeout in milliseconds. */ long DEFAULT_HANDSHAKE_TIMEOUT_MS = 10_000; /** - * Creates a builder for a secure transport configuration. + * Creates a builder for a transport layer security configuration. * - * @return the created builder for a secure transport configuration. + * @return the created builder for a transport layer security configuration. */ - static @NotNull MqttClientSslConfigBuilder builder() { - return new MqttClientSslConfigImplBuilder.Default(); + static @NotNull MqttClientTlsConfigBuilder builder() { + return new MqttClientTlsConfigImplBuilder.Default(); } /** @@ -78,7 +78,7 @@ public interface MqttClientSslConfig { @NotNull Optional<@Immutable List<@NotNull String>> getProtocols(); /** - * @return the SSL/TLS handshake timeout in milliseconds. + * @return the TLS handshake timeout in milliseconds. */ long getHandshakeTimeoutMs(); @@ -89,10 +89,10 @@ public interface MqttClientSslConfig { @NotNull Optional getHostnameVerifier(); /** - * Creates a builder for extending this secure transport configuration. + * Creates a builder for extending this transport layer security configuration. * * @return the created builder. * @since 1.1 */ - @NotNull MqttClientSslConfigBuilder extend(); + @NotNull MqttClientTlsConfigBuilder extend(); } diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientSslConfigBuilder.java b/src/main/java/com/hivemq/client/mqtt/MqttClientTlsConfigBuilder.java similarity index 62% rename from src/main/java/com/hivemq/client/mqtt/MqttClientSslConfigBuilder.java rename to src/main/java/com/hivemq/client/mqtt/MqttClientTlsConfigBuilder.java index 9507de510..afb36b8a0 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientSslConfigBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientTlsConfigBuilder.java @@ -21,35 +21,35 @@ import org.jetbrains.annotations.NotNull; /** - * Builder for a {@link MqttClientSslConfig}. + * Builder for a {@link MqttClientTlsConfig}. * * @author Silvio Giebl * @since 1.0 */ @DoNotImplement -public interface MqttClientSslConfigBuilder extends MqttClientSslConfigBuilderBase { +public interface MqttClientTlsConfigBuilder extends MqttClientTlsConfigBuilderBase { /** - * Builds the {@link MqttClientSslConfig}. + * Builds the {@link MqttClientTlsConfig}. * - * @return the built {@link MqttClientSslConfig}. + * @return the built {@link MqttClientTlsConfig}. */ @CheckReturnValue - @NotNull MqttClientSslConfig build(); + @NotNull MqttClientTlsConfig build(); /** - * Builder for a {@link MqttClientSslConfig} that is applied to a parent. + * Builder for a {@link MqttClientTlsConfig} that is applied to a parent. * - * @param

the type of the result when the built {@link MqttClientSslConfig} is applied to the parent. + * @param

the type of the result when the built {@link MqttClientTlsConfig} is applied to the parent. */ @DoNotImplement - interface Nested

extends MqttClientSslConfigBuilderBase> { + interface Nested

extends MqttClientTlsConfigBuilderBase> { /** - * Builds the {@link MqttClientSslConfig} and applies it to the parent. + * Builds the {@link MqttClientTlsConfig} and applies it to the parent. * - * @return the result when the built {@link MqttClientSslConfig} is applied to the parent. + * @return the result when the built {@link MqttClientTlsConfig} is applied to the parent. */ - @NotNull P applySslConfig(); + @NotNull P applyTlsConfig(); } } diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientSslConfigBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttClientTlsConfigBuilderBase.java similarity index 83% rename from src/main/java/com/hivemq/client/mqtt/MqttClientSslConfigBuilderBase.java rename to src/main/java/com/hivemq/client/mqtt/MqttClientTlsConfigBuilderBase.java index b8aeb0692..5f58e472e 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientSslConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientTlsConfigBuilderBase.java @@ -28,17 +28,17 @@ import java.util.concurrent.TimeUnit; /** - * Builder base for a {@link MqttClientSslConfig}. + * Builder base for a {@link MqttClientTlsConfig}. * * @param the type of the builder. * @author Silvio Giebl * @since 1.0 */ @DoNotImplement -public interface MqttClientSslConfigBuilderBase> { +public interface MqttClientTlsConfigBuilderBase> { /** - * Sets the optional user defined {@link MqttClientSslConfig#getKeyManagerFactory() key manager factory}. + * Sets the optional user defined {@link MqttClientTlsConfig#getKeyManagerFactory() key manager factory}. * * @param keyManagerFactory the key manager factory or null to remove any previously set key manager * factory. @@ -48,7 +48,7 @@ public interface MqttClientSslConfigBuilderBasenull to remove any previously set trust * manager factory @@ -58,7 +58,7 @@ public interface MqttClientSslConfigBuilderBasenull to use the default cipher suites of Netty (network * communication framework). @@ -68,7 +68,7 @@ public interface MqttClientSslConfigBuilderBase cipherSuites); /** - * Sets the optional user defined {@link MqttClientSslConfig#getProtocols() protocols}. + * Sets the optional user defined {@link MqttClientTlsConfig#getProtocols() protocols}. * * @param protocols the protocols or null to use the default protocols of Netty (network communication * framework). @@ -78,11 +78,11 @@ public interface MqttClientSslConfigBuilderBase protocols); /** - * Sets the {@link MqttClientSslConfig#getHandshakeTimeoutMs() SSL/TLS handshake timeout}. + * Sets the {@link MqttClientTlsConfig#getHandshakeTimeoutMs() TLS handshake timeout}. *

* The timeout in milliseconds must be in the range: [0, {@link Integer#MAX_VALUE}]. * - * @param timeout the SSL/TLS handshake timeout or 0 to disable the timeout. + * @param timeout the TLS handshake timeout or 0 to disable the timeout. * @param timeUnit the time unit of the given timeout (this timeout only supports millisecond precision). * @return the builder. */ @@ -90,7 +90,7 @@ public interface MqttClientSslConfigBuilderBasenull to use https hostname verification. * @return the builder. diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfig.java index 29b72549c..78fd17a1d 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfig.java @@ -41,17 +41,17 @@ public interface MqttClientTransportConfig { */ int DEFAULT_SERVER_PORT = 1883; /** - * The default server port when using SSL/TLS. + * The default server port when using TLS. */ - int DEFAULT_SERVER_PORT_SSL = 8883; + int DEFAULT_SERVER_PORT_TLS = 8883; /** * The default server port when using WebSocket. */ int DEFAULT_SERVER_PORT_WEBSOCKET = 80; /** - * The default server port when using SSL/TLS and WebSocket. + * The default server port when using TLS and WebSocket. */ - int DEFAULT_SERVER_PORT_WEBSOCKET_SSL = 443; + int DEFAULT_SERVER_PORT_WEBSOCKET_TLS = 443; /** * The default timeout for connecting the socket to the server in milliseconds. * @@ -86,9 +86,9 @@ public interface MqttClientTransportConfig { @NotNull Optional getLocalAddress(); /** - * @return the optional secure transport configuration. + * @return the optional transport layer security configuration. */ - @NotNull Optional getSslConfig(); + @NotNull Optional getTlsConfig(); /** * @return the optional WebSocket transport configuration. diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfigBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfigBuilderBase.java index ef2840ccd..63912a9d3 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfigBuilderBase.java @@ -116,7 +116,7 @@ public interface MqttClientTransportConfigBuilderBase * This means that the systems default trust store, ciphers and protocols are used. @@ -124,29 +124,29 @@ public interface MqttClientTransportConfigBuilderBasenull to remove any previously set secure - * transport configuration. + * @param tlsConfig the transport layer security configuration or null to remove any previously set + * transport layer security configuration. * @return the builder. */ @CheckReturnValue - @NotNull B sslConfig(@Nullable MqttClientSslConfig sslConfig); + @NotNull B tlsConfig(@Nullable MqttClientTlsConfig tlsConfig); /** - * Fluent counterpart of {@link #sslConfig(MqttClientSslConfig)}. + * Fluent counterpart of {@link #tlsConfig(MqttClientTlsConfig)}. *

- * Calling {@link MqttClientSslConfigBuilder.Nested#applySslConfig()} on the returned builder has the effect of - * extending the current secure transport configuration. + * Calling {@link MqttClientTlsConfigBuilder.Nested#applyTlsConfig()} on the returned builder has the effect of + * extending the current transport layer security configuration. * - * @return the fluent builder for the secure transport configuration. - * @see #sslConfig(MqttClientSslConfig) + * @return the fluent builder for the transport layer security configuration. + * @see #tlsConfig(MqttClientTlsConfig) */ @CheckReturnValue - MqttClientSslConfigBuilder.@NotNull Nested sslConfig(); + MqttClientTlsConfigBuilder.@NotNull Nested tlsConfig(); /** * Sets the {@link MqttClientTransportConfig#getWebSocketConfig() WebSocket transport configuration} to the default diff --git a/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java b/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java index d1d244a73..e5de33c5e 100644 --- a/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java +++ b/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java @@ -18,7 +18,7 @@ import com.hivemq.client.mqtt.MqttClient; import com.hivemq.client.mqtt.MqttClientBuilder; -import com.hivemq.client.mqtt.MqttClientSslConfig; +import com.hivemq.client.mqtt.MqttClientTlsConfig; import com.hivemq.client.mqtt.MqttWebSocketConfig; import com.hivemq.client.mqtt.datatypes.MqttQos; import com.hivemq.client.mqtt.mqtt3.Mqtt3RxClient; @@ -168,7 +168,7 @@ private Mqtt3RxClient getClient() { MqttClient.builder().identifier(UUID.randomUUID().toString()).serverHost(server).serverPort(port); if (usesSsl) { - mqttClientBuilder.sslConfig(MqttClientSslConfig.builder() + mqttClientBuilder.tlsConfig(MqttClientTlsConfig.builder() .keyManagerFactory(keyManagerFactory) .trustManagerFactory(trustManagerFactory) .build()); diff --git a/src/test/java/com/hivemq/client/internal/mqtt/MqttClientSslConfigImplTest.java b/src/test/java/com/hivemq/client/internal/mqtt/MqttClientTlsConfigImplTest.java similarity index 94% rename from src/test/java/com/hivemq/client/internal/mqtt/MqttClientSslConfigImplTest.java rename to src/test/java/com/hivemq/client/internal/mqtt/MqttClientTlsConfigImplTest.java index dba92a6da..855fe5424 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/MqttClientSslConfigImplTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/MqttClientTlsConfigImplTest.java @@ -28,7 +28,7 @@ /** * @author Silvio Giebl */ -class MqttClientSslConfigImplTest { +class MqttClientTlsConfigImplTest { @Test void equals() throws NoSuchAlgorithmException { @@ -37,7 +37,7 @@ void equals() throws NoSuchAlgorithmException { final TrustManagerFactory tmf1 = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); final TrustManagerFactory tmf2 = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); - EqualsVerifier.forClass(MqttClientSslConfigImpl.class) + EqualsVerifier.forClass(MqttClientTlsConfigImpl.class) .withIgnoredAnnotations(NotNull.class) // EqualsVerifier thinks @NotNull Optional is @NotNull .withPrefabValues(KeyManagerFactory.class, kmf1, kmf2) .withPrefabValues(TrustManagerFactory.class, tmf1, tmf2) diff --git a/src/test/java/com/hivemq/client/internal/mqtt/handler/ssl/MqttSslInitializerTest.java b/src/test/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsInitializerTest.java similarity index 90% rename from src/test/java/com/hivemq/client/internal/mqtt/handler/ssl/MqttSslInitializerTest.java rename to src/test/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsInitializerTest.java index e163dccf0..b364b3c4f 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/handler/ssl/MqttSslInitializerTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsInitializerTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.ssl; +package com.hivemq.client.internal.mqtt.handler.tls; -import com.hivemq.client.internal.mqtt.MqttClientSslConfigImpl; -import com.hivemq.client.internal.mqtt.MqttClientSslConfigImplBuilder; +import com.hivemq.client.internal.mqtt.MqttClientTlsConfigImpl; +import com.hivemq.client.internal.mqtt.MqttClientTlsConfigImplBuilder; import com.hivemq.client.internal.util.collections.ImmutableList; import io.netty.channel.Channel; import io.netty.channel.embedded.EmbeddedChannel; @@ -40,7 +40,7 @@ /** * @author Christoph Schäbel */ -class MqttSslInitializerTest { +class MqttTlsInitializerTest { @SuppressWarnings("NullabilityAnnotations") private EmbeddedChannel embeddedChannel; @@ -56,7 +56,7 @@ public void test_createSslEngine_null_values() throws Exception { final TrustManagerFactory tmf = null; final SSLEngine sslEngine = createSslEngine(embeddedChannel, - new MqttClientSslConfigImplBuilder.Default().trustManagerFactory(tmf).build()); + new MqttClientTlsConfigImplBuilder.Default().trustManagerFactory(tmf).build()); assertNotNull(sslEngine); assertTrue(sslEngine.getUseClientMode()); @@ -72,7 +72,7 @@ public void test_createSslEngine_cipher_suite() throws Exception { final ImmutableList cipherSuite = getFirstSupportedCipherSuite(); final SSLEngine sslEngine = createSslEngine(embeddedChannel, - new MqttClientSslConfigImplBuilder.Default().trustManagerFactory(tmf) + new MqttClientTlsConfigImplBuilder.Default().trustManagerFactory(tmf) .cipherSuites(cipherSuite) .build()); @@ -92,7 +92,7 @@ public void test_createSslEngine_multiple_cipher_suites() throws Exception { final ImmutableList cipherSuites = getOtherSupportedCipherSuites(); final SSLEngine sslEngine = createSslEngine(embeddedChannel, - new MqttClientSslConfigImplBuilder.Default().trustManagerFactory(tmf) + new MqttClientTlsConfigImplBuilder.Default().trustManagerFactory(tmf) .cipherSuites(cipherSuites) .build()); @@ -115,7 +115,7 @@ public void test_createSslEngine_protocol() throws Exception { final ImmutableList protocol = ImmutableList.of("TLSv1"); final SSLEngine sslEngine = createSslEngine(embeddedChannel, - new MqttClientSslConfigImplBuilder.Default().trustManagerFactory(tmf).protocols(protocol).build()); + new MqttClientTlsConfigImplBuilder.Default().trustManagerFactory(tmf).protocols(protocol).build()); assertNotNull(sslEngine); @@ -133,7 +133,7 @@ public void test_createSslEngine_multiple_protocols() throws Exception { final ImmutableList protocols = ImmutableList.of("TLSv1.1", "TLSv1.2"); final SSLEngine sslEngine = createSslEngine(embeddedChannel, - new MqttClientSslConfigImplBuilder.Default().trustManagerFactory(tmf).protocols(protocols).build()); + new MqttClientTlsConfigImplBuilder.Default().trustManagerFactory(tmf).protocols(protocols).build()); assertNotNull(sslEngine); @@ -181,8 +181,8 @@ private List getEnabledProtocols() throws Exception { } private static @NotNull SSLEngine createSslEngine( - final @NotNull Channel channel, final @NotNull MqttClientSslConfigImpl sslConfig) throws SSLException { + final @NotNull Channel channel, final @NotNull MqttClientTlsConfigImpl tlsConfig) throws SSLException { - return MqttSslInitializer.createSslContext(sslConfig).newEngine(channel.alloc()); + return MqttTlsInitializer.createSslContext(tlsConfig).newEngine(channel.alloc()); } } \ No newline at end of file diff --git a/src/test/java/com/hivemq/client/mqtt/MqttClientSslConfigBuilderTest.java b/src/test/java/com/hivemq/client/mqtt/MqttClientTlsConfigBuilderTest.java similarity index 62% rename from src/test/java/com/hivemq/client/mqtt/MqttClientSslConfigBuilderTest.java rename to src/test/java/com/hivemq/client/mqtt/MqttClientTlsConfigBuilderTest.java index 7ba5cfa13..d9c0f4822 100644 --- a/src/test/java/com/hivemq/client/mqtt/MqttClientSslConfigBuilderTest.java +++ b/src/test/java/com/hivemq/client/mqtt/MqttClientTlsConfigBuilderTest.java @@ -26,43 +26,43 @@ /** * @author Christian Hoff */ -class MqttClientSslConfigBuilderTest { +class MqttClientTlsConfigBuilderTest { @Test void cipherSuites_simple() { final List expectedCipherSuites = Arrays.asList("TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305"); - final MqttClientSslConfig sslConfig = MqttClientSslConfig.builder().cipherSuites(expectedCipherSuites).build(); + final MqttClientTlsConfig tlsConfig = MqttClientTlsConfig.builder().cipherSuites(expectedCipherSuites).build(); - assertNotNull(sslConfig.getCipherSuites()); - assertTrue(sslConfig.getCipherSuites().isPresent()); - assertEquals(sslConfig.getCipherSuites().get(), expectedCipherSuites); + assertNotNull(tlsConfig.getCipherSuites()); + assertTrue(tlsConfig.getCipherSuites().isPresent()); + assertEquals(tlsConfig.getCipherSuites().get(), expectedCipherSuites); } @Test void cipherSuites_null() { - final MqttClientSslConfig sslConfig = MqttClientSslConfig.builder().cipherSuites(null).build(); + final MqttClientTlsConfig tlsConfig = MqttClientTlsConfig.builder().cipherSuites(null).build(); - assertNotNull(sslConfig.getCipherSuites()); - assertFalse(sslConfig.getCipherSuites().isPresent()); + assertNotNull(tlsConfig.getCipherSuites()); + assertFalse(tlsConfig.getCipherSuites().isPresent()); } @Test void protocols_simple() { final List expectedProtocols = Arrays.asList("TLSv1.2", "TLSv1.1"); - final MqttClientSslConfig sslConfig = MqttClientSslConfig.builder().protocols(expectedProtocols).build(); + final MqttClientTlsConfig tlsConfig = MqttClientTlsConfig.builder().protocols(expectedProtocols).build(); - assertNotNull(sslConfig.getProtocols()); - assertTrue(sslConfig.getProtocols().isPresent()); - assertEquals(sslConfig.getProtocols().get(), expectedProtocols); + assertNotNull(tlsConfig.getProtocols()); + assertTrue(tlsConfig.getProtocols().isPresent()); + assertEquals(tlsConfig.getProtocols().get(), expectedProtocols); } @Test void protocols_null() { - final MqttClientSslConfig sslConfig = MqttClientSslConfig.builder().protocols(null).build(); + final MqttClientTlsConfig tlsConfig = MqttClientTlsConfig.builder().protocols(null).build(); - assertNotNull(sslConfig.getProtocols()); - assertFalse(sslConfig.getProtocols().isPresent()); + assertNotNull(tlsConfig.getProtocols()); + assertFalse(tlsConfig.getProtocols().isPresent()); } } From b2ed27f41cdb2bbc41feeddbaa32782f54f61a7c Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Thu, 12 Nov 2020 23:38:49 +0100 Subject: [PATCH 08/62] MqttClientTransportConfig -> MqttTransportConfig --- .../internal/mqtt/MqttClientConfig.java | 12 ++--- .../mqtt/MqttClientConnectionConfig.java | 6 +-- .../mqtt/MqttRxClientBuilderBase.java | 14 ++--- ...Impl.java => MqttTransportConfigImpl.java} | 20 +++---- ...va => MqttTransportConfigImplBuilder.java} | 53 +++++++++---------- .../handler/connect/MqttConnAckSingle.java | 4 +- .../websocket/MqttWebSocketInitializer.java | 4 +- .../mqtt/lifecycle/MqttClientReconnector.java | 20 +++---- .../mqtt3/Mqtt3ClientReconnectorView.java | 16 +++--- .../mqtt/mqtt3/Mqtt3ClientConfigView.java | 4 +- .../client/mqtt/MqttClientBuilderBase.java | 12 ++--- .../hivemq/client/mqtt/MqttClientConfig.java | 2 +- .../mqtt/MqttClientConnectionConfig.java | 2 +- ...rtConfig.java => MqttTransportConfig.java} | 10 ++-- ...r.java => MqttTransportConfigBuilder.java} | 21 ++++---- ...va => MqttTransportConfigBuilderBase.java} | 24 ++++----- .../mqtt/lifecycle/MqttClientReconnector.java | 24 ++++----- .../lifecycle/Mqtt3ClientReconnector.java | 8 +-- .../lifecycle/Mqtt5ClientReconnector.java | 8 +-- ....java => MqttTransportConfigImplTest.java} | 5 +- .../decoder/AbstractMqttDecoderTest.java | 4 +- .../encoder/AbstractMqttEncoderTest.java | 8 +-- 22 files changed, 138 insertions(+), 143 deletions(-) rename src/main/java/com/hivemq/client/internal/mqtt/{MqttClientTransportConfigImpl.java => MqttTransportConfigImpl.java} (86%) rename src/main/java/com/hivemq/client/internal/mqtt/{MqttClientTransportConfigImplBuilder.java => MqttTransportConfigImplBuilder.java} (80%) rename src/main/java/com/hivemq/client/mqtt/{MqttClientTransportConfig.java => MqttTransportConfig.java} (91%) rename src/main/java/com/hivemq/client/mqtt/{MqttClientTransportConfigBuilder.java => MqttTransportConfigBuilder.java} (59%) rename src/main/java/com/hivemq/client/mqtt/{MqttClientTransportConfigBuilderBase.java => MqttTransportConfigBuilderBase.java} (84%) rename src/test/java/com/hivemq/client/internal/mqtt/{MqttClientTransportConfigImplTest.java => MqttTransportConfigImplTest.java} (91%) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java index 5c291f44b..a409d22e5 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java +++ b/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,7 +66,7 @@ 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; @@ -74,7 +74,7 @@ public class MqttClientConfig implements Mqtt5ClientConfig { 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; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConnectionConfig.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConnectionConfig.java index b48f1c175..2a17bbb20 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConnectionConfig.java +++ b/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; } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java index 5dac72153..80241b6c0 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java @@ -39,11 +39,11 @@ * @author Silvio Giebl */ public abstract class MqttRxClientBuilderBase> - extends MqttClientTransportConfigImplBuilder { + extends MqttTransportConfigImplBuilder { 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 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 transportConfig() { - return new MqttClientTransportConfigImplBuilder.Nested<>(this, this::transportConfig); + public MqttTransportConfigImplBuilder.@NotNull Nested 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(); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImpl.java similarity index 86% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImpl.java rename to src/main/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImpl.java index ada280e41..c50ea094a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImpl.java +++ b/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,8 +119,8 @@ 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 @@ -128,10 +128,10 @@ 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) && diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImplBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImplBuilder.java similarity index 80% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImplBuilder.java rename to src/main/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImplBuilder.java index 5b28dad17..f3eb9302b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImplBuilder.java +++ b/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> { +public abstract class MqttTransportConfigImplBuilder> { 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 - implements MqttClientTransportConfigBuilder { + public static class Default extends MqttTransportConfigImplBuilder 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

extends MqttClientTransportConfigImplBuilder> - implements MqttClientTransportConfigBuilder.Nested

{ + public static class Nested

extends MqttTransportConfigImplBuilder> + implements MqttTransportConfigBuilder.Nested

{ - private final @NotNull Function parentConsumer; + private final @NotNull Function parentConsumer; public Nested( - final @NotNull MqttClientTransportConfigImpl transportConfig, - final @NotNull Function parentConsumer) { + final @NotNull MqttTransportConfigImpl transportConfig, + final @NotNull Function parentConsumer) { super(transportConfig); this.parentConsumer = parentConsumer; } Nested( - final @NotNull MqttClientTransportConfigImplBuilder builder, - final @NotNull Function parentConsumer) { + final @NotNull MqttTransportConfigImplBuilder builder, + final @NotNull Function parentConsumer) { super(builder); this.parentConsumer = parentConsumer; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java index 31e8f13c0..671681486 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java +++ b/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()) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java index 2ac97c63e..38cf4333f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java +++ b/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(), diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientReconnector.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientReconnector.java index 48ee6b414..98a83e24c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientReconnector.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientReconnector.java @@ -16,13 +16,13 @@ package com.hivemq.client.internal.mqtt.lifecycle; -import com.hivemq.client.internal.mqtt.MqttClientTransportConfigImpl; -import com.hivemq.client.internal.mqtt.MqttClientTransportConfigImplBuilder; +import com.hivemq.client.internal.mqtt.MqttTransportConfigImpl; +import com.hivemq.client.internal.mqtt.MqttTransportConfigImplBuilder; import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; import com.hivemq.client.internal.mqtt.message.connect.MqttConnectBuilder; import com.hivemq.client.internal.mqtt.util.MqttChecks; import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.MqttClientTransportConfig; +import com.hivemq.client.mqtt.MqttTransportConfig; import com.hivemq.client.mqtt.mqtt5.lifecycle.Mqtt5ClientReconnector; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; import io.netty.channel.EventLoop; @@ -45,7 +45,7 @@ public class MqttClientReconnector implements Mqtt5ClientReconnector { private boolean resubscribeIfSessionExpired = DEFAULT_RESUBSCRIBE_IF_SESSION_EXPIRED; private boolean republishIfSessionExpired = DEFAULT_REPUBLISH_IF_SESSION_EXPIRED; private long delayNanos = TimeUnit.MILLISECONDS.toNanos(DEFAULT_DELAY_MS); - private @NotNull MqttClientTransportConfigImpl transportConfig; + private @NotNull MqttTransportConfigImpl transportConfig; private @NotNull MqttConnect connect; private boolean afterOnDisconnected; @@ -54,7 +54,7 @@ public MqttClientReconnector( final @NotNull EventLoop eventLoop, final int attempts, final @NotNull MqttConnect connect, - final @NotNull MqttClientTransportConfigImpl transportConfig) { + final @NotNull MqttTransportConfigImpl transportConfig) { this.eventLoop = eventLoop; this.attempts = attempts; @@ -142,21 +142,21 @@ public long getDelay(final @NotNull TimeUnit timeUnit) { } @Override - public @NotNull MqttClientReconnector transportConfig(final @Nullable MqttClientTransportConfig transportConfig) { + public @NotNull MqttClientReconnector transportConfig(final @Nullable MqttTransportConfig transportConfig) { checkInEventLoop(); this.transportConfig = - Checks.notImplemented(transportConfig, MqttClientTransportConfigImpl.class, "Transport config"); + Checks.notImplemented(transportConfig, MqttTransportConfigImpl.class, "Transport config"); return this; } @Override - public MqttClientTransportConfigImplBuilder.@NotNull Nested transportConfig() { + public MqttTransportConfigImplBuilder.@NotNull Nested transportConfig() { checkInEventLoop(); - return new MqttClientTransportConfigImplBuilder.Nested<>(transportConfig, this::transportConfig); + return new MqttTransportConfigImplBuilder.Nested<>(transportConfig, this::transportConfig); } @Override - public @NotNull MqttClientTransportConfigImpl getTransportConfig() { + public @NotNull MqttTransportConfigImpl getTransportConfig() { checkInEventLoop(); return transportConfig; } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientReconnectorView.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientReconnectorView.java index d56bf3763..4e4ab7846 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientReconnectorView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientReconnectorView.java @@ -16,13 +16,13 @@ package com.hivemq.client.internal.mqtt.lifecycle.mqtt3; -import com.hivemq.client.internal.mqtt.MqttClientTransportConfigImpl; -import com.hivemq.client.internal.mqtt.MqttClientTransportConfigImplBuilder; +import com.hivemq.client.internal.mqtt.MqttTransportConfigImpl; +import com.hivemq.client.internal.mqtt.MqttTransportConfigImplBuilder; import com.hivemq.client.internal.mqtt.lifecycle.MqttClientReconnector; import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectView; import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectViewBuilder; import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.mqtt.MqttClientTransportConfig; +import com.hivemq.client.mqtt.MqttTransportConfig; import com.hivemq.client.mqtt.mqtt3.lifecycle.Mqtt3ClientReconnector; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; import org.jetbrains.annotations.NotNull; @@ -102,20 +102,18 @@ public long getDelay(final @NotNull TimeUnit timeUnit) { } @Override - public @NotNull Mqtt3ClientReconnectorView transportConfig( - final @Nullable MqttClientTransportConfig transportConfig) { - + public @NotNull Mqtt3ClientReconnectorView transportConfig(final @Nullable MqttTransportConfig transportConfig) { delegate.transportConfig(transportConfig); return this; } @Override - public MqttClientTransportConfigImplBuilder.@NotNull Nested transportConfig() { - return new MqttClientTransportConfigImplBuilder.Nested<>(getTransportConfig(), this::transportConfig); + public MqttTransportConfigImplBuilder.@NotNull Nested transportConfig() { + return new MqttTransportConfigImplBuilder.Nested<>(getTransportConfig(), this::transportConfig); } @Override - public @NotNull MqttClientTransportConfigImpl getTransportConfig() { + public @NotNull MqttTransportConfigImpl getTransportConfig() { return delegate.getTransportConfig(); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java index 1002e1516..f29f9b84d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java @@ -24,7 +24,7 @@ import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; import com.hivemq.client.mqtt.MqttClientExecutorConfig; import com.hivemq.client.mqtt.MqttClientState; -import com.hivemq.client.mqtt.MqttClientTransportConfig; +import com.hivemq.client.mqtt.MqttTransportConfig; import com.hivemq.client.mqtt.MqttVersion; import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; import com.hivemq.client.mqtt.lifecycle.MqttClientAutoReconnect; @@ -62,7 +62,7 @@ public Mqtt3ClientConfigView(final @NotNull MqttClientConfig delegate) { } @Override - public @NotNull MqttClientTransportConfig getTransportConfig() { + public @NotNull MqttTransportConfig getTransportConfig() { return delegate.getTransportConfig(); } diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java index 20aeddab2..d20fe9081 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java @@ -173,20 +173,20 @@ public interface MqttClientBuilderBase> { * @since 1.1 */ @CheckReturnValue - @NotNull B transportConfig(@NotNull MqttClientTransportConfig transportConfig); + @NotNull B transportConfig(@NotNull MqttTransportConfig transportConfig); /** - * Fluent counterpart of {@link #transportConfig(MqttClientTransportConfig)}. + * Fluent counterpart of {@link #transportConfig(MqttTransportConfig)}. *

- * Calling {@link MqttClientTransportConfigBuilder.Nested#applyTransportConfig()} on the returned builder has the - * effect of extending the current transport configuration. + * Calling {@link MqttTransportConfigBuilder.Nested#applyTransportConfig()} on the returned builder has the effect + * of extending the current transport configuration. * * @return the fluent builder for the transport configuration. - * @see #transportConfig(MqttClientTransportConfig) + * @see #transportConfig(MqttTransportConfig) * @since 1.1 */ @CheckReturnValue - MqttClientTransportConfigBuilder.@NotNull Nested transportConfig(); + MqttTransportConfigBuilder.@NotNull Nested transportConfig(); /** * Sets the {@link MqttClientConfig#getExecutorConfig() executor configuration}. diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java index 1d723c7c0..7256b2095 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java @@ -90,7 +90,7 @@ default int getServerPort() { * @return the transport configuration of the client. * @since 1.1 */ - @NotNull MqttClientTransportConfig getTransportConfig(); + @NotNull MqttTransportConfig getTransportConfig(); /** * @return the executor configuration of the client. diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientConnectionConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttClientConnectionConfig.java index b4bdc75f8..7a8311496 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientConnectionConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientConnectionConfig.java @@ -32,7 +32,7 @@ public interface MqttClientConnectionConfig { * @return the transport configuration the client is connected with. * @since 1.1 */ - @NotNull MqttClientTransportConfig getTransportConfig(); + @NotNull MqttTransportConfig getTransportConfig(); /** * @return the keep alive in seconds that is used while the client is connected. diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttTransportConfig.java similarity index 91% rename from src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfig.java rename to src/main/java/com/hivemq/client/mqtt/MqttTransportConfig.java index 78fd17a1d..93844f490 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttTransportConfig.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt; import com.hivemq.client.annotations.DoNotImplement; -import com.hivemq.client.internal.mqtt.MqttClientTransportConfigImplBuilder; +import com.hivemq.client.internal.mqtt.MqttTransportConfigImplBuilder; import org.jetbrains.annotations.NotNull; import java.net.InetSocketAddress; @@ -30,7 +30,7 @@ * @since 1.1 */ @DoNotImplement -public interface MqttClientTransportConfig { +public interface MqttTransportConfig { /** * The default server host. @@ -70,8 +70,8 @@ public interface MqttClientTransportConfig { * * @return the created builder for a transport configuration. */ - static @NotNull MqttClientTransportConfigBuilder builder() { - return new MqttClientTransportConfigImplBuilder.Default(); + static @NotNull MqttTransportConfigBuilder builder() { + return new MqttTransportConfigImplBuilder.Default(); } /** @@ -118,5 +118,5 @@ public interface MqttClientTransportConfig { * * @return the created builder. */ - @NotNull MqttClientTransportConfigBuilder extend(); + @NotNull MqttTransportConfigBuilder extend(); } diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfigBuilder.java b/src/main/java/com/hivemq/client/mqtt/MqttTransportConfigBuilder.java similarity index 59% rename from src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfigBuilder.java rename to src/main/java/com/hivemq/client/mqtt/MqttTransportConfigBuilder.java index 08dbe88c5..79bf1c973 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfigBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttTransportConfigBuilder.java @@ -21,35 +21,34 @@ import org.jetbrains.annotations.NotNull; /** - * Builder for a {@link MqttClientTransportConfig}. + * Builder for a {@link MqttTransportConfig}. * * @author Silvio Giebl * @since 1.1 */ @DoNotImplement -public interface MqttClientTransportConfigBuilder - extends MqttClientTransportConfigBuilderBase { +public interface MqttTransportConfigBuilder extends MqttTransportConfigBuilderBase { /** - * Builds the {@link MqttClientTransportConfig}. + * Builds the {@link MqttTransportConfig}. * - * @return the built {@link MqttClientTransportConfig}. + * @return the built {@link MqttTransportConfig}. */ @CheckReturnValue - @NotNull MqttClientTransportConfig build(); + @NotNull MqttTransportConfig build(); /** - * Builder for a {@link MqttClientTransportConfig} that is applied to a parent. + * Builder for a {@link MqttTransportConfig} that is applied to a parent. * - * @param

the type of the result when the built {@link MqttClientTransportConfig} is applied to the parent. + * @param

the type of the result when the built {@link MqttTransportConfig} is applied to the parent. */ @DoNotImplement - interface Nested

extends MqttClientTransportConfigBuilderBase> { + interface Nested

extends MqttTransportConfigBuilderBase> { /** - * Builds the {@link MqttClientTransportConfig} and applies it to the parent. + * Builds the {@link MqttTransportConfig} and applies it to the parent. * - * @return the result when the built {@link MqttClientTransportConfig} is applied to the parent. + * @return the result when the built {@link MqttTransportConfig} is applied to the parent. */ @NotNull P applyTransportConfig(); } diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfigBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttTransportConfigBuilderBase.java similarity index 84% rename from src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfigBuilderBase.java rename to src/main/java/com/hivemq/client/mqtt/MqttTransportConfigBuilderBase.java index 63912a9d3..557918e74 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientTransportConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttTransportConfigBuilderBase.java @@ -26,17 +26,17 @@ import java.util.concurrent.TimeUnit; /** - * Builder base for a {@link MqttClientTransportConfig}. + * Builder base for a {@link MqttTransportConfig}. * * @param the type of the builder. * @author Silvio Giebl * @since 1.1 */ @DoNotImplement -public interface MqttClientTransportConfigBuilderBase> { +public interface MqttTransportConfigBuilderBase> { /** - * Sets the {@link MqttClientTransportConfig#getServerAddress() server address} to connect to. + * Sets the {@link MqttTransportConfig#getServerAddress() server address} to connect to. * * @param address the server address. * @return the builder. @@ -72,7 +72,7 @@ public interface MqttClientTransportConfigBuilderBase * The address must be resolved. * @@ -116,7 +116,7 @@ public interface MqttClientTransportConfigBuilderBase * This means that the systems default trust store, ciphers and protocols are used. @@ -127,7 +127,7 @@ public interface MqttClientTransportConfigBuilderBasenull to remove any previously set * transport layer security configuration. @@ -149,7 +149,7 @@ public interface MqttClientTransportConfigBuilderBase tlsConfig(); /** - * Sets the {@link MqttClientTransportConfig#getWebSocketConfig() WebSocket transport configuration} to the default + * Sets the {@link MqttTransportConfig#getWebSocketConfig() WebSocket transport configuration} to the default * configuration. * * @return the builder. @@ -158,7 +158,7 @@ public interface MqttClientTransportConfigBuilderBasenull to remove any previously set * WebSocket transport configuration. @@ -180,7 +180,7 @@ public interface MqttClientTransportConfigBuilderBase webSocketConfig(); /** - * Sets the optional {@link MqttClientTransportConfig#getProxyConfig() proxy configuration}. + * Sets the optional {@link MqttTransportConfig#getProxyConfig() proxy configuration}. * * @param proxyConfig the proxy configuration or null to remove any previously set proxy * configuration. @@ -204,7 +204,7 @@ public interface MqttClientTransportConfigBuilderBase proxyConfig(); /** - * Sets the {@link MqttClientTransportConfig#getSocketConnectTimeoutMs() timeout for connecting the socket to the + * Sets the {@link MqttTransportConfig#getSocketConnectTimeoutMs() timeout for connecting the socket to the * server}. *

* The timeout in milliseconds must be in the range: [0, {@link Integer#MAX_VALUE}]. @@ -218,8 +218,8 @@ public interface MqttClientTransportConfigBuilderBase * The timeout in milliseconds must be in the range: [0, {@link Integer#MAX_VALUE}]. * diff --git a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientReconnector.java b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientReconnector.java index 584471935..47cdd8ff0 100644 --- a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientReconnector.java +++ b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientReconnector.java @@ -18,8 +18,8 @@ import com.hivemq.client.annotations.CheckReturnValue; import com.hivemq.client.annotations.DoNotImplement; -import com.hivemq.client.mqtt.MqttClientTransportConfig; -import com.hivemq.client.mqtt.MqttClientTransportConfigBuilder; +import com.hivemq.client.mqtt.MqttTransportConfig; +import com.hivemq.client.mqtt.MqttTransportConfigBuilder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -192,29 +192,29 @@ public interface MqttClientReconnector { * @param transportConfig the transport configuration the client will try to reconnect with. * @return this reconnector. */ - @NotNull MqttClientReconnector transportConfig(@NotNull MqttClientTransportConfig transportConfig); + @NotNull MqttClientReconnector transportConfig(@NotNull MqttTransportConfig transportConfig); /** - * Fluent counterpart of {@link #transportConfig(MqttClientTransportConfig)}. + * Fluent counterpart of {@link #transportConfig(MqttTransportConfig)}. *

- * Calling {@link MqttClientTransportConfigBuilder.Nested#applyTransportConfig()} on the returned builder has the - * effect of extending the current transport configuration. + * Calling {@link MqttTransportConfigBuilder.Nested#applyTransportConfig()} on the returned builder has the effect + * of extending the current transport configuration. * * @return the fluent builder for the transport configuration. - * @see #transportConfig(MqttClientTransportConfig) + * @see #transportConfig(MqttTransportConfig) */ @CheckReturnValue - MqttClientTransportConfigBuilder.@NotNull Nested transportConfig(); + MqttTransportConfigBuilder.@NotNull Nested transportConfig(); /** * Returns the currently set transport configuration the client will try to reconnect with. *

- * If the {@link #transportConfig(MqttClientTransportConfig)} method has not been called before (including previous - * {@link MqttClientDisconnectedListener MqttClientDisconnectedListeners}) it will be the transport configuration - * the client was connected with or the {@link com.hivemq.client.mqtt.MqttClientConfig#getTransportConfig() default + * If the {@link #transportConfig(MqttTransportConfig)} method has not been called before (including previous {@link + * MqttClientDisconnectedListener MqttClientDisconnectedListeners}) it will be the transport configuration the + * client was connected with or the {@link com.hivemq.client.mqtt.MqttClientConfig#getTransportConfig() default * transport configuration} if it has not been connected yet. * * @return the transport configuration. */ - @NotNull MqttClientTransportConfig getTransportConfig(); + @NotNull MqttTransportConfig getTransportConfig(); } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ClientReconnector.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ClientReconnector.java index 13dd93324..aaca2d367 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ClientReconnector.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ClientReconnector.java @@ -18,8 +18,8 @@ import com.hivemq.client.annotations.CheckReturnValue; import com.hivemq.client.annotations.DoNotImplement; -import com.hivemq.client.mqtt.MqttClientTransportConfig; -import com.hivemq.client.mqtt.MqttClientTransportConfigBuilder; +import com.hivemq.client.mqtt.MqttTransportConfig; +import com.hivemq.client.mqtt.MqttTransportConfigBuilder; import com.hivemq.client.mqtt.lifecycle.MqttClientReconnector; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnectBuilder; @@ -57,11 +57,11 @@ public interface Mqtt3ClientReconnector extends MqttClientReconnector { @NotNull Mqtt3ClientReconnector delay(long delay, @NotNull TimeUnit timeUnit); @Override - @NotNull Mqtt3ClientReconnector transportConfig(@NotNull MqttClientTransportConfig transportConfig); + @NotNull Mqtt3ClientReconnector transportConfig(@NotNull MqttTransportConfig transportConfig); @Override @CheckReturnValue - MqttClientTransportConfigBuilder.@NotNull Nested transportConfig(); + MqttTransportConfigBuilder.@NotNull Nested transportConfig(); /** * Sets a different Connect message the client will try to reconnect with. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ClientReconnector.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ClientReconnector.java index 46de2ac1b..83c2e1203 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ClientReconnector.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ClientReconnector.java @@ -18,8 +18,8 @@ import com.hivemq.client.annotations.CheckReturnValue; import com.hivemq.client.annotations.DoNotImplement; -import com.hivemq.client.mqtt.MqttClientTransportConfig; -import com.hivemq.client.mqtt.MqttClientTransportConfigBuilder; +import com.hivemq.client.mqtt.MqttTransportConfig; +import com.hivemq.client.mqtt.MqttTransportConfigBuilder; import com.hivemq.client.mqtt.lifecycle.MqttClientReconnector; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectBuilder; @@ -57,11 +57,11 @@ public interface Mqtt5ClientReconnector extends MqttClientReconnector { @NotNull Mqtt5ClientReconnector delay(long delay, @NotNull TimeUnit timeUnit); @Override - @NotNull Mqtt5ClientReconnector transportConfig(@NotNull MqttClientTransportConfig transportConfig); + @NotNull Mqtt5ClientReconnector transportConfig(@NotNull MqttTransportConfig transportConfig); @Override @CheckReturnValue - MqttClientTransportConfigBuilder.@NotNull Nested transportConfig(); + MqttTransportConfigBuilder.@NotNull Nested transportConfig(); /** * Sets a different Connect message the client will try to reconnect with. diff --git a/src/test/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImplTest.java b/src/test/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImplTest.java similarity index 91% rename from src/test/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImplTest.java rename to src/test/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImplTest.java index faeffea69..c71ac425a 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/MqttClientTransportConfigImplTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImplTest.java @@ -28,7 +28,7 @@ /** * @author Silvio Giebl */ -class MqttClientTransportConfigImplTest { +class MqttTransportConfigImplTest { @Test void equals() throws NoSuchAlgorithmException { @@ -37,8 +37,7 @@ void equals() throws NoSuchAlgorithmException { final TrustManagerFactory tmf1 = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); final TrustManagerFactory tmf2 = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); - EqualsVerifier.forClass(MqttClientTransportConfigImpl.class) - .suppress(Warning.STRICT_INHERITANCE) + EqualsVerifier.forClass(MqttTransportConfigImpl.class).suppress(Warning.STRICT_INHERITANCE) .withIgnoredAnnotations(NotNull.class) // EqualsVerifier thinks @NotNull Optional is @NotNull .withNonnullFields("serverAddress") .withPrefabValues(KeyManagerFactory.class, kmf1, kmf2) diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/AbstractMqttDecoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/AbstractMqttDecoderTest.java index 311c9fd65..cde3d37b0 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/AbstractMqttDecoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/AbstractMqttDecoderTest.java @@ -18,7 +18,7 @@ import com.hivemq.client.internal.mqtt.MqttClientConfig; import com.hivemq.client.internal.mqtt.MqttClientExecutorConfigImpl; -import com.hivemq.client.internal.mqtt.MqttClientTransportConfigImpl; +import com.hivemq.client.internal.mqtt.MqttTransportConfigImpl; import com.hivemq.client.internal.mqtt.advanced.MqttClientAdvancedConfig; import com.hivemq.client.internal.mqtt.advanced.MqttClientAdvancedConfigBuilder; import com.hivemq.client.internal.mqtt.datatypes.MqttClientIdentifierImpl; @@ -110,7 +110,7 @@ private void createChannel(final boolean validatePayloadFormat) { new MqttClientAdvancedConfigBuilder.Default().validatePayloadFormat(validatePayloadFormat).build(); final MqttClientConfig clientConfig = new MqttClientConfig(MqttVersion.MQTT_5_0, MqttClientIdentifierImpl.of("test"), - MqttClientTransportConfigImpl.DEFAULT, MqttClientExecutorConfigImpl.DEFAULT, advancedConfig, + MqttTransportConfigImpl.DEFAULT, MqttClientExecutorConfigImpl.DEFAULT, advancedConfig, MqttClientConfig.ConnectDefaults.of(null, null, null), ImmutableList.of(), ImmutableList.of()); channel = new EmbeddedChannel(); diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/AbstractMqttEncoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/AbstractMqttEncoderTest.java index 9bdb3ea75..2897b5b64 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/AbstractMqttEncoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/AbstractMqttEncoderTest.java @@ -17,7 +17,7 @@ package com.hivemq.client.internal.mqtt.codec.encoder; import com.hivemq.client.internal.mqtt.MqttClientConnectionConfig; -import com.hivemq.client.internal.mqtt.MqttClientTransportConfigImpl; +import com.hivemq.client.internal.mqtt.MqttTransportConfigImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; import com.hivemq.client.mqtt.datatypes.MqttQos; import io.netty.buffer.ByteBuf; @@ -65,9 +65,9 @@ private void createChannel() { protected void connected(final int maximumPacketSize) { encoder.onConnected( - new MqttClientConnectionConfig(MqttClientTransportConfigImpl.DEFAULT, 10, true, true, 0, false, false, - null, 10, MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT, 0, true, false, 10, - maximumPacketSize, 3, MqttQos.EXACTLY_ONCE, true, true, true, true, channel)); + new MqttClientConnectionConfig(MqttTransportConfigImpl.DEFAULT, 10, true, true, 0, false, false, null, + 10, MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT, 0, true, false, 10, maximumPacketSize, 3, + MqttQos.EXACTLY_ONCE, true, true, true, true, channel)); } protected void encode(final @NotNull Object message, final @NotNull byte[] expected) { From 288cc3290046774e5acfe8c37d7fee996a05f76a Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Thu, 12 Nov 2020 23:46:39 +0100 Subject: [PATCH 09/62] MqttClientTlsConfig -> MqttTlsConfig --- .../mqtt/MqttRxClientBuilderBase.java | 2 +- ...ConfigImpl.java => MqttTlsConfigImpl.java} | 18 +++++------ ...der.java => MqttTlsConfigImplBuilder.java} | 32 +++++++++---------- .../mqtt/MqttTransportConfigImpl.java | 10 +++--- .../mqtt/MqttTransportConfigImplBuilder.java | 14 ++++---- .../mqtt/handler/MqttChannelInitializer.java | 4 +-- .../mqtt/handler/tls/MqttTlsInitializer.java | 6 ++-- .../client/mqtt/MqttClientBuilderBase.java | 12 +++---- .../hivemq/client/mqtt/MqttClientConfig.java | 2 +- ...lientTlsConfig.java => MqttTlsConfig.java} | 10 +++--- ...Builder.java => MqttTlsConfigBuilder.java} | 20 ++++++------ ...ase.java => MqttTlsConfigBuilderBase.java} | 16 +++++----- .../client/mqtt/MqttTransportConfig.java | 2 +- .../mqtt/MqttTransportConfigBuilderBase.java | 12 +++---- .../client/example/Mqtt3ClientExample.java | 4 +-- ...plTest.java => MqttTlsConfigImplTest.java} | 4 +-- .../handler/tls/MqttTlsInitializerTest.java | 20 +++++------- ...est.java => MqttTlsConfigBuilderTest.java} | 10 +++--- 18 files changed, 97 insertions(+), 101 deletions(-) rename src/main/java/com/hivemq/client/internal/mqtt/{MqttClientTlsConfigImpl.java => MqttTlsConfigImpl.java} (89%) rename src/main/java/com/hivemq/client/internal/mqtt/{MqttClientTlsConfigImplBuilder.java => MqttTlsConfigImplBuilder.java} (74%) rename src/main/java/com/hivemq/client/mqtt/{MqttClientTlsConfig.java => MqttTlsConfig.java} (91%) rename src/main/java/com/hivemq/client/mqtt/{MqttClientTlsConfigBuilder.java => MqttTlsConfigBuilder.java} (61%) rename src/main/java/com/hivemq/client/mqtt/{MqttClientTlsConfigBuilderBase.java => MqttTlsConfigBuilderBase.java} (80%) rename src/test/java/com/hivemq/client/internal/mqtt/{MqttClientTlsConfigImplTest.java => MqttTlsConfigImplTest.java} (94%) rename src/test/java/com/hivemq/client/mqtt/{MqttClientTlsConfigBuilderTest.java => MqttTlsConfigBuilderTest.java} (79%) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java index 80241b6c0..82f4c9c23 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java +++ b/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); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTlsConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImpl.java similarity index 89% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttClientTlsConfigImpl.java rename to src/main/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImpl.java index de6fd7b9a..9f09cdd17 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTlsConfigImpl.java +++ b/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 cipherSuites, @@ -122,8 +122,8 @@ 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 @@ -131,10 +131,10 @@ 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) && diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTlsConfigImplBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImplBuilder.java similarity index 74% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttClientTlsConfigImplBuilder.java rename to src/main/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImplBuilder.java index 9dab2aa96..c3b4913ba 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientTlsConfigImplBuilder.java +++ b/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> { +public abstract class MqttTlsConfigImplBuilder> { private @Nullable KeyManagerFactory keyManagerFactory; private @Nullable TrustManagerFactory trustManagerFactory; private @Nullable ImmutableList cipherSuites; private @Nullable ImmutableList 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 implements MqttClientTlsConfigBuilder { + public static class Default extends MqttTlsConfigImplBuilder 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

extends MqttClientTlsConfigImplBuilder> - implements MqttClientTlsConfigBuilder.Nested

{ + public static class Nested

extends MqttTlsConfigImplBuilder> + implements MqttTlsConfigBuilder.Nested

{ - private final @NotNull Function parentConsumer; + private final @NotNull Function parentConsumer; Nested( - final @Nullable MqttClientTlsConfigImpl tlsConfig, - final @NotNull Function parentConsumer) { + final @Nullable MqttTlsConfigImpl tlsConfig, + final @NotNull Function parentConsumer) { super(tlsConfig); this.parentConsumer = parentConsumer; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImpl.java index c50ea094a..ba4d282fe 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImpl.java +++ b/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 getTlsConfig() { + public @NotNull Optional getTlsConfig() { return Optional.ofNullable(tlsConfig); } - public @Nullable MqttClientTlsConfigImpl getRawTlsConfig() { + public @Nullable MqttTlsConfigImpl getRawTlsConfig() { return tlsConfig; } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImplBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImplBuilder.java index f3eb9302b..65a6b8d85 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImplBuilder.java +++ b/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 tlsConfig() { - return new MqttClientTlsConfigImplBuilder.Nested<>(tlsConfig, this::tlsConfig); + public MqttTlsConfigImplBuilder.@NotNull Nested tlsConfig() { + return new MqttTlsConfigImplBuilder.Nested<>(tlsConfig, this::tlsConfig); } public @NotNull B webSocketWithDefaultConfig() { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttChannelInitializer.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttChannelInitializer.java index 1c09011be..8ec2de071 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttChannelInitializer.java +++ b/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 { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsInitializer.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsInitializer.java index 2dd8a0731..fb7a3041a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsInitializer.java +++ b/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 onSuccess, final @NotNull BiConsumer 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 protocols = tlsConfig.getRawProtocols(); return SslContextBuilder.forClient() diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java index d20fe9081..e2b828408 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java @@ -116,20 +116,20 @@ public interface MqttClientBuilderBase> { * @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)}. *

- * 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 tlsConfig(); + MqttTlsConfigBuilder.@NotNull Nested tlsConfig(); /** * Sets the {@link MqttClientConfig#getWebSocketConfig() WebSocket transport configuration} to the default diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java index 7256b2095..e4f8ca74d 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java +++ b/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 getTlsConfig() { + default @NotNull Optional getTlsConfig() { return getTransportConfig().getTlsConfig(); } diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientTlsConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttTlsConfig.java similarity index 91% rename from src/main/java/com/hivemq/client/mqtt/MqttClientTlsConfig.java rename to src/main/java/com/hivemq/client/mqtt/MqttTlsConfig.java index 8611a1856..d478866a4 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientTlsConfig.java +++ b/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(); } diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientTlsConfigBuilder.java b/src/main/java/com/hivemq/client/mqtt/MqttTlsConfigBuilder.java similarity index 61% rename from src/main/java/com/hivemq/client/mqtt/MqttClientTlsConfigBuilder.java rename to src/main/java/com/hivemq/client/mqtt/MqttTlsConfigBuilder.java index afb36b8a0..086276faf 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientTlsConfigBuilder.java +++ b/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 { +public interface MqttTlsConfigBuilder extends MqttTlsConfigBuilderBase { /** - * 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

the type of the result when the built {@link MqttClientTlsConfig} is applied to the parent. + * @param

the type of the result when the built {@link MqttTlsConfig} is applied to the parent. */ @DoNotImplement - interface Nested

extends MqttClientTlsConfigBuilderBase> { + interface Nested

extends MqttTlsConfigBuilderBase> { /** - * 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(); } diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientTlsConfigBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttTlsConfigBuilderBase.java similarity index 80% rename from src/main/java/com/hivemq/client/mqtt/MqttClientTlsConfigBuilderBase.java rename to src/main/java/com/hivemq/client/mqtt/MqttTlsConfigBuilderBase.java index 5f58e472e..d456e46c4 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientTlsConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttTlsConfigBuilderBase.java @@ -28,17 +28,17 @@ import java.util.concurrent.TimeUnit; /** - * Builder base for a {@link MqttClientTlsConfig}. + * Builder base for a {@link MqttTlsConfig}. * * @param the type of the builder. * @author Silvio Giebl * @since 1.0 */ @DoNotImplement -public interface MqttClientTlsConfigBuilderBase> { +public interface MqttTlsConfigBuilderBase> { /** - * Sets the optional user defined {@link MqttClientTlsConfig#getKeyManagerFactory() key manager factory}. + * Sets the optional user defined {@link MqttTlsConfig#getKeyManagerFactory() key manager factory}. * * @param keyManagerFactory the key manager factory or null to remove any previously set key manager * factory. @@ -48,7 +48,7 @@ public interface MqttClientTlsConfigBuilderBasenull to remove any previously set trust * manager factory @@ -58,7 +58,7 @@ public interface MqttClientTlsConfigBuilderBasenull to use the default cipher suites of Netty (network * communication framework). @@ -68,7 +68,7 @@ public interface MqttClientTlsConfigBuilderBase cipherSuites); /** - * Sets the optional user defined {@link MqttClientTlsConfig#getProtocols() protocols}. + * Sets the optional user defined {@link MqttTlsConfig#getProtocols() protocols}. * * @param protocols the protocols or null to use the default protocols of Netty (network communication * framework). @@ -78,7 +78,7 @@ public interface MqttClientTlsConfigBuilderBase protocols); /** - * Sets the {@link MqttClientTlsConfig#getHandshakeTimeoutMs() TLS handshake timeout}. + * Sets the {@link MqttTlsConfig#getHandshakeTimeoutMs() TLS handshake timeout}. *

* The timeout in milliseconds must be in the range: [0, {@link Integer#MAX_VALUE}]. * @@ -90,7 +90,7 @@ public interface MqttClientTlsConfigBuilderBasenull to use https hostname verification. * @return the builder. diff --git a/src/main/java/com/hivemq/client/mqtt/MqttTransportConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttTransportConfig.java index 93844f490..1243d4b5d 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttTransportConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttTransportConfig.java @@ -88,7 +88,7 @@ public interface MqttTransportConfig { /** * @return the optional transport layer security configuration. */ - @NotNull Optional getTlsConfig(); + @NotNull Optional getTlsConfig(); /** * @return the optional WebSocket transport configuration. diff --git a/src/main/java/com/hivemq/client/mqtt/MqttTransportConfigBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttTransportConfigBuilderBase.java index 557918e74..eee4d0a4f 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttTransportConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttTransportConfigBuilderBase.java @@ -134,19 +134,19 @@ public interface MqttTransportConfigBuilderBase - * 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) */ @CheckReturnValue - MqttClientTlsConfigBuilder.@NotNull Nested tlsConfig(); + MqttTlsConfigBuilder.@NotNull Nested tlsConfig(); /** * Sets the {@link MqttTransportConfig#getWebSocketConfig() WebSocket transport configuration} to the default diff --git a/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java b/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java index e5de33c5e..a23409d95 100644 --- a/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java +++ b/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java @@ -18,7 +18,7 @@ import com.hivemq.client.mqtt.MqttClient; import com.hivemq.client.mqtt.MqttClientBuilder; -import com.hivemq.client.mqtt.MqttClientTlsConfig; +import com.hivemq.client.mqtt.MqttTlsConfig; import com.hivemq.client.mqtt.MqttWebSocketConfig; import com.hivemq.client.mqtt.datatypes.MqttQos; import com.hivemq.client.mqtt.mqtt3.Mqtt3RxClient; @@ -168,7 +168,7 @@ private Mqtt3RxClient getClient() { MqttClient.builder().identifier(UUID.randomUUID().toString()).serverHost(server).serverPort(port); if (usesSsl) { - mqttClientBuilder.tlsConfig(MqttClientTlsConfig.builder() + mqttClientBuilder.tlsConfig(MqttTlsConfig.builder() .keyManagerFactory(keyManagerFactory) .trustManagerFactory(trustManagerFactory) .build()); diff --git a/src/test/java/com/hivemq/client/internal/mqtt/MqttClientTlsConfigImplTest.java b/src/test/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImplTest.java similarity index 94% rename from src/test/java/com/hivemq/client/internal/mqtt/MqttClientTlsConfigImplTest.java rename to src/test/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImplTest.java index 855fe5424..ef41bbb0a 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/MqttClientTlsConfigImplTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImplTest.java @@ -28,7 +28,7 @@ /** * @author Silvio Giebl */ -class MqttClientTlsConfigImplTest { +class MqttTlsConfigImplTest { @Test void equals() throws NoSuchAlgorithmException { @@ -37,7 +37,7 @@ void equals() throws NoSuchAlgorithmException { final TrustManagerFactory tmf1 = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); final TrustManagerFactory tmf2 = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); - EqualsVerifier.forClass(MqttClientTlsConfigImpl.class) + EqualsVerifier.forClass(MqttTlsConfigImpl.class) .withIgnoredAnnotations(NotNull.class) // EqualsVerifier thinks @NotNull Optional is @NotNull .withPrefabValues(KeyManagerFactory.class, kmf1, kmf2) .withPrefabValues(TrustManagerFactory.class, tmf1, tmf2) diff --git a/src/test/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsInitializerTest.java b/src/test/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsInitializerTest.java index b364b3c4f..cbd76de8e 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsInitializerTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsInitializerTest.java @@ -16,8 +16,8 @@ package com.hivemq.client.internal.mqtt.handler.tls; -import com.hivemq.client.internal.mqtt.MqttClientTlsConfigImpl; -import com.hivemq.client.internal.mqtt.MqttClientTlsConfigImplBuilder; +import com.hivemq.client.internal.mqtt.MqttTlsConfigImpl; +import com.hivemq.client.internal.mqtt.MqttTlsConfigImplBuilder; import com.hivemq.client.internal.util.collections.ImmutableList; import io.netty.channel.Channel; import io.netty.channel.embedded.EmbeddedChannel; @@ -56,7 +56,7 @@ public void test_createSslEngine_null_values() throws Exception { final TrustManagerFactory tmf = null; final SSLEngine sslEngine = createSslEngine(embeddedChannel, - new MqttClientTlsConfigImplBuilder.Default().trustManagerFactory(tmf).build()); + new MqttTlsConfigImplBuilder.Default().trustManagerFactory(tmf).build()); assertNotNull(sslEngine); assertTrue(sslEngine.getUseClientMode()); @@ -72,9 +72,7 @@ public void test_createSslEngine_cipher_suite() throws Exception { final ImmutableList cipherSuite = getFirstSupportedCipherSuite(); final SSLEngine sslEngine = createSslEngine(embeddedChannel, - new MqttClientTlsConfigImplBuilder.Default().trustManagerFactory(tmf) - .cipherSuites(cipherSuite) - .build()); + new MqttTlsConfigImplBuilder.Default().trustManagerFactory(tmf).cipherSuites(cipherSuite).build()); assertNotNull(sslEngine); @@ -92,9 +90,7 @@ public void test_createSslEngine_multiple_cipher_suites() throws Exception { final ImmutableList cipherSuites = getOtherSupportedCipherSuites(); final SSLEngine sslEngine = createSslEngine(embeddedChannel, - new MqttClientTlsConfigImplBuilder.Default().trustManagerFactory(tmf) - .cipherSuites(cipherSuites) - .build()); + new MqttTlsConfigImplBuilder.Default().trustManagerFactory(tmf).cipherSuites(cipherSuites).build()); assertNotNull(sslEngine); @@ -115,7 +111,7 @@ public void test_createSslEngine_protocol() throws Exception { final ImmutableList protocol = ImmutableList.of("TLSv1"); final SSLEngine sslEngine = createSslEngine(embeddedChannel, - new MqttClientTlsConfigImplBuilder.Default().trustManagerFactory(tmf).protocols(protocol).build()); + new MqttTlsConfigImplBuilder.Default().trustManagerFactory(tmf).protocols(protocol).build()); assertNotNull(sslEngine); @@ -133,7 +129,7 @@ public void test_createSslEngine_multiple_protocols() throws Exception { final ImmutableList protocols = ImmutableList.of("TLSv1.1", "TLSv1.2"); final SSLEngine sslEngine = createSslEngine(embeddedChannel, - new MqttClientTlsConfigImplBuilder.Default().trustManagerFactory(tmf).protocols(protocols).build()); + new MqttTlsConfigImplBuilder.Default().trustManagerFactory(tmf).protocols(protocols).build()); assertNotNull(sslEngine); @@ -181,7 +177,7 @@ private List getEnabledProtocols() throws Exception { } private static @NotNull SSLEngine createSslEngine( - final @NotNull Channel channel, final @NotNull MqttClientTlsConfigImpl tlsConfig) throws SSLException { + final @NotNull Channel channel, final @NotNull MqttTlsConfigImpl tlsConfig) throws SSLException { return MqttTlsInitializer.createSslContext(tlsConfig).newEngine(channel.alloc()); } diff --git a/src/test/java/com/hivemq/client/mqtt/MqttClientTlsConfigBuilderTest.java b/src/test/java/com/hivemq/client/mqtt/MqttTlsConfigBuilderTest.java similarity index 79% rename from src/test/java/com/hivemq/client/mqtt/MqttClientTlsConfigBuilderTest.java rename to src/test/java/com/hivemq/client/mqtt/MqttTlsConfigBuilderTest.java index d9c0f4822..1fbebccca 100644 --- a/src/test/java/com/hivemq/client/mqtt/MqttClientTlsConfigBuilderTest.java +++ b/src/test/java/com/hivemq/client/mqtt/MqttTlsConfigBuilderTest.java @@ -26,13 +26,13 @@ /** * @author Christian Hoff */ -class MqttClientTlsConfigBuilderTest { +class MqttTlsConfigBuilderTest { @Test void cipherSuites_simple() { final List expectedCipherSuites = Arrays.asList("TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305"); - final MqttClientTlsConfig tlsConfig = MqttClientTlsConfig.builder().cipherSuites(expectedCipherSuites).build(); + final MqttTlsConfig tlsConfig = MqttTlsConfig.builder().cipherSuites(expectedCipherSuites).build(); assertNotNull(tlsConfig.getCipherSuites()); assertTrue(tlsConfig.getCipherSuites().isPresent()); @@ -41,7 +41,7 @@ void cipherSuites_simple() { @Test void cipherSuites_null() { - final MqttClientTlsConfig tlsConfig = MqttClientTlsConfig.builder().cipherSuites(null).build(); + final MqttTlsConfig tlsConfig = MqttTlsConfig.builder().cipherSuites(null).build(); assertNotNull(tlsConfig.getCipherSuites()); assertFalse(tlsConfig.getCipherSuites().isPresent()); @@ -51,7 +51,7 @@ void cipherSuites_null() { void protocols_simple() { final List expectedProtocols = Arrays.asList("TLSv1.2", "TLSv1.1"); - final MqttClientTlsConfig tlsConfig = MqttClientTlsConfig.builder().protocols(expectedProtocols).build(); + final MqttTlsConfig tlsConfig = MqttTlsConfig.builder().protocols(expectedProtocols).build(); assertNotNull(tlsConfig.getProtocols()); assertTrue(tlsConfig.getProtocols().isPresent()); @@ -60,7 +60,7 @@ void protocols_simple() { @Test void protocols_null() { - final MqttClientTlsConfig tlsConfig = MqttClientTlsConfig.builder().protocols(null).build(); + final MqttTlsConfig tlsConfig = MqttTlsConfig.builder().protocols(null).build(); assertNotNull(tlsConfig.getProtocols()); assertFalse(tlsConfig.getProtocols().isPresent()); From 4e62f54b43f2e7c7aec826e29aa09744a40d1aa7 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Thu, 12 Nov 2020 23:51:37 +0100 Subject: [PATCH 10/62] MqttClientExecutorConfig -> MqttExecutorConfig --- .../internal/mqtt/MqttClientConfig.java | 6 ++-- ...gImpl.java => MqttExecutorConfigImpl.java} | 18 +++++------ ...ava => MqttExecutorConfigImplBuilder.java} | 31 +++++++++---------- .../mqtt/MqttRxClientBuilderBase.java | 11 +++---- .../mqtt/mqtt3/Mqtt3ClientConfigView.java | 4 +-- .../netty/NettyEventLoopProvider.java | 6 ++-- .../client/mqtt/MqttClientBuilderBase.java | 12 +++---- .../hivemq/client/mqtt/MqttClientConfig.java | 2 +- ...torConfig.java => MqttExecutorConfig.java} | 10 +++--- ...er.java => MqttExecutorConfigBuilder.java} | 21 ++++++------- ...ava => MqttExecutorConfigBuilderBase.java} | 14 ++++----- ...t.java => MqttExecutorConfigImplTest.java} | 4 +-- .../decoder/AbstractMqttDecoderTest.java | 4 +-- 13 files changed, 70 insertions(+), 73 deletions(-) rename src/main/java/com/hivemq/client/internal/mqtt/{MqttClientExecutorConfigImpl.java => MqttExecutorConfigImpl.java} (80%) rename src/main/java/com/hivemq/client/internal/mqtt/{MqttClientExecutorConfigImplBuilder.java => MqttExecutorConfigImplBuilder.java} (64%) rename src/main/java/com/hivemq/client/mqtt/{MqttClientExecutorConfig.java => MqttExecutorConfig.java} (86%) rename src/main/java/com/hivemq/client/mqtt/{MqttClientExecutorConfigBuilder.java => MqttExecutorConfigBuilder.java} (59%) rename src/main/java/com/hivemq/client/mqtt/{MqttClientExecutorConfigBuilderBase.java => MqttExecutorConfigBuilderBase.java} (75%) rename src/test/java/com/hivemq/client/internal/mqtt/{MqttClientExecutorConfigImplTest.java => MqttExecutorConfigImplTest.java} (91%) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java index a409d22e5..95d788b28 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java @@ -52,7 +52,7 @@ public class MqttClientConfig implements Mqtt5ClientConfig { private final @NotNull MqttVersion mqttVersion; private volatile @NotNull MqttClientIdentifierImpl clientIdentifier; private final @NotNull MqttTransportConfigImpl transportConfig; - private final @NotNull MqttClientExecutorConfigImpl executorConfig; + private final @NotNull MqttExecutorConfigImpl executorConfig; private final @NotNull MqttClientAdvancedConfig advancedConfig; private final @NotNull ConnectDefaults connectDefaults; private final @NotNull ImmutableList connectedListeners; @@ -75,7 +75,7 @@ public MqttClientConfig( final @NotNull MqttVersion mqttVersion, final @NotNull MqttClientIdentifierImpl clientIdentifier, final @NotNull MqttTransportConfigImpl transportConfig, - final @NotNull MqttClientExecutorConfigImpl executorConfig, + final @NotNull MqttExecutorConfigImpl executorConfig, final @NotNull MqttClientAdvancedConfig advancedConfig, final @NotNull ConnectDefaults connectDefaults, final @NotNull ImmutableList connectedListeners, @@ -121,7 +121,7 @@ public void setClientIdentifier(final @NotNull MqttClientIdentifierImpl clientId } @Override - public @NotNull MqttClientExecutorConfigImpl getExecutorConfig() { + public @NotNull MqttExecutorConfigImpl getExecutorConfig() { return executorConfig; } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientExecutorConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImpl.java similarity index 80% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttClientExecutorConfigImpl.java rename to src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImpl.java index 4f1b290f9..45f9d775f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientExecutorConfigImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImpl.java @@ -16,7 +16,7 @@ package com.hivemq.client.internal.mqtt; -import com.hivemq.client.mqtt.MqttClientExecutorConfig; +import com.hivemq.client.mqtt.MqttExecutorConfig; import io.reactivex.Scheduler; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -29,17 +29,17 @@ /** * @author Silvio Giebl */ -public class MqttClientExecutorConfigImpl implements MqttClientExecutorConfig { +public class MqttExecutorConfigImpl implements MqttExecutorConfig { public static final int DEFAULT_NETTY_THREADS = 0; - public static final @NotNull MqttClientExecutorConfigImpl DEFAULT = - new MqttClientExecutorConfigImpl(null, DEFAULT_NETTY_THREADS, DEFAULT_APPLICATION_SCHEDULER); + public static final @NotNull MqttExecutorConfigImpl DEFAULT = + new MqttExecutorConfigImpl(null, DEFAULT_NETTY_THREADS, DEFAULT_APPLICATION_SCHEDULER); private final @Nullable Executor nettyExecutor; private final int nettyThreads; private final @NotNull Scheduler applicationScheduler; - MqttClientExecutorConfigImpl( + MqttExecutorConfigImpl( final @Nullable Executor nettyExecutor, final int nettyThreads, final @NotNull Scheduler applicationScheduler) { @@ -73,8 +73,8 @@ public int getRawNettyThreads() { } @Override - public MqttClientExecutorConfigImplBuilder.@NotNull Default extend() { - return new MqttClientExecutorConfigImplBuilder.Default(this); + public MqttExecutorConfigImplBuilder.@NotNull Default extend() { + return new MqttExecutorConfigImplBuilder.Default(this); } @Override @@ -82,10 +82,10 @@ public boolean equals(final @Nullable Object o) { if (this == o) { return true; } - if (!(o instanceof MqttClientExecutorConfigImpl)) { + if (!(o instanceof MqttExecutorConfigImpl)) { return false; } - final MqttClientExecutorConfigImpl that = (MqttClientExecutorConfigImpl) o; + final MqttExecutorConfigImpl that = (MqttExecutorConfigImpl) o; return Objects.equals(nettyExecutor, that.nettyExecutor) && (nettyThreads == that.nettyThreads) && applicationScheduler.equals(that.applicationScheduler); diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientExecutorConfigImplBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImplBuilder.java similarity index 64% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttClientExecutorConfigImplBuilder.java rename to src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImplBuilder.java index 6c68726af..f480190c6 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientExecutorConfigImplBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImplBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.internal.mqtt; import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.MqttClientExecutorConfigBuilder; +import com.hivemq.client.mqtt.MqttExecutorConfigBuilder; import io.reactivex.Scheduler; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -28,15 +28,15 @@ /** * @author Silvio Giebl */ -public abstract class MqttClientExecutorConfigImplBuilder> { +public abstract class MqttExecutorConfigImplBuilder> { private @Nullable Executor nettyExecutor; - private int nettyThreads = MqttClientExecutorConfigImpl.DEFAULT_NETTY_THREADS; - private @NotNull Scheduler applicationScheduler = MqttClientExecutorConfigImpl.DEFAULT_APPLICATION_SCHEDULER; + private int nettyThreads = MqttExecutorConfigImpl.DEFAULT_NETTY_THREADS; + private @NotNull Scheduler applicationScheduler = MqttExecutorConfigImpl.DEFAULT_APPLICATION_SCHEDULER; - MqttClientExecutorConfigImplBuilder() {} + MqttExecutorConfigImplBuilder() {} - MqttClientExecutorConfigImplBuilder(final @NotNull MqttClientExecutorConfigImpl executorConfig) { + MqttExecutorConfigImplBuilder(final @NotNull MqttExecutorConfigImpl executorConfig) { nettyExecutor = executorConfig.getRawNettyExecutor(); nettyThreads = executorConfig.getRawNettyThreads(); applicationScheduler = executorConfig.getApplicationScheduler(); @@ -63,16 +63,15 @@ public abstract class MqttClientExecutorConfigImplBuilder - implements MqttClientExecutorConfigBuilder { + public static class Default extends MqttExecutorConfigImplBuilder implements MqttExecutorConfigBuilder { public Default() {} - Default(final @NotNull MqttClientExecutorConfigImpl executorConfig) { + Default(final @NotNull MqttExecutorConfigImpl executorConfig) { super(executorConfig); } @@ -82,14 +81,14 @@ public Default() {} } } - public static class Nested

extends MqttClientExecutorConfigImplBuilder> - implements MqttClientExecutorConfigBuilder.Nested

{ + public static class Nested

extends MqttExecutorConfigImplBuilder> + implements MqttExecutorConfigBuilder.Nested

{ - private final @NotNull Function parentConsumer; + private final @NotNull Function parentConsumer; Nested( - final @NotNull MqttClientExecutorConfigImpl executorConfig, - final @NotNull Function parentConsumer) { + final @NotNull MqttExecutorConfigImpl executorConfig, + final @NotNull Function parentConsumer) { super(executorConfig); this.parentConsumer = parentConsumer; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java index 82f4c9c23..f78f26456 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java @@ -44,7 +44,7 @@ public abstract class MqttRxClientBuilderBase connectedListenersBuilder; private ImmutableList.@Nullable Builder disconnectedListenersBuilder; @@ -131,14 +131,13 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase clie return new MqttTransportConfigImplBuilder.Nested<>(this, this::transportConfig); } - public @NotNull B executorConfig(final @Nullable MqttClientExecutorConfig executorConfig) { - this.executorConfig = - Checks.notImplemented(executorConfig, MqttClientExecutorConfigImpl.class, "Executor config"); + public @NotNull B executorConfig(final @Nullable MqttExecutorConfig executorConfig) { + this.executorConfig = Checks.notImplemented(executorConfig, MqttExecutorConfigImpl.class, "Executor config"); return self(); } - public MqttClientExecutorConfigImplBuilder.@NotNull Nested executorConfig() { - return new MqttClientExecutorConfigImplBuilder.Nested<>(executorConfig, this::executorConfig); + public MqttExecutorConfigImplBuilder.@NotNull Nested executorConfig() { + return new MqttExecutorConfigImplBuilder.Nested<>(executorConfig, this::executorConfig); } public @NotNull B automaticReconnectWithDefaultConfig() { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java index f29f9b84d..933cd81c5 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java @@ -22,8 +22,8 @@ import com.hivemq.client.internal.mqtt.message.auth.mqtt3.Mqtt3SimpleAuthView; import com.hivemq.client.internal.mqtt.message.publish.MqttWillPublish; import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; -import com.hivemq.client.mqtt.MqttClientExecutorConfig; import com.hivemq.client.mqtt.MqttClientState; +import com.hivemq.client.mqtt.MqttExecutorConfig; import com.hivemq.client.mqtt.MqttTransportConfig; import com.hivemq.client.mqtt.MqttVersion; import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; @@ -67,7 +67,7 @@ public Mqtt3ClientConfigView(final @NotNull MqttClientConfig delegate) { } @Override - public @NotNull MqttClientExecutorConfig getExecutorConfig() { + public @NotNull MqttExecutorConfig getExecutorConfig() { return delegate.getExecutorConfig(); } diff --git a/src/main/java/com/hivemq/client/internal/netty/NettyEventLoopProvider.java b/src/main/java/com/hivemq/client/internal/netty/NettyEventLoopProvider.java index 5ef5044c4..377155782 100644 --- a/src/main/java/com/hivemq/client/internal/netty/NettyEventLoopProvider.java +++ b/src/main/java/com/hivemq/client/internal/netty/NettyEventLoopProvider.java @@ -19,7 +19,7 @@ import com.hivemq.client.internal.annotations.ThreadSafe; import com.hivemq.client.internal.logging.InternalLogger; import com.hivemq.client.internal.logging.InternalLoggerFactory; -import com.hivemq.client.internal.mqtt.MqttClientExecutorConfigImpl; +import com.hivemq.client.internal.mqtt.MqttExecutorConfigImpl; import com.hivemq.client.internal.util.ClassUtil; import io.netty.channel.ChannelFactory; import io.netty.channel.EventLoop; @@ -96,7 +96,7 @@ threadCount, new ThreadPerTaskExecutor( } else if (executor instanceof MultithreadEventLoopGroup) { eventLoopGroup = (MultithreadEventLoopGroup) executor; - if ((threadCount != MqttClientExecutorConfigImpl.DEFAULT_NETTY_THREADS) && + if ((threadCount != MqttExecutorConfigImpl.DEFAULT_NETTY_THREADS) && (eventLoopGroup.executorCount() != threadCount)) { LOGGER.warn("Tried to use a different amount of Netty threads for the provided event loop. " + "Using {} threads instead of {}", eventLoopGroup.executorCount(), threadCount); @@ -107,7 +107,7 @@ threadCount, new ThreadPerTaskExecutor( entry = new Entry(eventLoopGroup); entries.put(executor, entry); } else { - if ((threadCount != MqttClientExecutorConfigImpl.DEFAULT_NETTY_THREADS) && + if ((threadCount != MqttExecutorConfigImpl.DEFAULT_NETTY_THREADS) && (entry.eventLoopGroup.executorCount() != threadCount)) { LOGGER.warn("Tried to use a different amount of Netty threads for the same executor. " + "Using {} threads instead of {}", entry.eventLoopGroup.executorCount(), threadCount); diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java index e2b828408..bccf1f28f 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java @@ -195,19 +195,19 @@ public interface MqttClientBuilderBase> { * @return the builder. */ @CheckReturnValue - @NotNull B executorConfig(@NotNull MqttClientExecutorConfig executorConfig); + @NotNull B executorConfig(@NotNull MqttExecutorConfig executorConfig); /** - * Fluent counterpart of {@link #executorConfig(MqttClientExecutorConfig)}. + * Fluent counterpart of {@link #executorConfig(MqttExecutorConfig)}. *

- * Calling {@link MqttClientExecutorConfigBuilder.Nested#applyExecutorConfig()} on the returned builder has the - * effect of extending the current executor configuration. + * Calling {@link MqttExecutorConfigBuilder.Nested#applyExecutorConfig()} on the returned builder has the effect of + * extending the current executor configuration. * * @return the fluent builder for the executor configuration. - * @see #executorConfig(MqttClientExecutorConfig) + * @see #executorConfig(MqttExecutorConfig) */ @CheckReturnValue - MqttClientExecutorConfigBuilder.@NotNull Nested executorConfig(); + MqttExecutorConfigBuilder.@NotNull Nested executorConfig(); /** * Uses automatic reconnect with the default configuration. diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java index e4f8ca74d..758e33277 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java @@ -95,7 +95,7 @@ default int getServerPort() { /** * @return the executor configuration of the client. */ - @NotNull MqttClientExecutorConfig getExecutorConfig(); + @NotNull MqttExecutorConfig getExecutorConfig(); /** * @return the optional automatic reconnect strategy of the client. diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientExecutorConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfig.java similarity index 86% rename from src/main/java/com/hivemq/client/mqtt/MqttClientExecutorConfig.java rename to src/main/java/com/hivemq/client/mqtt/MqttExecutorConfig.java index 5b98e764f..aed4316a3 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientExecutorConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfig.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt; import com.hivemq.client.annotations.DoNotImplement; -import com.hivemq.client.internal.mqtt.MqttClientExecutorConfigImplBuilder; +import com.hivemq.client.internal.mqtt.MqttExecutorConfigImplBuilder; import io.reactivex.Scheduler; import io.reactivex.schedulers.Schedulers; import org.jetbrains.annotations.NotNull; @@ -33,7 +33,7 @@ * @since 1.0 */ @DoNotImplement -public interface MqttClientExecutorConfig { +public interface MqttExecutorConfig { @NotNull Scheduler DEFAULT_APPLICATION_SCHEDULER = Schedulers.computation(); @@ -42,8 +42,8 @@ public interface MqttClientExecutorConfig { * * @return the created builder for an executor configuration. */ - static @NotNull MqttClientExecutorConfigBuilder builder() { - return new MqttClientExecutorConfigImplBuilder.Default(); + static @NotNull MqttExecutorConfigBuilder builder() { + return new MqttExecutorConfigImplBuilder.Default(); } /** @@ -67,5 +67,5 @@ public interface MqttClientExecutorConfig { * @return the created builder. * @since 1.1 */ - @NotNull MqttClientExecutorConfigBuilder extend(); + @NotNull MqttExecutorConfigBuilder extend(); } diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientExecutorConfigBuilder.java b/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfigBuilder.java similarity index 59% rename from src/main/java/com/hivemq/client/mqtt/MqttClientExecutorConfigBuilder.java rename to src/main/java/com/hivemq/client/mqtt/MqttExecutorConfigBuilder.java index e1afc50f8..d8a26f838 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientExecutorConfigBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfigBuilder.java @@ -21,35 +21,34 @@ import org.jetbrains.annotations.NotNull; /** - * Builder for a {@link MqttClientExecutorConfig}. + * Builder for a {@link MqttExecutorConfig}. * * @author Silvio Giebl * @since 1.0 */ @DoNotImplement -public interface MqttClientExecutorConfigBuilder - extends MqttClientExecutorConfigBuilderBase { +public interface MqttExecutorConfigBuilder extends MqttExecutorConfigBuilderBase { /** - * Builds the {@link MqttClientExecutorConfig}. + * Builds the {@link MqttExecutorConfig}. * - * @return the built {@link MqttClientExecutorConfig}. + * @return the built {@link MqttExecutorConfig}. */ @CheckReturnValue - @NotNull MqttClientExecutorConfig build(); + @NotNull MqttExecutorConfig build(); /** - * Builder for a {@link MqttClientExecutorConfig} that is applied to a parent. + * Builder for a {@link MqttExecutorConfig} that is applied to a parent. * - * @param

the type of the result when the built {@link MqttClientExecutorConfig} is applied to the parent. + * @param

the type of the result when the built {@link MqttExecutorConfig} is applied to the parent. */ @DoNotImplement - interface Nested

extends MqttClientExecutorConfigBuilderBase> { + interface Nested

extends MqttExecutorConfigBuilderBase> { /** - * Builds the {@link MqttClientExecutorConfig} and applies it to the parent. + * Builds the {@link MqttExecutorConfig} and applies it to the parent. * - * @return the result when the built {@link MqttClientExecutorConfig} is applied to the parent. + * @return the result when the built {@link MqttExecutorConfig} is applied to the parent. */ @NotNull P applyExecutorConfig(); } diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientExecutorConfigBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfigBuilderBase.java similarity index 75% rename from src/main/java/com/hivemq/client/mqtt/MqttClientExecutorConfigBuilderBase.java rename to src/main/java/com/hivemq/client/mqtt/MqttExecutorConfigBuilderBase.java index 1ac5696e0..73685a026 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientExecutorConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfigBuilderBase.java @@ -25,17 +25,17 @@ import java.util.concurrent.Executor; /** - * Builder base for a {@link MqttClientExecutorConfig}. + * Builder base for a {@link MqttExecutorConfig}. * * @param the type of the builder. * @author Silvio Giebl * @since 1.0 */ @DoNotImplement -public interface MqttClientExecutorConfigBuilderBase> { +public interface MqttExecutorConfigBuilderBase> { /** - * Sets the optional user defined {@link MqttClientExecutorConfig#getNettyExecutor() executor for Netty} (network + * Sets the optional user defined {@link MqttExecutorConfig#getNettyExecutor() executor for Netty} (network * communication framework). * * @param nettyExecutor the user defined executor for Netty or null to use the default executor. @@ -45,8 +45,8 @@ public interface MqttClientExecutorConfigBuilderBase Date: Fri, 13 Nov 2020 11:02:59 +0100 Subject: [PATCH 11/62] Mqtt5ClientAdvancedConfig -> Mqtt5AdvancedConfig --- .../internal/mqtt/MqttClientConfig.java | 8 +++--- .../internal/mqtt/MqttRxClientBuilder.java | 16 +++++------ .../mqtt/MqttRxClientBuilderBase.java | 4 +-- ...cedConfig.java => MqttAdvancedConfig.java} | 16 +++++------ ...er.java => MqttAdvancedConfigBuilder.java} | 27 +++++++++---------- .../mqtt/mqtt3/Mqtt3RxClientViewBuilder.java | 4 +-- .../client/mqtt/mqtt5/Mqtt5ClientBuilder.java | 16 +++++------ .../client/mqtt/mqtt5/Mqtt5ClientConfig.java | 4 +-- ...edConfig.java => Mqtt5AdvancedConfig.java} | 10 +++---- ...r.java => Mqtt5AdvancedConfigBuilder.java} | 21 +++++++-------- ...va => Mqtt5AdvancedConfigBuilderBase.java} | 8 +++--- ...gTest.java => MqttAdvancedConfigTest.java} | 4 +-- .../decoder/AbstractMqttDecoderTest.java | 8 +++--- 13 files changed, 72 insertions(+), 74 deletions(-) rename src/main/java/com/hivemq/client/internal/mqtt/advanced/{MqttClientAdvancedConfig.java => MqttAdvancedConfig.java} (80%) rename src/main/java/com/hivemq/client/internal/mqtt/advanced/{MqttClientAdvancedConfigBuilder.java => MqttAdvancedConfigBuilder.java} (71%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/{Mqtt5ClientAdvancedConfig.java => Mqtt5AdvancedConfig.java} (86%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/{Mqtt5ClientAdvancedConfigBuilder.java => Mqtt5AdvancedConfigBuilder.java} (59%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/{Mqtt5ClientAdvancedConfigBuilderBase.java => Mqtt5AdvancedConfigBuilderBase.java} (86%) rename src/test/java/com/hivemq/client/internal/mqtt/advanced/{MqttClientAdvancedConfigTest.java => MqttAdvancedConfigTest.java} (85%) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java index 95d788b28..3654e3f94 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java @@ -16,7 +16,7 @@ package com.hivemq.client.internal.mqtt; -import com.hivemq.client.internal.mqtt.advanced.MqttClientAdvancedConfig; +import com.hivemq.client.internal.mqtt.advanced.MqttAdvancedConfig; import com.hivemq.client.internal.mqtt.datatypes.MqttClientIdentifierImpl; import com.hivemq.client.internal.mqtt.ioc.ClientComponent; import com.hivemq.client.internal.mqtt.ioc.SingletonComponent; @@ -53,7 +53,7 @@ public class MqttClientConfig implements Mqtt5ClientConfig { private volatile @NotNull MqttClientIdentifierImpl clientIdentifier; private final @NotNull MqttTransportConfigImpl transportConfig; private final @NotNull MqttExecutorConfigImpl executorConfig; - private final @NotNull MqttClientAdvancedConfig advancedConfig; + private final @NotNull MqttAdvancedConfig advancedConfig; private final @NotNull ConnectDefaults connectDefaults; private final @NotNull ImmutableList connectedListeners; private final @NotNull ImmutableList disconnectedListeners; @@ -76,7 +76,7 @@ public MqttClientConfig( final @NotNull MqttClientIdentifierImpl clientIdentifier, final @NotNull MqttTransportConfigImpl transportConfig, final @NotNull MqttExecutorConfigImpl executorConfig, - final @NotNull MqttClientAdvancedConfig advancedConfig, + final @NotNull MqttAdvancedConfig advancedConfig, final @NotNull ConnectDefaults connectDefaults, final @NotNull ImmutableList connectedListeners, final @NotNull ImmutableList disconnectedListeners) { @@ -126,7 +126,7 @@ public void setClientIdentifier(final @NotNull MqttClientIdentifierImpl clientId } @Override - public @NotNull MqttClientAdvancedConfig getAdvancedConfig() { + public @NotNull MqttAdvancedConfig getAdvancedConfig() { return advancedConfig; } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilder.java index f1f1ed2d0..66fed3ee6 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilder.java @@ -16,8 +16,8 @@ package com.hivemq.client.internal.mqtt; -import com.hivemq.client.internal.mqtt.advanced.MqttClientAdvancedConfig; -import com.hivemq.client.internal.mqtt.advanced.MqttClientAdvancedConfigBuilder; +import com.hivemq.client.internal.mqtt.advanced.MqttAdvancedConfig; +import com.hivemq.client.internal.mqtt.advanced.MqttAdvancedConfigBuilder; import com.hivemq.client.internal.mqtt.message.auth.MqttSimpleAuth; import com.hivemq.client.internal.mqtt.message.auth.MqttSimpleAuthBuilder; import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; @@ -26,7 +26,7 @@ import com.hivemq.client.internal.util.Checks; import com.hivemq.client.mqtt.MqttVersion; import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientBuilder; -import com.hivemq.client.mqtt.mqtt5.advanced.Mqtt5ClientAdvancedConfig; +import com.hivemq.client.mqtt.mqtt5.advanced.Mqtt5AdvancedConfig; import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; @@ -38,7 +38,7 @@ */ public class MqttRxClientBuilder extends MqttRxClientBuilderBase implements Mqtt5ClientBuilder { - private @NotNull MqttClientAdvancedConfig advancedConfig = MqttClientAdvancedConfig.DEFAULT; + private @NotNull MqttAdvancedConfig advancedConfig = MqttAdvancedConfig.DEFAULT; private @Nullable MqttSimpleAuth simpleAuth; private @Nullable Mqtt5EnhancedAuthMechanism enhancedAuthMechanism; private @Nullable MqttWillPublish willPublish; @@ -55,14 +55,14 @@ public MqttRxClientBuilder() {} } @Override - public @NotNull MqttRxClientBuilder advancedConfig(final @NotNull Mqtt5ClientAdvancedConfig advancedConfig) { - this.advancedConfig = Checks.notImplemented(advancedConfig, MqttClientAdvancedConfig.class, "Advanced config"); + public @NotNull MqttRxClientBuilder advancedConfig(final @NotNull Mqtt5AdvancedConfig advancedConfig) { + this.advancedConfig = Checks.notImplemented(advancedConfig, MqttAdvancedConfig.class, "Advanced config"); return this; } @Override - public MqttClientAdvancedConfigBuilder.@NotNull Nested advancedConfig() { - return new MqttClientAdvancedConfigBuilder.Nested<>(advancedConfig, this::advancedConfig); + public MqttAdvancedConfigBuilder.@NotNull Nested advancedConfig() { + return new MqttAdvancedConfigBuilder.Nested<>(advancedConfig, this::advancedConfig); } @Override diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java index f78f26456..7536d1e05 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java @@ -16,7 +16,7 @@ package com.hivemq.client.internal.mqtt; -import com.hivemq.client.internal.mqtt.advanced.MqttClientAdvancedConfig; +import com.hivemq.client.internal.mqtt.advanced.MqttAdvancedConfig; import com.hivemq.client.internal.mqtt.datatypes.MqttClientIdentifierImpl; import com.hivemq.client.internal.mqtt.lifecycle.MqttClientAutoReconnectImpl; import com.hivemq.client.internal.mqtt.lifecycle.MqttClientAutoReconnectImplBuilder; @@ -205,7 +205,7 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase clie protected @NotNull MqttClientConfig buildClientConfig( final @NotNull MqttVersion mqttVersion, - final @NotNull MqttClientAdvancedConfig advancedConfig, + final @NotNull MqttAdvancedConfig advancedConfig, final @NotNull MqttClientConfig.ConnectDefaults connectDefaults) { return new MqttClientConfig(mqttVersion, identifier, buildTransportConfig(), executorConfig, advancedConfig, diff --git a/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttClientAdvancedConfig.java b/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfig.java similarity index 80% rename from src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttClientAdvancedConfig.java rename to src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfig.java index 45e6e4729..3c93ae827 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttClientAdvancedConfig.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfig.java @@ -17,7 +17,7 @@ package com.hivemq.client.internal.mqtt.advanced; import com.hivemq.client.internal.mqtt.advanced.interceptor.MqttClientInterceptors; -import com.hivemq.client.mqtt.mqtt5.advanced.Mqtt5ClientAdvancedConfig; +import com.hivemq.client.mqtt.mqtt5.advanced.Mqtt5AdvancedConfig; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -26,15 +26,15 @@ /** * @author Silvio Giebl */ -public class MqttClientAdvancedConfig implements Mqtt5ClientAdvancedConfig { +public class MqttAdvancedConfig implements Mqtt5AdvancedConfig { - public static final @NotNull MqttClientAdvancedConfig DEFAULT = new MqttClientAdvancedConfig(false, false, null); + public static final @NotNull MqttAdvancedConfig DEFAULT = new MqttAdvancedConfig(false, false, null); private final boolean allowServerReAuth; private final boolean validatePayloadFormat; private final @Nullable MqttClientInterceptors interceptors; - MqttClientAdvancedConfig( + MqttAdvancedConfig( final boolean allowServerReAuth, final boolean validatePayloadFormat, final @Nullable MqttClientInterceptors interceptors) { @@ -60,8 +60,8 @@ public boolean isValidatePayloadFormat() { } @Override - public MqttClientAdvancedConfigBuilder.@NotNull Default extend() { - return new MqttClientAdvancedConfigBuilder.Default(this); + public MqttAdvancedConfigBuilder.@NotNull Default extend() { + return new MqttAdvancedConfigBuilder.Default(this); } @Override @@ -69,10 +69,10 @@ public boolean equals(final @Nullable Object o) { if (this == o) { return true; } - if (!(o instanceof MqttClientAdvancedConfig)) { + if (!(o instanceof MqttAdvancedConfig)) { return false; } - final MqttClientAdvancedConfig that = (MqttClientAdvancedConfig) o; + final MqttAdvancedConfig that = (MqttAdvancedConfig) o; return (allowServerReAuth == that.allowServerReAuth) && (validatePayloadFormat == that.validatePayloadFormat) && Objects.equals(interceptors, that.interceptors); diff --git a/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttClientAdvancedConfigBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfigBuilder.java similarity index 71% rename from src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttClientAdvancedConfigBuilder.java rename to src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfigBuilder.java index 0b243925d..11f3042f1 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttClientAdvancedConfigBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfigBuilder.java @@ -19,7 +19,7 @@ import com.hivemq.client.internal.mqtt.advanced.interceptor.MqttClientInterceptors; import com.hivemq.client.internal.mqtt.advanced.interceptor.MqttClientInterceptorsBuilder; import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.mqtt5.advanced.Mqtt5ClientAdvancedConfigBuilder; +import com.hivemq.client.mqtt.mqtt5.advanced.Mqtt5AdvancedConfigBuilder; import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.Mqtt5ClientInterceptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -29,15 +29,15 @@ /** * @author Silvio Giebl */ -public abstract class MqttClientAdvancedConfigBuilder> { +public abstract class MqttAdvancedConfigBuilder> { private boolean allowServerReAuth; private boolean validatePayloadFormat; private @Nullable MqttClientInterceptors interceptors; - MqttClientAdvancedConfigBuilder() {} + MqttAdvancedConfigBuilder() {} - MqttClientAdvancedConfigBuilder(final @NotNull MqttClientAdvancedConfig advancedConfig) { + MqttAdvancedConfigBuilder(final @NotNull MqttAdvancedConfig advancedConfig) { allowServerReAuth = advancedConfig.isAllowServerReAuth(); validatePayloadFormat = advancedConfig.isValidatePayloadFormat(); interceptors = advancedConfig.getInterceptors(); @@ -64,16 +64,15 @@ public abstract class MqttClientAdvancedConfigBuilder(interceptors, this::interceptors); } - public @NotNull MqttClientAdvancedConfig build() { - return new MqttClientAdvancedConfig(allowServerReAuth, validatePayloadFormat, interceptors); + public @NotNull MqttAdvancedConfig build() { + return new MqttAdvancedConfig(allowServerReAuth, validatePayloadFormat, interceptors); } - public static class Default extends MqttClientAdvancedConfigBuilder - implements Mqtt5ClientAdvancedConfigBuilder { + public static class Default extends MqttAdvancedConfigBuilder implements Mqtt5AdvancedConfigBuilder { public Default() {} - Default(final @NotNull MqttClientAdvancedConfig advancedConfig) { + Default(final @NotNull MqttAdvancedConfig advancedConfig) { super(advancedConfig); } @@ -83,14 +82,14 @@ public Default() {} } } - public static class Nested

extends MqttClientAdvancedConfigBuilder> - implements Mqtt5ClientAdvancedConfigBuilder.Nested

{ + public static class Nested

extends MqttAdvancedConfigBuilder> + implements Mqtt5AdvancedConfigBuilder.Nested

{ - private final @NotNull Function parentConsumer; + private final @NotNull Function parentConsumer; public Nested( - final @NotNull MqttClientAdvancedConfig advancedConfig, - final @NotNull Function parentConsumer) { + final @NotNull MqttAdvancedConfig advancedConfig, + final @NotNull Function parentConsumer) { super(advancedConfig); this.parentConsumer = parentConsumer; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewBuilder.java index b935435b2..69d1759d8 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.internal.mqtt.mqtt3; import com.hivemq.client.internal.mqtt.*; -import com.hivemq.client.internal.mqtt.advanced.MqttClientAdvancedConfig; +import com.hivemq.client.internal.mqtt.advanced.MqttAdvancedConfig; import com.hivemq.client.internal.mqtt.message.auth.MqttSimpleAuth; import com.hivemq.client.internal.mqtt.message.auth.mqtt3.Mqtt3SimpleAuthView; import com.hivemq.client.internal.mqtt.message.auth.mqtt3.Mqtt3SimpleAuthViewBuilder; @@ -109,7 +109,7 @@ public Mqtt3RxClientViewBuilder(final @NotNull MqttRxClientBuilderBase client } private @NotNull MqttClientConfig buildClientConfig() { - return buildClientConfig(MqttVersion.MQTT_3_1_1, MqttClientAdvancedConfig.DEFAULT, + return buildClientConfig(MqttVersion.MQTT_3_1_1, MqttAdvancedConfig.DEFAULT, MqttClientConfig.ConnectDefaults.of(simpleAuth, null, willPublish)); } } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientBuilder.java index d12533716..53dd435bb 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientBuilder.java @@ -19,8 +19,8 @@ import com.hivemq.client.annotations.CheckReturnValue; import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttClientBuilderBase; -import com.hivemq.client.mqtt.mqtt5.advanced.Mqtt5ClientAdvancedConfig; -import com.hivemq.client.mqtt.mqtt5.advanced.Mqtt5ClientAdvancedConfigBuilder; +import com.hivemq.client.mqtt.mqtt5.advanced.Mqtt5AdvancedConfig; +import com.hivemq.client.mqtt.mqtt5.advanced.Mqtt5AdvancedConfigBuilder; import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuthBuilder; @@ -45,19 +45,19 @@ public interface Mqtt5ClientBuilder extends MqttClientBuilderBase - * Calling {@link Mqtt5ClientAdvancedConfigBuilder.Nested#applyAdvancedConfig()} on the returned builder has the - * effect of extending the current advanced configuration. + * Calling {@link Mqtt5AdvancedConfigBuilder.Nested#applyAdvancedConfig()} on the returned builder has the effect of + * extending the current advanced configuration. * * @return the fluent builder for the advanced configuration. - * @see #advancedConfig(Mqtt5ClientAdvancedConfig) + * @see #advancedConfig(Mqtt5AdvancedConfig) */ @CheckReturnValue - Mqtt5ClientAdvancedConfigBuilder.@NotNull Nested advancedConfig(); + Mqtt5AdvancedConfigBuilder.@NotNull Nested advancedConfig(); /** * Sets the optional {@link Mqtt5ClientConfig#getSimpleAuth() simple authentication and/or authorization related diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConfig.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConfig.java index 3839aafe5..d72a1136d 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConfig.java @@ -18,7 +18,7 @@ import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttClientConfig; -import com.hivemq.client.mqtt.mqtt5.advanced.Mqtt5ClientAdvancedConfig; +import com.hivemq.client.mqtt.mqtt5.advanced.Mqtt5AdvancedConfig; import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublish; @@ -41,7 +41,7 @@ public interface Mqtt5ClientConfig extends MqttClientConfig { /** * @return the advanced configuration of the client. */ - @NotNull Mqtt5ClientAdvancedConfig getAdvancedConfig(); + @NotNull Mqtt5AdvancedConfig getAdvancedConfig(); /** * Returns the optional simple authentication and/or authorization related data of the client. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5ClientAdvancedConfig.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfig.java similarity index 86% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5ClientAdvancedConfig.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfig.java index 6e6260ddb..e9706497e 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5ClientAdvancedConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfig.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt5.advanced; import com.hivemq.client.annotations.DoNotImplement; -import com.hivemq.client.internal.mqtt.advanced.MqttClientAdvancedConfigBuilder; +import com.hivemq.client.internal.mqtt.advanced.MqttAdvancedConfigBuilder; import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.Mqtt5ClientInterceptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -29,15 +29,15 @@ * @since 1.0 */ @DoNotImplement -public interface Mqtt5ClientAdvancedConfig { +public interface Mqtt5AdvancedConfig { /** * Creates a builder for an advanced configuration. * * @return the created builder for an advanced configuration. */ - static @NotNull Mqtt5ClientAdvancedConfigBuilder builder() { - return new MqttClientAdvancedConfigBuilder.Default(); + static @NotNull Mqtt5AdvancedConfigBuilder builder() { + return new MqttAdvancedConfigBuilder.Default(); } /** @@ -64,5 +64,5 @@ public interface Mqtt5ClientAdvancedConfig { * @return the created builder. * @since 1.1 */ - @NotNull Mqtt5ClientAdvancedConfigBuilder extend(); + @NotNull Mqtt5AdvancedConfigBuilder extend(); } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5ClientAdvancedConfigBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilder.java similarity index 59% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5ClientAdvancedConfigBuilder.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilder.java index 9804156b8..853a7f3ec 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5ClientAdvancedConfigBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilder.java @@ -21,35 +21,34 @@ import org.jetbrains.annotations.NotNull; /** - * Builder for a {@link Mqtt5ClientAdvancedConfig}. + * Builder for a {@link Mqtt5AdvancedConfig}. * * @author Silvio Giebl * @since 1.0 */ @DoNotImplement -public interface Mqtt5ClientAdvancedConfigBuilder - extends Mqtt5ClientAdvancedConfigBuilderBase { +public interface Mqtt5AdvancedConfigBuilder extends Mqtt5AdvancedConfigBuilderBase { /** - * Builds the {@link Mqtt5ClientAdvancedConfig}. + * Builds the {@link Mqtt5AdvancedConfig}. * - * @return the built {@link Mqtt5ClientAdvancedConfig}. + * @return the built {@link Mqtt5AdvancedConfig}. */ @CheckReturnValue - @NotNull Mqtt5ClientAdvancedConfig build(); + @NotNull Mqtt5AdvancedConfig build(); /** - * Builder for a {@link Mqtt5ClientAdvancedConfig} that is applied to a parent. + * Builder for a {@link Mqtt5AdvancedConfig} that is applied to a parent. * - * @param

the type of the result when the built {@link Mqtt5ClientAdvancedConfig} is applied to the parent. + * @param

the type of the result when the built {@link Mqtt5AdvancedConfig} is applied to the parent. */ @DoNotImplement - interface Nested

extends Mqtt5ClientAdvancedConfigBuilderBase> { + interface Nested

extends Mqtt5AdvancedConfigBuilderBase> { /** - * Builds the {@link Mqtt5ClientAdvancedConfig} and applies it to the parent. + * Builds the {@link Mqtt5AdvancedConfig} and applies it to the parent. * - * @return the result when the built {@link Mqtt5ClientAdvancedConfig} is applied to the parent. + * @return the result when the built {@link Mqtt5AdvancedConfig} is applied to the parent. */ @NotNull P applyAdvancedConfig(); } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5ClientAdvancedConfigBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java similarity index 86% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5ClientAdvancedConfigBuilderBase.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java index ce3718fa5..3d4cfcfb4 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5ClientAdvancedConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java @@ -24,17 +24,17 @@ import org.jetbrains.annotations.Nullable; /** - * Builder base for a {@link Mqtt5ClientAdvancedConfig}. + * Builder base for a {@link Mqtt5AdvancedConfig}. * * @param the type of the builder. * @author Silvio Giebl * @since 1.0 */ @DoNotImplement -public interface Mqtt5ClientAdvancedConfigBuilderBase> { +public interface Mqtt5AdvancedConfigBuilderBase> { /** - * Sets whether {@link Mqtt5ClientAdvancedConfig#isAllowServerReAuth() server re-auth is allowed}. + * Sets whether {@link Mqtt5AdvancedConfig#isAllowServerReAuth() server re-auth is allowed}. * * @param allowServerReAuth whether server re-auth is allowed. * @return the builder. @@ -43,7 +43,7 @@ public interface Mqtt5ClientAdvancedConfigBuilderBase Date: Fri, 13 Nov 2020 12:21:19 +0100 Subject: [PATCH 12/62] MqttClientAutoReconnect -> MqttAutoReconnect --- .../internal/mqtt/MqttClientConfig.java | 8 ++--- .../mqtt/MqttRxClientBuilderBase.java | 18 +++++------ ...ctImpl.java => MqttAutoReconnectImpl.java} | 19 ++++++------ ...java => MqttAutoReconnectImplBuilder.java} | 31 +++++++++---------- .../mqtt/mqtt3/Mqtt3ClientConfigView.java | 4 +-- .../client/mqtt/MqttClientBuilderBase.java | 16 +++++----- .../hivemq/client/mqtt/MqttClientConfig.java | 4 +-- ...oReconnect.java => MqttAutoReconnect.java} | 10 +++--- ...der.java => MqttAutoReconnectBuilder.java} | 21 ++++++------- ...java => MqttAutoReconnectBuilderBase.java} | 4 +-- 10 files changed, 66 insertions(+), 69 deletions(-) rename src/main/java/com/hivemq/client/internal/mqtt/lifecycle/{MqttClientAutoReconnectImpl.java => MqttAutoReconnectImpl.java} (75%) rename src/main/java/com/hivemq/client/internal/mqtt/lifecycle/{MqttClientAutoReconnectImplBuilder.java => MqttAutoReconnectImplBuilder.java} (65%) rename src/main/java/com/hivemq/client/mqtt/lifecycle/{MqttClientAutoReconnect.java => MqttAutoReconnect.java} (87%) rename src/main/java/com/hivemq/client/mqtt/lifecycle/{MqttClientAutoReconnectBuilder.java => MqttAutoReconnectBuilder.java} (60%) rename src/main/java/com/hivemq/client/mqtt/lifecycle/{MqttClientAutoReconnectBuilderBase.java => MqttAutoReconnectBuilderBase.java} (91%) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java index 3654e3f94..b2d35cf23 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java @@ -28,7 +28,7 @@ import com.hivemq.client.mqtt.MqttClientState; import com.hivemq.client.mqtt.MqttVersion; import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; -import com.hivemq.client.mqtt.lifecycle.MqttClientAutoReconnect; +import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnect; import com.hivemq.client.mqtt.lifecycle.MqttClientConnectedListener; import com.hivemq.client.mqtt.lifecycle.MqttClientDisconnectedListener; import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; @@ -150,10 +150,10 @@ public void setClientIdentifier(final @NotNull MqttClientIdentifierImpl clientId } @Override - public @NotNull Optional getAutomaticReconnect() { + public @NotNull Optional getAutomaticReconnect() { for (final MqttClientDisconnectedListener disconnectedListener : disconnectedListeners) { - if (disconnectedListener instanceof MqttClientAutoReconnect) { - return Optional.of((MqttClientAutoReconnect) disconnectedListener); + if (disconnectedListener instanceof MqttAutoReconnect) { + return Optional.of((MqttAutoReconnect) disconnectedListener); } } return Optional.empty(); diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java index 7536d1e05..dc85a5319 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java @@ -18,15 +18,15 @@ import com.hivemq.client.internal.mqtt.advanced.MqttAdvancedConfig; import com.hivemq.client.internal.mqtt.datatypes.MqttClientIdentifierImpl; -import com.hivemq.client.internal.mqtt.lifecycle.MqttClientAutoReconnectImpl; -import com.hivemq.client.internal.mqtt.lifecycle.MqttClientAutoReconnectImplBuilder; +import com.hivemq.client.internal.mqtt.lifecycle.MqttAutoReconnectImpl; +import com.hivemq.client.internal.mqtt.lifecycle.MqttAutoReconnectImplBuilder; import com.hivemq.client.internal.mqtt.mqtt3.Mqtt3RxClientViewBuilder; import com.hivemq.client.internal.mqtt.util.MqttChecks; import com.hivemq.client.internal.util.Checks; import com.hivemq.client.internal.util.collections.ImmutableList; import com.hivemq.client.mqtt.*; import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; -import com.hivemq.client.mqtt.lifecycle.MqttClientAutoReconnect; +import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnect; import com.hivemq.client.mqtt.lifecycle.MqttClientConnectedListener; import com.hivemq.client.mqtt.lifecycle.MqttClientDisconnectedListener; import org.jetbrains.annotations.NotNull; @@ -45,7 +45,7 @@ public abstract class MqttRxClientBuilderBase connectedListenersBuilder; private ImmutableList.@Nullable Builder disconnectedListenersBuilder; @@ -141,18 +141,18 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase clie } public @NotNull B automaticReconnectWithDefaultConfig() { - this.autoReconnect = MqttClientAutoReconnectImpl.DEFAULT; + this.autoReconnect = MqttAutoReconnectImpl.DEFAULT; return self(); } - public @NotNull B automaticReconnect(final @Nullable MqttClientAutoReconnect autoReconnect) { + public @NotNull B automaticReconnect(final @Nullable MqttAutoReconnect autoReconnect) { this.autoReconnect = - Checks.notImplementedOrNull(autoReconnect, MqttClientAutoReconnectImpl.class, "Automatic reconnect"); + Checks.notImplementedOrNull(autoReconnect, MqttAutoReconnectImpl.class, "Automatic reconnect"); return self(); } - public MqttClientAutoReconnectImplBuilder.@NotNull Nested automaticReconnect() { - return new MqttClientAutoReconnectImplBuilder.Nested<>(autoReconnect, this::automaticReconnect); + public MqttAutoReconnectImplBuilder.@NotNull Nested automaticReconnect() { + return new MqttAutoReconnectImplBuilder.Nested<>(autoReconnect, this::automaticReconnect); } public @NotNull B addConnectedListener(final @Nullable MqttClientConnectedListener connectedListener) { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientAutoReconnectImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttAutoReconnectImpl.java similarity index 75% rename from src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientAutoReconnectImpl.java rename to src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttAutoReconnectImpl.java index 28be4ecdd..4dd1bc3b5 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientAutoReconnectImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttAutoReconnectImpl.java @@ -16,7 +16,7 @@ package com.hivemq.client.internal.mqtt.lifecycle; -import com.hivemq.client.mqtt.lifecycle.MqttClientAutoReconnect; +import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnect; import com.hivemq.client.mqtt.lifecycle.MqttClientDisconnectedContext; import com.hivemq.client.mqtt.lifecycle.MqttClientReconnector; import com.hivemq.client.mqtt.lifecycle.MqttDisconnectSource; @@ -28,18 +28,17 @@ /** * @author Silvio Giebl */ -public class MqttClientAutoReconnectImpl implements MqttClientAutoReconnect { +public class MqttAutoReconnectImpl implements MqttAutoReconnect { - static final long DEFAULT_START_DELAY_NANOS = - TimeUnit.SECONDS.toNanos(MqttClientAutoReconnect.DEFAULT_START_DELAY_S); - static final long DEFAULT_MAX_DELAY_NANOS = TimeUnit.SECONDS.toNanos(MqttClientAutoReconnect.DEFAULT_MAX_DELAY_S); - public static final @NotNull MqttClientAutoReconnectImpl DEFAULT = - new MqttClientAutoReconnectImpl(DEFAULT_START_DELAY_NANOS, DEFAULT_MAX_DELAY_NANOS); + static final long DEFAULT_START_DELAY_NANOS = TimeUnit.SECONDS.toNanos(MqttAutoReconnect.DEFAULT_START_DELAY_S); + static final long DEFAULT_MAX_DELAY_NANOS = TimeUnit.SECONDS.toNanos(MqttAutoReconnect.DEFAULT_MAX_DELAY_S); + public static final @NotNull MqttAutoReconnectImpl DEFAULT = + new MqttAutoReconnectImpl(DEFAULT_START_DELAY_NANOS, DEFAULT_MAX_DELAY_NANOS); private final long initialDelayNanos; private final long maxDelayNanos; - MqttClientAutoReconnectImpl(final long initialDelayNanos, final long maxDelayNanos) { + MqttAutoReconnectImpl(final long initialDelayNanos, final long maxDelayNanos) { this.initialDelayNanos = initialDelayNanos; this.maxDelayNanos = maxDelayNanos; } @@ -66,7 +65,7 @@ public long getMaxDelay(final @NotNull TimeUnit timeUnit) { } @Override - public MqttClientAutoReconnectImplBuilder.@NotNull Default extend() { - return new MqttClientAutoReconnectImplBuilder.Default(this); + public MqttAutoReconnectImplBuilder.@NotNull Default extend() { + return new MqttAutoReconnectImplBuilder.Default(this); } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientAutoReconnectImplBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttAutoReconnectImplBuilder.java similarity index 65% rename from src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientAutoReconnectImplBuilder.java rename to src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttAutoReconnectImplBuilder.java index dc7e866b6..0596c6a99 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientAutoReconnectImplBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttAutoReconnectImplBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.internal.mqtt.lifecycle; import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.lifecycle.MqttClientAutoReconnectBuilder; +import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnectBuilder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -27,14 +27,14 @@ /** * @author Silvio Giebl */ -public abstract class MqttClientAutoReconnectImplBuilder> { +public abstract class MqttAutoReconnectImplBuilder> { - private long initialDelayNanos = MqttClientAutoReconnectImpl.DEFAULT_START_DELAY_NANOS; - private long maxDelayNanos = MqttClientAutoReconnectImpl.DEFAULT_MAX_DELAY_NANOS; + private long initialDelayNanos = MqttAutoReconnectImpl.DEFAULT_START_DELAY_NANOS; + private long maxDelayNanos = MqttAutoReconnectImpl.DEFAULT_MAX_DELAY_NANOS; - MqttClientAutoReconnectImplBuilder() {} + MqttAutoReconnectImplBuilder() {} - MqttClientAutoReconnectImplBuilder(final @Nullable MqttClientAutoReconnectImpl autoReconnect) { + MqttAutoReconnectImplBuilder(final @Nullable MqttAutoReconnectImpl autoReconnect) { if (autoReconnect != null) { initialDelayNanos = autoReconnect.getInitialDelay(TimeUnit.NANOSECONDS); maxDelayNanos = autoReconnect.getMaxDelay(TimeUnit.NANOSECONDS); @@ -61,16 +61,15 @@ public abstract class MqttClientAutoReconnectImplBuilder - implements MqttClientAutoReconnectBuilder { + public static class Default extends MqttAutoReconnectImplBuilder implements MqttAutoReconnectBuilder { public Default() {} - Default(final @Nullable MqttClientAutoReconnectImpl autoReconnect) { + Default(final @Nullable MqttAutoReconnectImpl autoReconnect) { super(autoReconnect); } @@ -80,14 +79,14 @@ public Default() {} } } - public static class Nested

extends MqttClientAutoReconnectImplBuilder> - implements MqttClientAutoReconnectBuilder.Nested

{ + public static class Nested

extends MqttAutoReconnectImplBuilder> + implements MqttAutoReconnectBuilder.Nested

{ - private final @NotNull Function parentConsumer; + private final @NotNull Function parentConsumer; public Nested( - final @Nullable MqttClientAutoReconnectImpl autoReconnect, - final @NotNull Function parentConsumer) { + final @Nullable MqttAutoReconnectImpl autoReconnect, + final @NotNull Function parentConsumer) { super(autoReconnect); this.parentConsumer = parentConsumer; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java index 933cd81c5..e53b9d05f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java @@ -27,7 +27,7 @@ import com.hivemq.client.mqtt.MqttTransportConfig; import com.hivemq.client.mqtt.MqttVersion; import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; -import com.hivemq.client.mqtt.lifecycle.MqttClientAutoReconnect; +import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnect; import com.hivemq.client.mqtt.lifecycle.MqttClientConnectedListener; import com.hivemq.client.mqtt.lifecycle.MqttClientDisconnectedListener; import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientConfig; @@ -72,7 +72,7 @@ public Mqtt3ClientConfigView(final @NotNull MqttClientConfig delegate) { } @Override - public @NotNull Optional getAutomaticReconnect() { + public @NotNull Optional getAutomaticReconnect() { return delegate.getAutomaticReconnect(); } diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java index bccf1f28f..56ddc906a 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java @@ -19,8 +19,8 @@ import com.hivemq.client.annotations.CheckReturnValue; import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; -import com.hivemq.client.mqtt.lifecycle.MqttClientAutoReconnect; -import com.hivemq.client.mqtt.lifecycle.MqttClientAutoReconnectBuilder; +import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnect; +import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnectBuilder; import com.hivemq.client.mqtt.lifecycle.MqttClientConnectedListener; import com.hivemq.client.mqtt.lifecycle.MqttClientDisconnectedListener; import org.jetbrains.annotations.NotNull; @@ -227,20 +227,20 @@ public interface MqttClientBuilderBase> { * @since 1.1 */ @CheckReturnValue - @NotNull B automaticReconnect(@Nullable MqttClientAutoReconnect autoReconnect); + @NotNull B automaticReconnect(@Nullable MqttAutoReconnect autoReconnect); /** - * Fluent counterpart of {@link #automaticReconnect(MqttClientAutoReconnect)}. + * Fluent counterpart of {@link #automaticReconnect(MqttAutoReconnect)}. *

- * Calling {@link MqttClientAutoReconnectBuilder.Nested#applyAutomaticReconnect()} on the returned builder has the - * effect of extending the current automatic reconnect strategy. + * Calling {@link MqttAutoReconnectBuilder.Nested#applyAutomaticReconnect()} on the returned builder has the effect + * of extending the current automatic reconnect strategy. * * @return the fluent builder for the automatic reconnect strategy. - * @see #automaticReconnect(MqttClientAutoReconnect) + * @see #automaticReconnect(MqttAutoReconnect) * @since 1.1 */ @CheckReturnValue - MqttClientAutoReconnectBuilder.@NotNull Nested automaticReconnect(); + MqttAutoReconnectBuilder.@NotNull Nested automaticReconnect(); /** * Adds a listener which is notified when the client is connected (a successful ConnAck message is received). diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java index 758e33277..773efedcf 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java @@ -19,7 +19,7 @@ import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; -import com.hivemq.client.mqtt.lifecycle.MqttClientAutoReconnect; +import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnect; import com.hivemq.client.mqtt.lifecycle.MqttClientConnectedListener; import com.hivemq.client.mqtt.lifecycle.MqttClientDisconnectedListener; import org.jetbrains.annotations.NotNull; @@ -101,7 +101,7 @@ default int getServerPort() { * @return the optional automatic reconnect strategy of the client. * @since 1.1 */ - @NotNull Optional getAutomaticReconnect(); + @NotNull Optional getAutomaticReconnect(); /** * @return the listeners which are notified (in the order of the list) when this client is connected (a successful diff --git a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientAutoReconnect.java b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnect.java similarity index 87% rename from src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientAutoReconnect.java rename to src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnect.java index baf73dff4..068b662d6 100644 --- a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientAutoReconnect.java +++ b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnect.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.lifecycle; import com.hivemq.client.annotations.DoNotImplement; -import com.hivemq.client.internal.mqtt.lifecycle.MqttClientAutoReconnectImplBuilder; +import com.hivemq.client.internal.mqtt.lifecycle.MqttAutoReconnectImplBuilder; import org.jetbrains.annotations.NotNull; import java.util.concurrent.TimeUnit; @@ -32,7 +32,7 @@ * @since 1.1 */ @DoNotImplement -public interface MqttClientAutoReconnect extends MqttClientDisconnectedListener { +public interface MqttAutoReconnect extends MqttClientDisconnectedListener { /** * The default initial delay in seconds the client will wait before it tries to reconnect. @@ -49,8 +49,8 @@ public interface MqttClientAutoReconnect extends MqttClientDisconnectedListener * * @return the created builder for an automatic reconnect strategy. */ - static @NotNull MqttClientAutoReconnectBuilder builder() { - return new MqttClientAutoReconnectImplBuilder.Default(); + static @NotNull MqttAutoReconnectBuilder builder() { + return new MqttAutoReconnectImplBuilder.Default(); } /** @@ -76,5 +76,5 @@ public interface MqttClientAutoReconnect extends MqttClientDisconnectedListener * * @return the created builder. */ - @NotNull MqttClientAutoReconnectBuilder extend(); + @NotNull MqttAutoReconnectBuilder extend(); } diff --git a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientAutoReconnectBuilder.java b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnectBuilder.java similarity index 60% rename from src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientAutoReconnectBuilder.java rename to src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnectBuilder.java index 14796aa56..610c92969 100644 --- a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientAutoReconnectBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnectBuilder.java @@ -21,35 +21,34 @@ import org.jetbrains.annotations.NotNull; /** - * Builder for a {@link MqttClientAutoReconnect}. + * Builder for a {@link MqttAutoReconnect}. * * @author Silvio Giebl * @since 1.1 */ @DoNotImplement -public interface MqttClientAutoReconnectBuilder - extends MqttClientAutoReconnectBuilderBase { +public interface MqttAutoReconnectBuilder extends MqttAutoReconnectBuilderBase { /** - * Builds the {@link MqttClientAutoReconnect}. + * Builds the {@link MqttAutoReconnect}. * - * @return the built {@link MqttClientAutoReconnect}. + * @return the built {@link MqttAutoReconnect}. */ @CheckReturnValue - @NotNull MqttClientAutoReconnect build(); + @NotNull MqttAutoReconnect build(); /** - * Builder for a {@link MqttClientAutoReconnect} that is applied to a parent. + * Builder for a {@link MqttAutoReconnect} that is applied to a parent. * - * @param

the type of the result when the built {@link MqttClientAutoReconnect} is applied to the parent. + * @param

the type of the result when the built {@link MqttAutoReconnect} is applied to the parent. */ @DoNotImplement - interface Nested

extends MqttClientAutoReconnectBuilderBase> { + interface Nested

extends MqttAutoReconnectBuilderBase> { /** - * Builds the {@link MqttClientAutoReconnect} and applies it to the parent. + * Builds the {@link MqttAutoReconnect} and applies it to the parent. * - * @return the result when the built {@link MqttClientAutoReconnect} is applied to the parent. + * @return the result when the built {@link MqttAutoReconnect} is applied to the parent. */ @NotNull P applyAutomaticReconnect(); } diff --git a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientAutoReconnectBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnectBuilderBase.java similarity index 91% rename from src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientAutoReconnectBuilderBase.java rename to src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnectBuilderBase.java index 23e4ef3eb..7b640d38f 100644 --- a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientAutoReconnectBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnectBuilderBase.java @@ -23,14 +23,14 @@ import java.util.concurrent.TimeUnit; /** - * Builder base for a {@link MqttClientAutoReconnect}. + * Builder base for a {@link MqttAutoReconnect}. * * @param the type of the builder. * @author Silvio Giebl * @since 1.1 */ @DoNotImplement -public interface MqttClientAutoReconnectBuilderBase> { +public interface MqttAutoReconnectBuilderBase> { /** * Sets the initial delay the client will wait before it tries to reconnect. From 2a655b88f427a80644ee96ce1a4dbc28d4afdff7 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Fri, 13 Nov 2020 13:09:45 +0100 Subject: [PATCH 13/62] MqttClientConnectedContext/Listener -> MqttConnectedContext/Listener MqttClientDisconnectedContext/Listener -> MqttDisconnectedContext/Listener MqttClientReconnector -> MqttReconnector --- .../mqtt/examples/ReconnectStrategy.java | 4 +- .../internal/mqtt/MqttClientConfig.java | 18 +++---- .../mqtt/MqttRxClientBuilderBase.java | 18 +++---- .../handler/connect/MqttConnAckSingle.java | 18 +++---- .../handler/connect/MqttConnectHandler.java | 13 +++-- .../mqtt/lifecycle/MqttAutoReconnectImpl.java | 8 +-- ...mpl.java => MqttConnectedContextImpl.java} | 16 +++--- ....java => MqttDisconnectedContextImpl.java} | 24 ++++----- ...tReconnector.java => MqttReconnector.java} | 26 ++++----- ...ew.java => Mqtt3ConnectedContextView.java} | 12 ++--- ...java => Mqtt3DisconnectedContextView.java} | 24 ++++----- ...torView.java => Mqtt3ReconnectorView.java} | 28 +++++----- .../mqtt/mqtt3/Mqtt3ClientConfigView.java | 8 +-- .../client/mqtt/MqttClientBuilderBase.java | 8 +-- .../hivemq/client/mqtt/MqttClientConfig.java | 8 +-- .../mqtt/lifecycle/MqttAutoReconnect.java | 2 +- ...Context.java => MqttConnectedContext.java} | 2 +- ...stener.java => MqttConnectedListener.java} | 4 +- ...text.java => MqttDisconnectedContext.java} | 4 +- ...ner.java => MqttDisconnectedListener.java} | 8 +-- ...tReconnector.java => MqttReconnector.java} | 54 +++++++++---------- ...ontext.java => Mqtt3ConnectedContext.java} | 6 +-- ...ext.java => Mqtt3DisconnectedContext.java} | 8 +-- ...Reconnector.java => Mqtt3Reconnector.java} | 31 ++++++----- ...ontext.java => Mqtt5ConnectedContext.java} | 6 +-- ...ext.java => Mqtt5DisconnectedContext.java} | 8 +-- ...Reconnector.java => Mqtt5Reconnector.java} | 29 +++++----- 27 files changed, 196 insertions(+), 199 deletions(-) rename src/main/java/com/hivemq/client/internal/mqtt/lifecycle/{MqttClientConnectedContextImpl.java => MqttConnectedContextImpl.java} (76%) rename src/main/java/com/hivemq/client/internal/mqtt/lifecycle/{MqttClientDisconnectedContextImpl.java => MqttDisconnectedContextImpl.java} (68%) rename src/main/java/com/hivemq/client/internal/mqtt/lifecycle/{MqttClientReconnector.java => MqttReconnector.java} (83%) rename src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/{Mqtt3ClientConnectedContextView.java => Mqtt3ConnectedContextView.java} (85%) rename src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/{Mqtt3ClientDisconnectedContextView.java => Mqtt3DisconnectedContextView.java} (69%) rename src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/{Mqtt3ClientReconnectorView.java => Mqtt3ReconnectorView.java} (72%) rename src/main/java/com/hivemq/client/mqtt/lifecycle/{MqttClientConnectedContext.java => MqttConnectedContext.java} (95%) rename src/main/java/com/hivemq/client/mqtt/lifecycle/{MqttClientConnectedListener.java => MqttConnectedListener.java} (90%) rename src/main/java/com/hivemq/client/mqtt/lifecycle/{MqttClientDisconnectedContext.java => MqttDisconnectedContext.java} (96%) rename src/main/java/com/hivemq/client/mqtt/lifecycle/{MqttClientDisconnectedListener.java => MqttDisconnectedListener.java} (88%) rename src/main/java/com/hivemq/client/mqtt/lifecycle/{MqttClientReconnector.java => MqttReconnector.java} (74%) rename src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/{Mqtt3ClientConnectedContext.java => Mqtt3ConnectedContext.java} (83%) rename src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/{Mqtt3ClientDisconnectedContext.java => Mqtt3DisconnectedContext.java} (74%) rename src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/{Mqtt3ClientReconnector.java => Mqtt3Reconnector.java} (67%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/{Mqtt5ClientConnectedContext.java => Mqtt5ConnectedContext.java} (83%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/{Mqtt5ClientDisconnectedContext.java => Mqtt5DisconnectedContext.java} (74%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/{Mqtt5ClientReconnector.java => Mqtt5Reconnector.java} (67%) diff --git a/examples/src/main/java/com/hivemq/client/mqtt/examples/ReconnectStrategy.java b/examples/src/main/java/com/hivemq/client/mqtt/examples/ReconnectStrategy.java index dfd65fb26..51e839834 100644 --- a/examples/src/main/java/com/hivemq/client/mqtt/examples/ReconnectStrategy.java +++ b/examples/src/main/java/com/hivemq/client/mqtt/examples/ReconnectStrategy.java @@ -18,7 +18,7 @@ import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient; import com.hivemq.client.mqtt.mqtt5.Mqtt5Client; -import com.hivemq.client.mqtt.mqtt5.lifecycle.Mqtt5ClientDisconnectedContext; +import com.hivemq.client.mqtt.mqtt5.lifecycle.Mqtt5DisconnectedContext; import java.time.LocalTime; import java.util.concurrent.CompletableFuture; @@ -76,7 +76,7 @@ private static void completelyCustom() { }) // multiple DisconnectedListener can form a reconnect strategy .addDisconnectedListener(context -> { - final Mqtt5ClientDisconnectedContext context5 = (Mqtt5ClientDisconnectedContext) context; + final Mqtt5DisconnectedContext context5 = (Mqtt5DisconnectedContext) context; context5.getReconnector() .reconnectWhen(getOAuthToken(), (token, throwable) -> { // first reconnect would be delayed 2s but OAuth server needs more time if (token != null) { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java index b2d35cf23..5682fbc36 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java @@ -29,8 +29,8 @@ import com.hivemq.client.mqtt.MqttVersion; import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnect; -import com.hivemq.client.mqtt.lifecycle.MqttClientConnectedListener; -import com.hivemq.client.mqtt.lifecycle.MqttClientDisconnectedListener; +import com.hivemq.client.mqtt.lifecycle.MqttConnectedListener; +import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedListener; import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConnectionConfig; import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; @@ -55,8 +55,8 @@ public class MqttClientConfig implements Mqtt5ClientConfig { private final @NotNull MqttExecutorConfigImpl executorConfig; private final @NotNull MqttAdvancedConfig advancedConfig; private final @NotNull ConnectDefaults connectDefaults; - private final @NotNull ImmutableList connectedListeners; - private final @NotNull ImmutableList disconnectedListeners; + private final @NotNull ImmutableList connectedListeners; + private final @NotNull ImmutableList disconnectedListeners; private final @NotNull ClientComponent clientComponent; @@ -78,8 +78,8 @@ public MqttClientConfig( final @NotNull MqttExecutorConfigImpl executorConfig, final @NotNull MqttAdvancedConfig advancedConfig, final @NotNull ConnectDefaults connectDefaults, - final @NotNull ImmutableList connectedListeners, - final @NotNull ImmutableList disconnectedListeners) { + final @NotNull ImmutableList connectedListeners, + final @NotNull ImmutableList disconnectedListeners) { this.mqttVersion = mqttVersion; this.clientIdentifier = clientIdentifier; @@ -151,7 +151,7 @@ public void setClientIdentifier(final @NotNull MqttClientIdentifierImpl clientId @Override public @NotNull Optional getAutomaticReconnect() { - for (final MqttClientDisconnectedListener disconnectedListener : disconnectedListeners) { + for (final MqttDisconnectedListener disconnectedListener : disconnectedListeners) { if (disconnectedListener instanceof MqttAutoReconnect) { return Optional.of((MqttAutoReconnect) disconnectedListener); } @@ -160,12 +160,12 @@ public void setClientIdentifier(final @NotNull MqttClientIdentifierImpl clientId } @Override - public @NotNull ImmutableList getConnectedListeners() { + public @NotNull ImmutableList getConnectedListeners() { return connectedListeners; } @Override - public @NotNull ImmutableList getDisconnectedListeners() { + public @NotNull ImmutableList getDisconnectedListeners() { return disconnectedListeners; } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java index dc85a5319..59a163797 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java @@ -27,8 +27,8 @@ import com.hivemq.client.mqtt.*; import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnect; -import com.hivemq.client.mqtt.lifecycle.MqttClientConnectedListener; -import com.hivemq.client.mqtt.lifecycle.MqttClientDisconnectedListener; +import com.hivemq.client.mqtt.lifecycle.MqttConnectedListener; +import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedListener; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -46,8 +46,8 @@ public abstract class MqttRxClientBuilderBase connectedListenersBuilder; - private ImmutableList.@Nullable Builder disconnectedListenersBuilder; + private ImmutableList.@Nullable Builder connectedListenersBuilder; + private ImmutableList.@Nullable Builder disconnectedListenersBuilder; protected MqttRxClientBuilderBase() {} @@ -155,7 +155,7 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase clie return new MqttAutoReconnectImplBuilder.Nested<>(autoReconnect, this::automaticReconnect); } - public @NotNull B addConnectedListener(final @Nullable MqttClientConnectedListener connectedListener) { + public @NotNull B addConnectedListener(final @Nullable MqttConnectedListener connectedListener) { Checks.notNull(connectedListener, "Connected listener"); if (connectedListenersBuilder == null) { connectedListenersBuilder = ImmutableList.builder(); @@ -164,7 +164,7 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase clie return self(); } - public @NotNull B addDisconnectedListener(final @Nullable MqttClientDisconnectedListener disconnectedListener) { + public @NotNull B addDisconnectedListener(final @Nullable MqttDisconnectedListener disconnectedListener) { Checks.notNull(disconnectedListener, "Disconnected listener"); if (disconnectedListenersBuilder == null) { disconnectedListenersBuilder = ImmutableList.builder(); @@ -181,14 +181,14 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase clie return transportConfig; } - private @NotNull ImmutableList buildConnectedListeners() { + private @NotNull ImmutableList buildConnectedListeners() { if (connectedListenersBuilder == null) { return ImmutableList.of(); } return connectedListenersBuilder.build(); } - private @NotNull ImmutableList buildDisconnectedListeners() { + private @NotNull ImmutableList buildDisconnectedListeners() { if (disconnectedListenersBuilder == null) { if (autoReconnect == null) { return ImmutableList.of(); @@ -198,7 +198,7 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase clie if (autoReconnect == null) { return disconnectedListenersBuilder.build(); } - return ImmutableList.builder().add(autoReconnect) + return ImmutableList.builder().add(autoReconnect) .addAll(disconnectedListenersBuilder.build()) .build(); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java index 671681486..bd635e40d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java @@ -21,13 +21,13 @@ import com.hivemq.client.internal.mqtt.MqttClientConfig; 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; +import com.hivemq.client.internal.mqtt.lifecycle.MqttDisconnectedContextImpl; +import com.hivemq.client.internal.mqtt.lifecycle.MqttReconnector; import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; import com.hivemq.client.mqtt.exceptions.ConnectionFailedException; -import com.hivemq.client.mqtt.lifecycle.MqttClientDisconnectedContext; -import com.hivemq.client.mqtt.lifecycle.MqttClientDisconnectedListener; import com.hivemq.client.mqtt.lifecycle.MqttDisconnectSource; +import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedContext; +import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedListener; import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck; import io.netty.bootstrap.Bootstrap; import io.netty.channel.EventLoop; @@ -137,12 +137,12 @@ private static void reconnect( final @Nullable MqttConnAckFlow flow, final @NotNull EventLoop eventLoop) { - final MqttClientReconnector reconnector = - new MqttClientReconnector(eventLoop, attempts, connect, clientConfig.getCurrentTransportConfig()); - final MqttClientDisconnectedContext context = - MqttClientDisconnectedContextImpl.of(clientConfig, source, cause, reconnector); + final MqttReconnector reconnector = + new MqttReconnector(eventLoop, attempts, connect, clientConfig.getCurrentTransportConfig()); + final MqttDisconnectedContext context = + MqttDisconnectedContextImpl.of(clientConfig, source, cause, reconnector); - for (final MqttClientDisconnectedListener disconnectedListener : clientConfig.getDisconnectedListeners()) { + for (final MqttDisconnectedListener disconnectedListener : clientConfig.getDisconnectedListeners()) { try { disconnectedListener.onDisconnected(context); } catch (final Throwable t) { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnectHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnectHandler.java index ff5d470a3..43a48b9cf 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnectHandler.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnectHandler.java @@ -29,7 +29,7 @@ import com.hivemq.client.internal.mqtt.handler.ping.MqttPingHandler; import com.hivemq.client.internal.mqtt.handler.util.MqttTimeoutInboundHandler; import com.hivemq.client.internal.mqtt.ioc.ConnectionScope; -import com.hivemq.client.internal.mqtt.lifecycle.MqttClientConnectedContextImpl; +import com.hivemq.client.internal.mqtt.lifecycle.MqttConnectedContextImpl; import com.hivemq.client.internal.mqtt.message.MqttMessage; import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; import com.hivemq.client.internal.mqtt.message.connect.MqttConnectRestrictions; @@ -38,8 +38,8 @@ import com.hivemq.client.internal.util.collections.ImmutableList; import com.hivemq.client.mqtt.MqttClientState; import com.hivemq.client.mqtt.MqttVersion; -import com.hivemq.client.mqtt.lifecycle.MqttClientConnectedContext; -import com.hivemq.client.mqtt.lifecycle.MqttClientConnectedListener; +import com.hivemq.client.mqtt.lifecycle.MqttConnectedContext; +import com.hivemq.client.mqtt.lifecycle.MqttConnectedListener; import com.hivemq.client.mqtt.lifecycle.MqttDisconnectSource; import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5ConnAckException; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; @@ -176,11 +176,10 @@ private void readConnAck(final @NotNull MqttConnAck connAck, final @NotNull Chan clientConfig.getRawState().set(MqttClientState.CONNECTED); - final ImmutableList connectedListeners = clientConfig.getConnectedListeners(); + final ImmutableList connectedListeners = clientConfig.getConnectedListeners(); if (!connectedListeners.isEmpty()) { - final MqttClientConnectedContext context = - MqttClientConnectedContextImpl.of(clientConfig, connect, connAck); - for (final MqttClientConnectedListener connectedListener : connectedListeners) { + final MqttConnectedContext context = MqttConnectedContextImpl.of(clientConfig, connect, connAck); + for (final MqttConnectedListener connectedListener : connectedListeners) { try { connectedListener.onConnected(context); } catch (final Throwable t) { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttAutoReconnectImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttAutoReconnectImpl.java index 4dd1bc3b5..24591d814 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttAutoReconnectImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttAutoReconnectImpl.java @@ -17,9 +17,9 @@ package com.hivemq.client.internal.mqtt.lifecycle; import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnect; -import com.hivemq.client.mqtt.lifecycle.MqttClientDisconnectedContext; -import com.hivemq.client.mqtt.lifecycle.MqttClientReconnector; import com.hivemq.client.mqtt.lifecycle.MqttDisconnectSource; +import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedContext; +import com.hivemq.client.mqtt.lifecycle.MqttReconnector; import org.jetbrains.annotations.NotNull; import java.util.concurrent.ThreadLocalRandom; @@ -44,9 +44,9 @@ public class MqttAutoReconnectImpl implements MqttAutoReconnect { } @Override - public void onDisconnected(final @NotNull MqttClientDisconnectedContext context) { + public void onDisconnected(final @NotNull MqttDisconnectedContext context) { if (context.getSource() != MqttDisconnectSource.USER) { - final MqttClientReconnector reconnector = context.getReconnector(); + final MqttReconnector reconnector = context.getReconnector(); final long delay = (long) Math.min(initialDelayNanos * Math.pow(2, reconnector.getAttempts()), maxDelayNanos); final long randomDelay = (long) (delay / 4d / Integer.MAX_VALUE * ThreadLocalRandom.current().nextInt()); diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientConnectedContextImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttConnectedContextImpl.java similarity index 76% rename from src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientConnectedContextImpl.java rename to src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttConnectedContextImpl.java index bd9ae8362..a95c22e97 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientConnectedContextImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttConnectedContextImpl.java @@ -17,35 +17,35 @@ package com.hivemq.client.internal.mqtt.lifecycle; import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.lifecycle.mqtt3.Mqtt3ClientConnectedContextView; +import com.hivemq.client.internal.mqtt.lifecycle.mqtt3.Mqtt3ConnectedContextView; import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; import com.hivemq.client.internal.mqtt.message.connect.connack.MqttConnAck; import com.hivemq.client.mqtt.MqttVersion; -import com.hivemq.client.mqtt.lifecycle.MqttClientConnectedContext; -import com.hivemq.client.mqtt.mqtt5.lifecycle.Mqtt5ClientConnectedContext; +import com.hivemq.client.mqtt.lifecycle.MqttConnectedContext; +import com.hivemq.client.mqtt.mqtt5.lifecycle.Mqtt5ConnectedContext; import org.jetbrains.annotations.NotNull; /** * @author Silvio Giebl */ -public class MqttClientConnectedContextImpl implements Mqtt5ClientConnectedContext { +public class MqttConnectedContextImpl implements Mqtt5ConnectedContext { - public static @NotNull MqttClientConnectedContext of( + public static @NotNull MqttConnectedContext of( final @NotNull MqttClientConfig clientConfig, final @NotNull MqttConnect connect, final @NotNull MqttConnAck connAck) { if (clientConfig.getMqttVersion() == MqttVersion.MQTT_3_1_1) { - return Mqtt3ClientConnectedContextView.of(clientConfig, connect, connAck); + return Mqtt3ConnectedContextView.of(clientConfig, connect, connAck); } - return new MqttClientConnectedContextImpl(clientConfig, connect, connAck); + return new MqttConnectedContextImpl(clientConfig, connect, connAck); } private final @NotNull MqttClientConfig clientConfig; private final @NotNull MqttConnect connect; private final @NotNull MqttConnAck connAck; - private MqttClientConnectedContextImpl( + private MqttConnectedContextImpl( final @NotNull MqttClientConfig clientConfig, final @NotNull MqttConnect connect, final @NotNull MqttConnAck connAck) { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientDisconnectedContextImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttDisconnectedContextImpl.java similarity index 68% rename from src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientDisconnectedContextImpl.java rename to src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttDisconnectedContextImpl.java index 9296bea82..f88ae0296 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientDisconnectedContextImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttDisconnectedContextImpl.java @@ -17,40 +17,40 @@ package com.hivemq.client.internal.mqtt.lifecycle; import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.lifecycle.mqtt3.Mqtt3ClientDisconnectedContextView; +import com.hivemq.client.internal.mqtt.lifecycle.mqtt3.Mqtt3DisconnectedContextView; import com.hivemq.client.mqtt.MqttVersion; -import com.hivemq.client.mqtt.lifecycle.MqttClientDisconnectedContext; import com.hivemq.client.mqtt.lifecycle.MqttDisconnectSource; -import com.hivemq.client.mqtt.mqtt5.lifecycle.Mqtt5ClientDisconnectedContext; +import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedContext; +import com.hivemq.client.mqtt.mqtt5.lifecycle.Mqtt5DisconnectedContext; import org.jetbrains.annotations.NotNull; /** * @author Silvio Giebl */ -public class MqttClientDisconnectedContextImpl implements Mqtt5ClientDisconnectedContext { +public class MqttDisconnectedContextImpl implements Mqtt5DisconnectedContext { - public static @NotNull MqttClientDisconnectedContext of( + public static @NotNull MqttDisconnectedContext of( final @NotNull MqttClientConfig clientConfig, final @NotNull MqttDisconnectSource source, final @NotNull Throwable cause, - final @NotNull MqttClientReconnector reconnector) { + final @NotNull MqttReconnector reconnector) { if (clientConfig.getMqttVersion() == MqttVersion.MQTT_3_1_1) { - return Mqtt3ClientDisconnectedContextView.of(clientConfig, source, cause, reconnector); + return Mqtt3DisconnectedContextView.of(clientConfig, source, cause, reconnector); } - return new MqttClientDisconnectedContextImpl(clientConfig, source, cause, reconnector); + return new MqttDisconnectedContextImpl(clientConfig, source, cause, reconnector); } private final @NotNull MqttClientConfig clientConfig; private final @NotNull MqttDisconnectSource source; private final @NotNull Throwable cause; - private final @NotNull MqttClientReconnector reconnector; + private final @NotNull MqttReconnector reconnector; - private MqttClientDisconnectedContextImpl( + private MqttDisconnectedContextImpl( final @NotNull MqttClientConfig clientConfig, final @NotNull MqttDisconnectSource source, final @NotNull Throwable cause, - final @NotNull MqttClientReconnector reconnector) { + final @NotNull MqttReconnector reconnector) { this.clientConfig = clientConfig; this.source = source; @@ -74,7 +74,7 @@ private MqttClientDisconnectedContextImpl( } @Override - public @NotNull MqttClientReconnector getReconnector() { + public @NotNull MqttReconnector getReconnector() { return reconnector; } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientReconnector.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttReconnector.java similarity index 83% rename from src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientReconnector.java rename to src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttReconnector.java index 98a83e24c..f45b60db0 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttClientReconnector.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttReconnector.java @@ -23,7 +23,7 @@ import com.hivemq.client.internal.mqtt.util.MqttChecks; import com.hivemq.client.internal.util.Checks; import com.hivemq.client.mqtt.MqttTransportConfig; -import com.hivemq.client.mqtt.mqtt5.lifecycle.Mqtt5ClientReconnector; +import com.hivemq.client.mqtt.mqtt5.lifecycle.Mqtt5Reconnector; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; import io.netty.channel.EventLoop; import org.jetbrains.annotations.NotNull; @@ -36,7 +36,7 @@ /** * @author Silvio Giebl */ -public class MqttClientReconnector implements Mqtt5ClientReconnector { +public class MqttReconnector implements Mqtt5Reconnector { private final @NotNull EventLoop eventLoop; private final int attempts; @@ -50,7 +50,7 @@ public class MqttClientReconnector implements Mqtt5ClientReconnector { private boolean afterOnDisconnected; - public MqttClientReconnector( + public MqttReconnector( final @NotNull EventLoop eventLoop, final int attempts, final @NotNull MqttConnect connect, @@ -69,14 +69,14 @@ public int getAttempts() { } @Override - public @NotNull MqttClientReconnector reconnect(final boolean reconnect) { + public @NotNull MqttReconnector reconnect(final boolean reconnect) { checkInEventLoop(); this.reconnect = reconnect; return this; } @Override - public @NotNull MqttClientReconnector reconnectWhen( + public @NotNull MqttReconnector reconnectWhen( @Nullable CompletableFuture future, final @Nullable BiConsumer callback) { checkInOnDisconnected("reconnectWhen"); @@ -101,7 +101,7 @@ public boolean isReconnect() { } @Override - public @NotNull MqttClientReconnector resubscribeIfSessionExpired(final boolean resubscribe) { + public @NotNull MqttReconnector resubscribeIfSessionExpired(final boolean resubscribe) { checkInOnDisconnected("resubscribeIfSessionExpired"); resubscribeIfSessionExpired = resubscribe; return this; @@ -114,7 +114,7 @@ public boolean isResubscribeIfSessionExpired() { } @Override - public @NotNull MqttClientReconnector republishIfSessionExpired(final boolean republish) { + public @NotNull MqttReconnector republishIfSessionExpired(final boolean republish) { checkInOnDisconnected("republishIfSessionExpired"); republishIfSessionExpired = republish; return this; @@ -127,7 +127,7 @@ public boolean isRepublishIfSessionExpired() { } @Override - public @NotNull MqttClientReconnector delay(final long delay, final @Nullable TimeUnit timeUnit) { + public @NotNull MqttReconnector delay(final long delay, final @Nullable TimeUnit timeUnit) { checkInOnDisconnected("delay"); Checks.notNull(timeUnit, "Time unit"); this.delayNanos = timeUnit.toNanos(delay); @@ -142,7 +142,7 @@ public long getDelay(final @NotNull TimeUnit timeUnit) { } @Override - public @NotNull MqttClientReconnector transportConfig(final @Nullable MqttTransportConfig transportConfig) { + public @NotNull MqttReconnector transportConfig(final @Nullable MqttTransportConfig transportConfig) { checkInEventLoop(); this.transportConfig = Checks.notImplemented(transportConfig, MqttTransportConfigImpl.class, "Transport config"); @@ -150,7 +150,7 @@ public long getDelay(final @NotNull TimeUnit timeUnit) { } @Override - public MqttTransportConfigImplBuilder.@NotNull Nested transportConfig() { + public MqttTransportConfigImplBuilder.@NotNull Nested transportConfig() { checkInEventLoop(); return new MqttTransportConfigImplBuilder.Nested<>(transportConfig, this::transportConfig); } @@ -162,14 +162,14 @@ public long getDelay(final @NotNull TimeUnit timeUnit) { } @Override - public @NotNull MqttClientReconnector connect(final @Nullable Mqtt5Connect connect) { + public @NotNull MqttReconnector connect(final @Nullable Mqtt5Connect connect) { checkInEventLoop(); this.connect = MqttChecks.connect(connect); return this; } @Override - public MqttConnectBuilder.@NotNull Nested connectWith() { + public MqttConnectBuilder.@NotNull Nested connectWith() { checkInEventLoop(); return new MqttConnectBuilder.Nested<>(connect, this::connect); } @@ -185,7 +185,7 @@ public void afterOnDisconnected() { } private void checkInEventLoop() { - Checks.state(eventLoop.inEventLoop(), "MqttClientReconnector must be called from the eventLoop."); + Checks.state(eventLoop.inEventLoop(), "MqttReconnector must be called from the eventLoop."); } private void checkInOnDisconnected(final @NotNull String method) { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientConnectedContextView.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ConnectedContextView.java similarity index 85% rename from src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientConnectedContextView.java rename to src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ConnectedContextView.java index aac46e0f5..5128f4e99 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientConnectedContextView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ConnectedContextView.java @@ -22,21 +22,21 @@ import com.hivemq.client.internal.mqtt.message.connect.connack.mqtt3.Mqtt3ConnAckView; import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectView; import com.hivemq.client.internal.mqtt.mqtt3.Mqtt3ClientConfigView; -import com.hivemq.client.mqtt.lifecycle.MqttClientConnectedContext; -import com.hivemq.client.mqtt.mqtt3.lifecycle.Mqtt3ClientConnectedContext; +import com.hivemq.client.mqtt.lifecycle.MqttConnectedContext; +import com.hivemq.client.mqtt.mqtt3.lifecycle.Mqtt3ConnectedContext; import org.jetbrains.annotations.NotNull; /** * @author Silvio Giebl */ -public class Mqtt3ClientConnectedContextView implements Mqtt3ClientConnectedContext { +public class Mqtt3ConnectedContextView implements Mqtt3ConnectedContext { - public static @NotNull MqttClientConnectedContext of( + public static @NotNull MqttConnectedContext of( final @NotNull MqttClientConfig clientConfig, final @NotNull MqttConnect connect, final @NotNull MqttConnAck connAck) { - return new Mqtt3ClientConnectedContextView( + return new Mqtt3ConnectedContextView( new Mqtt3ClientConfigView(clientConfig), Mqtt3ConnectView.of(connect), Mqtt3ConnAckView.of(connAck)); } @@ -44,7 +44,7 @@ public class Mqtt3ClientConnectedContextView implements Mqtt3ClientConnectedCont private final @NotNull Mqtt3ConnectView connect; private final @NotNull Mqtt3ConnAckView connAck; - private Mqtt3ClientConnectedContextView( + private Mqtt3ConnectedContextView( final @NotNull Mqtt3ClientConfigView clientConfig, final @NotNull Mqtt3ConnectView connect, final @NotNull Mqtt3ConnAckView connAck) { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientDisconnectedContextView.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3DisconnectedContextView.java similarity index 69% rename from src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientDisconnectedContextView.java rename to src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3DisconnectedContextView.java index bf65d8596..6921200e1 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientDisconnectedContextView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3DisconnectedContextView.java @@ -18,38 +18,38 @@ import com.hivemq.client.internal.mqtt.MqttClientConfig; import com.hivemq.client.internal.mqtt.exceptions.mqtt3.Mqtt3ExceptionFactory; -import com.hivemq.client.internal.mqtt.lifecycle.MqttClientReconnector; +import com.hivemq.client.internal.mqtt.lifecycle.MqttReconnector; import com.hivemq.client.internal.mqtt.mqtt3.Mqtt3ClientConfigView; -import com.hivemq.client.mqtt.lifecycle.MqttClientDisconnectedContext; import com.hivemq.client.mqtt.lifecycle.MqttDisconnectSource; -import com.hivemq.client.mqtt.mqtt3.lifecycle.Mqtt3ClientDisconnectedContext; +import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedContext; +import com.hivemq.client.mqtt.mqtt3.lifecycle.Mqtt3DisconnectedContext; import org.jetbrains.annotations.NotNull; /** * @author Silvio Giebl */ -public class Mqtt3ClientDisconnectedContextView implements Mqtt3ClientDisconnectedContext { +public class Mqtt3DisconnectedContextView implements Mqtt3DisconnectedContext { - public static @NotNull MqttClientDisconnectedContext of( + public static @NotNull MqttDisconnectedContext of( final @NotNull MqttClientConfig clientConfig, final @NotNull MqttDisconnectSource source, final @NotNull Throwable cause, - final @NotNull MqttClientReconnector reconnector) { + final @NotNull MqttReconnector reconnector) { - return new Mqtt3ClientDisconnectedContextView(new Mqtt3ClientConfigView(clientConfig), source, - Mqtt3ExceptionFactory.map(cause), new Mqtt3ClientReconnectorView(reconnector)); + return new Mqtt3DisconnectedContextView(new Mqtt3ClientConfigView(clientConfig), source, + Mqtt3ExceptionFactory.map(cause), new Mqtt3ReconnectorView(reconnector)); } private final @NotNull Mqtt3ClientConfigView clientConfig; private final @NotNull MqttDisconnectSource source; private final @NotNull Throwable cause; - private final @NotNull Mqtt3ClientReconnectorView reconnector; + private final @NotNull Mqtt3ReconnectorView reconnector; - private Mqtt3ClientDisconnectedContextView( + private Mqtt3DisconnectedContextView( final @NotNull Mqtt3ClientConfigView clientConfig, final @NotNull MqttDisconnectSource source, final @NotNull Throwable cause, - final @NotNull Mqtt3ClientReconnectorView reconnector) { + final @NotNull Mqtt3ReconnectorView reconnector) { this.clientConfig = clientConfig; this.source = source; @@ -73,7 +73,7 @@ private Mqtt3ClientDisconnectedContextView( } @Override - public @NotNull Mqtt3ClientReconnectorView getReconnector() { + public @NotNull Mqtt3ReconnectorView getReconnector() { return reconnector; } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientReconnectorView.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ReconnectorView.java similarity index 72% rename from src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientReconnectorView.java rename to src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ReconnectorView.java index 4e4ab7846..1cb413768 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ClientReconnectorView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ReconnectorView.java @@ -18,12 +18,12 @@ import com.hivemq.client.internal.mqtt.MqttTransportConfigImpl; import com.hivemq.client.internal.mqtt.MqttTransportConfigImplBuilder; -import com.hivemq.client.internal.mqtt.lifecycle.MqttClientReconnector; +import com.hivemq.client.internal.mqtt.lifecycle.MqttReconnector; import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectView; import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectViewBuilder; import com.hivemq.client.internal.mqtt.util.MqttChecks; import com.hivemq.client.mqtt.MqttTransportConfig; -import com.hivemq.client.mqtt.mqtt3.lifecycle.Mqtt3ClientReconnector; +import com.hivemq.client.mqtt.mqtt3.lifecycle.Mqtt3Reconnector; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -35,22 +35,22 @@ /** * @author Silvio Giebl */ -public class Mqtt3ClientReconnectorView implements Mqtt3ClientReconnector { +public class Mqtt3ReconnectorView implements Mqtt3Reconnector { - private final @NotNull MqttClientReconnector delegate; + private final @NotNull MqttReconnector delegate; - Mqtt3ClientReconnectorView(final @NotNull MqttClientReconnector delegate) { + Mqtt3ReconnectorView(final @NotNull MqttReconnector delegate) { this.delegate = delegate; } @Override - public @NotNull Mqtt3ClientReconnectorView reconnect(final boolean reconnect) { + public @NotNull Mqtt3ReconnectorView reconnect(final boolean reconnect) { delegate.reconnect(reconnect); return this; } @Override - public @NotNull Mqtt3ClientReconnectorView reconnectWhen( + public @NotNull Mqtt3ReconnectorView reconnectWhen( final @Nullable CompletableFuture future, final @Nullable BiConsumer callback) { @@ -64,7 +64,7 @@ public boolean isReconnect() { } @Override - public @NotNull Mqtt3ClientReconnectorView resubscribeIfSessionExpired(final boolean resubscribe) { + public @NotNull Mqtt3ReconnectorView resubscribeIfSessionExpired(final boolean resubscribe) { delegate.resubscribeIfSessionExpired(resubscribe); return this; } @@ -75,7 +75,7 @@ public boolean isResubscribeIfSessionExpired() { } @Override - public @NotNull Mqtt3ClientReconnectorView republishIfSessionExpired(final boolean republish) { + public @NotNull Mqtt3ReconnectorView republishIfSessionExpired(final boolean republish) { delegate.republishIfSessionExpired(republish); return this; } @@ -91,7 +91,7 @@ public int getAttempts() { } @Override - public @NotNull Mqtt3ClientReconnectorView delay(final long delay, final @Nullable TimeUnit timeUnit) { + public @NotNull Mqtt3ReconnectorView delay(final long delay, final @Nullable TimeUnit timeUnit) { delegate.delay(delay, timeUnit); return this; } @@ -102,13 +102,13 @@ public long getDelay(final @NotNull TimeUnit timeUnit) { } @Override - public @NotNull Mqtt3ClientReconnectorView transportConfig(final @Nullable MqttTransportConfig transportConfig) { + public @NotNull Mqtt3ReconnectorView transportConfig(final @Nullable MqttTransportConfig transportConfig) { delegate.transportConfig(transportConfig); return this; } @Override - public MqttTransportConfigImplBuilder.@NotNull Nested transportConfig() { + public MqttTransportConfigImplBuilder.@NotNull Nested transportConfig() { return new MqttTransportConfigImplBuilder.Nested<>(getTransportConfig(), this::transportConfig); } @@ -118,13 +118,13 @@ public long getDelay(final @NotNull TimeUnit timeUnit) { } @Override - public @NotNull Mqtt3ClientReconnectorView connect(final @Nullable Mqtt3Connect connect) { + public @NotNull Mqtt3ReconnectorView connect(final @Nullable Mqtt3Connect connect) { delegate.connect(MqttChecks.connect(connect)); return this; } @Override - public Mqtt3ConnectViewBuilder.@NotNull Nested connectWith() { + public Mqtt3ConnectViewBuilder.@NotNull Nested connectWith() { return new Mqtt3ConnectViewBuilder.Nested<>(getConnect(), this::connect); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java index e53b9d05f..f20ee80f1 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java @@ -28,8 +28,8 @@ import com.hivemq.client.mqtt.MqttVersion; import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnect; -import com.hivemq.client.mqtt.lifecycle.MqttClientConnectedListener; -import com.hivemq.client.mqtt.lifecycle.MqttClientDisconnectedListener; +import com.hivemq.client.mqtt.lifecycle.MqttConnectedListener; +import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedListener; import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientConfig; import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientConnectionConfig; import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; @@ -97,12 +97,12 @@ public Mqtt3ClientConfigView(final @NotNull MqttClientConfig delegate) { } @Override - public @Immutable @NotNull List<@NotNull MqttClientConnectedListener> getConnectedListeners() { + public @Immutable @NotNull List<@NotNull MqttConnectedListener> getConnectedListeners() { return delegate.getConnectedListeners(); } @Override - public @Immutable @NotNull List<@NotNull MqttClientDisconnectedListener> getDisconnectedListeners() { + public @Immutable @NotNull List<@NotNull MqttDisconnectedListener> getDisconnectedListeners() { return delegate.getDisconnectedListeners(); } diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java index 56ddc906a..6ed442a73 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java @@ -21,8 +21,8 @@ import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnect; import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnectBuilder; -import com.hivemq.client.mqtt.lifecycle.MqttClientConnectedListener; -import com.hivemq.client.mqtt.lifecycle.MqttClientDisconnectedListener; +import com.hivemq.client.mqtt.lifecycle.MqttConnectedListener; +import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedListener; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -252,7 +252,7 @@ public interface MqttClientBuilderBase> { * @since 1.1 */ @CheckReturnValue - @NotNull B addConnectedListener(@NotNull MqttClientConnectedListener connectedListener); + @NotNull B addConnectedListener(@NotNull MqttConnectedListener connectedListener); /** * Adds a listener which is notified when the client is disconnected (with or without a Disconnect message) or the @@ -265,5 +265,5 @@ public interface MqttClientBuilderBase> { * @since 1.1 */ @CheckReturnValue - @NotNull B addDisconnectedListener(@NotNull MqttClientDisconnectedListener disconnectedListener); + @NotNull B addDisconnectedListener(@NotNull MqttDisconnectedListener disconnectedListener); } diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java index 773efedcf..dd25eaf08 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java @@ -20,8 +20,8 @@ import com.hivemq.client.annotations.Immutable; import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnect; -import com.hivemq.client.mqtt.lifecycle.MqttClientConnectedListener; -import com.hivemq.client.mqtt.lifecycle.MqttClientDisconnectedListener; +import com.hivemq.client.mqtt.lifecycle.MqttConnectedListener; +import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedListener; import org.jetbrains.annotations.NotNull; import java.net.InetSocketAddress; @@ -108,14 +108,14 @@ default int getServerPort() { * ConnAck message is received). * @since 1.1 */ - @Immutable @NotNull List<@NotNull MqttClientConnectedListener> getConnectedListeners(); + @Immutable @NotNull List<@NotNull MqttConnectedListener> getConnectedListeners(); /** * @return the listeners which are notified (in the order of the list) when this client is disconnected (with or * without a Disconnect message) or the connection fails. * @since 1.1 */ - @Immutable @NotNull List<@NotNull MqttClientDisconnectedListener> getDisconnectedListeners(); + @Immutable @NotNull List<@NotNull MqttDisconnectedListener> getDisconnectedListeners(); /** * @return the state of the client. diff --git a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnect.java b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnect.java index 068b662d6..97b3a8c4d 100644 --- a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnect.java +++ b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnect.java @@ -32,7 +32,7 @@ * @since 1.1 */ @DoNotImplement -public interface MqttAutoReconnect extends MqttClientDisconnectedListener { +public interface MqttAutoReconnect extends MqttDisconnectedListener { /** * The default initial delay in seconds the client will wait before it tries to reconnect. diff --git a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientConnectedContext.java b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttConnectedContext.java similarity index 95% rename from src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientConnectedContext.java rename to src/main/java/com/hivemq/client/mqtt/lifecycle/MqttConnectedContext.java index a550021f5..e8cbcdd72 100644 --- a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientConnectedContext.java +++ b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttConnectedContext.java @@ -27,7 +27,7 @@ * @since 1.1 */ @DoNotImplement -public interface MqttClientConnectedContext { +public interface MqttConnectedContext { /** * @return the config of the client that is now connected. diff --git a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientConnectedListener.java b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttConnectedListener.java similarity index 90% rename from src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientConnectedListener.java rename to src/main/java/com/hivemq/client/mqtt/lifecycle/MqttConnectedListener.java index 3a79f8793..0c28e68a0 100644 --- a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientConnectedListener.java +++ b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttConnectedListener.java @@ -25,7 +25,7 @@ * @since 1.1 */ @FunctionalInterface -public interface MqttClientConnectedListener { +public interface MqttConnectedListener { /** * Listener method which is notified when a client is connected (a successful ConnAck message is received). @@ -34,5 +34,5 @@ public interface MqttClientConnectedListener { * * @param context provides context about the client that is now connected. */ - void onConnected(@NotNull MqttClientConnectedContext context); + void onConnected(@NotNull MqttConnectedContext context); } diff --git a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientDisconnectedContext.java b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttDisconnectedContext.java similarity index 96% rename from src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientDisconnectedContext.java rename to src/main/java/com/hivemq/client/mqtt/lifecycle/MqttDisconnectedContext.java index cc0a46190..cc8eb5590 100644 --- a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientDisconnectedContext.java +++ b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttDisconnectedContext.java @@ -27,7 +27,7 @@ * @since 1.1 */ @DoNotImplement -public interface MqttClientDisconnectedContext { +public interface MqttDisconnectedContext { /** * @return the config of the client that is now disconnected. @@ -75,5 +75,5 @@ public interface MqttClientDisconnectedContext { /** * @return the reconnector which can be used for reconnecting. */ - @NotNull MqttClientReconnector getReconnector(); + @NotNull MqttReconnector getReconnector(); } diff --git a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientDisconnectedListener.java b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttDisconnectedListener.java similarity index 88% rename from src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientDisconnectedListener.java rename to src/main/java/com/hivemq/client/mqtt/lifecycle/MqttDisconnectedListener.java index a1c0a5ed1..f7b0fc161 100644 --- a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientDisconnectedListener.java +++ b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttDisconnectedListener.java @@ -26,7 +26,7 @@ * @since 1.1 */ @FunctionalInterface -public interface MqttClientDisconnectedListener { +public interface MqttDisconnectedListener { /** * Listener method which is notified in the following cases: @@ -40,7 +40,7 @@ public interface MqttClientDisconnectedListener { *

  • A reconnect attempt by the client failed. The client state will still be * {@link com.hivemq.client.mqtt.MqttClientState#CONNECTING_RECONNECT CONNECTING_RECONNECT}. * - * The client state will be updated after all {@link MqttClientDisconnectedListener MqttClientDisconnectedListeners} + * The client state will be updated after all {@link MqttDisconnectedListener}s * are called to *
      *
    • {@link com.hivemq.client.mqtt.MqttClientState#DISCONNECTED DISCONNECTED} or @@ -49,10 +49,10 @@ public interface MqttClientDisconnectedListener { *
    *

    * This method must not block. If you want to reconnect you have to use the supplied {@link - * MqttClientDisconnectedContext#getReconnector()}. + * MqttDisconnectedContext#getReconnector()}. * * @param context provides context about the client that is now disconnected, the cause for disconnection and allows * reconnecting. */ - void onDisconnected(@NotNull MqttClientDisconnectedContext context); + void onDisconnected(@NotNull MqttDisconnectedContext context); } diff --git a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientReconnector.java b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttReconnector.java similarity index 74% rename from src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientReconnector.java rename to src/main/java/com/hivemq/client/mqtt/lifecycle/MqttReconnector.java index 47cdd8ff0..522df4f88 100644 --- a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttClientReconnector.java +++ b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttReconnector.java @@ -28,19 +28,19 @@ import java.util.function.BiConsumer; /** - * A reconnector is supplied by a {@link MqttClientDisconnectedContext} and can be used for reconnecting. + * A reconnector is supplied by a {@link MqttDisconnectedContext} and can be used for reconnecting. *

    * The client will reconnect only if at least one of the methods {@link #reconnect(boolean)} or {@link * #reconnectWhen(CompletableFuture, BiConsumer)} is called. *

    - * All methods must only be called in {@link MqttClientDisconnectedListener#onDisconnected(MqttClientDisconnectedContext)}. - * Some methods can also be called in the callback supplied to {@link #reconnectWhen(CompletableFuture, BiConsumer)}. + * All methods must only be called in {@link MqttDisconnectedListener#onDisconnected(MqttDisconnectedContext)}. Some + * methods can also be called in the callback supplied to {@link #reconnectWhen(CompletableFuture, BiConsumer)}. * * @author Silvio Giebl * @since 1.1 */ @DoNotImplement -public interface MqttClientReconnector { +public interface MqttReconnector { /** * If reconnect is enabled by default. @@ -78,7 +78,7 @@ public interface MqttClientReconnector { * @param reconnect whether to reconnect. * @return this reconnector. */ - @NotNull MqttClientReconnector reconnect(boolean reconnect); + @NotNull MqttReconnector reconnect(boolean reconnect); /** * Instructs the client to reconnect after a future completes. @@ -86,17 +86,17 @@ public interface MqttClientReconnector { * If additionally a {@link #delay(long, TimeUnit) delay} is supplied, the client will reconnect after both are * complete. *

    - * This method must only be called in {@link MqttClientDisconnectedListener#onDisconnected(MqttClientDisconnectedContext)} - * and not in the supplied callback. + * This method must only be called in {@link MqttDisconnectedListener#onDisconnected(MqttDisconnectedContext)} and + * not in the supplied callback. * * @param future the client will reconnect only after the future completes. * @param callback the callback that will be called after the future completes and before the client will reconnect. * It can be used to set new connect properties (e.g. credentials). * @param the result type of the future. * @return this reconnector. - * @throws UnsupportedOperationException if called outside of {@link MqttClientDisconnectedListener#onDisconnected(MqttClientDisconnectedContext)}. + * @throws UnsupportedOperationException if called outside of {@link MqttDisconnectedListener#onDisconnected(MqttDisconnectedContext)}. */ - @NotNull MqttClientReconnector reconnectWhen( + @NotNull MqttReconnector reconnectWhen( @NotNull CompletableFuture future, @Nullable BiConsumer callback); /** @@ -114,15 +114,15 @@ public interface MqttClientReconnector { * This setting only has effect if the client will reconnect (at least one of the methods {@link * #reconnect(boolean)} or {@link #reconnectWhen(CompletableFuture, BiConsumer)} is called). *

    - * This method must only be called in {@link MqttClientDisconnectedListener#onDisconnected(MqttClientDisconnectedContext)} - * and not in the callback supplied to {@link #reconnectWhen(CompletableFuture, BiConsumer)}. + * This method must only be called in {@link MqttDisconnectedListener#onDisconnected(MqttDisconnectedContext)} and + * not in the callback supplied to {@link #reconnectWhen(CompletableFuture, BiConsumer)}. * * @param resubscribe whether to resubscribe when the session expired before the client reconnected successfully. * @return this reconnector. - * @throws UnsupportedOperationException if called outside of {@link MqttClientDisconnectedListener#onDisconnected(MqttClientDisconnectedContext)}. + * @throws UnsupportedOperationException if called outside of {@link MqttDisconnectedListener#onDisconnected(MqttDisconnectedContext)}. * @since 1.2 */ - @NotNull MqttClientReconnector resubscribeIfSessionExpired(boolean resubscribe); + @NotNull MqttReconnector resubscribeIfSessionExpired(boolean resubscribe); /** * @return whether the client will resubscribe when the session expired before it reconnected successfully. @@ -140,15 +140,15 @@ public interface MqttClientReconnector { * This setting only has effect if the client will reconnect (at least one of the methods {@link * #reconnect(boolean)} or {@link #reconnectWhen(CompletableFuture, BiConsumer)} is called). *

    - * This method must only be called in {@link MqttClientDisconnectedListener#onDisconnected(MqttClientDisconnectedContext)} - * and not in the callback supplied to {@link #reconnectWhen(CompletableFuture, BiConsumer)}. + * This method must only be called in {@link MqttDisconnectedListener#onDisconnected(MqttDisconnectedContext)} and + * not in the callback supplied to {@link #reconnectWhen(CompletableFuture, BiConsumer)}. * * @param republish whether to republish when the session expired before the client reconnected successfully. * @return this reconnector. - * @throws UnsupportedOperationException if called outside of {@link MqttClientDisconnectedListener#onDisconnected(MqttClientDisconnectedContext)}. + * @throws UnsupportedOperationException if called outside of {@link MqttDisconnectedListener#onDisconnected(MqttDisconnectedContext)}. * @since 1.2 */ - @NotNull MqttClientReconnector republishIfSessionExpired(boolean republish); + @NotNull MqttReconnector republishIfSessionExpired(boolean republish); /** * @return whether the client will republish when the session expired before it reconnected successfully. @@ -165,21 +165,21 @@ public interface MqttClientReconnector { * If additionally a {@link #reconnectWhen(CompletableFuture, BiConsumer) future} is supplied, the client will * reconnect after both are complete. *

    - * This method must only be called in {@link MqttClientDisconnectedListener#onDisconnected(MqttClientDisconnectedContext)} - * and not in the callback supplied to {@link #reconnectWhen(CompletableFuture, BiConsumer)}. + * This method must only be called in {@link MqttDisconnectedListener#onDisconnected(MqttDisconnectedContext)} and + * not in the callback supplied to {@link #reconnectWhen(CompletableFuture, BiConsumer)}. * * @param delay delay which the client will wait before trying to reconnect. * @param timeUnit the time unit of the delay. * @return this reconnector. - * @throws UnsupportedOperationException if called outside of {@link MqttClientDisconnectedListener#onDisconnected(MqttClientDisconnectedContext)}. + * @throws UnsupportedOperationException if called outside of {@link MqttDisconnectedListener#onDisconnected(MqttDisconnectedContext)}. */ - @NotNull MqttClientReconnector delay(long delay, @NotNull TimeUnit timeUnit); + @NotNull MqttReconnector delay(long delay, @NotNull TimeUnit timeUnit); /** * Returns the currently set delay the client will wait for before trying to reconnect. *

    * If the {@link #delay(long, TimeUnit)} method has not been called before (including previous {@link - * MqttClientDisconnectedListener MqttClientDisconnectedListeners}) it will be {@link #DEFAULT_DELAY_MS}. + * MqttDisconnectedListener}s) it will be {@link #DEFAULT_DELAY_MS}. * * @param timeUnit the time unit of the returned delay. * @return the delay in the given time unit. @@ -192,7 +192,7 @@ public interface MqttClientReconnector { * @param transportConfig the transport configuration the client will try to reconnect with. * @return this reconnector. */ - @NotNull MqttClientReconnector transportConfig(@NotNull MqttTransportConfig transportConfig); + @NotNull MqttReconnector transportConfig(@NotNull MqttTransportConfig transportConfig); /** * Fluent counterpart of {@link #transportConfig(MqttTransportConfig)}. @@ -204,15 +204,15 @@ public interface MqttClientReconnector { * @see #transportConfig(MqttTransportConfig) */ @CheckReturnValue - MqttTransportConfigBuilder.@NotNull Nested transportConfig(); + MqttTransportConfigBuilder.@NotNull Nested transportConfig(); /** * Returns the currently set transport configuration the client will try to reconnect with. *

    * If the {@link #transportConfig(MqttTransportConfig)} method has not been called before (including previous {@link - * MqttClientDisconnectedListener MqttClientDisconnectedListeners}) it will be the transport configuration the - * client was connected with or the {@link com.hivemq.client.mqtt.MqttClientConfig#getTransportConfig() default - * transport configuration} if it has not been connected yet. + * MqttDisconnectedListener}s) it will be the transport configuration the client was connected with or the {@link + * com.hivemq.client.mqtt.MqttClientConfig#getTransportConfig() default transport configuration} if it has not been + * connected yet. * * @return the transport configuration. */ diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ClientConnectedContext.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ConnectedContext.java similarity index 83% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ClientConnectedContext.java rename to src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ConnectedContext.java index e5aa65a46..5ef2cbe14 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ClientConnectedContext.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ConnectedContext.java @@ -17,21 +17,21 @@ package com.hivemq.client.mqtt.mqtt3.lifecycle; import com.hivemq.client.annotations.DoNotImplement; -import com.hivemq.client.mqtt.lifecycle.MqttClientConnectedContext; +import com.hivemq.client.mqtt.lifecycle.MqttConnectedContext; import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientConfig; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAck; import org.jetbrains.annotations.NotNull; /** - * A {@link MqttClientConnectedContext} with methods specific to an {@link com.hivemq.client.mqtt.mqtt3.Mqtt3Client + * A {@link MqttConnectedContext} with methods specific to an {@link com.hivemq.client.mqtt.mqtt3.Mqtt3Client * Mqtt3Client}. * * @author Silvio Giebl * @since 1.1 */ @DoNotImplement -public interface Mqtt3ClientConnectedContext extends MqttClientConnectedContext { +public interface Mqtt3ConnectedContext extends MqttConnectedContext { @Override @NotNull Mqtt3ClientConfig getClientConfig(); diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ClientDisconnectedContext.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3DisconnectedContext.java similarity index 74% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ClientDisconnectedContext.java rename to src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3DisconnectedContext.java index 1b8901af8..6931b7693 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ClientDisconnectedContext.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3DisconnectedContext.java @@ -17,23 +17,23 @@ package com.hivemq.client.mqtt.mqtt3.lifecycle; import com.hivemq.client.annotations.DoNotImplement; -import com.hivemq.client.mqtt.lifecycle.MqttClientDisconnectedContext; +import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedContext; import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientConfig; import org.jetbrains.annotations.NotNull; /** - * A {@link MqttClientDisconnectedContext} with methods specific to an {@link com.hivemq.client.mqtt.mqtt3.Mqtt3Client + * A {@link MqttDisconnectedContext} with methods specific to an {@link com.hivemq.client.mqtt.mqtt3.Mqtt3Client * Mqtt3Client}. * * @author Silvio Giebl * @since 1.1 */ @DoNotImplement -public interface Mqtt3ClientDisconnectedContext extends MqttClientDisconnectedContext { +public interface Mqtt3DisconnectedContext extends MqttDisconnectedContext { @Override @NotNull Mqtt3ClientConfig getClientConfig(); @Override - @NotNull Mqtt3ClientReconnector getReconnector(); + @NotNull Mqtt3Reconnector getReconnector(); } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ClientReconnector.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3Reconnector.java similarity index 67% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ClientReconnector.java rename to src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3Reconnector.java index aaca2d367..541486b87 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ClientReconnector.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3Reconnector.java @@ -20,7 +20,7 @@ import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttTransportConfig; import com.hivemq.client.mqtt.MqttTransportConfigBuilder; -import com.hivemq.client.mqtt.lifecycle.MqttClientReconnector; +import com.hivemq.client.mqtt.lifecycle.MqttReconnector; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnectBuilder; import org.jetbrains.annotations.NotNull; @@ -31,37 +31,36 @@ import java.util.function.BiConsumer; /** - * A {@link MqttClientReconnector} with methods specific to an {@link com.hivemq.client.mqtt.mqtt3.Mqtt3Client - * Mqtt3Client}. + * A {@link MqttReconnector} with methods specific to an {@link com.hivemq.client.mqtt.mqtt3.Mqtt3Client Mqtt3Client}. * * @author Silvio Giebl * @since 1.1 */ @DoNotImplement -public interface Mqtt3ClientReconnector extends MqttClientReconnector { +public interface Mqtt3Reconnector extends MqttReconnector { @Override - @NotNull Mqtt3ClientReconnector reconnect(boolean reconnect); + @NotNull Mqtt3Reconnector reconnect(boolean reconnect); @Override - @NotNull Mqtt3ClientReconnector reconnectWhen( + @NotNull Mqtt3Reconnector reconnectWhen( @NotNull CompletableFuture future, @Nullable BiConsumer callback); @Override - @NotNull Mqtt3ClientReconnector resubscribeIfSessionExpired(boolean resubscribe); + @NotNull Mqtt3Reconnector resubscribeIfSessionExpired(boolean resubscribe); @Override - @NotNull Mqtt3ClientReconnector republishIfSessionExpired(boolean republish); + @NotNull Mqtt3Reconnector republishIfSessionExpired(boolean republish); @Override - @NotNull Mqtt3ClientReconnector delay(long delay, @NotNull TimeUnit timeUnit); + @NotNull Mqtt3Reconnector delay(long delay, @NotNull TimeUnit timeUnit); @Override - @NotNull Mqtt3ClientReconnector transportConfig(@NotNull MqttTransportConfig transportConfig); + @NotNull Mqtt3Reconnector transportConfig(@NotNull MqttTransportConfig transportConfig); @Override @CheckReturnValue - MqttTransportConfigBuilder.@NotNull Nested transportConfig(); + MqttTransportConfigBuilder.@NotNull Nested transportConfig(); /** * Sets a different Connect message the client will try to reconnect with. @@ -69,7 +68,7 @@ public interface Mqtt3ClientReconnector extends MqttClientReconnector { * @param connect the Connect message. * @return this reconnector. */ - @NotNull Mqtt3ClientReconnector connect(@NotNull Mqtt3Connect connect); + @NotNull Mqtt3Reconnector connect(@NotNull Mqtt3Connect connect); /** * Fluent counterpart of {@link #connect(Mqtt3Connect)}. @@ -81,14 +80,14 @@ public interface Mqtt3ClientReconnector extends MqttClientReconnector { * @see #connect(Mqtt3Connect) */ @CheckReturnValue - Mqtt3ConnectBuilder.@NotNull Nested connectWith(); + Mqtt3ConnectBuilder.@NotNull Nested connectWith(); /** - * Returns the currently set Connect message the client will try to reconnect with. + * Returns the currently set Connect message the client will try to reconnect with.@ *

    * If the {@link #connect(Mqtt3Connect)} method has not been called before (including previous {@link - * com.hivemq.client.mqtt.lifecycle.MqttClientDisconnectedListener MqttClientDisconnectedListeners}) it will be the - * Connect message that is reconstructed from the {@link com.hivemq.client.mqtt.mqtt3.Mqtt3ClientConnectionConfig + * com.hivemq.client.mqtt.lifecycle.MqttDisconnectedListener MqttDisconnectedListener}s) it will be the Connect + * message that is reconstructed from the {@link com.hivemq.client.mqtt.mqtt3.Mqtt3ClientConnectionConfig * Mqtt3ClientConnectionConfig} or the Connect message of the previous connect try if it has not been successfully * connected. * diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ClientConnectedContext.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ConnectedContext.java similarity index 83% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ClientConnectedContext.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ConnectedContext.java index cb27d8dfc..3151cd268 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ClientConnectedContext.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ConnectedContext.java @@ -17,21 +17,21 @@ package com.hivemq.client.mqtt.mqtt5.lifecycle; import com.hivemq.client.annotations.DoNotImplement; -import com.hivemq.client.mqtt.lifecycle.MqttClientConnectedContext; +import com.hivemq.client.mqtt.lifecycle.MqttConnectedContext; import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck; import org.jetbrains.annotations.NotNull; /** - * A {@link MqttClientConnectedContext} with methods specific to an {@link com.hivemq.client.mqtt.mqtt5.Mqtt5Client + * A {@link MqttConnectedContext} with methods specific to an {@link com.hivemq.client.mqtt.mqtt5.Mqtt5Client * Mqtt5Client}. * * @author Silvio Giebl * @since 1.1 */ @DoNotImplement -public interface Mqtt5ClientConnectedContext extends MqttClientConnectedContext { +public interface Mqtt5ConnectedContext extends MqttConnectedContext { @Override @NotNull Mqtt5ClientConfig getClientConfig(); diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ClientDisconnectedContext.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5DisconnectedContext.java similarity index 74% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ClientDisconnectedContext.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5DisconnectedContext.java index ff48ccbc4..6463fcbde 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ClientDisconnectedContext.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5DisconnectedContext.java @@ -17,23 +17,23 @@ package com.hivemq.client.mqtt.mqtt5.lifecycle; import com.hivemq.client.annotations.DoNotImplement; -import com.hivemq.client.mqtt.lifecycle.MqttClientDisconnectedContext; +import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedContext; import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; import org.jetbrains.annotations.NotNull; /** - * A {@link MqttClientDisconnectedContext} with methods specific to an {@link com.hivemq.client.mqtt.mqtt5.Mqtt5Client + * A {@link MqttDisconnectedContext} with methods specific to an {@link com.hivemq.client.mqtt.mqtt5.Mqtt5Client * Mqtt5Client}. * * @author Silvio Giebl * @since 1.1 */ @DoNotImplement -public interface Mqtt5ClientDisconnectedContext extends MqttClientDisconnectedContext { +public interface Mqtt5DisconnectedContext extends MqttDisconnectedContext { @Override @NotNull Mqtt5ClientConfig getClientConfig(); @Override - @NotNull Mqtt5ClientReconnector getReconnector(); + @NotNull Mqtt5Reconnector getReconnector(); } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ClientReconnector.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5Reconnector.java similarity index 67% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ClientReconnector.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5Reconnector.java index 83c2e1203..ac30706c8 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ClientReconnector.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5Reconnector.java @@ -20,7 +20,7 @@ import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttTransportConfig; import com.hivemq.client.mqtt.MqttTransportConfigBuilder; -import com.hivemq.client.mqtt.lifecycle.MqttClientReconnector; +import com.hivemq.client.mqtt.lifecycle.MqttReconnector; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectBuilder; import org.jetbrains.annotations.NotNull; @@ -31,37 +31,36 @@ import java.util.function.BiConsumer; /** - * A {@link MqttClientReconnector} with methods specific to an {@link com.hivemq.client.mqtt.mqtt5.Mqtt5Client - * Mqtt5Client}. + * A {@link MqttReconnector} with methods specific to an {@link com.hivemq.client.mqtt.mqtt5.Mqtt5Client Mqtt5Client}. * * @author Silvio Giebl * @since 1.1 */ @DoNotImplement -public interface Mqtt5ClientReconnector extends MqttClientReconnector { +public interface Mqtt5Reconnector extends MqttReconnector { @Override - @NotNull Mqtt5ClientReconnector reconnect(boolean reconnect); + @NotNull Mqtt5Reconnector reconnect(boolean reconnect); @Override - @NotNull Mqtt5ClientReconnector reconnectWhen( + @NotNull Mqtt5Reconnector reconnectWhen( @NotNull CompletableFuture future, @Nullable BiConsumer callback); @Override - @NotNull Mqtt5ClientReconnector resubscribeIfSessionExpired(boolean resubscribe); + @NotNull Mqtt5Reconnector resubscribeIfSessionExpired(boolean resubscribe); @Override - @NotNull Mqtt5ClientReconnector republishIfSessionExpired(boolean republish); + @NotNull Mqtt5Reconnector republishIfSessionExpired(boolean republish); @Override - @NotNull Mqtt5ClientReconnector delay(long delay, @NotNull TimeUnit timeUnit); + @NotNull Mqtt5Reconnector delay(long delay, @NotNull TimeUnit timeUnit); @Override - @NotNull Mqtt5ClientReconnector transportConfig(@NotNull MqttTransportConfig transportConfig); + @NotNull Mqtt5Reconnector transportConfig(@NotNull MqttTransportConfig transportConfig); @Override @CheckReturnValue - MqttTransportConfigBuilder.@NotNull Nested transportConfig(); + MqttTransportConfigBuilder.@NotNull Nested transportConfig(); /** * Sets a different Connect message the client will try to reconnect with. @@ -69,7 +68,7 @@ public interface Mqtt5ClientReconnector extends MqttClientReconnector { * @param connect the Connect message. * @return this reconnector. */ - @NotNull Mqtt5ClientReconnector connect(@NotNull Mqtt5Connect connect); + @NotNull Mqtt5Reconnector connect(@NotNull Mqtt5Connect connect); /** * Fluent counterpart of {@link #connect(Mqtt5Connect)}. @@ -81,14 +80,14 @@ public interface Mqtt5ClientReconnector extends MqttClientReconnector { * @see #connect(Mqtt5Connect) */ @CheckReturnValue - Mqtt5ConnectBuilder.@NotNull Nested connectWith(); + Mqtt5ConnectBuilder.@NotNull Nested connectWith(); /** * Returns the currently set Connect message the client will try to reconnect with. *

    * If the {@link #connect(Mqtt5Connect)} method has not been called before (including previous {@link - * com.hivemq.client.mqtt.lifecycle.MqttClientDisconnectedListener MqttClientDisconnectedListeners}) it will be the - * Connect message that is reconstructed from the {@link com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConnectionConfig + * com.hivemq.client.mqtt.lifecycle.MqttDisconnectedListener MqttDisconnectedListener}s) it will be the Connect + * message that is reconstructed from the {@link com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConnectionConfig * Mqtt5ClientConnectionConfig} or the Connect message of the previous connect try if it has not been successfully * connected. * From 94393afbbaefe9a822e12df1965f74514cea1b94 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Fri, 13 Nov 2020 17:23:20 +0100 Subject: [PATCH 14/62] Reduced package depth of messages - api: max 8 -> 7, internal: max 9 -> 8 - flatted connack, puback/rec/rel/comp, suback, unsuback subpackages --- .../client/mqtt/examples/Mqtt5Features.java | 4 ++-- .../mqtt3/reactor/Mqtt3ReactorClientView.java | 4 ++-- .../internal/mqtt/reactor/MqttReactorClient.java | 6 +++--- .../mqtt/mqtt3/reactor/Mqtt3ReactorClient.java | 4 ++-- .../mqtt/mqtt5/reactor/Mqtt5ReactorClient.java | 6 +++--- .../client/internal/mqtt/MqttAsyncClient.java | 6 +++--- .../client/internal/mqtt/MqttBlockingClient.java | 6 +++--- .../client/internal/mqtt/MqttRxClient.java | 6 +++--- .../codec/decoder/mqtt3/Mqtt3ConnAckDecoder.java | 6 +++--- .../codec/decoder/mqtt3/Mqtt3PubAckDecoder.java | 4 ++-- .../codec/decoder/mqtt3/Mqtt3PubCompDecoder.java | 4 ++-- .../codec/decoder/mqtt3/Mqtt3PubRecDecoder.java | 4 ++-- .../codec/decoder/mqtt3/Mqtt3PubRelDecoder.java | 4 ++-- .../codec/decoder/mqtt3/Mqtt3SubAckDecoder.java | 6 +++--- .../decoder/mqtt3/Mqtt3UnsubAckDecoder.java | 4 ++-- .../codec/decoder/mqtt5/Mqtt5ConnAckDecoder.java | 16 ++++++++-------- .../decoder/mqtt5/Mqtt5MessageDecoderUtil.java | 2 +- .../codec/decoder/mqtt5/Mqtt5PubAckDecoder.java | 10 +++++----- .../codec/decoder/mqtt5/Mqtt5PubCompDecoder.java | 10 +++++----- .../codec/decoder/mqtt5/Mqtt5PubRecDecoder.java | 10 +++++----- .../codec/decoder/mqtt5/Mqtt5PubRelDecoder.java | 10 +++++----- .../codec/decoder/mqtt5/Mqtt5SubAckDecoder.java | 8 ++++---- .../decoder/mqtt5/Mqtt5UnsubAckDecoder.java | 8 ++++---- .../codec/encoder/mqtt3/Mqtt3PubAckEncoder.java | 2 +- .../codec/encoder/mqtt3/Mqtt3PubCompEncoder.java | 2 +- .../codec/encoder/mqtt3/Mqtt3PubRecEncoder.java | 2 +- .../codec/encoder/mqtt3/Mqtt3PubRelEncoder.java | 2 +- .../codec/encoder/mqtt5/Mqtt5PubAckEncoder.java | 6 +++--- .../codec/encoder/mqtt5/Mqtt5PubCompEncoder.java | 6 +++--- .../codec/encoder/mqtt5/Mqtt5PubRecEncoder.java | 6 +++--- .../codec/encoder/mqtt5/Mqtt5PubRelEncoder.java | 6 +++--- .../exceptions/mqtt3/Mqtt3ExceptionFactory.java | 8 ++++---- .../internal/mqtt/handler/MqttSession.java | 2 +- .../handler/auth/MqttConnectAuthHandler.java | 4 ++-- .../auth/MqttDisconnectOnAuthHandler.java | 2 +- .../mqtt/handler/connect/MqttConnAckFlow.java | 2 +- .../mqtt/handler/connect/MqttConnAckSingle.java | 2 +- .../mqtt/handler/connect/MqttConnectHandler.java | 4 ++-- .../disconnect/MqttDisconnectHandler.java | 2 +- .../incoming/MqttIncomingPublishFlows.java | 6 +++--- .../publish/incoming/MqttIncomingQosHandler.java | 11 ++--------- .../incoming/MqttSubscribedPublishFlow.java | 4 ++-- .../incoming/MqttSubscribedPublishFlowable.java | 2 +- .../publish/outgoing/MqttOutgoingQosHandler.java | 9 +-------- .../publish/outgoing/MqttPubRelWithFlow.java | 4 ++-- .../mqtt/handler/subscribe/MqttSubAckSingle.java | 4 ++-- .../handler/subscribe/MqttSubscribeWithFlow.java | 2 +- .../subscribe/MqttSubscriptionHandler.java | 10 +++++----- .../handler/subscribe/MqttUnsubAckSingle.java | 4 ++-- .../subscribe/MqttUnsubscribeWithFlow.java | 2 +- .../mqtt/lifecycle/MqttConnectedContextImpl.java | 2 +- .../mqtt3/Mqtt3ConnectedContextView.java | 4 ++-- .../connect/{connack => }/MqttConnAck.java | 6 +++--- .../{connack => }/MqttConnAckProperty.java | 2 +- .../{connack => }/MqttConnAckRestrictions.java | 4 ++-- .../{connack => }/mqtt3/Mqtt3ConnAckView.java | 16 ++++++++-------- .../message/publish/{puback => }/MqttPubAck.java | 6 +++--- .../publish/{puback => }/MqttPubAckBuilder.java | 7 +++---- .../publish/{puback => }/MqttPubAckProperty.java | 2 +- .../publish/{pubcomp => }/MqttPubComp.java | 6 +++--- .../{pubcomp => }/MqttPubCompBuilder.java | 7 +++---- .../{pubcomp => }/MqttPubCompProperty.java | 2 +- .../message/publish/{pubrec => }/MqttPubRec.java | 6 +++--- .../publish/{pubrec => }/MqttPubRecBuilder.java | 7 +++---- .../publish/{pubrec => }/MqttPubRecProperty.java | 2 +- .../message/publish/{pubrel => }/MqttPubRel.java | 6 +++--- .../publish/{pubrel => }/MqttPubRelBuilder.java | 7 +++---- .../publish/{pubrel => }/MqttPubRelProperty.java | 2 +- .../mqtt/message/publish/MqttPublishResult.java | 4 ---- .../{puback => }/mqtt3/Mqtt3PubAckView.java | 8 ++++---- .../{pubcomp => }/mqtt3/Mqtt3PubCompView.java | 8 ++++---- .../{pubrec => }/mqtt3/Mqtt3PubRecView.java | 8 ++++---- .../{pubrel => }/mqtt3/Mqtt3PubRelView.java | 8 ++++---- .../subscribe/{suback => }/MqttSubAck.java | 6 +++--- .../{suback => }/MqttSubAckProperty.java | 2 +- .../{suback => }/mqtt3/Mqtt3SubAckView.java | 12 ++++++------ .../unsubscribe/{unsuback => }/MqttUnsubAck.java | 6 +++--- .../{unsuback => }/MqttUnsubAckProperty.java | 2 +- .../{unsuback => }/mqtt3/Mqtt3UnsubAckView.java | 8 ++++---- .../mqtt/mqtt3/Mqtt3AsyncClientView.java | 10 +++++----- .../mqtt/mqtt3/Mqtt3BlockingClientView.java | 8 ++++---- .../internal/mqtt/mqtt3/Mqtt3RxClientView.java | 12 ++++++------ .../client/mqtt/mqtt3/Mqtt3AsyncClient.java | 4 ++-- .../client/mqtt/mqtt3/Mqtt3BlockingClient.java | 4 ++-- .../hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java | 4 ++-- .../mqtt3/exceptions/Mqtt3ConnAckException.java | 2 +- .../mqtt3/exceptions/Mqtt3PubAckException.java | 4 ++-- .../mqtt3/exceptions/Mqtt3PubRecException.java | 4 ++-- .../mqtt3/exceptions/Mqtt3SubAckException.java | 2 +- .../mqtt3/exceptions/Mqtt3UnsubAckException.java | 4 ++-- .../mqtt3/lifecycle/Mqtt3ConnectedContext.java | 2 +- .../connect/{connack => }/Mqtt3ConnAck.java | 2 +- .../{connack => }/Mqtt3ConnAckReturnCode.java | 2 +- .../publish/{puback => }/Mqtt3PubAck.java | 2 +- .../publish/{pubcomp => }/Mqtt3PubComp.java | 2 +- .../publish/{pubrec => }/Mqtt3PubRec.java | 2 +- .../publish/{pubrel => }/Mqtt3PubRel.java | 2 +- .../subscribe/{suback => }/Mqtt3SubAck.java | 2 +- .../{suback => }/Mqtt3SubAckReturnCode.java | 2 +- .../{unsuback => }/Mqtt3UnsubAck.java | 2 +- .../client/mqtt/mqtt5/Mqtt5AsyncClient.java | 6 +++--- .../client/mqtt/mqtt5/Mqtt5BlockingClient.java | 6 +++--- .../mqtt/mqtt5/Mqtt5ClientConnectionConfig.java | 16 ++++++++-------- .../hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java | 6 +++--- .../qos1/Mqtt5IncomingQos1Interceptor.java | 2 +- .../qos1/Mqtt5OutgoingQos1Interceptor.java | 2 +- .../qos2/Mqtt5IncomingQos2Interceptor.java | 6 +++--- .../qos2/Mqtt5OutgoingQos2Interceptor.java | 6 +----- .../mqtt5/auth/Mqtt5EnhancedAuthMechanism.java | 2 +- .../mqtt5/exceptions/Mqtt5ConnAckException.java | 2 +- .../mqtt5/exceptions/Mqtt5PubAckException.java | 2 +- .../mqtt5/exceptions/Mqtt5PubRecException.java | 2 +- .../mqtt5/exceptions/Mqtt5SubAckException.java | 2 +- .../mqtt5/exceptions/Mqtt5UnsubAckException.java | 2 +- .../mqtt5/lifecycle/Mqtt5ConnectedContext.java | 2 +- .../connect/{connack => }/Mqtt5ConnAck.java | 2 +- .../{connack => }/Mqtt5ConnAckReasonCode.java | 2 +- .../{connack => }/Mqtt5ConnAckRestrictions.java | 2 +- .../connect/Mqtt5ConnectRestrictions.java | 11 ++++------- .../publish/{puback => }/Mqtt5PubAck.java | 2 +- .../publish/{puback => }/Mqtt5PubAckBuilder.java | 2 +- .../{puback => }/Mqtt5PubAckReasonCode.java | 2 +- .../publish/{pubcomp => }/Mqtt5PubComp.java | 2 +- .../{pubcomp => }/Mqtt5PubCompBuilder.java | 2 +- .../{pubcomp => }/Mqtt5PubCompReasonCode.java | 2 +- .../publish/{pubrec => }/Mqtt5PubRec.java | 2 +- .../publish/{pubrec => }/Mqtt5PubRecBuilder.java | 2 +- .../{pubrec => }/Mqtt5PubRecReasonCode.java | 2 +- .../publish/{pubrel => }/Mqtt5PubRel.java | 2 +- .../publish/{pubrel => }/Mqtt5PubRelBuilder.java | 2 +- .../{pubrel => }/Mqtt5PubRelReasonCode.java | 2 +- .../message/publish/Mqtt5PublishResult.java | 4 ---- .../subscribe/{suback => }/Mqtt5SubAck.java | 2 +- .../{suback => }/Mqtt5SubAckReasonCode.java | 2 +- .../{unsuback => }/Mqtt5UnsubAck.java | 2 +- .../{unsuback => }/Mqtt5UnsubAckReasonCode.java | 2 +- .../client/example/Mqtt3ClientExample.java | 2 +- .../decoder/mqtt3/Mqtt3ConnAckDecoderTest.java | 4 ++-- .../decoder/mqtt3/Mqtt3PubAckDecoderTest.java | 2 +- .../decoder/mqtt3/Mqtt3PubCompDecoderTest.java | 2 +- .../decoder/mqtt3/Mqtt3PubRecDecoderTest.java | 2 +- .../decoder/mqtt3/Mqtt3PubRelDecoderTest.java | 2 +- .../decoder/mqtt3/Mqtt3SubAckDecoderTest.java | 4 ++-- .../decoder/mqtt3/Mqtt3UnsubAckDecoderTest.java | 2 +- .../decoder/mqtt5/Mqtt5ConnAckDecoderTest.java | 10 +++++----- .../decoder/mqtt5/Mqtt5PubAckDecoderTest.java | 4 ++-- .../decoder/mqtt5/Mqtt5PubCompDecoderTest.java | 4 ++-- .../decoder/mqtt5/Mqtt5PubRecDecoderTest.java | 6 +++--- .../decoder/mqtt5/Mqtt5PubRelDecoderTest.java | 6 +++--- .../decoder/mqtt5/Mqtt5SubAckDecoderTest.java | 4 ++-- .../decoder/mqtt5/Mqtt5UnsubAckDecoderTest.java | 8 ++++---- .../encoder/mqtt3/Mqtt3PubAckEncoderTest.java | 4 ++-- .../encoder/mqtt3/Mqtt3PubCompEncoderTest.java | 4 ++-- .../encoder/mqtt3/Mqtt3PubRecEncoderTest.java | 4 ++-- .../encoder/mqtt3/Mqtt3PubRelEncoderTest.java | 4 ++-- .../encoder/mqtt5/Mqtt5ConnectEncoderTest.java | 2 +- .../encoder/mqtt5/Mqtt5PubAckEncoderTest.java | 4 ++-- .../encoder/mqtt5/Mqtt5PubCompEncoderTest.java | 8 ++++---- .../encoder/mqtt5/Mqtt5PubRecEncoderTest.java | 6 +++--- .../encoder/mqtt5/Mqtt5PubRelEncoderTest.java | 6 +++--- .../MqttConnAckRestrictionsTest.java | 2 +- .../connect/{connack => }/MqttConnAckTest.java | 2 +- .../mqtt3/Mqtt3ConnAckViewTest.java | 2 +- .../publish/{puback => }/MqttPubAckTest.java | 2 +- .../publish/{pubcomp => }/MqttPubCompTest.java | 2 +- .../publish/{pubrec => }/MqttPubRecTest.java | 2 +- .../publish/{pubrel => }/MqttPubRelTest.java | 2 +- .../subscribe/{suback => }/MqttSubAckTest.java | 2 +- .../{suback => }/mqtt3/Mqtt3SubAckViewTest.java | 2 +- .../{unsuback => }/MqttUnsubAckTest.java | 6 +++--- .../mqtt3/Mqtt3RxClientViewExceptionsTest.java | 2 +- .../exceptions/Mqtt3ConnAckExceptionTest.java | 2 +- .../exceptions/Mqtt3SubAckExceptionTest.java | 2 +- .../Mqtt3ConnAckReturnCodeTest.java | 2 +- .../{suback => }/Mqtt3SubAckReturnCodeTest.java | 2 +- .../exceptions/Mqtt5ConnAckExceptionTest.java | 2 +- .../exceptions/Mqtt5PubAckExceptionTest.java | 2 +- .../exceptions/Mqtt5PubRecExceptionTest.java | 2 +- .../exceptions/Mqtt5SubAckExceptionTest.java | 2 +- .../exceptions/Mqtt5UnsubAckExceptionTest.java | 2 +- .../Mqtt5ConnAckReasonCodeTest.java | 2 +- .../{puback => }/Mqtt5PubAckReasonCodeTest.java | 2 +- .../Mqtt5PubCompReasonCodeTest.java | 2 +- .../{pubrec => }/Mqtt5PubRecReasonCodeTest.java | 2 +- .../{pubrel => }/Mqtt5PubRelReasonCodeTest.java | 2 +- .../{suback => }/Mqtt5SubAckReasonCodeTest.java | 2 +- .../Mqtt5UnsubAckReasonCodeTest.java | 2 +- 187 files changed, 377 insertions(+), 410 deletions(-) rename src/main/java/com/hivemq/client/internal/mqtt/message/connect/{connack => }/MqttConnAck.java (97%) rename src/main/java/com/hivemq/client/internal/mqtt/message/connect/{connack => }/MqttConnAckProperty.java (97%) rename src/main/java/com/hivemq/client/internal/mqtt/message/connect/{connack => }/MqttConnAckRestrictions.java (97%) rename src/main/java/com/hivemq/client/internal/mqtt/message/connect/{connack => }/mqtt3/Mqtt3ConnAckView.java (87%) rename src/main/java/com/hivemq/client/internal/mqtt/message/publish/{puback => }/MqttPubAck.java (90%) rename src/main/java/com/hivemq/client/internal/mqtt/message/publish/{puback => }/MqttPubAckBuilder.java (90%) rename src/main/java/com/hivemq/client/internal/mqtt/message/publish/{puback => }/MqttPubAckProperty.java (94%) rename src/main/java/com/hivemq/client/internal/mqtt/message/publish/{pubcomp => }/MqttPubComp.java (90%) rename src/main/java/com/hivemq/client/internal/mqtt/message/publish/{pubcomp => }/MqttPubCompBuilder.java (90%) rename src/main/java/com/hivemq/client/internal/mqtt/message/publish/{pubcomp => }/MqttPubCompProperty.java (94%) rename src/main/java/com/hivemq/client/internal/mqtt/message/publish/{pubrec => }/MqttPubRec.java (90%) rename src/main/java/com/hivemq/client/internal/mqtt/message/publish/{pubrec => }/MqttPubRecBuilder.java (90%) rename src/main/java/com/hivemq/client/internal/mqtt/message/publish/{pubrec => }/MqttPubRecProperty.java (94%) rename src/main/java/com/hivemq/client/internal/mqtt/message/publish/{pubrel => }/MqttPubRel.java (90%) rename src/main/java/com/hivemq/client/internal/mqtt/message/publish/{pubrel => }/MqttPubRelBuilder.java (90%) rename src/main/java/com/hivemq/client/internal/mqtt/message/publish/{pubrel => }/MqttPubRelProperty.java (94%) rename src/main/java/com/hivemq/client/internal/mqtt/message/publish/{puback => }/mqtt3/Mqtt3PubAckView.java (84%) rename src/main/java/com/hivemq/client/internal/mqtt/message/publish/{pubcomp => }/mqtt3/Mqtt3PubCompView.java (84%) rename src/main/java/com/hivemq/client/internal/mqtt/message/publish/{pubrec => }/mqtt3/Mqtt3PubRecView.java (84%) rename src/main/java/com/hivemq/client/internal/mqtt/message/publish/{pubrel => }/mqtt3/Mqtt3PubRelView.java (84%) rename src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/{suback => }/MqttSubAck.java (91%) rename src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/{suback => }/MqttSubAckProperty.java (94%) rename src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/{suback => }/mqtt3/Mqtt3SubAckView.java (91%) rename src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/{unsuback => }/MqttUnsubAck.java (90%) rename src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/{unsuback => }/MqttUnsubAckProperty.java (93%) rename src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/{unsuback => }/mqtt3/Mqtt3UnsubAckView.java (84%) rename src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/{connack => }/Mqtt3ConnAck.java (95%) rename src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/{connack => }/Mqtt3ConnAckReturnCode.java (97%) rename src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/{puback => }/Mqtt3PubAck.java (95%) rename src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/{pubcomp => }/Mqtt3PubComp.java (95%) rename src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/{pubrec => }/Mqtt3PubRec.java (95%) rename src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/{pubrel => }/Mqtt3PubRel.java (95%) rename src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/{suback => }/Mqtt3SubAck.java (96%) rename src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/{suback => }/Mqtt3SubAckReturnCode.java (97%) rename src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/{unsuback => }/Mqtt3UnsubAck.java (94%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/{connack => }/Mqtt5ConnAck.java (98%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/{connack => }/Mqtt5ConnAckReasonCode.java (98%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/{connack => }/Mqtt5ConnAckRestrictions.java (98%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/{puback => }/Mqtt5PubAck.java (96%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/{puback => }/Mqtt5PubAckBuilder.java (97%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/{puback => }/Mqtt5PubAckReasonCode.java (98%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/{pubcomp => }/Mqtt5PubComp.java (96%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/{pubcomp => }/Mqtt5PubCompBuilder.java (97%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/{pubcomp => }/Mqtt5PubCompReasonCode.java (97%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/{pubrec => }/Mqtt5PubRec.java (96%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/{pubrec => }/Mqtt5PubRecBuilder.java (97%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/{pubrec => }/Mqtt5PubRecReasonCode.java (98%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/{pubrel => }/Mqtt5PubRel.java (96%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/{pubrel => }/Mqtt5PubRelBuilder.java (97%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/{pubrel => }/Mqtt5PubRelReasonCode.java (97%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/{suback => }/Mqtt5SubAck.java (97%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/{suback => }/Mqtt5SubAckReasonCode.java (98%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/{unsuback => }/Mqtt5UnsubAck.java (96%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/{unsuback => }/Mqtt5UnsubAckReasonCode.java (97%) rename src/test/java/com/hivemq/client/internal/mqtt/message/connect/{connack => }/MqttConnAckRestrictionsTest.java (94%) rename src/test/java/com/hivemq/client/internal/mqtt/message/connect/{connack => }/MqttConnAckTest.java (94%) rename src/test/java/com/hivemq/client/internal/mqtt/message/connect/{connack => }/mqtt3/Mqtt3ConnAckViewTest.java (93%) rename src/test/java/com/hivemq/client/internal/mqtt/message/publish/{puback => }/MqttPubAckTest.java (95%) rename src/test/java/com/hivemq/client/internal/mqtt/message/publish/{pubcomp => }/MqttPubCompTest.java (95%) rename src/test/java/com/hivemq/client/internal/mqtt/message/publish/{pubrec => }/MqttPubRecTest.java (95%) rename src/test/java/com/hivemq/client/internal/mqtt/message/publish/{pubrel => }/MqttPubRelTest.java (95%) rename src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/{suback => }/MqttSubAckTest.java (94%) rename src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/{suback => }/mqtt3/Mqtt3SubAckViewTest.java (92%) rename src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/{unsuback => }/MqttUnsubAckTest.java (95%) rename src/test/java/com/hivemq/client/mqtt/mqtt3/message/connect/{connack => }/Mqtt3ConnAckReturnCodeTest.java (97%) rename src/test/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/{suback => }/Mqtt3SubAckReturnCodeTest.java (97%) rename src/test/java/com/hivemq/client/mqtt/mqtt5/message/connect/{connack => }/Mqtt5ConnAckReasonCodeTest.java (99%) rename src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/{puback => }/Mqtt5PubAckReasonCodeTest.java (98%) rename src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/{pubcomp => }/Mqtt5PubCompReasonCodeTest.java (98%) rename src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/{pubrec => }/Mqtt5PubRecReasonCodeTest.java (98%) rename src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/{pubrel => }/Mqtt5PubRelReasonCodeTest.java (98%) rename src/test/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/{suback => }/Mqtt5SubAckReasonCodeTest.java (98%) rename src/test/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/{unsuback => }/Mqtt5UnsubAckReasonCodeTest.java (98%) diff --git a/examples/src/main/java/com/hivemq/client/mqtt/examples/Mqtt5Features.java b/examples/src/main/java/com/hivemq/client/mqtt/examples/Mqtt5Features.java index 4fbd65106..24ef04973 100644 --- a/examples/src/main/java/com/hivemq/client/mqtt/examples/Mqtt5Features.java +++ b/examples/src/main/java/com/hivemq/client/mqtt/examples/Mqtt5Features.java @@ -21,10 +21,10 @@ import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient; import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient; import com.hivemq.client.mqtt.mqtt5.Mqtt5Client; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5RetainHandling; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import java.util.concurrent.CountDownLatch; diff --git a/reactor/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/reactor/Mqtt3ReactorClientView.java b/reactor/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/reactor/Mqtt3ReactorClientView.java index 5cfb253bd..4d062709a 100644 --- a/reactor/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/reactor/Mqtt3ReactorClientView.java +++ b/reactor/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/reactor/Mqtt3ReactorClientView.java @@ -25,12 +25,12 @@ import com.hivemq.client.mqtt.mqtt3.Mqtt3BlockingClient; import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientConfig; import com.hivemq.client.mqtt.mqtt3.Mqtt3RxClient; +import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; -import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult; +import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.suback.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import com.hivemq.client.mqtt.mqtt3.reactor.Mqtt3ReactorClient; import com.hivemq.client.rx.reactor.FluxWithSingle; diff --git a/reactor/src/main/java/com/hivemq/client/internal/mqtt/reactor/MqttReactorClient.java b/reactor/src/main/java/com/hivemq/client/internal/mqtt/reactor/MqttReactorClient.java index 351ed3ebe..459abd75d 100644 --- a/reactor/src/main/java/com/hivemq/client/internal/mqtt/reactor/MqttReactorClient.java +++ b/reactor/src/main/java/com/hivemq/client/internal/mqtt/reactor/MqttReactorClient.java @@ -27,15 +27,15 @@ import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient; import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; import com.hivemq.client.mqtt.mqtt5.Mqtt5RxClient; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck; +import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAck; import com.hivemq.client.mqtt.mqtt5.reactor.Mqtt5ReactorClient; import com.hivemq.client.rx.reactor.FluxWithSingle; import io.reactivex.Flowable; diff --git a/reactor/src/main/java/com/hivemq/client/mqtt/mqtt3/reactor/Mqtt3ReactorClient.java b/reactor/src/main/java/com/hivemq/client/mqtt/mqtt3/reactor/Mqtt3ReactorClient.java index 9ec071eef..28dd8105f 100644 --- a/reactor/src/main/java/com/hivemq/client/mqtt/mqtt3/reactor/Mqtt3ReactorClient.java +++ b/reactor/src/main/java/com/hivemq/client/mqtt/mqtt3/reactor/Mqtt3ReactorClient.java @@ -21,14 +21,14 @@ import com.hivemq.client.internal.mqtt.mqtt3.reactor.Mqtt3ReactorClientView; import com.hivemq.client.mqtt.MqttGlobalPublishFilter; import com.hivemq.client.mqtt.mqtt3.Mqtt3Client; +import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnectBuilder; -import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult; +import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilder; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.suback.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; import com.hivemq.client.rx.reactor.FluxWithSingle; diff --git a/reactor/src/main/java/com/hivemq/client/mqtt/mqtt5/reactor/Mqtt5ReactorClient.java b/reactor/src/main/java/com/hivemq/client/mqtt/mqtt5/reactor/Mqtt5ReactorClient.java index 76c64eb4b..a33aa31cc 100644 --- a/reactor/src/main/java/com/hivemq/client/mqtt/mqtt5/reactor/Mqtt5ReactorClient.java +++ b/reactor/src/main/java/com/hivemq/client/mqtt/mqtt5/reactor/Mqtt5ReactorClient.java @@ -21,19 +21,19 @@ import com.hivemq.client.internal.mqtt.reactor.MqttReactorClient; import com.hivemq.client.mqtt.MqttGlobalPublishFilter; import com.hivemq.client.mqtt.mqtt5.Mqtt5Client; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectBuilder; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectBuilder; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubscribeBuilder; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck; +import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubscribeBuilder; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAck; import com.hivemq.client.rx.reactor.FluxWithSingle; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Publisher; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java index 00d1e0328..0410b03bb 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java @@ -31,15 +31,15 @@ import com.hivemq.client.internal.util.Checks; import com.hivemq.client.mqtt.MqttGlobalPublishFilter; import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck; +import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAck; import io.reactivex.FlowableSubscriber; import io.reactivex.schedulers.Schedulers; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java index db775c190..859f3b16c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java @@ -35,15 +35,15 @@ import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5SubAckException; import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5UnsubAckException; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck; +import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAck; import io.reactivex.Flowable; import io.reactivex.FlowableSubscriber; import io.reactivex.internal.subscriptions.SubscriptionHelper; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java index 971c15f71..b946c60bd 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java @@ -39,15 +39,15 @@ import com.hivemq.client.internal.util.Checks; import com.hivemq.client.mqtt.MqttGlobalPublishFilter; import com.hivemq.client.mqtt.mqtt5.Mqtt5RxClient; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck; +import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAck; import com.hivemq.client.rx.FlowableWithSingle; import io.reactivex.Completable; import io.reactivex.Flowable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ConnAckDecoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ConnAckDecoder.java index beeb576f1..89ac60eb4 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ConnAckDecoder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ConnAckDecoder.java @@ -19,9 +19,9 @@ import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.message.connect.connack.MqttConnAck; -import com.hivemq.client.internal.mqtt.message.connect.connack.mqtt3.Mqtt3ConnAckView; -import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAckReturnCode; +import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; +import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnAckView; +import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAckReturnCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubAckDecoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubAckDecoder.java index b27396df7..46c4900be 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubAckDecoder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubAckDecoder.java @@ -19,8 +19,8 @@ import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.message.publish.puback.MqttPubAck; -import com.hivemq.client.internal.mqtt.message.publish.puback.mqtt3.Mqtt3PubAckView; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubAck; +import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubAckView; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubCompDecoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubCompDecoder.java index 15cb121e4..8099754c5 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubCompDecoder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubCompDecoder.java @@ -19,8 +19,8 @@ import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.message.publish.pubcomp.MqttPubComp; -import com.hivemq.client.internal.mqtt.message.publish.pubcomp.mqtt3.Mqtt3PubCompView; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubComp; +import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubCompView; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRecDecoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRecDecoder.java index da8be5614..142feb8ae 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRecDecoder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRecDecoder.java @@ -19,8 +19,8 @@ import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.message.publish.pubrec.MqttPubRec; -import com.hivemq.client.internal.mqtt.message.publish.pubrec.mqtt3.Mqtt3PubRecView; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubRec; +import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubRecView; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRelDecoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRelDecoder.java index 2d57d6db3..552ae56f7 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRelDecoder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRelDecoder.java @@ -19,8 +19,8 @@ import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.message.publish.pubrel.MqttPubRel; -import com.hivemq.client.internal.mqtt.message.publish.pubrel.mqtt3.Mqtt3PubRelView; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubRel; +import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubRelView; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3SubAckDecoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3SubAckDecoder.java index a1a067d2f..32a137795 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3SubAckDecoder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3SubAckDecoder.java @@ -19,10 +19,10 @@ import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.message.subscribe.suback.MqttSubAck; -import com.hivemq.client.internal.mqtt.message.subscribe.suback.mqtt3.Mqtt3SubAckView; +import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; +import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubAckView; import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.suback.Mqtt3SubAckReturnCode; +import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAckReturnCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3UnsubAckDecoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3UnsubAckDecoder.java index fe4ee306e..ec01fb5be 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3UnsubAckDecoder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3UnsubAckDecoder.java @@ -19,8 +19,8 @@ import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.message.unsubscribe.unsuback.MqttUnsubAck; -import com.hivemq.client.internal.mqtt.message.unsubscribe.unsuback.mqtt3.Mqtt3UnsubAckView; +import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubAck; +import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ConnAckDecoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ConnAckDecoder.java index 2949a5b6c..8224d5f25 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ConnAckDecoder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ConnAckDecoder.java @@ -21,12 +21,12 @@ import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; import com.hivemq.client.internal.mqtt.datatypes.*; import com.hivemq.client.internal.mqtt.message.auth.MqttEnhancedAuth; -import com.hivemq.client.internal.mqtt.message.connect.connack.MqttConnAck; -import com.hivemq.client.internal.mqtt.message.connect.connack.MqttConnAckRestrictions; +import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; +import com.hivemq.client.internal.mqtt.message.connect.MqttConnAckRestrictions; import com.hivemq.client.internal.util.collections.ImmutableList; import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAckReturnCode; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckReasonCode; +import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAckReturnCode; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckReasonCode; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; @@ -37,10 +37,10 @@ import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.*; import static com.hivemq.client.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; -import static com.hivemq.client.internal.mqtt.message.connect.connack.MqttConnAck.KEEP_ALIVE_FROM_CONNECT; -import static com.hivemq.client.internal.mqtt.message.connect.connack.MqttConnAck.SESSION_EXPIRY_INTERVAL_FROM_CONNECT; -import static com.hivemq.client.internal.mqtt.message.connect.connack.MqttConnAckProperty.*; -import static com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckRestrictions.*; +import static com.hivemq.client.internal.mqtt.message.connect.MqttConnAck.KEEP_ALIVE_FROM_CONNECT; +import static com.hivemq.client.internal.mqtt.message.connect.MqttConnAck.SESSION_EXPIRY_INTERVAL_FROM_CONNECT; +import static com.hivemq.client.internal.mqtt.message.connect.MqttConnAckProperty.*; +import static com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions.*; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5MessageDecoderUtil.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5MessageDecoderUtil.java index 7beccb86b..ac0f592f5 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5MessageDecoderUtil.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5MessageDecoderUtil.java @@ -32,7 +32,7 @@ import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.malformedUTF8String; import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; -import static com.hivemq.client.internal.mqtt.message.connect.connack.MqttConnAck.SESSION_EXPIRY_INTERVAL_FROM_CONNECT; +import static com.hivemq.client.internal.mqtt.message.connect.MqttConnAck.SESSION_EXPIRY_INTERVAL_FROM_CONNECT; /** * Util for decoders for MQTT 5 messages. diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubAckDecoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubAckDecoder.java index 307f81edb..59f3b22b6 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubAckDecoder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubAckDecoder.java @@ -22,9 +22,9 @@ import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.publish.puback.MqttPubAck; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubAck; import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.publish.puback.Mqtt5PubAckReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAckReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; @@ -34,9 +34,9 @@ import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; import static com.hivemq.client.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; -import static com.hivemq.client.internal.mqtt.message.publish.puback.MqttPubAck.DEFAULT_REASON_CODE; -import static com.hivemq.client.internal.mqtt.message.publish.puback.MqttPubAckProperty.REASON_STRING; -import static com.hivemq.client.internal.mqtt.message.publish.puback.MqttPubAckProperty.USER_PROPERTY; +import static com.hivemq.client.internal.mqtt.message.publish.MqttPubAck.DEFAULT_REASON_CODE; +import static com.hivemq.client.internal.mqtt.message.publish.MqttPubAckProperty.REASON_STRING; +import static com.hivemq.client.internal.mqtt.message.publish.MqttPubAckProperty.USER_PROPERTY; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubCompDecoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubCompDecoder.java index 552fe31e7..1fca4208a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubCompDecoder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubCompDecoder.java @@ -22,9 +22,9 @@ import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.publish.pubcomp.MqttPubComp; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubComp; import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubcomp.Mqtt5PubCompReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; @@ -34,9 +34,9 @@ import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; import static com.hivemq.client.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; -import static com.hivemq.client.internal.mqtt.message.publish.pubcomp.MqttPubComp.DEFAULT_REASON_CODE; -import static com.hivemq.client.internal.mqtt.message.publish.pubcomp.MqttPubCompProperty.REASON_STRING; -import static com.hivemq.client.internal.mqtt.message.publish.pubcomp.MqttPubCompProperty.USER_PROPERTY; +import static com.hivemq.client.internal.mqtt.message.publish.MqttPubComp.DEFAULT_REASON_CODE; +import static com.hivemq.client.internal.mqtt.message.publish.MqttPubCompProperty.REASON_STRING; +import static com.hivemq.client.internal.mqtt.message.publish.MqttPubCompProperty.USER_PROPERTY; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRecDecoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRecDecoder.java index 735b7f649..564230d65 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRecDecoder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRecDecoder.java @@ -22,9 +22,9 @@ import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.publish.pubrec.MqttPubRec; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubRec; import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrec.Mqtt5PubRecReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; @@ -34,9 +34,9 @@ import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; import static com.hivemq.client.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; -import static com.hivemq.client.internal.mqtt.message.publish.pubrec.MqttPubRec.DEFAULT_REASON_CODE; -import static com.hivemq.client.internal.mqtt.message.publish.pubrec.MqttPubRecProperty.REASON_STRING; -import static com.hivemq.client.internal.mqtt.message.publish.pubrec.MqttPubRecProperty.USER_PROPERTY; +import static com.hivemq.client.internal.mqtt.message.publish.MqttPubRec.DEFAULT_REASON_CODE; +import static com.hivemq.client.internal.mqtt.message.publish.MqttPubRecProperty.REASON_STRING; +import static com.hivemq.client.internal.mqtt.message.publish.MqttPubRecProperty.USER_PROPERTY; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRelDecoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRelDecoder.java index 34b98248b..352eabbef 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRelDecoder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRelDecoder.java @@ -22,9 +22,9 @@ import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.publish.pubrel.MqttPubRel; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubRel; import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrel.Mqtt5PubRelReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; @@ -34,9 +34,9 @@ import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; import static com.hivemq.client.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; -import static com.hivemq.client.internal.mqtt.message.publish.pubrel.MqttPubRel.DEFAULT_REASON_CODE; -import static com.hivemq.client.internal.mqtt.message.publish.pubrel.MqttPubRelProperty.REASON_STRING; -import static com.hivemq.client.internal.mqtt.message.publish.pubrel.MqttPubRelProperty.USER_PROPERTY; +import static com.hivemq.client.internal.mqtt.message.publish.MqttPubRel.DEFAULT_REASON_CODE; +import static com.hivemq.client.internal.mqtt.message.publish.MqttPubRelProperty.REASON_STRING; +import static com.hivemq.client.internal.mqtt.message.publish.MqttPubRelProperty.USER_PROPERTY; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5SubAckDecoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5SubAckDecoder.java index e4b0d4cda..466a84c52 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5SubAckDecoder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5SubAckDecoder.java @@ -22,9 +22,9 @@ import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.subscribe.suback.MqttSubAck; +import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAckReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAckReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; @@ -34,8 +34,8 @@ import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; import static com.hivemq.client.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; -import static com.hivemq.client.internal.mqtt.message.subscribe.suback.MqttSubAckProperty.REASON_STRING; -import static com.hivemq.client.internal.mqtt.message.subscribe.suback.MqttSubAckProperty.USER_PROPERTY; +import static com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAckProperty.REASON_STRING; +import static com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAckProperty.USER_PROPERTY; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoder.java index 3144b0cbf..423597ae0 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoder.java @@ -22,9 +22,9 @@ import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.unsubscribe.unsuback.MqttUnsubAck; +import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubAck; import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAckReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; @@ -34,8 +34,8 @@ import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; import static com.hivemq.client.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; -import static com.hivemq.client.internal.mqtt.message.unsubscribe.unsuback.MqttUnsubAckProperty.REASON_STRING; -import static com.hivemq.client.internal.mqtt.message.unsubscribe.unsuback.MqttUnsubAckProperty.USER_PROPERTY; +import static com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubAckProperty.REASON_STRING; +import static com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubAckProperty.USER_PROPERTY; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubAckEncoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubAckEncoder.java index 4143c90cd..f93e0b8db 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubAckEncoder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubAckEncoder.java @@ -17,7 +17,7 @@ package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; import com.hivemq.client.internal.mqtt.codec.encoder.mqtt3.Mqtt3MessageEncoder.Mqtt3MessageWithIdEncoder; -import com.hivemq.client.internal.mqtt.message.publish.puback.MqttPubAck; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubAck; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; import javax.inject.Inject; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubCompEncoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubCompEncoder.java index 5a537146c..3f40349e6 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubCompEncoder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubCompEncoder.java @@ -17,7 +17,7 @@ package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; import com.hivemq.client.internal.mqtt.codec.encoder.mqtt3.Mqtt3MessageEncoder.Mqtt3MessageWithIdEncoder; -import com.hivemq.client.internal.mqtt.message.publish.pubcomp.MqttPubComp; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubComp; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; import javax.inject.Inject; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRecEncoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRecEncoder.java index ab678e32c..501b35d3c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRecEncoder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRecEncoder.java @@ -17,7 +17,7 @@ package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; import com.hivemq.client.internal.mqtt.codec.encoder.mqtt3.Mqtt3MessageEncoder.Mqtt3MessageWithIdEncoder; -import com.hivemq.client.internal.mqtt.message.publish.pubrec.MqttPubRec; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubRec; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; import javax.inject.Inject; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRelEncoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRelEncoder.java index 01ef046a4..f4ba10b50 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRelEncoder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRelEncoder.java @@ -17,7 +17,7 @@ package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; import com.hivemq.client.internal.mqtt.codec.encoder.mqtt3.Mqtt3MessageEncoder.Mqtt3MessageWithIdEncoder; -import com.hivemq.client.internal.mqtt.message.publish.pubrel.MqttPubRel; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubRel; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; import javax.inject.Inject; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubAckEncoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubAckEncoder.java index e4ad274b5..d5d0df2f0 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubAckEncoder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubAckEncoder.java @@ -16,15 +16,15 @@ package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; -import com.hivemq.client.internal.mqtt.message.publish.puback.MqttPubAck; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubAck; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.publish.puback.Mqtt5PubAckReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAckReasonCode; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.message.publish.puback.MqttPubAck.DEFAULT_REASON_CODE; +import static com.hivemq.client.internal.mqtt.message.publish.MqttPubAck.DEFAULT_REASON_CODE; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubCompEncoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubCompEncoder.java index f1cac1fd6..09eb840d3 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubCompEncoder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubCompEncoder.java @@ -16,15 +16,15 @@ package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; -import com.hivemq.client.internal.mqtt.message.publish.pubcomp.MqttPubComp; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubComp; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubcomp.Mqtt5PubCompReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.message.publish.pubcomp.MqttPubComp.DEFAULT_REASON_CODE; +import static com.hivemq.client.internal.mqtt.message.publish.MqttPubComp.DEFAULT_REASON_CODE; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRecEncoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRecEncoder.java index 42fb61b0a..20f314676 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRecEncoder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRecEncoder.java @@ -16,15 +16,15 @@ package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; -import com.hivemq.client.internal.mqtt.message.publish.pubrec.MqttPubRec; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubRec; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrec.Mqtt5PubRecReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.message.publish.pubrec.MqttPubRec.DEFAULT_REASON_CODE; +import static com.hivemq.client.internal.mqtt.message.publish.MqttPubRec.DEFAULT_REASON_CODE; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRelEncoder.java b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRelEncoder.java index cba0adab5..5c7845ecb 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRelEncoder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRelEncoder.java @@ -16,15 +16,15 @@ package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; -import com.hivemq.client.internal.mqtt.message.publish.pubrel.MqttPubRel; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubRel; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrel.Mqtt5PubRelReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.message.publish.pubrel.MqttPubRel.DEFAULT_REASON_CODE; +import static com.hivemq.client.internal.mqtt.message.publish.MqttPubRel.DEFAULT_REASON_CODE; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java b/src/main/java/com/hivemq/client/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java index 6c3083380..5e3ae4304 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java @@ -16,10 +16,10 @@ package com.hivemq.client.internal.mqtt.exceptions.mqtt3; -import com.hivemq.client.internal.mqtt.message.connect.connack.MqttConnAck; -import com.hivemq.client.internal.mqtt.message.connect.connack.mqtt3.Mqtt3ConnAckView; -import com.hivemq.client.internal.mqtt.message.subscribe.suback.MqttSubAck; -import com.hivemq.client.internal.mqtt.message.subscribe.suback.mqtt3.Mqtt3SubAckView; +import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; +import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnAckView; +import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; +import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubAckView; import com.hivemq.client.mqtt.exceptions.MqttSessionExpiredException; import com.hivemq.client.mqtt.mqtt3.exceptions.*; import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5MessageException; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttSession.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttSession.java index b2319d966..e93b899c5 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttSession.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttSession.java @@ -23,8 +23,8 @@ import com.hivemq.client.internal.mqtt.handler.publish.outgoing.MqttOutgoingQosHandler; import com.hivemq.client.internal.mqtt.handler.subscribe.MqttSubscriptionHandler; import com.hivemq.client.internal.mqtt.ioc.ClientScope; +import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.connack.MqttConnAck; import com.hivemq.client.mqtt.exceptions.MqttSessionExpiredException; import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5ConnAckException; import io.netty.channel.ChannelPipeline; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttConnectAuthHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttConnectAuthHandler.java index c8ad5076b..b0eb646df 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttConnectAuthHandler.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttConnectAuthHandler.java @@ -22,9 +22,9 @@ import com.hivemq.client.internal.mqtt.ioc.ConnectionScope; import com.hivemq.client.internal.mqtt.message.auth.MqttAuth; import com.hivemq.client.internal.mqtt.message.auth.MqttEnhancedAuthBuilder; +import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; import com.hivemq.client.internal.mqtt.message.connect.MqttStatefulConnect; -import com.hivemq.client.internal.mqtt.message.connect.connack.MqttConnAck; import com.hivemq.client.internal.netty.DefaultChannelOutboundHandler; import com.hivemq.client.internal.util.Checks; import com.hivemq.client.mqtt.exceptions.ConnectionFailedException; @@ -35,8 +35,8 @@ import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5ConnAckException; import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuth; import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuthBuilder; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPromise; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttDisconnectOnAuthHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttDisconnectOnAuthHandler.java index 8ffa3adb0..d58da8588 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttDisconnectOnAuthHandler.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttDisconnectOnAuthHandler.java @@ -18,7 +18,7 @@ import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectUtil; import com.hivemq.client.internal.mqtt.message.auth.MqttAuth; -import com.hivemq.client.internal.mqtt.message.connect.connack.MqttConnAck; +import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5AuthException; import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5ConnAckException; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckFlow.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckFlow.java index b6d2215ca..d7f4f5cdd 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckFlow.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckFlow.java @@ -16,7 +16,7 @@ package com.hivemq.client.internal.mqtt.handler.connect; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java index bd635e40d..398ccaa74 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java @@ -28,7 +28,7 @@ import com.hivemq.client.mqtt.lifecycle.MqttDisconnectSource; import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedContext; import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedListener; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import io.netty.bootstrap.Bootstrap; import io.netty.channel.EventLoop; import io.reactivex.Single; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnectHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnectHandler.java index 43a48b9cf..512d2453f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnectHandler.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnectHandler.java @@ -31,10 +31,10 @@ import com.hivemq.client.internal.mqtt.ioc.ConnectionScope; import com.hivemq.client.internal.mqtt.lifecycle.MqttConnectedContextImpl; import com.hivemq.client.internal.mqtt.message.MqttMessage; +import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; +import com.hivemq.client.internal.mqtt.message.connect.MqttConnAckRestrictions; import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; import com.hivemq.client.internal.mqtt.message.connect.MqttConnectRestrictions; -import com.hivemq.client.internal.mqtt.message.connect.connack.MqttConnAck; -import com.hivemq.client.internal.mqtt.message.connect.connack.MqttConnAckRestrictions; import com.hivemq.client.internal.util.collections.ImmutableList; import com.hivemq.client.mqtt.MqttClientState; import com.hivemq.client.mqtt.MqttVersion; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectHandler.java index 145c8afe0..5755679e0 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectHandler.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectHandler.java @@ -26,9 +26,9 @@ import com.hivemq.client.internal.mqtt.handler.MqttSession; import com.hivemq.client.internal.mqtt.handler.connect.MqttConnAckSingle; import com.hivemq.client.internal.mqtt.ioc.ConnectionScope; +import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; import com.hivemq.client.internal.mqtt.message.connect.MqttConnectRestrictions; -import com.hivemq.client.internal.mqtt.message.connect.connack.MqttConnAck; import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect; import com.hivemq.client.internal.rx.CompletableFlow; import com.hivemq.client.mqtt.MqttVersion; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlows.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlows.java index 75465668f..084860a9e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlows.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlows.java @@ -22,13 +22,13 @@ import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscription; import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; -import com.hivemq.client.internal.mqtt.message.unsubscribe.unsuback.mqtt3.Mqtt3UnsubAckView; +import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; import com.hivemq.client.internal.util.collections.HandleList; import com.hivemq.client.internal.util.collections.HandleList.Handle; import com.hivemq.client.internal.util.collections.ImmutableList; import com.hivemq.client.mqtt.MqttGlobalPublishFilter; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAckReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAckReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAckReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingQosHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingQosHandler.java index ad1e2f7d4..be977d612 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingQosHandler.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingQosHandler.java @@ -25,21 +25,14 @@ import com.hivemq.client.internal.mqtt.handler.MqttSessionAwareHandler; import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectUtil; import com.hivemq.client.internal.mqtt.ioc.ClientScope; -import com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish; -import com.hivemq.client.internal.mqtt.message.publish.puback.MqttPubAck; -import com.hivemq.client.internal.mqtt.message.publish.puback.MqttPubAckBuilder; -import com.hivemq.client.internal.mqtt.message.publish.pubcomp.MqttPubComp; -import com.hivemq.client.internal.mqtt.message.publish.pubcomp.MqttPubCompBuilder; -import com.hivemq.client.internal.mqtt.message.publish.pubrec.MqttPubRec; -import com.hivemq.client.internal.mqtt.message.publish.pubrec.MqttPubRecBuilder; -import com.hivemq.client.internal.mqtt.message.publish.pubrel.MqttPubRel; +import com.hivemq.client.internal.mqtt.message.publish.*; import com.hivemq.client.internal.util.collections.IntIndex; import com.hivemq.client.mqtt.MqttVersion; import com.hivemq.client.mqtt.datatypes.MqttQos; import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5IncomingQos1Interceptor; import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5IncomingQos2Interceptor; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubcomp.Mqtt5PubCompReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.EventLoop; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlow.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlow.java index 6559528ac..272a2cd1e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlow.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlow.java @@ -19,10 +19,10 @@ import com.hivemq.client.internal.mqtt.MqttClientConfig; import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImpl; import com.hivemq.client.internal.mqtt.handler.subscribe.MqttSubscriptionFlow; -import com.hivemq.client.internal.mqtt.message.subscribe.suback.MqttSubAck; +import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; import com.hivemq.client.internal.util.collections.HandleList; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import com.hivemq.client.rx.FlowableWithSingleSubscriber; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Subscriber; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowable.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowable.java index 8cc939d9e..d07857df9 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowable.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowable.java @@ -21,7 +21,7 @@ import com.hivemq.client.internal.mqtt.ioc.ClientComponent; import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import com.hivemq.client.rx.FlowableWithSingle; import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java index 7eb3e534e..0340a6241 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java @@ -29,18 +29,11 @@ import com.hivemq.client.internal.mqtt.handler.publish.outgoing.MqttPubRelWithFlow.MqttQos2IntermediateWithFlow; import com.hivemq.client.internal.mqtt.handler.subscribe.MqttSubscriptionHandler; import com.hivemq.client.internal.mqtt.ioc.ClientScope; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublishResult; +import com.hivemq.client.internal.mqtt.message.publish.*; import com.hivemq.client.internal.mqtt.message.publish.MqttPublishResult.MqttQos1Result; import com.hivemq.client.internal.mqtt.message.publish.MqttPublishResult.MqttQos2CompleteResult; import com.hivemq.client.internal.mqtt.message.publish.MqttPublishResult.MqttQos2IntermediateResult; import com.hivemq.client.internal.mqtt.message.publish.MqttPublishResult.MqttQos2Result; -import com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish; -import com.hivemq.client.internal.mqtt.message.publish.puback.MqttPubAck; -import com.hivemq.client.internal.mqtt.message.publish.pubcomp.MqttPubComp; -import com.hivemq.client.internal.mqtt.message.publish.pubrec.MqttPubRec; -import com.hivemq.client.internal.mqtt.message.publish.pubrel.MqttPubRel; -import com.hivemq.client.internal.mqtt.message.publish.pubrel.MqttPubRelBuilder; import com.hivemq.client.internal.netty.ContextFuture; import com.hivemq.client.internal.netty.DefaultContextPromise; import com.hivemq.client.internal.util.Ranges; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPubRelWithFlow.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPubRelWithFlow.java index b3c8c6504..c39bf2867 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPubRelWithFlow.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPubRelWithFlow.java @@ -16,9 +16,9 @@ package com.hivemq.client.internal.mqtt.handler.publish.outgoing; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubRec; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubRel; import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.internal.mqtt.message.publish.pubrec.MqttPubRec; -import com.hivemq.client.internal.mqtt.message.publish.pubrel.MqttPubRel; import org.jetbrains.annotations.NotNull; import java.util.function.BooleanSupplier; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubAckSingle.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubAckSingle.java index ab914a897..0bb961747 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubAckSingle.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubAckSingle.java @@ -18,9 +18,9 @@ import com.hivemq.client.internal.mqtt.MqttClientConfig; import com.hivemq.client.internal.mqtt.ioc.ClientComponent; +import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; -import com.hivemq.client.internal.mqtt.message.subscribe.suback.MqttSubAck; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import io.reactivex.Single; import io.reactivex.SingleObserver; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscribeWithFlow.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscribeWithFlow.java index a2f388682..7467c8607 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscribeWithFlow.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscribeWithFlow.java @@ -16,8 +16,8 @@ package com.hivemq.client.internal.mqtt.handler.subscribe; +import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; -import com.hivemq.client.internal.mqtt.message.subscribe.suback.MqttSubAck; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscriptionHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscriptionHandler.java index 3e2ca8cad..01dbec647 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscriptionHandler.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscriptionHandler.java @@ -30,12 +30,12 @@ import com.hivemq.client.internal.mqtt.ioc.ClientScope; import com.hivemq.client.internal.mqtt.message.MqttCommonReasonCode; import com.hivemq.client.internal.mqtt.message.subscribe.MqttStatefulSubscribe; +import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; -import com.hivemq.client.internal.mqtt.message.subscribe.suback.MqttSubAck; import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttStatefulUnsubscribe; +import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubAck; import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; -import com.hivemq.client.internal.mqtt.message.unsubscribe.unsuback.MqttUnsubAck; -import com.hivemq.client.internal.mqtt.message.unsubscribe.unsuback.mqtt3.Mqtt3UnsubAckView; +import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; import com.hivemq.client.internal.util.Ranges; import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.internal.util.collections.ImmutableList; @@ -45,8 +45,8 @@ import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5SubAckException; import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5UnsubAckException; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAckReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAckReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAckReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.EventLoop; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttUnsubAckSingle.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttUnsubAckSingle.java index 197a87716..95b13e16e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttUnsubAckSingle.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttUnsubAckSingle.java @@ -18,9 +18,9 @@ import com.hivemq.client.internal.mqtt.MqttClientConfig; import com.hivemq.client.internal.mqtt.ioc.ClientComponent; +import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubAck; import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; -import com.hivemq.client.internal.mqtt.message.unsubscribe.unsuback.MqttUnsubAck; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAck; +import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; import io.reactivex.Single; import io.reactivex.SingleObserver; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttUnsubscribeWithFlow.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttUnsubscribeWithFlow.java index e0f9a180c..9154319e9 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttUnsubscribeWithFlow.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttUnsubscribeWithFlow.java @@ -16,8 +16,8 @@ package com.hivemq.client.internal.mqtt.handler.subscribe; +import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubAck; import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; -import com.hivemq.client.internal.mqtt.message.unsubscribe.unsuback.MqttUnsubAck; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttConnectedContextImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttConnectedContextImpl.java index a95c22e97..e1828856d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttConnectedContextImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttConnectedContextImpl.java @@ -18,8 +18,8 @@ import com.hivemq.client.internal.mqtt.MqttClientConfig; import com.hivemq.client.internal.mqtt.lifecycle.mqtt3.Mqtt3ConnectedContextView; +import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.connack.MqttConnAck; import com.hivemq.client.mqtt.MqttVersion; import com.hivemq.client.mqtt.lifecycle.MqttConnectedContext; import com.hivemq.client.mqtt.mqtt5.lifecycle.Mqtt5ConnectedContext; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ConnectedContextView.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ConnectedContextView.java index 5128f4e99..442d6a34b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ConnectedContextView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ConnectedContextView.java @@ -17,9 +17,9 @@ package com.hivemq.client.internal.mqtt.lifecycle.mqtt3; import com.hivemq.client.internal.mqtt.MqttClientConfig; +import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.connack.MqttConnAck; -import com.hivemq.client.internal.mqtt.message.connect.connack.mqtt3.Mqtt3ConnAckView; +import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnAckView; import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectView; import com.hivemq.client.internal.mqtt.mqtt3.Mqtt3ClientConfigView; import com.hivemq.client.mqtt.lifecycle.MqttConnectedContext; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAck.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAck.java similarity index 97% rename from src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAck.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAck.java index 582e38938..13c497dd4 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAck.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAck.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect.connack; +package com.hivemq.client.internal.mqtt.message.connect; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttClientIdentifierImpl; @@ -25,8 +25,8 @@ import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuth; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAckProperty.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckProperty.java similarity index 97% rename from src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAckProperty.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckProperty.java index 6d734ca6e..4e4edd141 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAckProperty.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckProperty.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect.connack; +package com.hivemq.client.internal.mqtt.message.connect; import com.hivemq.client.internal.mqtt.message.MqttProperty; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAckRestrictions.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckRestrictions.java similarity index 97% rename from src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAckRestrictions.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckRestrictions.java index 6489af4f9..40c703269 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAckRestrictions.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckRestrictions.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect.connack; +package com.hivemq.client.internal.mqtt.message.connect; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckRestrictions; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/mqtt3/Mqtt3ConnAckView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckView.java similarity index 87% rename from src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/mqtt3/Mqtt3ConnAckView.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckView.java index 161315ec9..a0e8d496b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/mqtt3/Mqtt3ConnAckView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckView.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect.connack.mqtt3; +package com.hivemq.client.internal.mqtt.message.connect.mqtt3; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.message.connect.connack.MqttConnAck; -import com.hivemq.client.internal.mqtt.message.connect.connack.MqttConnAckRestrictions; -import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAck; -import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAckReturnCode; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckReasonCode; +import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; +import com.hivemq.client.internal.mqtt.message.connect.MqttConnAckRestrictions; +import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; +import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAckReturnCode; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckReasonCode; import io.reactivex.functions.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAckReturnCode.*; +import static com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAckReturnCode.*; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/puback/MqttPubAck.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAck.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/puback/MqttPubAck.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAck.java index 3c1e04c03..9fe362c8e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/puback/MqttPubAck.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAck.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.puback; +package com.hivemq.client.internal.mqtt.message.publish; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; -import com.hivemq.client.mqtt.mqtt5.message.publish.puback.Mqtt5PubAck; -import com.hivemq.client.mqtt.mqtt5.message.publish.puback.Mqtt5PubAckReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAck; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAckReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/puback/MqttPubAckBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAckBuilder.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/puback/MqttPubAckBuilder.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAckBuilder.java index d30cb0d89..121ebe04b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/puback/MqttPubAckBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAckBuilder.java @@ -14,18 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.puback; +package com.hivemq.client.internal.mqtt.message.publish; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish; import com.hivemq.client.internal.mqtt.util.MqttChecks; import com.hivemq.client.internal.util.Checks; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.message.publish.puback.Mqtt5PubAckBuilder; -import com.hivemq.client.mqtt.mqtt5.message.publish.puback.Mqtt5PubAckReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAckBuilder; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAckReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/puback/MqttPubAckProperty.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAckProperty.java similarity index 94% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/puback/MqttPubAckProperty.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAckProperty.java index 463058f49..cf715fe75 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/puback/MqttPubAckProperty.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAckProperty.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.puback; +package com.hivemq.client.internal.mqtt.message.publish; import com.hivemq.client.internal.mqtt.message.MqttProperty; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubcomp/MqttPubComp.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubComp.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubcomp/MqttPubComp.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubComp.java index 6caae0dd5..9917936b9 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubcomp/MqttPubComp.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubComp.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.pubcomp; +package com.hivemq.client.internal.mqtt.message.publish; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubcomp.Mqtt5PubComp; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubcomp.Mqtt5PubCompReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubComp; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubcomp/MqttPubCompBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubCompBuilder.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubcomp/MqttPubCompBuilder.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubCompBuilder.java index d61b528e3..7a9d9d1d9 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubcomp/MqttPubCompBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubCompBuilder.java @@ -14,17 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.pubcomp; +package com.hivemq.client.internal.mqtt.message.publish; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.publish.pubrel.MqttPubRel; import com.hivemq.client.internal.mqtt.util.MqttChecks; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubcomp.Mqtt5PubCompBuilder; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubcomp.Mqtt5PubCompReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompBuilder; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubcomp/MqttPubCompProperty.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubCompProperty.java similarity index 94% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubcomp/MqttPubCompProperty.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubCompProperty.java index 080018da4..6e37476bf 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubcomp/MqttPubCompProperty.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubCompProperty.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.pubcomp; +package com.hivemq.client.internal.mqtt.message.publish; import com.hivemq.client.internal.mqtt.message.MqttProperty; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrec/MqttPubRec.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRec.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrec/MqttPubRec.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRec.java index 5bf73fa3f..0e78ef915 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrec/MqttPubRec.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRec.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.pubrec; +package com.hivemq.client.internal.mqtt.message.publish; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrec.Mqtt5PubRec; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrec.Mqtt5PubRecReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRec; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrec/MqttPubRecBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRecBuilder.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrec/MqttPubRecBuilder.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRecBuilder.java index d74e3565c..c0c67ca13 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrec/MqttPubRecBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRecBuilder.java @@ -14,18 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.pubrec; +package com.hivemq.client.internal.mqtt.message.publish; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish; import com.hivemq.client.internal.mqtt.util.MqttChecks; import com.hivemq.client.internal.util.Checks; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrec.Mqtt5PubRecBuilder; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrec.Mqtt5PubRecReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecBuilder; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrec/MqttPubRecProperty.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRecProperty.java similarity index 94% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrec/MqttPubRecProperty.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRecProperty.java index c73445414..7aa23b0c9 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrec/MqttPubRecProperty.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRecProperty.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.pubrec; +package com.hivemq.client.internal.mqtt.message.publish; import com.hivemq.client.internal.mqtt.message.MqttProperty; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrel/MqttPubRel.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRel.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrel/MqttPubRel.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRel.java index ba10053b4..6f54e54f3 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrel/MqttPubRel.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRel.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.pubrel; +package com.hivemq.client.internal.mqtt.message.publish; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrel.Mqtt5PubRel; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrel.Mqtt5PubRelReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRel; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrel/MqttPubRelBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRelBuilder.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrel/MqttPubRelBuilder.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRelBuilder.java index 98d06c267..5ce1e346d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrel/MqttPubRelBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRelBuilder.java @@ -14,17 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.pubrel; +package com.hivemq.client.internal.mqtt.message.publish; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.publish.pubrec.MqttPubRec; import com.hivemq.client.internal.mqtt.util.MqttChecks; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrel.Mqtt5PubRelBuilder; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrel.Mqtt5PubRelReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRelBuilder; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrel/MqttPubRelProperty.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRelProperty.java similarity index 94% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrel/MqttPubRelProperty.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRelProperty.java index 828ad9be9..85855b6ac 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrel/MqttPubRelProperty.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRelProperty.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.pubrel; +package com.hivemq.client.internal.mqtt.message.publish; import com.hivemq.client.internal.mqtt.message.MqttProperty; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishResult.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishResult.java index 86b387deb..d2d88243d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishResult.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishResult.java @@ -16,10 +16,6 @@ package com.hivemq.client.internal.mqtt.message.publish; -import com.hivemq.client.internal.mqtt.message.publish.puback.MqttPubAck; -import com.hivemq.client.internal.mqtt.message.publish.pubcomp.MqttPubComp; -import com.hivemq.client.internal.mqtt.message.publish.pubrec.MqttPubRec; -import com.hivemq.client.internal.mqtt.message.publish.pubrel.MqttPubRel; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/puback/mqtt3/Mqtt3PubAckView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubAckView.java similarity index 84% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/puback/mqtt3/Mqtt3PubAckView.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubAckView.java index 107829fcb..46b8c4f52 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/puback/mqtt3/Mqtt3PubAckView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubAckView.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.puback.mqtt3; +package com.hivemq.client.internal.mqtt.message.publish.mqtt3; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.message.publish.puback.MqttPubAck; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubAck; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; -import com.hivemq.client.mqtt.mqtt3.message.publish.puback.Mqtt3PubAck; -import com.hivemq.client.mqtt.mqtt5.message.publish.puback.Mqtt5PubAckReasonCode; +import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PubAck; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAckReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubcomp/mqtt3/Mqtt3PubCompView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubCompView.java similarity index 84% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubcomp/mqtt3/Mqtt3PubCompView.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubCompView.java index 90cc97b97..296d4e13a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubcomp/mqtt3/Mqtt3PubCompView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubCompView.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.pubcomp.mqtt3; +package com.hivemq.client.internal.mqtt.message.publish.mqtt3; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.message.publish.pubcomp.MqttPubComp; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubComp; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; -import com.hivemq.client.mqtt.mqtt3.message.publish.pubcomp.Mqtt3PubComp; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubcomp.Mqtt5PubCompReasonCode; +import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PubComp; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrec/mqtt3/Mqtt3PubRecView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubRecView.java similarity index 84% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrec/mqtt3/Mqtt3PubRecView.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubRecView.java index 9c419db34..516f3d9b7 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrec/mqtt3/Mqtt3PubRecView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubRecView.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.pubrec.mqtt3; +package com.hivemq.client.internal.mqtt.message.publish.mqtt3; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.message.publish.pubrec.MqttPubRec; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubRec; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; -import com.hivemq.client.mqtt.mqtt3.message.publish.pubrec.Mqtt3PubRec; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrec.Mqtt5PubRecReasonCode; +import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PubRec; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrel/mqtt3/Mqtt3PubRelView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubRelView.java similarity index 84% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrel/mqtt3/Mqtt3PubRelView.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubRelView.java index 0ad2176ef..97652a5ba 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/pubrel/mqtt3/Mqtt3PubRelView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubRelView.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.pubrel.mqtt3; +package com.hivemq.client.internal.mqtt.message.publish.mqtt3; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.message.publish.pubrel.MqttPubRel; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubRel; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; -import com.hivemq.client.mqtt.mqtt3.message.publish.pubrel.Mqtt3PubRel; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrel.Mqtt5PubRelReasonCode; +import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PubRel; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/suback/MqttSubAck.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubAck.java similarity index 91% rename from src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/suback/MqttSubAck.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubAck.java index 0b6623d37..888a08328 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/suback/MqttSubAck.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubAck.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe.suback; +package com.hivemq.client.internal.mqtt.message.subscribe; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; @@ -22,8 +22,8 @@ import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; import com.hivemq.client.internal.util.StringUtil; import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAckReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAckReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/suback/MqttSubAckProperty.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubAckProperty.java similarity index 94% rename from src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/suback/MqttSubAckProperty.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubAckProperty.java index 7b5b26fd0..44334a56d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/suback/MqttSubAckProperty.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubAckProperty.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe.suback; +package com.hivemq.client.internal.mqtt.message.subscribe; import com.hivemq.client.internal.mqtt.message.MqttProperty; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/suback/mqtt3/Mqtt3SubAckView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckView.java similarity index 91% rename from src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/suback/mqtt3/Mqtt3SubAckView.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckView.java index 940507d6c..b0a1e831b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/suback/mqtt3/Mqtt3SubAckView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckView.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe.suback.mqtt3; +package com.hivemq.client.internal.mqtt.message.subscribe.mqtt3; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.message.subscribe.suback.MqttSubAck; +import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.suback.Mqtt3SubAck; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.suback.Mqtt3SubAckReturnCode; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAckReasonCode; +import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; +import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAckReturnCode; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAckReasonCode; import io.reactivex.functions.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/unsuback/MqttUnsubAck.java b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubAck.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/unsuback/MqttUnsubAck.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubAck.java index 519b6bff4..6f4c11a6b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/unsuback/MqttUnsubAck.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubAck.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.unsubscribe.unsuback; +package com.hivemq.client.internal.mqtt.message.unsubscribe; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; @@ -22,8 +22,8 @@ import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; import com.hivemq.client.internal.util.StringUtil; import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAck; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAckReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; +import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/unsuback/MqttUnsubAckProperty.java b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubAckProperty.java similarity index 93% rename from src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/unsuback/MqttUnsubAckProperty.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubAckProperty.java index c86c09163..8eb1bcdfe 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/unsuback/MqttUnsubAckProperty.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubAckProperty.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.unsubscribe.unsuback; +package com.hivemq.client.internal.mqtt.message.unsubscribe; import com.hivemq.client.internal.mqtt.message.MqttProperty; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/unsuback/mqtt3/Mqtt3UnsubAckView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubAckView.java similarity index 84% rename from src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/unsuback/mqtt3/Mqtt3UnsubAckView.java rename to src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubAckView.java index 8f6f2050a..ed8f629d5 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/unsuback/mqtt3/Mqtt3UnsubAckView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubAckView.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.unsubscribe.unsuback.mqtt3; +package com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.message.unsubscribe.unsuback.MqttUnsubAck; +import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubAck; import com.hivemq.client.internal.util.collections.ImmutableList; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.unsuback.Mqtt3UnsubAck; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAckReasonCode; +import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; +import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java index 33359785b..f1cafc064 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java @@ -19,7 +19,7 @@ import com.hivemq.client.internal.mqtt.MqttAsyncClient; import com.hivemq.client.internal.mqtt.exceptions.mqtt3.Mqtt3ExceptionFactory; import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.connack.mqtt3.Mqtt3ConnAckView; +import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnAckView; import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectView; import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectViewBuilder; import com.hivemq.client.internal.mqtt.message.disconnect.mqtt3.Mqtt3DisconnectView; @@ -27,8 +27,8 @@ import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishViewBuilder; import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; +import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubAckView; import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubscribeViewBuilder; -import com.hivemq.client.internal.mqtt.message.subscribe.suback.mqtt3.Mqtt3SubAckView; import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubscribeViewBuilder; import com.hivemq.client.internal.mqtt.util.MqttChecks; @@ -38,14 +38,14 @@ import com.hivemq.client.mqtt.mqtt3.Mqtt3BlockingClient; import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientConfig; import com.hivemq.client.mqtt.mqtt3.Mqtt3RxClient; +import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; -import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; +import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.suback.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java index da317230e..d2fe7c861 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java @@ -19,7 +19,7 @@ import com.hivemq.client.internal.mqtt.MqttBlockingClient; import com.hivemq.client.internal.mqtt.exceptions.mqtt3.Mqtt3ExceptionFactory; import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.connack.mqtt3.Mqtt3ConnAckView; +import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnAckView; import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectView; import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectViewBuilder; import com.hivemq.client.internal.mqtt.message.disconnect.mqtt3.Mqtt3DisconnectView; @@ -27,8 +27,8 @@ import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishViewBuilder; import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; +import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubAckView; import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubscribeViewBuilder; -import com.hivemq.client.internal.mqtt.message.subscribe.suback.mqtt3.Mqtt3SubAckView; import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubscribeViewBuilder; import com.hivemq.client.internal.mqtt.util.MqttChecks; @@ -38,11 +38,11 @@ import com.hivemq.client.mqtt.mqtt3.Mqtt3BlockingClient; import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientConfig; import com.hivemq.client.mqtt.mqtt3.Mqtt3RxClient; +import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; -import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; +import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.suback.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient; import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5MessageException; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java index 815a7153c..2eac0943f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java @@ -19,7 +19,7 @@ import com.hivemq.client.internal.mqtt.MqttRxClient; import com.hivemq.client.internal.mqtt.exceptions.mqtt3.Mqtt3ExceptionFactory; import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.connack.mqtt3.Mqtt3ConnAckView; +import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnAckView; import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectView; import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectViewBuilder; import com.hivemq.client.internal.mqtt.message.disconnect.mqtt3.Mqtt3DisconnectView; @@ -27,25 +27,25 @@ import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishResultView; import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; +import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubAckView; import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubscribeViewBuilder; -import com.hivemq.client.internal.mqtt.message.subscribe.suback.mqtt3.Mqtt3SubAckView; import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubscribeViewBuilder; import com.hivemq.client.internal.mqtt.util.MqttChecks; import com.hivemq.client.internal.util.Checks; import com.hivemq.client.mqtt.MqttGlobalPublishFilter; import com.hivemq.client.mqtt.mqtt3.Mqtt3RxClient; +import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; -import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult; +import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.suback.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import com.hivemq.client.rx.FlowableWithSingle; import io.reactivex.Completable; import io.reactivex.Flowable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java index 28b12ef90..41e83ca5d 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java @@ -19,14 +19,14 @@ import com.hivemq.client.annotations.CheckReturnValue; import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttGlobalPublishFilter; +import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnectBuilder; -import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishBuilder; +import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilderBase; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.suback.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java index 91e19e870..e595dfa53 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java @@ -19,14 +19,14 @@ import com.hivemq.client.annotations.CheckReturnValue; import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttGlobalPublishFilter; +import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnectBuilder; -import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishBuilder; +import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilder; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.suback.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java index b5eecadc2..5c2e2e3af 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java @@ -19,14 +19,14 @@ import com.hivemq.client.annotations.CheckReturnValue; import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttGlobalPublishFilter; +import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnectBuilder; -import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult; +import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilder; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.suback.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; import com.hivemq.client.rx.FlowableWithSingle; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3ConnAckException.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3ConnAckException.java index 3f6369c8c..cc1c5c919 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3ConnAckException.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3ConnAckException.java @@ -16,7 +16,7 @@ package com.hivemq.client.mqtt.mqtt3.exceptions; -import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAck; +import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubAckException.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubAckException.java index bab9d68d1..1d9fff3ac 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubAckException.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubAckException.java @@ -16,8 +16,8 @@ package com.hivemq.client.mqtt.mqtt3.exceptions; -import com.hivemq.client.internal.mqtt.message.publish.puback.mqtt3.Mqtt3PubAckView; -import com.hivemq.client.mqtt.mqtt3.message.publish.puback.Mqtt3PubAck; +import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubAckView; +import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PubAck; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubRecException.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubRecException.java index 22e5e3682..d604468b1 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubRecException.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubRecException.java @@ -16,8 +16,8 @@ package com.hivemq.client.mqtt.mqtt3.exceptions; -import com.hivemq.client.internal.mqtt.message.publish.pubrec.mqtt3.Mqtt3PubRecView; -import com.hivemq.client.mqtt.mqtt3.message.publish.pubrec.Mqtt3PubRec; +import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubRecView; +import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PubRec; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3SubAckException.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3SubAckException.java index 1bb953576..a2afe935b 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3SubAckException.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3SubAckException.java @@ -16,7 +16,7 @@ package com.hivemq.client.mqtt.mqtt3.exceptions; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.suback.Mqtt3SubAck; +import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3UnsubAckException.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3UnsubAckException.java index c3bc162bd..2ec9b6fd8 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3UnsubAckException.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3UnsubAckException.java @@ -16,8 +16,8 @@ package com.hivemq.client.mqtt.mqtt3.exceptions; -import com.hivemq.client.internal.mqtt.message.unsubscribe.unsuback.mqtt3.Mqtt3UnsubAckView; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.unsuback.Mqtt3UnsubAck; +import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; +import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ConnectedContext.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ConnectedContext.java index 5ef2cbe14..e47ba1144 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ConnectedContext.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ConnectedContext.java @@ -19,8 +19,8 @@ import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.lifecycle.MqttConnectedContext; import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientConfig; +import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; -import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAck; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/connack/Mqtt3ConnAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnAck.java similarity index 95% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/connack/Mqtt3ConnAck.java rename to src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnAck.java index 531d09624..55239c0ca 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/connack/Mqtt3ConnAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnAck.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.connect.connack; +package com.hivemq.client.mqtt.mqtt3.message.connect; import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/connack/Mqtt3ConnAckReturnCode.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnAckReturnCode.java similarity index 97% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/connack/Mqtt3ConnAckReturnCode.java rename to src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnAckReturnCode.java index dca1ef5f7..799e3c585 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/connack/Mqtt3ConnAckReturnCode.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnAckReturnCode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.connect.connack; +package com.hivemq.client.mqtt.mqtt3.message.connect; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3ReturnCode; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/puback/Mqtt3PubAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubAck.java similarity index 95% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/puback/Mqtt3PubAck.java rename to src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubAck.java index 11b538b6b..a323ad384 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/puback/Mqtt3PubAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubAck.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.publish.puback; +package com.hivemq.client.mqtt.mqtt3.message.publish; import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/pubcomp/Mqtt3PubComp.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubComp.java similarity index 95% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/pubcomp/Mqtt3PubComp.java rename to src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubComp.java index d6333d76c..d4e557c28 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/pubcomp/Mqtt3PubComp.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubComp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.publish.pubcomp; +package com.hivemq.client.mqtt.mqtt3.message.publish; import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/pubrec/Mqtt3PubRec.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubRec.java similarity index 95% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/pubrec/Mqtt3PubRec.java rename to src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubRec.java index d0e6ffcb1..1e75894c0 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/pubrec/Mqtt3PubRec.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubRec.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.publish.pubrec; +package com.hivemq.client.mqtt.mqtt3.message.publish; import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/pubrel/Mqtt3PubRel.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubRel.java similarity index 95% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/pubrel/Mqtt3PubRel.java rename to src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubRel.java index 611568151..efe7ab4ca 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/pubrel/Mqtt3PubRel.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubRel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.publish.pubrel; +package com.hivemq.client.mqtt.mqtt3.message.publish; import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/suback/Mqtt3SubAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAck.java similarity index 96% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/suback/Mqtt3SubAck.java rename to src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAck.java index 9637b53ce..f80a45510 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/suback/Mqtt3SubAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAck.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.subscribe.suback; +package com.hivemq.client.mqtt.mqtt3.message.subscribe; import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.annotations.Immutable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/suback/Mqtt3SubAckReturnCode.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAckReturnCode.java similarity index 97% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/suback/Mqtt3SubAckReturnCode.java rename to src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAckReturnCode.java index a7f97f7ad..2b4f7a81c 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/suback/Mqtt3SubAckReturnCode.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAckReturnCode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.subscribe.suback; +package com.hivemq.client.mqtt.mqtt3.message.subscribe; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3ReturnCode; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/unsuback/Mqtt3UnsubAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubAck.java similarity index 94% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/unsuback/Mqtt3UnsubAck.java rename to src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubAck.java index aa6c1a04e..d37cbacc1 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/unsuback/Mqtt3UnsubAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubAck.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.unsubscribe.unsuback; +package com.hivemq.client.mqtt.mqtt3.message.unsubscribe; import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5AsyncClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5AsyncClient.java index 5e77444de..97c7e1b7c 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5AsyncClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5AsyncClient.java @@ -19,20 +19,20 @@ import com.hivemq.client.annotations.CheckReturnValue; import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttGlobalPublishFilter; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectBuilder; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectBuilder; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishBuilder; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubscribeBuilderBase; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck; +import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubscribeBuilder; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAck; import org.jetbrains.annotations.NotNull; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5BlockingClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5BlockingClient.java index bd65d86e2..8e86394ed 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5BlockingClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5BlockingClient.java @@ -19,20 +19,20 @@ import com.hivemq.client.annotations.CheckReturnValue; import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttGlobalPublishFilter; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectBuilder; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectBuilder; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishBuilder; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubscribeBuilder; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck; +import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubscribeBuilder; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAck; import org.jetbrains.annotations.NotNull; import java.util.Optional; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConnectionConfig.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConnectionConfig.java index e9080c915..05c1ee4e6 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConnectionConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConnectionConfig.java @@ -123,7 +123,7 @@ interface RestrictionsForClient { * concurrently. *

    * The value is determined by the minimum of {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions#getSendMaximum - * Mqtt5ConnectRestrictions#getSendMaximum()} and {@link com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckRestrictions#getReceiveMaximum() + * Mqtt5ConnectRestrictions#getSendMaximum()} and {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#getReceiveMaximum() * MqttConnAckRestrictions#getReceiveMaximum()}. * * @return the maximum amount of not acknowledged publishes with QoS 1 or 2 the client sends to the server @@ -135,7 +135,7 @@ interface RestrictionsForClient { * Returns the maximum packet size the client sends to the server. *

    * The value is determined by the minimum of {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions#getSendMaximumPacketSize - * Mqtt5ConnectRestrictions#getSendMaximumPacketSize()} and {@link com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckRestrictions#getMaximumPacketSize() + * Mqtt5ConnectRestrictions#getSendMaximumPacketSize()} and {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#getMaximumPacketSize() * MqttConnAckRestrictions#getMaximumPacketSize()}. * * @return the maximum packet size the client sends to the server. @@ -146,7 +146,7 @@ interface RestrictionsForClient { * Returns the maximum amount of topic aliases the client sends to the server. *

    * The value is determined by the minimum of {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions#getSendTopicAliasMaximum - * Mqtt5ConnectRestrictions#getSendTopicAliasMaximum()} and {@link com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckRestrictions#getTopicAliasMaximum() + * Mqtt5ConnectRestrictions#getSendTopicAliasMaximum()} and {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#getTopicAliasMaximum() * MqttConnAckRestrictions#getTopicAliasMaximum()}. * * @return the maximum amount of topic aliases the client sends to the server. @@ -156,7 +156,7 @@ interface RestrictionsForClient { /** * Returns the maximum {@link MqttQos QoS} the server accepts from the client. *

    - * The value is determined by {@link com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckRestrictions#getMaximumQos() + * The value is determined by {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#getMaximumQos() * MqttConnAckRestrictions#getMaximumQos()}. * * @return the maximum QoS the server accepts from the client. @@ -166,7 +166,7 @@ interface RestrictionsForClient { /** * Returns whether the server accepts retained messages from the client. *

    - * The value is determined by {@link com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckRestrictions#isRetainAvailable() + * The value is determined by {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#isRetainAvailable() * MqttConnAckRestrictions#isRetainAvailable()}. * * @return whether the server accepts retained messages from the client. @@ -176,7 +176,7 @@ interface RestrictionsForClient { /** * Returns whether the server accepts wildcard subscriptions from the client. *

    - * The value is determined by {@link com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckRestrictions#isWildcardSubscriptionAvailable() + * The value is determined by {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#isWildcardSubscriptionAvailable() * MqttConnAckRestrictions#isWildcardSubscriptionAvailable()}. * * @return whether the server accepts wildcard subscriptions. @@ -186,7 +186,7 @@ interface RestrictionsForClient { /** * Returns whether the server accepts shared subscriptions from the client. *

    - * The value is determined by {@link com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckRestrictions#isSharedSubscriptionAvailable() + * The value is determined by {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#isSharedSubscriptionAvailable() * MqttConnAckRestrictions#isSharedSubscriptionAvailable()}. * * @return whether the server accepts shared subscriptions from the client. @@ -196,7 +196,7 @@ interface RestrictionsForClient { /** * Returns whether the server accepts subscription identifiers from the client. *

    - * The value is determined by {@link com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckRestrictions#areSubscriptionIdentifiersAvailable() + * The value is determined by {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#areSubscriptionIdentifiersAvailable() * MqttConnAckRestrictions#areSubscriptionIdentifiersAvailable()}. * * @return whether the server accepts subscription identifiers from the client. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java index 24cda939f..4ca703e52 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java @@ -19,19 +19,19 @@ import com.hivemq.client.annotations.CheckReturnValue; import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttGlobalPublishFilter; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectBuilder; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectBuilder; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubscribeBuilder; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck; +import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubscribeBuilder; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAck; import com.hivemq.client.rx.FlowableWithSingle; import io.reactivex.Completable; import io.reactivex.Flowable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5IncomingQos1Interceptor.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5IncomingQos1Interceptor.java index f1f1451b0..06fff0666 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5IncomingQos1Interceptor.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5IncomingQos1Interceptor.java @@ -17,8 +17,8 @@ package com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1; import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAckBuilder; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.publish.puback.Mqtt5PubAckBuilder; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5OutgoingQos1Interceptor.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5OutgoingQos1Interceptor.java index c1a03cb16..5fe995ae0 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5OutgoingQos1Interceptor.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5OutgoingQos1Interceptor.java @@ -17,8 +17,8 @@ package com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1; import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAck; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.publish.puback.Mqtt5PubAck; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5IncomingQos2Interceptor.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5IncomingQos2Interceptor.java index f7a7e5ade..a344d221f 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5IncomingQos2Interceptor.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5IncomingQos2Interceptor.java @@ -17,10 +17,10 @@ package com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2; import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompBuilder; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecBuilder; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRel; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubcomp.Mqtt5PubCompBuilder; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrec.Mqtt5PubRecBuilder; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrel.Mqtt5PubRel; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutgoingQos2Interceptor.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutgoingQos2Interceptor.java index c240563be..cac1f95a7 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutgoingQos2Interceptor.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutgoingQos2Interceptor.java @@ -17,11 +17,7 @@ package com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2; import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubcomp.Mqtt5PubComp; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrec.Mqtt5PubRec; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrel.Mqtt5PubRel; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrel.Mqtt5PubRelBuilder; +import com.hivemq.client.mqtt.mqtt5.message.publish.*; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java index d8fc531b4..734435b8a 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java @@ -21,8 +21,8 @@ import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5Auth; import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5AuthBuilder; import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuthBuilder; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5ConnAckException.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5ConnAckException.java index 5e99c47b9..396951d02 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5ConnAckException.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5ConnAckException.java @@ -16,7 +16,7 @@ package com.hivemq.client.mqtt.mqtt5.exceptions; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubAckException.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubAckException.java index ce168449f..39f756e59 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubAckException.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubAckException.java @@ -16,7 +16,7 @@ package com.hivemq.client.mqtt.mqtt5.exceptions; -import com.hivemq.client.mqtt.mqtt5.message.publish.puback.Mqtt5PubAck; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAck; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubRecException.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubRecException.java index 7c739a21e..a6ffeb1f1 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubRecException.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubRecException.java @@ -16,7 +16,7 @@ package com.hivemq.client.mqtt.mqtt5.exceptions; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrec.Mqtt5PubRec; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRec; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5SubAckException.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5SubAckException.java index 06d48c363..e4b2d4e39 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5SubAckException.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5SubAckException.java @@ -16,7 +16,7 @@ package com.hivemq.client.mqtt.mqtt5.exceptions; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5UnsubAckException.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5UnsubAckException.java index fed3be97a..d01fb09de 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5UnsubAckException.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5UnsubAckException.java @@ -16,7 +16,7 @@ package com.hivemq.client.mqtt.mqtt5.exceptions; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAck; +import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ConnectedContext.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ConnectedContext.java index 3151cd268..041b774e2 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ConnectedContext.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ConnectedContext.java @@ -19,8 +19,8 @@ import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.lifecycle.MqttConnectedContext; import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/connack/Mqtt5ConnAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAck.java similarity index 98% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/connack/Mqtt5ConnAck.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAck.java index af537b401..8008b89b4 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/connack/Mqtt5ConnAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAck.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.connect.connack; +package com.hivemq.client.mqtt.mqtt5.message.connect; import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/connack/Mqtt5ConnAckReasonCode.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCode.java similarity index 98% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/connack/Mqtt5ConnAckReasonCode.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCode.java index 6cd4981d0..060b647ce 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/connack/Mqtt5ConnAckReasonCode.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.connect.connack; +package com.hivemq.client.mqtt.mqtt5.message.connect; import com.hivemq.client.internal.mqtt.message.MqttCommonReasonCode; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/connack/Mqtt5ConnAckRestrictions.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckRestrictions.java similarity index 98% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/connack/Mqtt5ConnAckRestrictions.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckRestrictions.java index 75ecb85e9..0c3b36acd 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/connack/Mqtt5ConnAckRestrictions.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckRestrictions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.connect.connack; +package com.hivemq.client.mqtt.mqtt5.message.connect; import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictions.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictions.java index 761cd85d3..4e4208b67 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictions.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictions.java @@ -34,7 +34,7 @@ *

  • Restrictions for the client set by the client itself. *

    * These restrictions are used in conjunction with the - * {@link com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckRestrictions Mqtt5ConnAckRestrictions} + * {@link Mqtt5ConnAckRestrictions} * to form the {@link com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConnectionConfig.RestrictionsForClient * Mqtt5ClientConnectionConfig.RestrictionsForClient}. * @@ -105,8 +105,7 @@ public interface Mqtt5ConnectRestrictions { * concurrently. The default is {@link #DEFAULT_SEND_MAXIMUM}. *

    * The actual amount a connected client will use is determined by the minimum of this value and {@link - * com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckRestrictions#getReceiveMaximum() - * MqttConnAckRestrictions#getReceiveMaximum()}. + * Mqtt5ConnAckRestrictions#getReceiveMaximum() MqttConnAckRestrictions#getReceiveMaximum()}. * * @return the maximum amount of not acknowledged publishes with QoS 1 or 2 the client sends to the server * concurrently. @@ -126,8 +125,7 @@ public interface Mqtt5ConnectRestrictions { * #DEFAULT_SEND_MAXIMUM_PACKET_SIZE}. *

    * The actual size a connected client will use is determined by the minimum of this value and {@link - * com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckRestrictions#getMaximumPacketSize() - * MqttConnAckRestrictions#getMaximumPacketSize()}. + * Mqtt5ConnAckRestrictions#getMaximumPacketSize() MqttConnAckRestrictions#getMaximumPacketSize()}. * * @return the maximum packet size the client sends to the server. */ @@ -146,8 +144,7 @@ public interface Mqtt5ConnectRestrictions { * #DEFAULT_SEND_TOPIC_ALIAS_MAXIMUM}. *

    * The actual amount a connected client will use is determined by the minimum of this value and {@link - * com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckRestrictions#getTopicAliasMaximum() - * MqttConnAckRestrictions#getTopicAliasMaximum()}. + * Mqtt5ConnAckRestrictions#getTopicAliasMaximum() MqttConnAckRestrictions#getTopicAliasMaximum()}. * * @return the maximum amount of topic aliases the client sends to the server. */ diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/puback/Mqtt5PubAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAck.java similarity index 96% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/puback/Mqtt5PubAck.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAck.java index 2227ad0af..b6a8fdc54 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/puback/Mqtt5PubAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAck.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.publish.puback; +package com.hivemq.client.mqtt.mqtt5.message.publish; import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/puback/Mqtt5PubAckBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckBuilder.java similarity index 97% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/puback/Mqtt5PubAckBuilder.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckBuilder.java index c11a3fd70..6fe4995f2 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/puback/Mqtt5PubAckBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.publish.puback; +package com.hivemq.client.mqtt.mqtt5.message.publish; import com.hivemq.client.annotations.CheckReturnValue; import com.hivemq.client.annotations.DoNotImplement; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/puback/Mqtt5PubAckReasonCode.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckReasonCode.java similarity index 98% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/puback/Mqtt5PubAckReasonCode.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckReasonCode.java index ddfa2cc7e..73c22050b 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/puback/Mqtt5PubAckReasonCode.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckReasonCode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.publish.puback; +package com.hivemq.client.mqtt.mqtt5.message.publish; import com.hivemq.client.internal.mqtt.message.MqttCommonReasonCode; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubcomp/Mqtt5PubComp.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubComp.java similarity index 96% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubcomp/Mqtt5PubComp.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubComp.java index 1cef4f907..6652d0e43 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubcomp/Mqtt5PubComp.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubComp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.publish.pubcomp; +package com.hivemq.client.mqtt.mqtt5.message.publish; import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubcomp/Mqtt5PubCompBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompBuilder.java similarity index 97% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubcomp/Mqtt5PubCompBuilder.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompBuilder.java index f0a6039f8..7f2329b1f 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubcomp/Mqtt5PubCompBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.publish.pubcomp; +package com.hivemq.client.mqtt.mqtt5.message.publish; import com.hivemq.client.annotations.CheckReturnValue; import com.hivemq.client.annotations.DoNotImplement; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubcomp/Mqtt5PubCompReasonCode.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompReasonCode.java similarity index 97% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubcomp/Mqtt5PubCompReasonCode.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompReasonCode.java index 276997e8a..256ca13cd 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubcomp/Mqtt5PubCompReasonCode.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompReasonCode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.publish.pubcomp; +package com.hivemq.client.mqtt.mqtt5.message.publish; import com.hivemq.client.internal.mqtt.message.MqttCommonReasonCode; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrec/Mqtt5PubRec.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRec.java similarity index 96% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrec/Mqtt5PubRec.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRec.java index 8e2aa05a7..dae251879 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrec/Mqtt5PubRec.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRec.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.publish.pubrec; +package com.hivemq.client.mqtt.mqtt5.message.publish; import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrec/Mqtt5PubRecBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecBuilder.java similarity index 97% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrec/Mqtt5PubRecBuilder.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecBuilder.java index e090e13df..cd0873ba4 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrec/Mqtt5PubRecBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.publish.pubrec; +package com.hivemq.client.mqtt.mqtt5.message.publish; import com.hivemq.client.annotations.CheckReturnValue; import com.hivemq.client.annotations.DoNotImplement; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrec/Mqtt5PubRecReasonCode.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecReasonCode.java similarity index 98% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrec/Mqtt5PubRecReasonCode.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecReasonCode.java index c4c3d5e6c..50533a3d5 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrec/Mqtt5PubRecReasonCode.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecReasonCode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.publish.pubrec; +package com.hivemq.client.mqtt.mqtt5.message.publish; import com.hivemq.client.internal.mqtt.message.MqttCommonReasonCode; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrel/Mqtt5PubRel.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRel.java similarity index 96% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrel/Mqtt5PubRel.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRel.java index 7d84c6d27..3ab2c22b7 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrel/Mqtt5PubRel.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.publish.pubrel; +package com.hivemq.client.mqtt.mqtt5.message.publish; import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrel/Mqtt5PubRelBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelBuilder.java similarity index 97% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrel/Mqtt5PubRelBuilder.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelBuilder.java index 33e2711ba..75e7819d7 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrel/Mqtt5PubRelBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.publish.pubrel; +package com.hivemq.client.mqtt.mqtt5.message.publish; import com.hivemq.client.annotations.CheckReturnValue; import com.hivemq.client.annotations.DoNotImplement; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrel/Mqtt5PubRelReasonCode.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelReasonCode.java similarity index 97% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrel/Mqtt5PubRelReasonCode.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelReasonCode.java index 2db5a1d6a..2b608a045 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrel/Mqtt5PubRelReasonCode.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelReasonCode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.publish.pubrel; +package com.hivemq.client.mqtt.mqtt5.message.publish; import com.hivemq.client.internal.mqtt.message.MqttCommonReasonCode; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishResult.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishResult.java index 92d275e39..adcb5f81c 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishResult.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishResult.java @@ -17,10 +17,6 @@ package com.hivemq.client.mqtt.mqtt5.message.publish; import com.hivemq.client.annotations.DoNotImplement; -import com.hivemq.client.mqtt.mqtt5.message.publish.puback.Mqtt5PubAck; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubcomp.Mqtt5PubComp; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrec.Mqtt5PubRec; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrel.Mqtt5PubRel; import org.jetbrains.annotations.NotNull; import java.util.Optional; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/suback/Mqtt5SubAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAck.java similarity index 97% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/suback/Mqtt5SubAck.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAck.java index 55b8d8de0..1088a907a 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/suback/Mqtt5SubAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAck.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.subscribe.suback; +package com.hivemq.client.mqtt.mqtt5.message.subscribe; import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.annotations.Immutable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/suback/Mqtt5SubAckReasonCode.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCode.java similarity index 98% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/suback/Mqtt5SubAckReasonCode.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCode.java index 334c63a03..ad5edd91b 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/suback/Mqtt5SubAckReasonCode.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.subscribe.suback; +package com.hivemq.client.mqtt.mqtt5.message.subscribe; import com.hivemq.client.internal.mqtt.message.MqttCommonReasonCode; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/unsuback/Mqtt5UnsubAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAck.java similarity index 96% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/unsuback/Mqtt5UnsubAck.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAck.java index 7c442bfed..f0bb0fadf 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/unsuback/Mqtt5UnsubAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAck.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback; +package com.hivemq.client.mqtt.mqtt5.message.unsubscribe; import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.annotations.Immutable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/unsuback/Mqtt5UnsubAckReasonCode.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCode.java similarity index 97% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/unsuback/Mqtt5UnsubAckReasonCode.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCode.java index 94f5e858c..ac7407550 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/unsuback/Mqtt5UnsubAckReasonCode.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback; +package com.hivemq.client.mqtt.mqtt5.message.unsubscribe; import com.hivemq.client.internal.mqtt.message.MqttCommonReasonCode; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; diff --git a/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java b/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java index a23409d95..adfc326f9 100644 --- a/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java +++ b/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java @@ -22,8 +22,8 @@ import com.hivemq.client.mqtt.MqttWebSocketConfig; import com.hivemq.client.mqtt.datatypes.MqttQos; import com.hivemq.client.mqtt.mqtt3.Mqtt3RxClient; +import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; -import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishBuilder; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ConnAckDecoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ConnAckDecoderTest.java index e6b6d0489..b5d9a79b3 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ConnAckDecoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ConnAckDecoderTest.java @@ -18,9 +18,9 @@ import com.google.common.primitives.Bytes; import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.message.connect.connack.MqttConnAck; +import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubAckDecoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubAckDecoderTest.java index 9c1993df1..30cb8017a 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubAckDecoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubAckDecoderTest.java @@ -18,7 +18,7 @@ import com.google.common.primitives.Bytes; import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.message.publish.puback.MqttPubAck; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubAck; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubCompDecoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubCompDecoderTest.java index 83ff67d92..49c0acefb 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubCompDecoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubCompDecoderTest.java @@ -18,7 +18,7 @@ import com.google.common.primitives.Bytes; import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.message.publish.pubcomp.MqttPubComp; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubComp; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRecDecoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRecDecoderTest.java index 731fe56a8..b7cc03351 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRecDecoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRecDecoderTest.java @@ -18,7 +18,7 @@ import com.google.common.primitives.Bytes; import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.message.publish.pubrec.MqttPubRec; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubRec; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRelDecoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRelDecoderTest.java index 6da8b34d8..bcdc60142 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRelDecoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRelDecoderTest.java @@ -18,7 +18,7 @@ import com.google.common.primitives.Bytes; import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.message.publish.pubrel.MqttPubRel; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubRel; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3SubAckDecoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3SubAckDecoderTest.java index 4a17009e1..568ae8821 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3SubAckDecoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3SubAckDecoderTest.java @@ -18,9 +18,9 @@ import com.google.common.primitives.Bytes; import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.message.subscribe.suback.MqttSubAck; +import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAckReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAckReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3UnsubAckDecoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3UnsubAckDecoderTest.java index 0f7a57fa2..7ca626abc 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3UnsubAckDecoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3UnsubAckDecoderTest.java @@ -18,7 +18,7 @@ import com.google.common.primitives.Bytes; import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.message.unsubscribe.unsuback.MqttUnsubAck; +import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubAck; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ConnAckDecoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ConnAckDecoderTest.java index a24f884d1..54593d404 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ConnAckDecoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ConnAckDecoderTest.java @@ -18,15 +18,15 @@ import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.message.connect.connack.MqttConnAck; -import com.hivemq.client.internal.mqtt.message.connect.connack.MqttConnAckRestrictions; +import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; +import com.hivemq.client.internal.mqtt.message.connect.MqttConnAckRestrictions; import com.hivemq.client.internal.util.collections.ImmutableList; import com.hivemq.client.mqtt.datatypes.MqttQos; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuth; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckRestrictions; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.buffer.ByteBuf; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubAckDecoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubAckDecoderTest.java index afd6022ec..0d2bfc352 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubAckDecoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubAckDecoderTest.java @@ -18,12 +18,12 @@ import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.message.publish.puback.MqttPubAck; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubAck; import com.hivemq.client.internal.util.collections.ImmutableList; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.publish.puback.Mqtt5PubAckReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAckReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubCompDecoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubCompDecoderTest.java index b9507d2ea..fe4a4731a 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubCompDecoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubCompDecoderTest.java @@ -18,12 +18,12 @@ import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.message.publish.pubcomp.MqttPubComp; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubComp; import com.hivemq.client.internal.util.collections.ImmutableList; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubcomp.Mqtt5PubCompReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRecDecoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRecDecoderTest.java index d1be2e21f..28105b258 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRecDecoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRecDecoderTest.java @@ -18,12 +18,12 @@ import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.message.publish.pubrec.MqttPubRec; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubRec; import com.hivemq.client.internal.util.collections.ImmutableList; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrec.Mqtt5PubRecReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -32,7 +32,7 @@ import org.junit.jupiter.params.provider.ValueSource; import static com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.MALFORMED_PACKET; -import static com.hivemq.client.mqtt.mqtt5.message.publish.pubrec.Mqtt5PubRecReasonCode.SUCCESS; +import static com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode.SUCCESS; import static org.junit.jupiter.api.Assertions.*; /** diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRelDecoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRelDecoderTest.java index aff4e0ba2..85463b6fa 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRelDecoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRelDecoderTest.java @@ -18,12 +18,12 @@ import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.message.publish.pubrel.MqttPubRel; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubRel; import com.hivemq.client.internal.util.collections.ImmutableList; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrel.Mqtt5PubRelReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -32,7 +32,7 @@ import org.junit.jupiter.params.provider.EnumSource; import static com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.MALFORMED_PACKET; -import static com.hivemq.client.mqtt.mqtt5.message.publish.pubrel.Mqtt5PubRelReasonCode.SUCCESS; +import static com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode.SUCCESS; import static org.junit.jupiter.api.Assertions.*; /** diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5SubAckDecoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5SubAckDecoderTest.java index 176a68cbf..ed1aef20c 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5SubAckDecoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5SubAckDecoderTest.java @@ -18,12 +18,12 @@ import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.message.subscribe.suback.MqttSubAck; +import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; import com.hivemq.client.internal.util.collections.ImmutableList; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAckReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAckReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoderTest.java index cf00ae19e..296f5842f 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoderTest.java @@ -18,14 +18,14 @@ import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.message.unsubscribe.unsuback.MqttUnsubAck; +import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubAck; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperty; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAck; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAckReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; +import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -38,7 +38,7 @@ import static com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.MALFORMED_PACKET; import static com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.PROTOCOL_ERROR; -import static com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAckReasonCode.*; +import static com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode.*; import static org.junit.jupiter.api.Assertions.*; /** diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubAckEncoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubAckEncoderTest.java index 574efd163..0d18422b5 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubAckEncoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubAckEncoderTest.java @@ -17,8 +17,8 @@ package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.message.publish.puback.MqttPubAck; -import com.hivemq.client.internal.mqtt.message.publish.puback.mqtt3.Mqtt3PubAckView; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubAck; +import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubAckView; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; import org.eclipse.paho.client.mqttv3.MqttException; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubCompEncoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubCompEncoderTest.java index 08eb61b51..6f68287f2 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubCompEncoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubCompEncoderTest.java @@ -17,8 +17,8 @@ package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.message.publish.pubcomp.MqttPubComp; -import com.hivemq.client.internal.mqtt.message.publish.pubcomp.mqtt3.Mqtt3PubCompView; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubComp; +import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubCompView; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; import org.eclipse.paho.client.mqttv3.MqttException; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRecEncoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRecEncoderTest.java index 5d19f6107..59851affd 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRecEncoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRecEncoderTest.java @@ -17,8 +17,8 @@ package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.message.publish.pubrec.MqttPubRec; -import com.hivemq.client.internal.mqtt.message.publish.pubrec.mqtt3.Mqtt3PubRecView; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubRec; +import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubRecView; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRelEncoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRelEncoderTest.java index b246d855e..6a1db16d9 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRelEncoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRelEncoderTest.java @@ -17,8 +17,8 @@ package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.message.publish.pubrel.MqttPubRel; -import com.hivemq.client.internal.mqtt.message.publish.pubrel.mqtt3.Mqtt3PubRelView; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubRel; +import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubRelView; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoderTest.java index bb0b0089e..8d6894e98 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoderTest.java @@ -35,8 +35,8 @@ import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5Auth; import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5AuthBuilder; import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuthBuilder; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PayloadFormatIndicator; import io.netty.handler.codec.EncoderException; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubAckEncoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubAckEncoderTest.java index 325bccc68..7e9924ce1 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubAckEncoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubAckEncoderTest.java @@ -21,10 +21,10 @@ import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.mqtt.message.publish.puback.MqttPubAck; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubAck; import com.hivemq.client.internal.util.collections.ImmutableList; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.publish.puback.Mqtt5PubAckReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAckReasonCode; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubCompEncoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubCompEncoderTest.java index 6f224b309..d4919435c 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubCompEncoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubCompEncoderTest.java @@ -20,10 +20,10 @@ import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.mqtt.message.publish.pubcomp.MqttPubComp; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubComp; import com.hivemq.client.mqtt.exceptions.MqttEncodeException; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubcomp.Mqtt5PubCompReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.jetbrains.annotations.NotNull; @@ -32,8 +32,8 @@ import org.junit.jupiter.params.provider.EnumSource; import static com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT; -import static com.hivemq.client.mqtt.mqtt5.message.publish.pubcomp.Mqtt5PubCompReasonCode.PACKET_IDENTIFIER_NOT_FOUND; -import static com.hivemq.client.mqtt.mqtt5.message.publish.pubcomp.Mqtt5PubCompReasonCode.SUCCESS; +import static com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode.PACKET_IDENTIFIER_NOT_FOUND; +import static com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode.SUCCESS; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.params.provider.EnumSource.Mode.EXCLUDE; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRecEncoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRecEncoderTest.java index dabb4839c..9f947b65e 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRecEncoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRecEncoderTest.java @@ -19,9 +19,9 @@ import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.publish.pubrec.MqttPubRec; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubRec; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrec.Mqtt5PubRecReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.jetbrains.annotations.NotNull; @@ -30,7 +30,7 @@ import org.junit.jupiter.params.provider.EnumSource; import static com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT; -import static com.hivemq.client.mqtt.mqtt5.message.publish.pubrec.Mqtt5PubRecReasonCode.SUCCESS; +import static com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode.SUCCESS; import static org.junit.jupiter.params.provider.EnumSource.Mode.EXCLUDE; /** diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRelEncoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRelEncoderTest.java index 2dc2e46c1..d86640f94 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRelEncoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRelEncoderTest.java @@ -20,9 +20,9 @@ import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.mqtt.message.publish.pubrel.MqttPubRel; +import com.hivemq.client.internal.mqtt.message.publish.MqttPubRel; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrel.Mqtt5PubRelReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.jetbrains.annotations.NotNull; @@ -31,7 +31,7 @@ import org.junit.jupiter.params.provider.EnumSource; import static com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT; -import static com.hivemq.client.mqtt.mqtt5.message.publish.pubrel.Mqtt5PubRelReasonCode.SUCCESS; +import static com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode.SUCCESS; import static org.junit.jupiter.params.provider.EnumSource.Mode.EXCLUDE; /** diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAckRestrictionsTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckRestrictionsTest.java similarity index 94% rename from src/test/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAckRestrictionsTest.java rename to src/test/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckRestrictionsTest.java index 7f65e768f..810630077 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAckRestrictionsTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckRestrictionsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect.connack; +package com.hivemq.client.internal.mqtt.message.connect; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAckTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckTest.java similarity index 94% rename from src/test/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAckTest.java rename to src/test/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckTest.java index fb577f944..9b719d561 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/connect/connack/MqttConnAckTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect.connack; +package com.hivemq.client.internal.mqtt.message.connect; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/connect/connack/mqtt3/Mqtt3ConnAckViewTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckViewTest.java similarity index 93% rename from src/test/java/com/hivemq/client/internal/mqtt/message/connect/connack/mqtt3/Mqtt3ConnAckViewTest.java rename to src/test/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckViewTest.java index 200a1924c..7e3ed56c5 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/connect/connack/mqtt3/Mqtt3ConnAckViewTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckViewTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect.connack.mqtt3; +package com.hivemq.client.internal.mqtt.message.connect.mqtt3; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/puback/MqttPubAckTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAckTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/message/publish/puback/MqttPubAckTest.java rename to src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAckTest.java index 49568c168..48e0702ab 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/puback/MqttPubAckTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAckTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.puback; +package com.hivemq.client.internal.mqtt.message.publish; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/pubcomp/MqttPubCompTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubCompTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/message/publish/pubcomp/MqttPubCompTest.java rename to src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubCompTest.java index 21f5e367c..832fdfa62 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/pubcomp/MqttPubCompTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubCompTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.pubcomp; +package com.hivemq.client.internal.mqtt.message.publish; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/pubrec/MqttPubRecTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRecTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/message/publish/pubrec/MqttPubRecTest.java rename to src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRecTest.java index 856bbdb92..08f3be3bc 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/pubrec/MqttPubRecTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRecTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.pubrec; +package com.hivemq.client.internal.mqtt.message.publish; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/pubrel/MqttPubRelTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRelTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/message/publish/pubrel/MqttPubRelTest.java rename to src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRelTest.java index f8dbf11a7..db6651499 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/pubrel/MqttPubRelTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRelTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.pubrel; +package com.hivemq.client.internal.mqtt.message.publish; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/suback/MqttSubAckTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubAckTest.java similarity index 94% rename from src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/suback/MqttSubAckTest.java rename to src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubAckTest.java index 8cf1d9f68..52cd79060 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/suback/MqttSubAckTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubAckTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe.suback; +package com.hivemq.client.internal.mqtt.message.subscribe; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/suback/mqtt3/Mqtt3SubAckViewTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckViewTest.java similarity index 92% rename from src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/suback/mqtt3/Mqtt3SubAckViewTest.java rename to src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckViewTest.java index 94a3b0f21..afa226031 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/suback/mqtt3/Mqtt3SubAckViewTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckViewTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe.suback.mqtt3; +package com.hivemq.client.internal.mqtt.message.subscribe.mqtt3; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/unsuback/MqttUnsubAckTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubAckTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/unsuback/MqttUnsubAckTest.java rename to src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubAckTest.java index 4f3c2c7aa..c746285b5 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/unsuback/MqttUnsubAckTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubAckTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.unsubscribe.unsuback; +package com.hivemq.client.internal.mqtt.message.unsubscribe; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAck; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAckReasonCode; +import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; +import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewExceptionsTest.java b/src/test/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewExceptionsTest.java index b89c8a30e..45a9be55e 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewExceptionsTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewExceptionsTest.java @@ -30,7 +30,7 @@ import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5DisconnectException; import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5MessageException; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import com.hivemq.client.rx.FlowableWithSingleSplit; import io.reactivex.Completable; import io.reactivex.Flowable; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3ConnAckExceptionTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3ConnAckExceptionTest.java index cecf4d209..d4124306a 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3ConnAckExceptionTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3ConnAckExceptionTest.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt3.exceptions; import com.hivemq.client.internal.util.AsyncRuntimeException; -import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAck; +import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3SubAckExceptionTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3SubAckExceptionTest.java index 53156b05b..c0a7cdad6 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3SubAckExceptionTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3SubAckExceptionTest.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt3.exceptions; import com.hivemq.client.internal.util.AsyncRuntimeException; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.suback.Mqtt3SubAck; +import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt3/message/connect/connack/Mqtt3ConnAckReturnCodeTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnAckReturnCodeTest.java similarity index 97% rename from src/test/java/com/hivemq/client/mqtt/mqtt3/message/connect/connack/Mqtt3ConnAckReturnCodeTest.java rename to src/test/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnAckReturnCodeTest.java index 4db1217c5..236881093 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt3/message/connect/connack/Mqtt3ConnAckReturnCodeTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnAckReturnCodeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.connect.connack; +package com.hivemq.client.mqtt.mqtt3.message.connect; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/suback/Mqtt3SubAckReturnCodeTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAckReturnCodeTest.java similarity index 97% rename from src/test/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/suback/Mqtt3SubAckReturnCodeTest.java rename to src/test/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAckReturnCodeTest.java index b2f05cafa..c7e1e9fd1 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/suback/Mqtt3SubAckReturnCodeTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAckReturnCodeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.subscribe.suback; +package com.hivemq.client.mqtt.mqtt3.message.subscribe; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5ConnAckExceptionTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5ConnAckExceptionTest.java index 2073eba30..85f156c3f 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5ConnAckExceptionTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5ConnAckExceptionTest.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt5.exceptions; import com.hivemq.client.internal.util.AsyncRuntimeException; -import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck; +import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubAckExceptionTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubAckExceptionTest.java index 869412f45..445290337 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubAckExceptionTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubAckExceptionTest.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt5.exceptions; import com.hivemq.client.internal.util.AsyncRuntimeException; -import com.hivemq.client.mqtt.mqtt5.message.publish.puback.Mqtt5PubAck; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAck; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubRecExceptionTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubRecExceptionTest.java index f06dcc351..cdd945300 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubRecExceptionTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubRecExceptionTest.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt5.exceptions; import com.hivemq.client.internal.util.AsyncRuntimeException; -import com.hivemq.client.mqtt.mqtt5.message.publish.pubrec.Mqtt5PubRec; +import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRec; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5SubAckExceptionTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5SubAckExceptionTest.java index d7a2c250e..97ba8daef 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5SubAckExceptionTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5SubAckExceptionTest.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt5.exceptions; import com.hivemq.client.internal.util.AsyncRuntimeException; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck; +import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5UnsubAckExceptionTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5UnsubAckExceptionTest.java index fd0c3334e..04e898fd6 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5UnsubAckExceptionTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5UnsubAckExceptionTest.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt5.exceptions; import com.hivemq.client.internal.util.AsyncRuntimeException; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAck; +import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/connect/connack/Mqtt5ConnAckReasonCodeTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCodeTest.java similarity index 99% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/message/connect/connack/Mqtt5ConnAckReasonCodeTest.java rename to src/test/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCodeTest.java index 35316e51f..308ada9ab 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/connect/connack/Mqtt5ConnAckReasonCodeTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCodeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.connect.connack; +package com.hivemq.client.mqtt.mqtt5.message.connect; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/puback/Mqtt5PubAckReasonCodeTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckReasonCodeTest.java similarity index 98% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/puback/Mqtt5PubAckReasonCodeTest.java rename to src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckReasonCodeTest.java index 1a9bf4c03..a05d6b7b5 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/puback/Mqtt5PubAckReasonCodeTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckReasonCodeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.publish.puback; +package com.hivemq.client.mqtt.mqtt5.message.publish; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubcomp/Mqtt5PubCompReasonCodeTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompReasonCodeTest.java similarity index 98% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubcomp/Mqtt5PubCompReasonCodeTest.java rename to src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompReasonCodeTest.java index 2361b727d..59e3c86f7 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubcomp/Mqtt5PubCompReasonCodeTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompReasonCodeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.publish.pubcomp; +package com.hivemq.client.mqtt.mqtt5.message.publish; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrec/Mqtt5PubRecReasonCodeTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecReasonCodeTest.java similarity index 98% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrec/Mqtt5PubRecReasonCodeTest.java rename to src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecReasonCodeTest.java index ff18d134d..eb7feaea2 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrec/Mqtt5PubRecReasonCodeTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecReasonCodeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.publish.pubrec; +package com.hivemq.client.mqtt.mqtt5.message.publish; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrel/Mqtt5PubRelReasonCodeTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelReasonCodeTest.java similarity index 98% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrel/Mqtt5PubRelReasonCodeTest.java rename to src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelReasonCodeTest.java index a8bab3ae0..d528557ad 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/pubrel/Mqtt5PubRelReasonCodeTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelReasonCodeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.publish.pubrel; +package com.hivemq.client.mqtt.mqtt5.message.publish; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/suback/Mqtt5SubAckReasonCodeTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCodeTest.java similarity index 98% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/suback/Mqtt5SubAckReasonCodeTest.java rename to src/test/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCodeTest.java index 461e346a9..73b25ae13 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/suback/Mqtt5SubAckReasonCodeTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCodeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.subscribe.suback; +package com.hivemq.client.mqtt.mqtt5.message.subscribe; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/unsuback/Mqtt5UnsubAckReasonCodeTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCodeTest.java similarity index 98% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/unsuback/Mqtt5UnsubAckReasonCodeTest.java rename to src/test/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCodeTest.java index 1ed77b632..80114bf25 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/unsuback/Mqtt5UnsubAckReasonCodeTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCodeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback; +package com.hivemq.client.mqtt.mqtt5.message.unsubscribe; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; From d62bab33cec1869b2f699dfb717236962538a352 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Fri, 13 Nov 2020 22:19:17 +0100 Subject: [PATCH 15/62] Updated jetrains.annotations to 20.1.0 Replaced DoNotImplement with ApiStatus.NonExtendable annotation Add ApiStatus.OverrideOnly annotations --- gradle.properties | 2 +- gradle/japicc.gradle.kts | 2 +- .../mqtt3/reactor/Mqtt3ReactorClient.java | 4 +-- .../mqtt5/reactor/Mqtt5ReactorClient.java | 4 +-- .../client/annotations/DoNotImplement.java | 34 ------------------ .../com/hivemq/client/mqtt/MqttClient.java | 4 +-- .../hivemq/client/mqtt/MqttClientBuilder.java | 4 +-- .../client/mqtt/MqttClientBuilderBase.java | 4 +-- .../hivemq/client/mqtt/MqttClientConfig.java | 4 +-- .../mqtt/MqttClientConnectionConfig.java | 4 +-- .../client/mqtt/MqttExecutorConfig.java | 4 +-- .../mqtt/MqttExecutorConfigBuilder.java | 6 ++-- .../mqtt/MqttExecutorConfigBuilderBase.java | 4 +-- .../hivemq/client/mqtt/MqttProxyConfig.java | 4 +-- .../client/mqtt/MqttProxyConfigBuilder.java | 6 ++-- .../mqtt/MqttProxyConfigBuilderBase.java | 4 +-- .../com/hivemq/client/mqtt/MqttTlsConfig.java | 4 +-- .../client/mqtt/MqttTlsConfigBuilder.java | 6 ++-- .../client/mqtt/MqttTlsConfigBuilderBase.java | 4 +-- .../client/mqtt/MqttTransportConfig.java | 4 +-- .../mqtt/MqttTransportConfigBuilder.java | 6 ++-- .../mqtt/MqttTransportConfigBuilderBase.java | 4 +-- .../client/mqtt/MqttWebSocketConfig.java | 4 +-- .../mqtt/MqttWebSocketConfigBuilder.java | 6 ++-- .../mqtt/MqttWebSocketConfigBuilderBase.java | 4 +-- .../mqtt/datatypes/MqttClientIdentifier.java | 4 +-- .../mqtt/datatypes/MqttSharedTopicFilter.java | 4 +-- .../MqttSharedTopicFilterBuilder.java | 14 ++++---- .../client/mqtt/datatypes/MqttTopic.java | 4 +-- .../mqtt/datatypes/MqttTopicBuilder.java | 10 +++--- .../mqtt/datatypes/MqttTopicBuilderBase.java | 4 +-- .../mqtt/datatypes/MqttTopicFilter.java | 4 +-- .../datatypes/MqttTopicFilterBuilder.java | 14 ++++---- .../datatypes/MqttTopicFilterBuilderBase.java | 12 +++---- .../client/mqtt/datatypes/MqttUtf8String.java | 4 +-- .../mqtt/lifecycle/MqttAutoReconnect.java | 4 +-- .../lifecycle/MqttAutoReconnectBuilder.java | 6 ++-- .../MqttAutoReconnectBuilderBase.java | 4 +-- .../mqtt/lifecycle/MqttConnectedContext.java | 4 +-- .../mqtt/lifecycle/MqttConnectedListener.java | 2 ++ .../lifecycle/MqttDisconnectedContext.java | 4 +-- .../lifecycle/MqttDisconnectedListener.java | 2 ++ .../mqtt/lifecycle/MqttReconnector.java | 4 +-- .../client/mqtt/mqtt3/Mqtt3AsyncClient.java | 16 ++++----- .../mqtt/mqtt3/Mqtt3BlockingClient.java | 6 ++-- .../hivemq/client/mqtt/mqtt3/Mqtt3Client.java | 4 +-- .../client/mqtt/mqtt3/Mqtt3ClientBuilder.java | 4 +-- .../client/mqtt/mqtt3/Mqtt3ClientConfig.java | 4 +-- .../mqtt3/Mqtt3ClientConnectionConfig.java | 6 ++-- .../client/mqtt/mqtt3/Mqtt3RxClient.java | 4 +-- .../lifecycle/Mqtt3ConnectedContext.java | 4 +-- .../lifecycle/Mqtt3DisconnectedContext.java | 4 +-- .../mqtt3/lifecycle/Mqtt3Reconnector.java | 4 +-- .../mqtt/mqtt3/message/Mqtt3Message.java | 4 +-- .../mqtt/mqtt3/message/Mqtt3ReturnCode.java | 4 +-- .../mqtt3/message/auth/Mqtt3SimpleAuth.java | 4 +-- .../message/auth/Mqtt3SimpleAuthBuilder.java | 10 +++--- .../auth/Mqtt3SimpleAuthBuilderBase.java | 6 ++-- .../mqtt3/message/connect/Mqtt3ConnAck.java | 4 +-- .../mqtt3/message/connect/Mqtt3Connect.java | 4 +-- .../message/connect/Mqtt3ConnectBuilder.java | 8 ++--- .../connect/Mqtt3ConnectBuilderBase.java | 4 +-- .../message/disconnect/Mqtt3Disconnect.java | 4 +-- .../mqtt/mqtt3/message/ping/Mqtt3PingReq.java | 4 +-- .../mqtt3/message/ping/Mqtt3PingResp.java | 4 +-- .../mqtt3/message/publish/Mqtt3PubAck.java | 4 +-- .../mqtt3/message/publish/Mqtt3PubComp.java | 4 +-- .../mqtt3/message/publish/Mqtt3PubRec.java | 4 +-- .../mqtt3/message/publish/Mqtt3PubRel.java | 4 +-- .../mqtt3/message/publish/Mqtt3Publish.java | 4 +-- .../message/publish/Mqtt3PublishBuilder.java | 18 +++++----- .../publish/Mqtt3PublishBuilderBase.java | 6 ++-- .../message/publish/Mqtt3PublishResult.java | 4 +-- .../publish/Mqtt3WillPublishBuilder.java | 10 +++--- .../mqtt3/message/subscribe/Mqtt3SubAck.java | 4 +-- .../message/subscribe/Mqtt3Subscribe.java | 4 +-- .../subscribe/Mqtt3SubscribeBuilder.java | 36 +++++++++---------- .../subscribe/Mqtt3SubscribeBuilderBase.java | 8 ++--- .../message/subscribe/Mqtt3Subscription.java | 4 +-- .../subscribe/Mqtt3SubscriptionBuilder.java | 10 +++--- .../Mqtt3SubscriptionBuilderBase.java | 6 ++-- .../message/unsubscribe/Mqtt3UnsubAck.java | 4 +-- .../message/unsubscribe/Mqtt3Unsubscribe.java | 4 +-- .../unsubscribe/Mqtt3UnsubscribeBuilder.java | 26 +++++++------- .../Mqtt3UnsubscribeBuilderBase.java | 6 ++-- .../client/mqtt/mqtt5/Mqtt5AsyncClient.java | 16 ++++----- .../mqtt/mqtt5/Mqtt5BlockingClient.java | 6 ++-- .../hivemq/client/mqtt/mqtt5/Mqtt5Client.java | 4 +-- .../client/mqtt/mqtt5/Mqtt5ClientBuilder.java | 4 +-- .../client/mqtt/mqtt5/Mqtt5ClientConfig.java | 4 +-- .../mqtt5/Mqtt5ClientConnectionConfig.java | 8 ++--- .../client/mqtt/mqtt5/Mqtt5RxClient.java | 4 +-- .../mqtt5/advanced/Mqtt5AdvancedConfig.java | 4 +-- .../advanced/Mqtt5AdvancedConfigBuilder.java | 6 ++-- .../Mqtt5AdvancedConfigBuilderBase.java | 4 +-- .../interceptor/Mqtt5ClientInterceptors.java | 4 +-- .../Mqtt5ClientInterceptorsBuilder.java | 6 ++-- .../Mqtt5ClientInterceptorsBuilderBase.java | 4 +-- .../qos1/Mqtt5IncomingQos1Interceptor.java | 2 ++ .../qos1/Mqtt5OutgoingQos1Interceptor.java | 2 ++ .../qos2/Mqtt5IncomingQos2Interceptor.java | 2 ++ .../qos2/Mqtt5OutgoingQos2Interceptor.java | 2 ++ .../auth/Mqtt5EnhancedAuthMechanism.java | 2 ++ .../mqtt5/datatypes/Mqtt5UserProperties.java | 4 +-- .../datatypes/Mqtt5UserPropertiesBuilder.java | 6 ++-- .../Mqtt5UserPropertiesBuilderBase.java | 4 +-- .../mqtt5/datatypes/Mqtt5UserProperty.java | 4 +-- .../lifecycle/Mqtt5ConnectedContext.java | 4 +-- .../lifecycle/Mqtt5DisconnectedContext.java | 4 +-- .../mqtt5/lifecycle/Mqtt5Reconnector.java | 4 +-- .../mqtt/mqtt5/message/Mqtt5Message.java | 4 +-- .../mqtt/mqtt5/message/Mqtt5ReasonCode.java | 4 +-- .../mqtt/mqtt5/message/auth/Mqtt5Auth.java | 4 +-- .../mqtt5/message/auth/Mqtt5AuthBuilder.java | 4 +-- .../mqtt5/message/auth/Mqtt5EnhancedAuth.java | 4 +-- .../auth/Mqtt5EnhancedAuthBuilder.java | 4 +-- .../mqtt5/message/auth/Mqtt5SimpleAuth.java | 4 +-- .../message/auth/Mqtt5SimpleAuthBuilder.java | 10 +++--- .../auth/Mqtt5SimpleAuthBuilderBase.java | 4 +-- .../mqtt5/message/connect/Mqtt5ConnAck.java | 4 +-- .../connect/Mqtt5ConnAckRestrictions.java | 4 +-- .../mqtt5/message/connect/Mqtt5Connect.java | 4 +-- .../message/connect/Mqtt5ConnectBuilder.java | 8 ++--- .../connect/Mqtt5ConnectBuilderBase.java | 4 +-- .../connect/Mqtt5ConnectRestrictions.java | 4 +-- .../Mqtt5ConnectRestrictionsBuilder.java | 6 ++-- .../Mqtt5ConnectRestrictionsBuilderBase.java | 4 +-- .../message/disconnect/Mqtt5Disconnect.java | 4 +-- .../disconnect/Mqtt5DisconnectBuilder.java | 10 +++--- .../Mqtt5DisconnectBuilderBase.java | 4 +-- .../mqtt/mqtt5/message/ping/Mqtt5PingReq.java | 4 +-- .../mqtt5/message/ping/Mqtt5PingResp.java | 4 +-- .../mqtt5/message/publish/Mqtt5PubAck.java | 4 +-- .../message/publish/Mqtt5PubAckBuilder.java | 4 +-- .../mqtt5/message/publish/Mqtt5PubComp.java | 4 +-- .../message/publish/Mqtt5PubCompBuilder.java | 4 +-- .../mqtt5/message/publish/Mqtt5PubRec.java | 4 +-- .../message/publish/Mqtt5PubRecBuilder.java | 4 +-- .../mqtt5/message/publish/Mqtt5PubRel.java | 4 +-- .../message/publish/Mqtt5PubRelBuilder.java | 4 +-- .../mqtt5/message/publish/Mqtt5Publish.java | 4 +-- .../message/publish/Mqtt5PublishBuilder.java | 14 ++++---- .../publish/Mqtt5PublishBuilderBase.java | 10 +++--- .../message/publish/Mqtt5PublishResult.java | 10 +++--- .../message/publish/Mqtt5WillPublish.java | 4 +-- .../publish/Mqtt5WillPublishBuilder.java | 10 +++--- .../mqtt5/message/subscribe/Mqtt5SubAck.java | 4 +-- .../message/subscribe/Mqtt5Subscribe.java | 4 +-- .../subscribe/Mqtt5SubscribeBuilder.java | 36 +++++++++---------- .../subscribe/Mqtt5SubscribeBuilderBase.java | 10 +++--- .../message/subscribe/Mqtt5Subscription.java | 4 +-- .../subscribe/Mqtt5SubscriptionBuilder.java | 10 +++--- .../Mqtt5SubscriptionBuilderBase.java | 6 ++-- .../message/unsubscribe/Mqtt5UnsubAck.java | 4 +-- .../message/unsubscribe/Mqtt5Unsubscribe.java | 4 +-- .../unsubscribe/Mqtt5UnsubscribeBuilder.java | 20 +++++------ .../Mqtt5UnsubscribeBuilderBase.java | 8 ++--- .../com/hivemq/client/util/TypeSwitch.java | 2 ++ 158 files changed, 462 insertions(+), 480 deletions(-) delete mode 100644 src/main/java/com/hivemq/client/annotations/DoNotImplement.java diff --git a/gradle.properties b/gradle.properties index 2a702bfe9..a3c20c04f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ rxjava.version=2.2.19 reactive-streams.version=1.0.3 netty.version=4.1.48.Final jctools.version=2.1.2 -annotations.version=16.0.3 +annotations.version=20.1.0 dagger.version=2.27 slf4j.version=1.7.30 reactor.version=3.3.4.RELEASE diff --git a/gradle/japicc.gradle.kts b/gradle/japicc.gradle.kts index 0b22ce41d..f3b404321 100644 --- a/gradle/japicc.gradle.kts +++ b/gradle/japicc.gradle.kts @@ -93,7 +93,7 @@ allprojects { val className = interfaceDef.split(Regex("[ <{]"), limit = 2)[0] classNames.add(className) - val annotationIndex = content.indexOf("@DoNotImplement", index) + val annotationIndex = content.indexOf("@ApiStatus.NonExtendable", index) if (annotationIndex == -1) break if (annotationIndex < start) { diff --git a/reactor/src/main/java/com/hivemq/client/mqtt/mqtt3/reactor/Mqtt3ReactorClient.java b/reactor/src/main/java/com/hivemq/client/mqtt/mqtt3/reactor/Mqtt3ReactorClient.java index 28dd8105f..ab7f28942 100644 --- a/reactor/src/main/java/com/hivemq/client/mqtt/mqtt3/reactor/Mqtt3ReactorClient.java +++ b/reactor/src/main/java/com/hivemq/client/mqtt/mqtt3/reactor/Mqtt3ReactorClient.java @@ -17,7 +17,6 @@ package com.hivemq.client.mqtt.mqtt3.reactor; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.mqtt3.reactor.Mqtt3ReactorClientView; import com.hivemq.client.mqtt.MqttGlobalPublishFilter; import com.hivemq.client.mqtt.mqtt3.Mqtt3Client; @@ -32,6 +31,7 @@ import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; import com.hivemq.client.rx.reactor.FluxWithSingle; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; @@ -43,7 +43,7 @@ * @author Silvio Giebl * @since 1.2 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3ReactorClient extends Mqtt3Client { /** diff --git a/reactor/src/main/java/com/hivemq/client/mqtt/mqtt5/reactor/Mqtt5ReactorClient.java b/reactor/src/main/java/com/hivemq/client/mqtt/mqtt5/reactor/Mqtt5ReactorClient.java index a33aa31cc..ce45fe115 100644 --- a/reactor/src/main/java/com/hivemq/client/mqtt/mqtt5/reactor/Mqtt5ReactorClient.java +++ b/reactor/src/main/java/com/hivemq/client/mqtt/mqtt5/reactor/Mqtt5ReactorClient.java @@ -17,7 +17,6 @@ package com.hivemq.client.mqtt.mqtt5.reactor; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.reactor.MqttReactorClient; import com.hivemq.client.mqtt.MqttGlobalPublishFilter; import com.hivemq.client.mqtt.mqtt5.Mqtt5Client; @@ -35,6 +34,7 @@ import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubscribeBuilder; import com.hivemq.client.rx.reactor.FluxWithSingle; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; @@ -46,7 +46,7 @@ * @author Silvio Giebl * @since 1.2 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5ReactorClient extends Mqtt5Client { /** diff --git a/src/main/java/com/hivemq/client/annotations/DoNotImplement.java b/src/main/java/com/hivemq/client/annotations/DoNotImplement.java deleted file mode 100644 index 6048c2ed2..000000000 --- a/src/main/java/com/hivemq/client/annotations/DoNotImplement.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2018-present HiveMQ and the HiveMQ Community - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.hivemq.client.annotations; - -import java.lang.annotation.*; - -/** - * Documents that an interface MUST NOT be implemented by the user. - *

    - * The implementation is provided by the library. - *

    - * This allows the library to later add methods to the interface without breaking backwards compatibility with - * implementing classes. - * - * @author Silvio Giebl - */ -@Documented -@Retention(RetentionPolicy.CLASS) -@Target(ElementType.TYPE) -public @interface DoNotImplement {} diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClient.java b/src/main/java/com/hivemq/client/mqtt/MqttClient.java index 449f9dc18..eecb19342 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClient.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClient.java @@ -16,8 +16,8 @@ package com.hivemq.client.mqtt; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.MqttRxClientBuilderBase; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,7 +26,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttClient { /** diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilder.java b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilder.java index 9bb0003e8..532cc2255 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilder.java @@ -17,9 +17,9 @@ package com.hivemq.client.mqtt; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientBuilder; import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -28,7 +28,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttClientBuilder extends MqttClientBuilderBase { /** diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java index 6ed442a73..7dbf47adc 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java @@ -17,12 +17,12 @@ package com.hivemq.client.mqtt; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnect; import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnectBuilder; import com.hivemq.client.mqtt.lifecycle.MqttConnectedListener; import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedListener; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -36,7 +36,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttClientBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java index dd25eaf08..9c98b1a1a 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java @@ -16,12 +16,12 @@ package com.hivemq.client.mqtt; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnect; import com.hivemq.client.mqtt.lifecycle.MqttConnectedListener; import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedListener; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.net.InetSocketAddress; @@ -34,7 +34,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttClientConfig { /** diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientConnectionConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttClientConnectionConfig.java index 7a8311496..fda278677 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientConnectionConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientConnectionConfig.java @@ -16,7 +16,7 @@ package com.hivemq.client.mqtt; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -25,7 +25,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttClientConnectionConfig { /** diff --git a/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfig.java index aed4316a3..20701f147 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfig.java @@ -16,10 +16,10 @@ package com.hivemq.client.mqtt; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.MqttExecutorConfigImplBuilder; import io.reactivex.Scheduler; import io.reactivex.schedulers.Schedulers; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Optional; @@ -32,7 +32,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttExecutorConfig { @NotNull Scheduler DEFAULT_APPLICATION_SCHEDULER = Schedulers.computation(); diff --git a/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfigBuilder.java b/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfigBuilder.java index d8a26f838..5f963a682 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfigBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfigBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,7 +26,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttExecutorConfigBuilder extends MqttExecutorConfigBuilderBase { /** @@ -42,7 +42,7 @@ public interface MqttExecutorConfigBuilder extends MqttExecutorConfigBuilderBase * * @param

    the type of the result when the built {@link MqttExecutorConfig} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends MqttExecutorConfigBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfigBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfigBuilderBase.java index 73685a026..3697ab312 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfigBuilderBase.java @@ -17,8 +17,8 @@ package com.hivemq.client.mqtt; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import io.reactivex.Scheduler; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -31,7 +31,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttExecutorConfigBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/MqttProxyConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttProxyConfig.java index 0ff13b44e..791fcbba0 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttProxyConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttProxyConfig.java @@ -16,8 +16,8 @@ package com.hivemq.client.mqtt; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.MqttProxyConfigImplBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.net.InetSocketAddress; @@ -29,7 +29,7 @@ * @author Silvio Giebl * @since 1.2 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttProxyConfig { /** diff --git a/src/main/java/com/hivemq/client/mqtt/MqttProxyConfigBuilder.java b/src/main/java/com/hivemq/client/mqtt/MqttProxyConfigBuilder.java index 0c52135b5..daf01c699 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttProxyConfigBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttProxyConfigBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,7 +26,7 @@ * @author Silvio Giebl * @since 1.2 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttProxyConfigBuilder extends MqttProxyConfigBuilderBase { /** @@ -42,7 +42,7 @@ public interface MqttProxyConfigBuilder extends MqttProxyConfigBuilderBase the type of the result when the built {@link MqttProxyConfig} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends MqttProxyConfigBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/MqttProxyConfigBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttProxyConfigBuilderBase.java index c593cc832..aec3c962d 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttProxyConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttProxyConfigBuilderBase.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -32,7 +32,7 @@ * @author Silvio Giebl * @since 1.2 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttProxyConfigBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/MqttTlsConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttTlsConfig.java index d478866a4..a9d228ba3 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttTlsConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttTlsConfig.java @@ -16,9 +16,9 @@ package com.hivemq.client.mqtt; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.MqttTlsConfigImplBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import javax.net.ssl.HostnameVerifier; @@ -34,7 +34,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttTlsConfig { /** diff --git a/src/main/java/com/hivemq/client/mqtt/MqttTlsConfigBuilder.java b/src/main/java/com/hivemq/client/mqtt/MqttTlsConfigBuilder.java index 086276faf..4bf55f354 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttTlsConfigBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttTlsConfigBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,7 +26,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttTlsConfigBuilder extends MqttTlsConfigBuilderBase { /** @@ -42,7 +42,7 @@ public interface MqttTlsConfigBuilder extends MqttTlsConfigBuilderBase the type of the result when the built {@link MqttTlsConfig} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends MqttTlsConfigBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/MqttTlsConfigBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttTlsConfigBuilderBase.java index d456e46c4..09d7a6001 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttTlsConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttTlsConfigBuilderBase.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -34,7 +34,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttTlsConfigBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/MqttTransportConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttTransportConfig.java index 1243d4b5d..7880cacf5 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttTransportConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttTransportConfig.java @@ -16,8 +16,8 @@ package com.hivemq.client.mqtt; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.MqttTransportConfigImplBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.net.InetSocketAddress; @@ -29,7 +29,7 @@ * @author Silvio Giebl * @since 1.1 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttTransportConfig { /** diff --git a/src/main/java/com/hivemq/client/mqtt/MqttTransportConfigBuilder.java b/src/main/java/com/hivemq/client/mqtt/MqttTransportConfigBuilder.java index 79bf1c973..e3ce2ae5d 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttTransportConfigBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttTransportConfigBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,7 +26,7 @@ * @author Silvio Giebl * @since 1.1 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttTransportConfigBuilder extends MqttTransportConfigBuilderBase { /** @@ -42,7 +42,7 @@ public interface MqttTransportConfigBuilder extends MqttTransportConfigBuilderBa * * @param

    the type of the result when the built {@link MqttTransportConfig} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends MqttTransportConfigBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/MqttTransportConfigBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttTransportConfigBuilderBase.java index eee4d0a4f..28f6cc5a0 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttTransportConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttTransportConfigBuilderBase.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -32,7 +32,7 @@ * @author Silvio Giebl * @since 1.1 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttTransportConfigBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/MqttWebSocketConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttWebSocketConfig.java index 41b17ff85..a8b6c65bf 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttWebSocketConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttWebSocketConfig.java @@ -16,8 +16,8 @@ package com.hivemq.client.mqtt; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.MqttWebSocketConfigImplBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -27,7 +27,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttWebSocketConfig { /** diff --git a/src/main/java/com/hivemq/client/mqtt/MqttWebSocketConfigBuilder.java b/src/main/java/com/hivemq/client/mqtt/MqttWebSocketConfigBuilder.java index 4ebde987b..bb38126c8 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttWebSocketConfigBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttWebSocketConfigBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,7 +26,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttWebSocketConfigBuilder extends MqttWebSocketConfigBuilderBase { /** @@ -42,7 +42,7 @@ public interface MqttWebSocketConfigBuilder extends MqttWebSocketConfigBuilderBa * * @param

    the type of the result when the built {@link MqttWebSocketConfig} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends MqttWebSocketConfigBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/MqttWebSocketConfigBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttWebSocketConfigBuilderBase.java index 79a0f1f82..7845abb94 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttWebSocketConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttWebSocketConfigBuilderBase.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.concurrent.TimeUnit; @@ -29,7 +29,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttWebSocketConfigBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttClientIdentifier.java b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttClientIdentifier.java index 15d0c47e7..84136418e 100644 --- a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttClientIdentifier.java +++ b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttClientIdentifier.java @@ -16,8 +16,8 @@ package com.hivemq.client.mqtt.datatypes; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.datatypes.MqttClientIdentifierImpl; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -28,7 +28,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttClientIdentifier extends MqttUtf8String { /** diff --git a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttSharedTopicFilter.java b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttSharedTopicFilter.java index b5bec5938..98a6d1c2e 100644 --- a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttSharedTopicFilter.java +++ b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttSharedTopicFilter.java @@ -16,9 +16,9 @@ package com.hivemq.client.mqtt.datatypes; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.datatypes.MqttSharedTopicFilterImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImplBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -39,7 +39,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttSharedTopicFilter extends MqttTopicFilter { /** diff --git a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttSharedTopicFilterBuilder.java b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttSharedTopicFilterBuilder.java index 2948a92d7..8c0fc4c9f 100644 --- a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttSharedTopicFilterBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttSharedTopicFilterBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.datatypes; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -27,7 +27,7 @@ * @since 1.0 */ // @formatter:off -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttSharedTopicFilterBuilder extends MqttTopicFilterBuilderBase.SharedBase< MqttSharedTopicFilterBuilder, MqttSharedTopicFilterBuilder.Complete, MqttSharedTopicFilterBuilder.End> { @@ -37,7 +37,7 @@ public interface MqttSharedTopicFilterBuilder extends * {@link MqttSharedTopicFilterBuilder} that is complete which means all mandatory fields are set. */ // @formatter:off - @DoNotImplement + @ApiStatus.NonExtendable interface Complete extends MqttSharedTopicFilterBuilder, MqttSharedTopicFilterBuilder.End, MqttTopicFilterBuilderBase.SharedBase.Complete< MqttSharedTopicFilterBuilder, MqttSharedTopicFilterBuilder.Complete, @@ -47,7 +47,7 @@ interface Complete extends MqttSharedTopicFilterBuilder, MqttSharedTopicFilterBu /** * End of a {@link MqttSharedTopicFilterBuilder} that does not allow to add any more levels or wildcards. */ - @DoNotImplement + @ApiStatus.NonExtendable interface End extends MqttTopicFilterBuilderBase.End { /** @@ -64,7 +64,7 @@ interface End extends MqttTopicFilterBuilderBase.End { * * @param

    the type of the result when the built {@link MqttSharedTopicFilter} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends MqttTopicFilterBuilderBase.SharedBase, Nested.Complete

    , Nested.End

    > { /** @@ -72,14 +72,14 @@ interface Nested

    extends MqttTopicFilterBuilderBase.SharedBase, Nes * * @param

    the type of the result when the built {@link MqttTopicFilter} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Nested

    , Nested.End

    , MqttTopicFilterBuilderBase.SharedBase.Complete, Nested.Complete

    , Nested.End

    > {} /** * End of a {@link Nested} that does not allow to add any more levels or wildcards. */ - @DoNotImplement + @ApiStatus.NonExtendable interface End

    extends MqttTopicFilterBuilderBase.End { /** diff --git a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopic.java b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopic.java index 75e6ce1d6..0655be444 100644 --- a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopic.java +++ b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopic.java @@ -16,10 +16,10 @@ package com.hivemq.client.mqtt.datatypes; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttTopicImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttTopicImplBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -37,7 +37,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttTopic extends MqttUtf8String { /** diff --git a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicBuilder.java b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicBuilder.java index 4d55e5a89..d86d1b0f9 100644 --- a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.datatypes; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,7 +26,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttTopicBuilder extends MqttTopicBuilderBase { /** @@ -49,7 +49,7 @@ public interface MqttTopicBuilder extends MqttTopicBuilderBase { /** @@ -66,7 +66,7 @@ interface Complete extends MqttTopicBuilder, MqttTopicBuilderBase the type of the result when the built {@link MqttTopic} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends MqttTopicBuilderBase> { /** @@ -74,7 +74,7 @@ interface Nested

    extends MqttTopicBuilderBase> { * * @param

    the type of the result when the built {@link MqttTopic} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Nested

    , MqttTopicBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicBuilderBase.java index 6686f9b6b..f3de563cb 100644 --- a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicBuilderBase.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.datatypes; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -27,7 +27,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttTopicBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicFilter.java b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicFilter.java index c88051899..d5d04490d 100644 --- a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicFilter.java +++ b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicFilter.java @@ -16,10 +16,10 @@ package com.hivemq.client.mqtt.datatypes; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImplBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -37,7 +37,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttTopicFilter extends MqttUtf8String { /** diff --git a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicFilterBuilder.java b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicFilterBuilder.java index 5d8770249..98bbac355 100644 --- a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicFilterBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicFilterBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.datatypes; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -27,7 +27,7 @@ * @since 1.0 */ // @formatter:off -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttTopicFilterBuilder extends MqttTopicFilterBuilderBase< MqttTopicFilterBuilder.Complete, MqttTopicFilterBuilder.End, MqttSharedTopicFilterBuilder, @@ -38,7 +38,7 @@ public interface MqttTopicFilterBuilder extends * {@link MqttTopicFilterBuilder} that is complete which means all mandatory fields are set. */ // @formatter:off - @DoNotImplement + @ApiStatus.NonExtendable interface Complete extends MqttTopicFilterBuilder, MqttTopicFilterBuilder.End, MqttTopicFilterBuilderBase.Complete< MqttTopicFilterBuilder.Complete, MqttTopicFilterBuilder.End, MqttSharedTopicFilterBuilder, @@ -48,7 +48,7 @@ interface Complete extends MqttTopicFilterBuilder, MqttTopicFilterBuilder.End, /** * End of a {@link MqttTopicFilterBuilder} that does not allow to add any more levels or wildcards. */ - @DoNotImplement + @ApiStatus.NonExtendable interface End extends MqttTopicFilterBuilderBase.End { /** @@ -66,7 +66,7 @@ interface End extends MqttTopicFilterBuilderBase.End { * @param

    the type of the result when the built {@link MqttTopicFilter} is applied to the parent. */ // @formatter:off - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends MqttTopicFilterBuilderBase< Nested.Complete

    , Nested.End

    , MqttSharedTopicFilterBuilder.Nested

    , @@ -79,7 +79,7 @@ interface Nested

    extends * @param

    the type of the result when the built {@link MqttTopicFilter} is applied to the parent. */ // @formatter:off - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Nested

    , Nested.End

    , MqttTopicFilterBuilderBase.Complete< Nested.Complete

    , Nested.End

    , MqttSharedTopicFilterBuilder.Nested

    , @@ -89,7 +89,7 @@ interface Complete

    extends Nested

    , Nested.End

    , /** * End of a {@link Nested} that does not allow to add any more levels or wildcards. */ - @DoNotImplement + @ApiStatus.NonExtendable interface End

    extends MqttTopicFilterBuilderBase.End { /** diff --git a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicFilterBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicFilterBuilderBase.java index 4642ba8bb..99dde86ac 100644 --- a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicFilterBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicFilterBuilderBase.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.datatypes; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -32,7 +32,7 @@ * @since 1.0 */ // @formatter:off -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttTopicFilterBuilderBase< C extends MqttTopicFilterBuilderBase, E extends MqttTopicFilterBuilderBase.End, @@ -85,7 +85,7 @@ public interface MqttTopicFilterBuilderBase< * @param the type of the end builder for a {@link MqttSharedTopicFilter}. */ // @formatter:off - @DoNotImplement + @ApiStatus.NonExtendable interface Complete< C extends MqttTopicFilterBuilderBase, E extends MqttTopicFilterBuilderBase.End, @@ -109,7 +109,7 @@ interface Complete< /** * End of a {@link MqttTopicFilterBuilderBase} that does not allow to add any more levels or wildcards. */ - @DoNotImplement + @ApiStatus.NonExtendable interface End {} /** @@ -120,7 +120,7 @@ interface End {} * @param the type of the end builder. */ // @formatter:off - @DoNotImplement + @ApiStatus.NonExtendable interface SharedBase< S extends SharedBase, SC extends S, @@ -136,7 +136,7 @@ interface SharedBase< * @param the type of the end builder. */ // @formatter:off - @DoNotImplement + @ApiStatus.NonExtendable interface Complete< S extends SharedBase, SC extends S, diff --git a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttUtf8String.java b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttUtf8String.java index 4bbe55ea9..2f97c4ae2 100644 --- a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttUtf8String.java +++ b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttUtf8String.java @@ -16,8 +16,8 @@ package com.hivemq.client.mqtt.datatypes; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.nio.ByteBuffer; @@ -45,7 +45,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttUtf8String extends Comparable { /** diff --git a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnect.java b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnect.java index 97b3a8c4d..24647cf14 100644 --- a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnect.java +++ b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnect.java @@ -16,8 +16,8 @@ package com.hivemq.client.mqtt.lifecycle; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.lifecycle.MqttAutoReconnectImplBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.concurrent.TimeUnit; @@ -31,7 +31,7 @@ * @author Silvio Giebl * @since 1.1 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttAutoReconnect extends MqttDisconnectedListener { /** diff --git a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnectBuilder.java b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnectBuilder.java index 610c92969..5e7db4b3d 100644 --- a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnectBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnectBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.lifecycle; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,7 +26,7 @@ * @author Silvio Giebl * @since 1.1 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttAutoReconnectBuilder extends MqttAutoReconnectBuilderBase { /** @@ -42,7 +42,7 @@ public interface MqttAutoReconnectBuilder extends MqttAutoReconnectBuilderBase the type of the result when the built {@link MqttAutoReconnect} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends MqttAutoReconnectBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnectBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnectBuilderBase.java index 7b640d38f..1dc61467b 100644 --- a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnectBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttAutoReconnectBuilderBase.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.lifecycle; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.concurrent.TimeUnit; @@ -29,7 +29,7 @@ * @author Silvio Giebl * @since 1.1 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttAutoReconnectBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttConnectedContext.java b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttConnectedContext.java index e8cbcdd72..0d0189ffc 100644 --- a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttConnectedContext.java +++ b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttConnectedContext.java @@ -16,8 +16,8 @@ package com.hivemq.client.mqtt.lifecycle; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttClientConfig; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,7 +26,7 @@ * @author Silvio Giebl * @since 1.1 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttConnectedContext { /** diff --git a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttConnectedListener.java b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttConnectedListener.java index 0c28e68a0..40c3bf20a 100644 --- a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttConnectedListener.java +++ b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttConnectedListener.java @@ -16,6 +16,7 @@ package com.hivemq.client.mqtt.lifecycle; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -24,6 +25,7 @@ * @author Silvio Giebl * @since 1.1 */ +@ApiStatus.OverrideOnly @FunctionalInterface public interface MqttConnectedListener { diff --git a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttDisconnectedContext.java b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttDisconnectedContext.java index cc8eb5590..789303796 100644 --- a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttDisconnectedContext.java +++ b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttDisconnectedContext.java @@ -16,8 +16,8 @@ package com.hivemq.client.mqtt.lifecycle; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttClientConfig; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,7 +26,7 @@ * @author Silvio Giebl * @since 1.1 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttDisconnectedContext { /** diff --git a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttDisconnectedListener.java b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttDisconnectedListener.java index f7b0fc161..a535249c0 100644 --- a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttDisconnectedListener.java +++ b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttDisconnectedListener.java @@ -16,6 +16,7 @@ package com.hivemq.client.mqtt.lifecycle; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -25,6 +26,7 @@ * @author Silvio Giebl * @since 1.1 */ +@ApiStatus.OverrideOnly @FunctionalInterface public interface MqttDisconnectedListener { diff --git a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttReconnector.java b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttReconnector.java index 522df4f88..5e6bc14e9 100644 --- a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttReconnector.java +++ b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttReconnector.java @@ -17,9 +17,9 @@ package com.hivemq.client.mqtt.lifecycle; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttTransportConfig; import com.hivemq.client.mqtt.MqttTransportConfigBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -39,7 +39,7 @@ * @author Silvio Giebl * @since 1.1 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface MqttReconnector { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java index 41e83ca5d..62cec6d96 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java @@ -17,7 +17,6 @@ package com.hivemq.client.mqtt.mqtt3; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttGlobalPublishFilter; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; @@ -29,6 +28,7 @@ import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilderBase; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.concurrent.CompletableFuture; @@ -41,7 +41,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3AsyncClient extends Mqtt3Client { /** @@ -332,14 +332,14 @@ void publishes( * #subscribe(Mqtt3Subscribe)}, {@link #subscribe(Mqtt3Subscribe, Consumer, boolean)} or {@link * #subscribe(Mqtt3Subscribe, Consumer, Executor, boolean)} call. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Mqtt3SubscribeAndCallbackBuilder extends Mqtt3SubscribeBuilderBase { /** * {@link Mqtt3SubscribeAndCallbackBuilder} that is complete which means all mandatory fields are set. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete extends Mqtt3SubscribeAndCallbackBuilder, Mqtt3SubscribeAndCallbackBuilder.Call, Mqtt3SubscribeBuilderBase {} @@ -347,7 +347,7 @@ interface Complete extends Mqtt3SubscribeAndCallbackBuilder, Mqtt3SubscribeAndCa * {@link Mqtt3SubscribeAndCallbackBuilder} that provides additional methods for the first subscription. */ // @formatter:off - @DoNotImplement + @ApiStatus.NonExtendable interface Start extends Mqtt3SubscribeAndCallbackBuilder, Mqtt3SubscribeBuilderBase.Start< Mqtt3SubscribeAndCallbackBuilder.Complete, Mqtt3SubscribeAndCallbackBuilder.Start.Complete> { @@ -358,7 +358,7 @@ interface Start extends Mqtt3SubscribeAndCallbackBuilder, * set. */ // @formatter:off - @DoNotImplement + @ApiStatus.NonExtendable interface Complete extends Mqtt3SubscribeAndCallbackBuilder.Start, Mqtt3SubscribeAndCallbackBuilder.Complete, Mqtt3SubscribeBuilderBase.Start.Complete< @@ -372,7 +372,7 @@ interface Complete extends * #subscribe(Mqtt3Subscribe, Consumer, boolean)} or {@link #subscribe(Mqtt3Subscribe, Consumer, Executor, * boolean)} call. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Call { /** @@ -398,7 +398,7 @@ interface Call { * Builder for additional arguments alongside the {@link Mqtt3Subscribe} that are applied to a {@link * #subscribe(Mqtt3Subscribe, Consumer, Executor, boolean)} call. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Ex extends Call { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java index e595dfa53..c95f2ed96 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java @@ -17,7 +17,6 @@ package com.hivemq.client.mqtt.mqtt3; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttGlobalPublishFilter; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; @@ -29,6 +28,7 @@ import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilder; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Optional; @@ -40,7 +40,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3BlockingClient extends Mqtt3Client { /** @@ -170,7 +170,7 @@ public interface Mqtt3BlockingClient extends Mqtt3Client { /** * Resource which queues incoming Publish messages until they are received. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Publishes extends AutoCloseable { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3Client.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3Client.java index 7fd7e2935..df9ab978e 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3Client.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3Client.java @@ -17,9 +17,9 @@ package com.hivemq.client.mqtt.mqtt3; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.mqtt3.Mqtt3RxClientViewBuilder; import com.hivemq.client.mqtt.MqttClient; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -28,7 +28,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3Client extends MqttClient { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientBuilder.java index c7d5607cb..f3e9e480f 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientBuilder.java @@ -17,12 +17,12 @@ package com.hivemq.client.mqtt.mqtt3; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttClientBuilderBase; import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuthBuilder; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3WillPublishBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -32,7 +32,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3ClientBuilder extends MqttClientBuilderBase { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientConfig.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientConfig.java index c0ff11d0a..e2f473d46 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientConfig.java @@ -16,10 +16,10 @@ package com.hivemq.client.mqtt.mqtt3; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttClientConfig; import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Optional; @@ -30,7 +30,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3ClientConfig extends MqttClientConfig { @Override diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientConnectionConfig.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientConnectionConfig.java index 42949102d..cd66a4aa1 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientConnectionConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientConnectionConfig.java @@ -16,8 +16,8 @@ package com.hivemq.client.mqtt.mqtt3; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttClientConnectionConfig; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,7 +26,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3ClientConnectionConfig extends MqttClientConnectionConfig { /** @@ -37,7 +37,7 @@ public interface Mqtt3ClientConnectionConfig extends MqttClientConnectionConfig /** * Restrictions for messages a {@link Mqtt3Client} sends. */ - @DoNotImplement + @ApiStatus.NonExtendable interface RestrictionsForClient { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java index 5c2e2e3af..86938f5a2 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java @@ -17,7 +17,6 @@ package com.hivemq.client.mqtt.mqtt3; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttGlobalPublishFilter; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; @@ -33,6 +32,7 @@ import io.reactivex.Completable; import io.reactivex.Flowable; import io.reactivex.Single; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Publisher; @@ -42,7 +42,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3RxClient extends Mqtt3Client { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ConnectedContext.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ConnectedContext.java index e47ba1144..e2c26b5b8 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ConnectedContext.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ConnectedContext.java @@ -16,11 +16,11 @@ package com.hivemq.client.mqtt.mqtt3.lifecycle; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.lifecycle.MqttConnectedContext; import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientConfig; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -30,7 +30,7 @@ * @author Silvio Giebl * @since 1.1 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3ConnectedContext extends MqttConnectedContext { @Override diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3DisconnectedContext.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3DisconnectedContext.java index 6931b7693..97fa2d949 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3DisconnectedContext.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3DisconnectedContext.java @@ -16,9 +16,9 @@ package com.hivemq.client.mqtt.mqtt3.lifecycle; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedContext; import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientConfig; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -28,7 +28,7 @@ * @author Silvio Giebl * @since 1.1 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3DisconnectedContext extends MqttDisconnectedContext { @Override diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3Reconnector.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3Reconnector.java index 541486b87..5bae944ae 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3Reconnector.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3Reconnector.java @@ -17,12 +17,12 @@ package com.hivemq.client.mqtt.mqtt3.lifecycle; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttTransportConfig; import com.hivemq.client.mqtt.MqttTransportConfigBuilder; import com.hivemq.client.mqtt.lifecycle.MqttReconnector; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnectBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -36,7 +36,7 @@ * @author Silvio Giebl * @since 1.1 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3Reconnector extends MqttReconnector { @Override diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/Mqtt3Message.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/Mqtt3Message.java index 95ca6a5c1..2c5848ded 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/Mqtt3Message.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/Mqtt3Message.java @@ -16,7 +16,7 @@ package com.hivemq.client.mqtt.mqtt3.message; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -25,7 +25,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3Message { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/Mqtt3ReturnCode.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/Mqtt3ReturnCode.java index 505a849f1..ad3a6cbef 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/Mqtt3ReturnCode.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/Mqtt3ReturnCode.java @@ -16,7 +16,7 @@ package com.hivemq.client.mqtt.mqtt3.message; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; /** * Return Code according to the MQTT 3 specification. @@ -24,7 +24,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3ReturnCode { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuth.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuth.java index 1ca47e1b1..d804db997 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuth.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuth.java @@ -16,9 +16,9 @@ package com.hivemq.client.mqtt.mqtt3.message.auth; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.message.auth.mqtt3.Mqtt3SimpleAuthViewBuilder; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.nio.ByteBuffer; @@ -31,7 +31,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3SimpleAuth { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilder.java index 989e5f8aa..ec173b0a2 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt3.message.auth; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,13 +26,13 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3SimpleAuthBuilder extends Mqtt3SimpleAuthBuilderBase { /** * {@link Mqtt3SimpleAuthBuilder} that is complete which means all mandatory fields are set. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete extends Mqtt3SimpleAuthBuilder, Mqtt3SimpleAuthBuilderBase.Complete { @@ -50,7 +50,7 @@ interface Complete * * @param

    the type of the result when the built {@link Mqtt3SimpleAuth} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends Mqtt3SimpleAuthBuilderBase> { /** @@ -58,7 +58,7 @@ interface Nested

    extends Mqtt3SimpleAuthBuilderBase> { * * @param

    the type of the result when the built {@link Mqtt3SimpleAuth} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Nested

    , Mqtt3SimpleAuthBuilderBase.Complete> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilderBase.java index b0ea14835..940b2a9df 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilderBase.java @@ -17,8 +17,8 @@ package com.hivemq.client.mqtt.mqtt3.message.auth; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.nio.ByteBuffer; @@ -30,7 +30,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3SimpleAuthBuilderBase> { /** @@ -56,7 +56,7 @@ public interface Mqtt3SimpleAuthBuilderBase the type of the complete builder. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete> extends Mqtt3SimpleAuthBuilderBase { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnAck.java index 55239c0ca..8b575a40a 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnAck.java @@ -16,9 +16,9 @@ package com.hivemq.client.mqtt.mqtt3.message.connect; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -28,7 +28,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3ConnAck extends Mqtt3Message { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3Connect.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3Connect.java index 2ec330c77..69ffbfabe 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3Connect.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3Connect.java @@ -16,12 +16,12 @@ package com.hivemq.client.mqtt.mqtt3.message.connect; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectViewBuilder; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Optional; @@ -32,7 +32,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3Connect extends Mqtt3Message { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilder.java index 5f7a9c6cc..629a06fb2 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt3.message.connect; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,7 +26,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3ConnectBuilder extends Mqtt3ConnectBuilderBase { /** @@ -42,7 +42,7 @@ public interface Mqtt3ConnectBuilder extends Mqtt3ConnectBuilderBase the type of the result when the built {@link Mqtt3Connect} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends Mqtt3ConnectBuilderBase> { /** @@ -59,7 +59,7 @@ interface Nested

    extends Mqtt3ConnectBuilderBase> { * * @param

    the type of the result when the built {@link Mqtt3Connect} is sent by the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Send

    extends Mqtt3ConnectBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java index 4d8cfffb9..acda3e9d0 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java @@ -17,11 +17,11 @@ package com.hivemq.client.mqtt.mqtt3.message.connect; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuthBuilder; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3WillPublishBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -32,7 +32,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3ConnectBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/disconnect/Mqtt3Disconnect.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/disconnect/Mqtt3Disconnect.java index 0ffdf3564..77104ee08 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/disconnect/Mqtt3Disconnect.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/disconnect/Mqtt3Disconnect.java @@ -16,9 +16,9 @@ package com.hivemq.client.mqtt.mqtt3.message.disconnect; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -27,7 +27,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3Disconnect extends Mqtt3Message { @Override diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/ping/Mqtt3PingReq.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/ping/Mqtt3PingReq.java index e7e5a46f2..4433b6067 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/ping/Mqtt3PingReq.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/ping/Mqtt3PingReq.java @@ -16,9 +16,9 @@ package com.hivemq.client.mqtt.mqtt3.message.ping; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -27,7 +27,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3PingReq extends Mqtt3Message { @Override diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/ping/Mqtt3PingResp.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/ping/Mqtt3PingResp.java index de1cf12d1..8d59477a5 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/ping/Mqtt3PingResp.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/ping/Mqtt3PingResp.java @@ -16,9 +16,9 @@ package com.hivemq.client.mqtt.mqtt3.message.ping; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -27,7 +27,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3PingResp extends Mqtt3Message { @Override diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubAck.java index a323ad384..acb75b5cd 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubAck.java @@ -16,9 +16,9 @@ package com.hivemq.client.mqtt.mqtt3.message.publish; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -28,7 +28,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3PubAck extends Mqtt3Message { @Override diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubComp.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubComp.java index d4e557c28..9b421c75e 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubComp.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubComp.java @@ -16,9 +16,9 @@ package com.hivemq.client.mqtt.mqtt3.message.publish; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -28,7 +28,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3PubComp extends Mqtt3Message { @Override diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubRec.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubRec.java index 1e75894c0..e00521a02 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubRec.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubRec.java @@ -16,9 +16,9 @@ package com.hivemq.client.mqtt.mqtt3.message.publish; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -28,7 +28,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3PubRec extends Mqtt3Message { @Override diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubRel.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubRel.java index efe7ab4ca..1465af687 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubRel.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubRel.java @@ -16,9 +16,9 @@ package com.hivemq.client.mqtt.mqtt3.message.publish; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -28,7 +28,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3PubRel extends Mqtt3Message { @Override diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3Publish.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3Publish.java index be7b4bb39..9ab44edf6 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3Publish.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3Publish.java @@ -16,12 +16,12 @@ package com.hivemq.client.mqtt.mqtt3.message.publish; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishViewBuilder; import com.hivemq.client.mqtt.datatypes.MqttQos; import com.hivemq.client.mqtt.datatypes.MqttTopic; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.nio.ByteBuffer; @@ -34,7 +34,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3Publish extends Mqtt3Message { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishBuilder.java index 2a78bcf1f..9811105d0 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt3.message.publish; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,13 +26,13 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3PublishBuilder extends Mqtt3PublishBuilderBase { /** * {@link Mqtt3PublishBuilder} that is complete which means all mandatory fields are set. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete extends Mqtt3PublishBuilder, Mqtt3PublishBuilderBase.Complete { /** @@ -49,7 +49,7 @@ interface Complete extends Mqtt3PublishBuilder, Mqtt3PublishBuilderBase.Complete * * @param

    the type of the result when the built {@link Mqtt3Publish} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends Mqtt3PublishBuilderBase> { /** @@ -57,7 +57,7 @@ interface Nested

    extends Mqtt3PublishBuilderBase> { * * @param

    the type of the result when the built {@link Mqtt3Publish} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Nested

    , Mqtt3PublishBuilderBase.Complete> { /** @@ -75,7 +75,7 @@ interface Complete

    extends Nested

    , Mqtt3PublishBuilderBase.Complete the type of the result when the built {@link Mqtt3Publish} is sent by the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Send

    extends Mqtt3PublishBuilderBase> { /** @@ -83,7 +83,7 @@ interface Send

    extends Mqtt3PublishBuilderBase> { * * @param

    the type of the result when the built {@link Mqtt3Publish} is sent by the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Send

    , Mqtt3PublishBuilderBase.Complete> { /** @@ -99,13 +99,13 @@ interface Complete

    extends Send

    , Mqtt3PublishBuilderBase.Complete { /** * {@link SendVoid} that is complete which means all mandatory fields are set. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete extends SendVoid, Mqtt3PublishBuilderBase.Complete { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishBuilderBase.java index 2db90bbbb..d6a0fa4f2 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishBuilderBase.java @@ -17,10 +17,10 @@ package com.hivemq.client.mqtt.mqtt3.message.publish; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttQos; import com.hivemq.client.mqtt.datatypes.MqttTopic; import com.hivemq.client.mqtt.datatypes.MqttTopicBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -33,7 +33,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3PublishBuilderBase> { /** @@ -71,7 +71,7 @@ public interface Mqtt3PublishBuilderBase the type of the complete builder. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete> extends Mqtt3PublishBuilderBase { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishResult.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishResult.java index 0ccaaf31f..150c602a8 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishResult.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishResult.java @@ -16,7 +16,7 @@ package com.hivemq.client.mqtt.mqtt3.message.publish; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Optional; @@ -30,7 +30,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3PublishResult { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3WillPublishBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3WillPublishBuilder.java index a6cbe71fb..0201c76f7 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3WillPublishBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3WillPublishBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt3.message.publish; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,13 +26,13 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3WillPublishBuilder extends Mqtt3PublishBuilderBase { /** * {@link Mqtt3WillPublishBuilder} that is complete which means all mandatory fields are set. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete extends Mqtt3WillPublishBuilder, Mqtt3PublishBuilderBase.Complete { @@ -50,7 +50,7 @@ interface Complete * * @param

    the type of the result when the built {@link Mqtt3Publish} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends Mqtt3PublishBuilderBase> { /** @@ -58,7 +58,7 @@ interface Nested

    extends Mqtt3PublishBuilderBase> { * * @param

    the type of the result when the built {@link Mqtt3Publish} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Nested

    , Mqtt3PublishBuilderBase.Complete> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAck.java index f80a45510..07a156c8f 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAck.java @@ -16,10 +16,10 @@ package com.hivemq.client.mqtt.mqtt3.message.subscribe; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -31,7 +31,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3SubAck extends Mqtt3Message { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3Subscribe.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3Subscribe.java index 6a7ec9da5..cafb13051 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3Subscribe.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3Subscribe.java @@ -16,11 +16,11 @@ package com.hivemq.client.mqtt.mqtt3.message.subscribe; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubscribeViewBuilder; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -31,7 +31,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3Subscribe extends Mqtt3Message { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java index fbc59ba1b..4c4cacc76 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt3.message.subscribe; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,13 +26,13 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3SubscribeBuilder extends Mqtt3SubscribeBuilderBase { /** * {@link Mqtt3SubscribeBuilder} that is complete which means all mandatory fields are set. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete extends Mqtt3SubscribeBuilder, Mqtt3SubscribeBuilderBase { /** @@ -47,7 +47,7 @@ interface Complete extends Mqtt3SubscribeBuilder, Mqtt3SubscribeBuilderBase { @@ -55,7 +55,7 @@ interface Start extends Mqtt3SubscribeBuilder, * {@link Mqtt3SubscribeBuilder.Start} that is complete which means all mandatory fields are set. */ // @formatter:off - @DoNotImplement + @ApiStatus.NonExtendable interface Complete extends Mqtt3SubscribeBuilder.Start, Mqtt3SubscribeBuilder.Complete, Mqtt3SubscribeBuilderBase.Start.Complete< Mqtt3SubscribeBuilder.Complete, Mqtt3SubscribeBuilder.Start.Complete> {} @@ -67,7 +67,7 @@ interface Complete extends Mqtt3SubscribeBuilder.Start, Mqtt3SubscribeBuilder.Co * * @param

    the type of the result when the built {@link Mqtt3Subscribe} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends Mqtt3SubscribeBuilderBase> { /** @@ -75,7 +75,7 @@ interface Nested

    extends Mqtt3SubscribeBuilderBase> { * * @param

    the type of the result when the built {@link Mqtt3Subscribe} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Nested

    , Mqtt3SubscribeBuilderBase> { /** @@ -91,7 +91,7 @@ interface Complete

    extends Nested

    , Mqtt3SubscribeBuilderBase the type of the result when the built {@link Mqtt3Subscribe} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Start

    extends Nested

    , Mqtt3SubscribeBuilderBase.Start, Nested.Start.Complete

    > { @@ -100,7 +100,7 @@ interface Start

    * * @param

    the type of the result when the built {@link Mqtt3Subscribe} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Nested.Start

    , Nested.Complete

    , Mqtt3SubscribeBuilderBase.Start.Complete, Nested.Start.Complete

    > {} } @@ -112,7 +112,7 @@ interface Complete

    extends Nested.Start

    , Nested.Complete

    , * * @param

    the type of the result when the built {@link Mqtt3Subscribe} is sent by the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Send

    extends Mqtt3SubscribeBuilderBase> { /** @@ -120,7 +120,7 @@ interface Send

    extends Mqtt3SubscribeBuilderBase> { * * @param

    the type of the result when the built {@link Mqtt3Subscribe} is sent by the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Send

    , Mqtt3SubscribeBuilderBase> { /** @@ -136,7 +136,7 @@ interface Complete

    extends Send

    , Mqtt3SubscribeBuilderBase the type of the result when the built {@link Mqtt3Subscribe} is sent by the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Start

    extends Send

    , Mqtt3SubscribeBuilderBase.Start, Send.Start.Complete

    > { /** @@ -144,7 +144,7 @@ interface Start

    extends Send

    , Mqtt3SubscribeBuilderBase.Start the type of the result when the built {@link Mqtt3Subscribe} is sent by the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Send.Start

    , Send.Complete

    , Mqtt3SubscribeBuilderBase.Start.Complete, Send.Start.Complete

    > {} } @@ -157,7 +157,7 @@ interface Complete

    extends Send.Start

    , Send.Complete

    , * @param

    the type of the result when the built {@link Mqtt3Subscribe} is applied to the parent. * @since 1.2 */ - @DoNotImplement + @ApiStatus.NonExtendable interface Publishes

    extends Mqtt3SubscribeBuilderBase> { /** @@ -165,7 +165,7 @@ interface Publishes

    extends Mqtt3SubscribeBuilderBase> * * @param

    the type of the result when the built {@link Mqtt3Subscribe} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Publishes

    , Publishes.Args

    , Mqtt3SubscribeBuilderBase> {} @@ -174,7 +174,7 @@ interface Complete

    * * @param

    the type of the result when the built {@link Mqtt3Subscribe} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Start

    extends Publishes

    , Mqtt3SubscribeBuilderBase.Start, Publishes.Start.Complete

    > { @@ -183,7 +183,7 @@ interface Start

    extends Publishes

    , * * @param

    the type of the result when the built {@link Mqtt3Subscribe} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Publishes.Start

    , Publishes.Complete

    , Mqtt3SubscribeBuilderBase.Start.Complete, Publishes.Start.Complete

    > {} } @@ -194,7 +194,7 @@ interface Complete

    extends Publishes.Start

    , Publishes.Complete

    , * * @param

    the type of the result when the built {@link Mqtt3Subscribe} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Args

    { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java index 224a9891f..04446d6b9 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt3.message.subscribe; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -30,7 +30,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3SubscribeBuilderBase> { /** @@ -96,7 +96,7 @@ public interface Mqtt3SubscribeBuilderBase the type of the complete start builder. */ // @formatter:off - @DoNotImplement + @ApiStatus.NonExtendable interface Start< C extends Mqtt3SubscribeBuilderBase, SC extends Mqtt3SubscribeBuilderBase.Start.Complete> @@ -110,7 +110,7 @@ interface Start< * @param the type of the complete start builder. */ // @formatter:off - @DoNotImplement + @ApiStatus.NonExtendable interface Complete< C extends Mqtt3SubscribeBuilderBase, SC extends Mqtt3SubscribeBuilderBase.Start.Complete> diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3Subscription.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3Subscription.java index 14194375b..9363176bc 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3Subscription.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3Subscription.java @@ -16,10 +16,10 @@ package com.hivemq.client.mqtt.mqtt3.message.subscribe; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubscriptionViewBuilder; import com.hivemq.client.mqtt.datatypes.MqttQos; import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -28,7 +28,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3Subscription { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilder.java index 0167e8bd3..e0cf72cd9 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt3.message.subscribe; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,13 +26,13 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3SubscriptionBuilder extends Mqtt3SubscriptionBuilderBase { /** * {@link Mqtt3SubscriptionBuilder} that is complete which means all mandatory fields are set. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete extends Mqtt3SubscriptionBuilder, Mqtt3SubscriptionBuilderBase.Complete { @@ -50,7 +50,7 @@ interface Complete * * @param

    the type of the result when the built {@link Mqtt3Subscription} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends Mqtt3SubscriptionBuilderBase> { /** @@ -58,7 +58,7 @@ interface Nested

    extends Mqtt3SubscriptionBuilderBase> { * * @param

    the type of the result when the built {@link Mqtt3Subscription} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Nested

    , Mqtt3SubscriptionBuilderBase.Complete> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilderBase.java index 360293319..257b9cdd4 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilderBase.java @@ -17,10 +17,10 @@ package com.hivemq.client.mqtt.mqtt3.message.subscribe; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttQos; import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; import com.hivemq.client.mqtt.datatypes.MqttTopicFilterBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -30,7 +30,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3SubscriptionBuilderBase> { /** @@ -69,7 +69,7 @@ public interface Mqtt3SubscriptionBuilderBase the type of the complete builder. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete> extends Mqtt3SubscriptionBuilderBase { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubAck.java index d37cbacc1..6e29fbd8b 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubAck.java @@ -16,9 +16,9 @@ package com.hivemq.client.mqtt.mqtt3.message.unsubscribe; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -28,7 +28,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3UnsubAck extends Mqtt3Message { @Override diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3Unsubscribe.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3Unsubscribe.java index 6f67054d0..d5ed1cb45 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3Unsubscribe.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3Unsubscribe.java @@ -16,12 +16,12 @@ package com.hivemq.client.mqtt.mqtt3.message.unsubscribe; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubscribeViewBuilder; import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -33,7 +33,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3Unsubscribe extends Mqtt3Message { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilder.java index 82bb9f01d..7aaa52926 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt3.message.unsubscribe; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,13 +26,13 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3UnsubscribeBuilder extends Mqtt3UnsubscribeBuilderBase { /** * {@link Mqtt3UnsubscribeBuilder} that is complete which means all mandatory fields are set. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete extends Mqtt3UnsubscribeBuilder, Mqtt3UnsubscribeBuilderBase { /** @@ -47,7 +47,7 @@ interface Complete extends Mqtt3UnsubscribeBuilder, Mqtt3UnsubscribeBuilderBase< /** * {@link Mqtt3UnsubscribeBuilder} that provides additional methods for the first Topic Filter. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Start extends Mqtt3UnsubscribeBuilder, Mqtt3UnsubscribeBuilderBase.Start {} @@ -56,7 +56,7 @@ interface Start * * @param

    the type of the result when the built {@link Mqtt3Unsubscribe} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends Mqtt3UnsubscribeBuilderBase> { /** @@ -64,7 +64,7 @@ interface Nested

    extends Mqtt3UnsubscribeBuilderBase> { * * @param

    the type of the result when the built {@link Mqtt3Unsubscribe} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Nested

    , Mqtt3UnsubscribeBuilderBase> { /** @@ -80,7 +80,7 @@ interface Complete

    extends Nested

    , Mqtt3UnsubscribeBuilderBase the type of the result when the built {@link Mqtt3Unsubscribe} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Start

    extends Nested

    , Mqtt3UnsubscribeBuilderBase.Start> {} } @@ -90,7 +90,7 @@ interface Start

    extends Nested

    , Mqtt3UnsubscribeBuilderBase.Start the type of the result when the built {@link Mqtt3Unsubscribe} is sent by the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Send

    extends Mqtt3UnsubscribeBuilderBase> { /** @@ -98,7 +98,7 @@ interface Send

    extends Mqtt3UnsubscribeBuilderBase> { * * @param

    the type of the result when the built {@link Mqtt3Unsubscribe} is sent by the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Send

    , Mqtt3UnsubscribeBuilderBase> { /** @@ -115,7 +115,7 @@ interface Complete

    extends Send

    , Mqtt3UnsubscribeBuilderBase the type of the result when the built {@link Mqtt3Unsubscribe} is sent by the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Start

    extends Send

    , Mqtt3UnsubscribeBuilderBase.Start> {} } @@ -123,13 +123,13 @@ interface Start

    extends Send

    , Mqtt3UnsubscribeBuilderBase.Start { /** * {@link SendVoid} that is complete which means all mandatory fields are set. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete extends SendVoid, Mqtt3UnsubscribeBuilderBase { /** @@ -142,7 +142,7 @@ interface Complete extends SendVoid, Mqtt3UnsubscribeBuilderBase {} } } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java index 17f751dae..d0294c685 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java @@ -17,10 +17,10 @@ package com.hivemq.client.mqtt.mqtt3.message.unsubscribe; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; import com.hivemq.client.mqtt.datatypes.MqttTopicFilterBuilder; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -33,7 +33,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt3UnsubscribeBuilderBase> { /** @@ -116,7 +116,7 @@ public interface Mqtt3UnsubscribeBuilderBase the type of the complete builder. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Start> extends Mqtt3UnsubscribeBuilderBase { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5AsyncClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5AsyncClient.java index 97c7e1b7c..2e5374ad7 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5AsyncClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5AsyncClient.java @@ -17,7 +17,6 @@ package com.hivemq.client.mqtt.mqtt5; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttGlobalPublishFilter; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; @@ -33,6 +32,7 @@ import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubscribeBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.concurrent.CompletableFuture; @@ -45,7 +45,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5AsyncClient extends Mqtt5Client { /** @@ -379,14 +379,14 @@ void publishes( * #subscribe(Mqtt5Subscribe)}, {@link #subscribe(Mqtt5Subscribe, Consumer, boolean)} or {@link * #subscribe(Mqtt5Subscribe, Consumer, Executor, boolean)} call. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Mqtt5SubscribeAndCallbackBuilder extends Mqtt5SubscribeBuilderBase { /** * {@link Mqtt5SubscribeAndCallbackBuilder} that is complete which means all mandatory fields are set. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete extends Mqtt5SubscribeAndCallbackBuilder, Mqtt5SubscribeAndCallbackBuilder.Call, Mqtt5SubscribeBuilderBase.Complete {} @@ -394,7 +394,7 @@ interface Complete extends Mqtt5SubscribeAndCallbackBuilder, Mqtt5SubscribeAndCa * {@link Mqtt5SubscribeAndCallbackBuilder} that provides additional methods for the first subscription. */ // @formatter:off - @DoNotImplement + @ApiStatus.NonExtendable interface Start extends Mqtt5SubscribeAndCallbackBuilder, Mqtt5SubscribeBuilderBase.Start< Mqtt5SubscribeAndCallbackBuilder.Complete, Mqtt5SubscribeAndCallbackBuilder.Start.Complete> { @@ -405,7 +405,7 @@ interface Start extends Mqtt5SubscribeAndCallbackBuilder, * set. */ // @formatter:off - @DoNotImplement + @ApiStatus.NonExtendable interface Complete extends Mqtt5SubscribeAndCallbackBuilder.Start, Mqtt5SubscribeAndCallbackBuilder.Complete, Mqtt5SubscribeBuilderBase.Start.Complete< @@ -419,7 +419,7 @@ interface Complete extends * #subscribe(Mqtt5Subscribe, Consumer, boolean)} or {@link #subscribe(Mqtt5Subscribe, Consumer, Executor, * boolean)} call. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Call { /** @@ -445,7 +445,7 @@ interface Call { * Builder for additional arguments alongside the {@link Mqtt5Subscribe} that are applied to a {@link * #subscribe(Mqtt5Subscribe, Consumer, Executor, boolean)} call. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Ex extends Call { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5BlockingClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5BlockingClient.java index 8e86394ed..6ae2707e3 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5BlockingClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5BlockingClient.java @@ -17,7 +17,6 @@ package com.hivemq.client.mqtt.mqtt5; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttGlobalPublishFilter; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; @@ -33,6 +32,7 @@ import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubscribeBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Optional; @@ -44,7 +44,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5BlockingClient extends Mqtt5Client { /** @@ -213,7 +213,7 @@ public interface Mqtt5BlockingClient extends Mqtt5Client { /** * Resource which queues incoming Publish messages until they are received. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Publishes extends AutoCloseable { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5Client.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5Client.java index bbfbb6cc3..bcda9b535 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5Client.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5Client.java @@ -17,9 +17,9 @@ package com.hivemq.client.mqtt.mqtt5; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.MqttRxClientBuilder; import com.hivemq.client.mqtt.MqttClient; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -28,7 +28,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5Client extends MqttClient { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientBuilder.java index 53dd435bb..e9ef751ce 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientBuilder.java @@ -17,7 +17,6 @@ package com.hivemq.client.mqtt.mqtt5; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttClientBuilderBase; import com.hivemq.client.mqtt.mqtt5.advanced.Mqtt5AdvancedConfig; import com.hivemq.client.mqtt.mqtt5.advanced.Mqtt5AdvancedConfigBuilder; @@ -26,6 +25,7 @@ import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuthBuilder; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublishBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -35,7 +35,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5ClientBuilder extends MqttClientBuilderBase { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConfig.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConfig.java index d72a1136d..1adff4031 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConfig.java @@ -16,12 +16,12 @@ package com.hivemq.client.mqtt.mqtt5; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttClientConfig; import com.hivemq.client.mqtt.mqtt5.advanced.Mqtt5AdvancedConfig; import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublish; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Optional; @@ -32,7 +32,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5ClientConfig extends MqttClientConfig { @Override diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConnectionConfig.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConnectionConfig.java index 05c1ee4e6..54ea81ada 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConnectionConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConnectionConfig.java @@ -16,10 +16,10 @@ package com.hivemq.client.mqtt.mqtt5; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttClientConnectionConfig; import com.hivemq.client.mqtt.datatypes.MqttQos; import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Optional; @@ -30,7 +30,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5ClientConnectionConfig extends MqttClientConnectionConfig { /** @@ -56,7 +56,7 @@ public interface Mqtt5ClientConnectionConfig extends MqttClientConnectionConfig /** * Restrictions for messages a {@link Mqtt5Client} receives. */ - @DoNotImplement + @ApiStatus.NonExtendable interface RestrictionsForServer { /** @@ -115,7 +115,7 @@ interface RestrictionsForServer { /** * Restrictions for messages a {@link Mqtt5Client} sends. */ - @DoNotImplement + @ApiStatus.NonExtendable interface RestrictionsForClient { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java index 4ca703e52..b299ba20e 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java @@ -17,7 +17,6 @@ package com.hivemq.client.mqtt.mqtt5; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttGlobalPublishFilter; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; @@ -36,6 +35,7 @@ import io.reactivex.Completable; import io.reactivex.Flowable; import io.reactivex.Single; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Publisher; @@ -45,7 +45,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5RxClient extends Mqtt5Client { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfig.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfig.java index e9706497e..2a69e4edb 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfig.java @@ -16,9 +16,9 @@ package com.hivemq.client.mqtt.mqtt5.advanced; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.advanced.MqttAdvancedConfigBuilder; import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.Mqtt5ClientInterceptors; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -28,7 +28,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5AdvancedConfig { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilder.java index 853a7f3ec..b20ce63a9 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt5.advanced; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,7 +26,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5AdvancedConfigBuilder extends Mqtt5AdvancedConfigBuilderBase { /** @@ -42,7 +42,7 @@ public interface Mqtt5AdvancedConfigBuilder extends Mqtt5AdvancedConfigBuilderBa * * @param

    the type of the result when the built {@link Mqtt5AdvancedConfig} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends Mqtt5AdvancedConfigBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java index 3d4cfcfb4..706ddf932 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java @@ -17,9 +17,9 @@ package com.hivemq.client.mqtt.mqtt5.advanced; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.Mqtt5ClientInterceptors; import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.Mqtt5ClientInterceptorsBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -30,7 +30,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5AdvancedConfigBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptors.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptors.java index 05d748b2d..d04ea974b 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptors.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptors.java @@ -16,12 +16,12 @@ package com.hivemq.client.mqtt.mqtt5.advanced.interceptor; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.advanced.interceptor.MqttClientInterceptorsBuilder; import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5IncomingQos1Interceptor; import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5OutgoingQos1Interceptor; import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5IncomingQos2Interceptor; import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutgoingQos2Interceptor; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -32,7 +32,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5ClientInterceptors { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilder.java index 6665c6b8e..d6bf3e6b3 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt5.advanced.interceptor; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,7 +26,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5ClientInterceptorsBuilder extends Mqtt5ClientInterceptorsBuilderBase { @@ -43,7 +43,7 @@ public interface Mqtt5ClientInterceptorsBuilder * * @param

    the type of the result when the built {@link Mqtt5ClientInterceptors} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends Mqtt5ClientInterceptorsBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilderBase.java index b777e1b6d..a45fa7a86 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilderBase.java @@ -17,11 +17,11 @@ package com.hivemq.client.mqtt.mqtt5.advanced.interceptor; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5IncomingQos1Interceptor; import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5OutgoingQos1Interceptor; import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5IncomingQos2Interceptor; import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutgoingQos2Interceptor; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -32,7 +32,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5ClientInterceptorsBuilderBase> { @CheckReturnValue diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5IncomingQos1Interceptor.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5IncomingQos1Interceptor.java index 06fff0666..5ef097c7d 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5IncomingQos1Interceptor.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5IncomingQos1Interceptor.java @@ -19,6 +19,7 @@ import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAckBuilder; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -27,6 +28,7 @@ * @author Silvio Giebl * @since 1.0 */ +@ApiStatus.OverrideOnly public interface Mqtt5IncomingQos1Interceptor { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5OutgoingQos1Interceptor.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5OutgoingQos1Interceptor.java index 5fe995ae0..d153baf79 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5OutgoingQos1Interceptor.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5OutgoingQos1Interceptor.java @@ -19,6 +19,7 @@ import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAck; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -27,6 +28,7 @@ * @author Silvio Giebl * @since 1.0 */ +@ApiStatus.OverrideOnly public interface Mqtt5OutgoingQos1Interceptor { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5IncomingQos2Interceptor.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5IncomingQos2Interceptor.java index a344d221f..c2ee6abda 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5IncomingQos2Interceptor.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5IncomingQos2Interceptor.java @@ -21,6 +21,7 @@ import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecBuilder; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRel; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -29,6 +30,7 @@ * @author Silvio Giebl * @since 1.0 */ +@ApiStatus.OverrideOnly public interface Mqtt5IncomingQos2Interceptor { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutgoingQos2Interceptor.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutgoingQos2Interceptor.java index cac1f95a7..ea0b9b295 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutgoingQos2Interceptor.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutgoingQos2Interceptor.java @@ -18,6 +18,7 @@ import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; import com.hivemq.client.mqtt.mqtt5.message.publish.*; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,6 +27,7 @@ * @author Silvio Giebl * @since 1.0 */ +@ApiStatus.OverrideOnly public interface Mqtt5OutgoingQos2Interceptor { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java index 734435b8a..b6bec7be8 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java @@ -24,6 +24,7 @@ import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.concurrent.CompletableFuture; @@ -53,6 +54,7 @@ * @author Silvio Giebl * @since 1.0 */ +@ApiStatus.OverrideOnly public interface Mqtt5EnhancedAuthMechanism { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserProperties.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserProperties.java index ec250aee0..873555a09 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserProperties.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserProperties.java @@ -16,11 +16,11 @@ package com.hivemq.client.mqtt.mqtt5.datatypes; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; import com.hivemq.client.internal.mqtt.util.MqttChecks; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -32,7 +32,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5UserProperties { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilder.java index 65852ed28..606aaec7d 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt5.datatypes; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,7 +26,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5UserPropertiesBuilder extends Mqtt5UserPropertiesBuilderBase { /** @@ -42,7 +42,7 @@ public interface Mqtt5UserPropertiesBuilder extends Mqtt5UserPropertiesBuilderBa * * @param

    the type of the result when the built {@link Mqtt5UserProperties} are applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends Mqtt5UserPropertiesBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilderBase.java index d146ac004..d54d25472 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilderBase.java @@ -17,8 +17,8 @@ package com.hivemq.client.mqtt.mqtt5.datatypes; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -31,7 +31,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5UserPropertiesBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserProperty.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserProperty.java index 29f9861e8..143c8d039 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserProperty.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserProperty.java @@ -16,10 +16,10 @@ package com.hivemq.client.mqtt.mqtt5.datatypes; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; import com.hivemq.client.internal.mqtt.util.MqttChecks; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -30,7 +30,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5UserProperty extends Comparable { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ConnectedContext.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ConnectedContext.java index 041b774e2..327cb44d2 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ConnectedContext.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ConnectedContext.java @@ -16,11 +16,11 @@ package com.hivemq.client.mqtt.mqtt5.lifecycle; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.lifecycle.MqttConnectedContext; import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -30,7 +30,7 @@ * @author Silvio Giebl * @since 1.1 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5ConnectedContext extends MqttConnectedContext { @Override diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5DisconnectedContext.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5DisconnectedContext.java index 6463fcbde..8006da7c6 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5DisconnectedContext.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5DisconnectedContext.java @@ -16,9 +16,9 @@ package com.hivemq.client.mqtt.mqtt5.lifecycle; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedContext; import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -28,7 +28,7 @@ * @author Silvio Giebl * @since 1.1 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5DisconnectedContext extends MqttDisconnectedContext { @Override diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5Reconnector.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5Reconnector.java index ac30706c8..fa25654cb 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5Reconnector.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5Reconnector.java @@ -17,12 +17,12 @@ package com.hivemq.client.mqtt.mqtt5.lifecycle; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.MqttTransportConfig; import com.hivemq.client.mqtt.MqttTransportConfigBuilder; import com.hivemq.client.mqtt.lifecycle.MqttReconnector; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -36,7 +36,7 @@ * @author Silvio Giebl * @since 1.1 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5Reconnector extends MqttReconnector { @Override diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5Message.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5Message.java index bc293bf25..8cd0a61d4 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5Message.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5Message.java @@ -16,7 +16,7 @@ package com.hivemq.client.mqtt.mqtt5.message; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -25,7 +25,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5Message { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5ReasonCode.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5ReasonCode.java index 3a00869ac..b0b9d5641 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5ReasonCode.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5ReasonCode.java @@ -16,7 +16,7 @@ package com.hivemq.client.mqtt.mqtt5.message; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; /** * Reason Code according to the MQTT 5 specification. @@ -24,7 +24,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5ReasonCode { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5Auth.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5Auth.java index 90cd0623a..30d1460a5 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5Auth.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5Auth.java @@ -16,11 +16,11 @@ package com.hivemq.client.mqtt.mqtt5.message.auth; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Optional; @@ -31,7 +31,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5Auth extends Mqtt5Message, Mqtt5EnhancedAuth { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthBuilder.java index 988a29313..346db16a0 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthBuilder.java @@ -17,10 +17,10 @@ package com.hivemq.client.mqtt.mqtt5.message.auth; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -32,7 +32,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5AuthBuilder extends Mqtt5EnhancedAuthBuilder { @Override diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuth.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuth.java index e4744084a..4022c5cb9 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuth.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuth.java @@ -16,8 +16,8 @@ package com.hivemq.client.mqtt.mqtt5.message.auth; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.nio.ByteBuffer; @@ -29,7 +29,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5EnhancedAuth { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuthBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuthBuilder.java index 7d4181c08..c643f5b47 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuthBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuthBuilder.java @@ -16,7 +16,7 @@ package com.hivemq.client.mqtt.mqtt5.message.auth; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -28,7 +28,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5EnhancedAuthBuilder { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuth.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuth.java index 3f5fbe6d8..84b0167c7 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuth.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuth.java @@ -16,9 +16,9 @@ package com.hivemq.client.mqtt.mqtt5.message.auth; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.message.auth.MqttSimpleAuthBuilder; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.nio.ByteBuffer; @@ -31,7 +31,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5SimpleAuth { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilder.java index dfdbabc86..759f6def0 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt5.message.auth; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,13 +26,13 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5SimpleAuthBuilder extends Mqtt5SimpleAuthBuilderBase { /** * {@link Mqtt5SimpleAuthBuilder} that is complete which means all mandatory fields are set. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete extends Mqtt5SimpleAuthBuilder, Mqtt5SimpleAuthBuilderBase { /** @@ -49,7 +49,7 @@ interface Complete extends Mqtt5SimpleAuthBuilder, Mqtt5SimpleAuthBuilderBase the type of the result when the built {@link Mqtt5SimpleAuth} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends Mqtt5SimpleAuthBuilderBase> { /** @@ -57,7 +57,7 @@ interface Nested

    extends Mqtt5SimpleAuthBuilderBase> { * * @param

    the type of the result when the built {@link Mqtt5SimpleAuth} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Nested

    , Mqtt5SimpleAuthBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilderBase.java index e4cdd5030..07d030377 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilderBase.java @@ -17,8 +17,8 @@ package com.hivemq.client.mqtt.mqtt5.message.auth; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.nio.ByteBuffer; @@ -30,7 +30,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5SimpleAuthBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAck.java index 8008b89b4..452cf0286 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAck.java @@ -16,13 +16,13 @@ package com.hivemq.client.mqtt.mqtt5.message.connect; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuth; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Optional; @@ -35,7 +35,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5ConnAck extends Mqtt5Message { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckRestrictions.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckRestrictions.java index 0c3b36acd..587de52e4 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckRestrictions.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckRestrictions.java @@ -16,10 +16,10 @@ package com.hivemq.client.mqtt.mqtt5.message.connect; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.mqtt.datatypes.MqttQos; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -32,7 +32,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5ConnAckRestrictions { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5Connect.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5Connect.java index d1572f2d8..7b98008a9 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5Connect.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5Connect.java @@ -16,7 +16,6 @@ package com.hivemq.client.mqtt.mqtt5.message.connect; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.message.connect.MqttConnectBuilder; import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; @@ -25,6 +24,7 @@ import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublish; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Optional; @@ -35,7 +35,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5Connect extends Mqtt5Message { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilder.java index 42883eeaa..30e613fcf 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt5.message.connect; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,7 +26,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5ConnectBuilder extends Mqtt5ConnectBuilderBase { /** @@ -42,7 +42,7 @@ public interface Mqtt5ConnectBuilder extends Mqtt5ConnectBuilderBase the type of the result when the built {@link Mqtt5Connect} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends Mqtt5ConnectBuilderBase> { /** @@ -59,7 +59,7 @@ interface Nested

    extends Mqtt5ConnectBuilderBase> { * * @param

    the type of the result when the built {@link Mqtt5Connect} is sent by the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Send

    extends Mqtt5ConnectBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilderBase.java index 3de0ecc4e..b765132ee 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilderBase.java @@ -17,7 +17,6 @@ package com.hivemq.client.mqtt.mqtt5.message.connect; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; @@ -25,6 +24,7 @@ import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuthBuilder; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublishBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -35,7 +35,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5ConnectBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictions.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictions.java index 4e4208b67..8ac932fb4 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictions.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictions.java @@ -16,10 +16,10 @@ package com.hivemq.client.mqtt.mqtt5.message.connect; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; import com.hivemq.client.internal.mqtt.message.connect.MqttConnectRestrictionsBuilder; import com.hivemq.client.internal.util.UnsignedDataTypes; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -42,7 +42,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5ConnectRestrictions { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilder.java index 128de1ada..b22ca93ff 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt5.message.connect; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,7 +26,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5ConnectRestrictionsBuilder extends Mqtt5ConnectRestrictionsBuilderBase { @@ -43,7 +43,7 @@ public interface Mqtt5ConnectRestrictionsBuilder * * @param

    the type of the result when the built {@link Mqtt5ConnectRestrictions} are applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends Mqtt5ConnectRestrictionsBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilderBase.java index 943e99dd9..51518d154 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilderBase.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt5.message.connect; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -27,7 +27,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5ConnectRestrictionsBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5Disconnect.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5Disconnect.java index 6afc5a82f..ae260d9ab 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5Disconnect.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5Disconnect.java @@ -16,12 +16,12 @@ package com.hivemq.client.mqtt.mqtt5.message.disconnect; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnectBuilder; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Optional; @@ -33,7 +33,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5Disconnect extends Mqtt5Message { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilder.java index 1ae623936..c7e23a0ce 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt5.message.disconnect; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,7 +26,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5DisconnectBuilder extends Mqtt5DisconnectBuilderBase { /** @@ -42,7 +42,7 @@ public interface Mqtt5DisconnectBuilder extends Mqtt5DisconnectBuilderBase the type of the result when the built {@link Mqtt5Disconnect} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends Mqtt5DisconnectBuilderBase> { /** @@ -59,7 +59,7 @@ interface Nested

    extends Mqtt5DisconnectBuilderBase> { * * @param

    the type of the result when the built {@link Mqtt5Disconnect} is sent by the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Send

    extends Mqtt5DisconnectBuilderBase> { /** @@ -74,7 +74,7 @@ interface Send

    extends Mqtt5DisconnectBuilderBase> { * Builder for a {@link Mqtt5Disconnect} that is applied to a parent {@link com.hivemq.client.mqtt.mqtt5.Mqtt5Client} * which then sends the Disconnect message without returning a result. */ - @DoNotImplement + @ApiStatus.NonExtendable interface SendVoid extends Mqtt5DisconnectBuilderBase { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilderBase.java index 4e6cfbef0..398d9d996 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilderBase.java @@ -17,10 +17,10 @@ package com.hivemq.client.mqtt.mqtt5.message.disconnect; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -31,7 +31,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5DisconnectBuilderBase> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/ping/Mqtt5PingReq.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/ping/Mqtt5PingReq.java index 5c3055963..1512fc526 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/ping/Mqtt5PingReq.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/ping/Mqtt5PingReq.java @@ -16,9 +16,9 @@ package com.hivemq.client.mqtt.mqtt5.message.ping; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -27,7 +27,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5PingReq extends Mqtt5Message { @Override diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/ping/Mqtt5PingResp.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/ping/Mqtt5PingResp.java index b578e53c3..4246a370a 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/ping/Mqtt5PingResp.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/ping/Mqtt5PingResp.java @@ -16,9 +16,9 @@ package com.hivemq.client.mqtt.mqtt5.message.ping; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -27,7 +27,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5PingResp extends Mqtt5Message { @Override diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAck.java index b6a8fdc54..1514d1848 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAck.java @@ -16,11 +16,11 @@ package com.hivemq.client.mqtt.mqtt5.message.publish; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Optional; @@ -31,7 +31,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5PubAck extends Mqtt5Message { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckBuilder.java index 6fe4995f2..16b1a565d 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckBuilder.java @@ -17,10 +17,10 @@ package com.hivemq.client.mqtt.mqtt5.message.publish; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -30,7 +30,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5PubAckBuilder { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubComp.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubComp.java index 6652d0e43..a3c9236b8 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubComp.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubComp.java @@ -16,11 +16,11 @@ package com.hivemq.client.mqtt.mqtt5.message.publish; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Optional; @@ -31,7 +31,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5PubComp extends Mqtt5Message { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompBuilder.java index 7f2329b1f..4bf0a16ef 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompBuilder.java @@ -17,10 +17,10 @@ package com.hivemq.client.mqtt.mqtt5.message.publish; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -30,7 +30,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5PubCompBuilder { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRec.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRec.java index dae251879..78511326e 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRec.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRec.java @@ -16,11 +16,11 @@ package com.hivemq.client.mqtt.mqtt5.message.publish; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Optional; @@ -31,7 +31,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5PubRec extends Mqtt5Message { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecBuilder.java index cd0873ba4..4b2e1bcf5 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecBuilder.java @@ -17,10 +17,10 @@ package com.hivemq.client.mqtt.mqtt5.message.publish; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -30,7 +30,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5PubRecBuilder { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRel.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRel.java index 3ab2c22b7..5644ae902 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRel.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRel.java @@ -16,11 +16,11 @@ package com.hivemq.client.mqtt.mqtt5.message.publish; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Optional; @@ -31,7 +31,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5PubRel extends Mqtt5Message { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelBuilder.java index 75e7819d7..62e422004 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelBuilder.java @@ -17,10 +17,10 @@ package com.hivemq.client.mqtt.mqtt5.message.publish; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -30,7 +30,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5PubRelBuilder { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5Publish.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5Publish.java index 9d24b1bc3..62e97244e 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5Publish.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5Publish.java @@ -16,7 +16,6 @@ package com.hivemq.client.mqtt.mqtt5.message.publish; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.message.publish.MqttPublishBuilder; import com.hivemq.client.mqtt.datatypes.MqttQos; import com.hivemq.client.mqtt.datatypes.MqttTopic; @@ -24,6 +23,7 @@ import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.nio.ByteBuffer; @@ -36,7 +36,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5Publish extends Mqtt5Message { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishBuilder.java index eb3329ddf..5eee1c05a 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt5.message.publish; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,7 +26,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5PublishBuilder extends Mqtt5PublishBuilderBase { /** @@ -40,7 +40,7 @@ public interface Mqtt5PublishBuilder extends Mqtt5PublishBuilderBase { /** @@ -67,7 +67,7 @@ interface Complete extends Mqtt5PublishBuilder, Mqtt5PublishBuilderBase.Complete * * @param

    the type of the result when the built {@link Mqtt5Publish} is sent by the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends Mqtt5PublishBuilderBase> { /** @@ -75,7 +75,7 @@ interface Nested

    extends Mqtt5PublishBuilderBase> { * * @param

    the type of the result when the built {@link Mqtt5Publish} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Nested

    , Mqtt5PublishBuilderBase.Complete> { /** @@ -91,7 +91,7 @@ interface Complete

    extends Nested

    , Mqtt5PublishBuilderBase.Complete extends Mqtt5PublishBuilderBase> { /** @@ -99,7 +99,7 @@ interface Send

    extends Mqtt5PublishBuilderBase> { * * @param

    the type of the result when the built {@link Mqtt5Publish} is sent by the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Send

    , Mqtt5PublishBuilderBase.Complete> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishBuilderBase.java index 93717c410..25a09954a 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishBuilderBase.java @@ -17,13 +17,13 @@ package com.hivemq.client.mqtt.mqtt5.message.publish; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttQos; import com.hivemq.client.mqtt.datatypes.MqttTopic; import com.hivemq.client.mqtt.datatypes.MqttTopicBuilder; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -36,7 +36,7 @@ * @author Bilvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5PublishBuilderBase> { /** @@ -74,7 +74,7 @@ public interface Mqtt5PublishBuilderBase the type of the complete builder. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete> extends Mqtt5PublishBuilderBase { /** @@ -237,7 +237,7 @@ interface Complete> extends Mqtt5P * * @param the type of the complete builder. */ - @DoNotImplement + @ApiStatus.NonExtendable interface WillBase> extends Mqtt5PublishBuilderBase { /** @@ -245,7 +245,7 @@ interface WillBase> extends Mqtt5PublishBuilderBa * * @param the type of the complete builder. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete> extends Mqtt5PublishBuilderBase.Complete, WillBase { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishResult.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishResult.java index adcb5f81c..a6d09911b 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishResult.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishResult.java @@ -16,7 +16,7 @@ package com.hivemq.client.mqtt.mqtt5.message.publish; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Optional; @@ -30,7 +30,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5PublishResult { /** @@ -49,7 +49,7 @@ public interface Mqtt5PublishResult { *

    * This result additionally provides the {@link Mqtt5PubAck PubAck message} that acknowledged the Publish message. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Mqtt5Qos1Result extends Mqtt5PublishResult { /** @@ -64,7 +64,7 @@ interface Mqtt5Qos1Result extends Mqtt5PublishResult { *

    * This result additionally provides the {@link Mqtt5PubRec PubRec message} that acknowledged the Publish message. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Mqtt5Qos2Result extends Mqtt5PublishResult { /** @@ -82,7 +82,7 @@ interface Mqtt5Qos2Result extends Mqtt5PublishResult { *

    * By default just a {@link Mqtt5Qos2Result} is provided as a result for a Publish message with QoS level 2. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Mqtt5Qos2CompleteResult extends Mqtt5Qos2Result { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5WillPublish.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5WillPublish.java index 068be0d4f..2df4d207e 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5WillPublish.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5WillPublish.java @@ -16,8 +16,8 @@ package com.hivemq.client.mqtt.mqtt5.message.publish; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.message.publish.MqttPublishBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -27,7 +27,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5WillPublish extends Mqtt5Publish { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5WillPublishBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5WillPublishBuilder.java index 1f79263e9..b166b3aac 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5WillPublishBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5WillPublishBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt5.message.publish; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,13 +26,13 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5WillPublishBuilder extends Mqtt5PublishBuilderBase.WillBase { /** * {@link Mqtt5WillPublishBuilder} that is complete which means all mandatory fields are set. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete extends Mqtt5WillPublishBuilder, Mqtt5PublishBuilderBase.WillBase.Complete { @@ -50,7 +50,7 @@ interface Complete extends Mqtt5WillPublishBuilder, * * @param

    the type of the result when the built {@link Mqtt5WillPublish} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends Mqtt5PublishBuilderBase.WillBase> { /** @@ -58,7 +58,7 @@ interface Nested

    extends Mqtt5PublishBuilderBase.WillBase> * * @param

    the type of the result when the built {@link Mqtt5WillPublish} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Nested

    , Mqtt5PublishBuilderBase.WillBase.Complete> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAck.java index 1088a907a..6d55768d9 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAck.java @@ -16,12 +16,12 @@ package com.hivemq.client.mqtt.mqtt5.message.subscribe; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -33,7 +33,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5SubAck extends Mqtt5Message { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5Subscribe.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5Subscribe.java index 972ab6069..96882edb1 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5Subscribe.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5Subscribe.java @@ -16,12 +16,12 @@ package com.hivemq.client.mqtt.mqtt5.message.subscribe; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribeBuilder; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -32,7 +32,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5Subscribe extends Mqtt5Message { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilder.java index 579f905a7..05f8f1c48 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt5.message.subscribe; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,13 +26,13 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5SubscribeBuilder extends Mqtt5SubscribeBuilderBase { /** * {@link Mqtt5SubscribeBuilder} that is complete which means all mandatory fields are set. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete extends Mqtt5SubscribeBuilder, Mqtt5SubscribeBuilderBase.Complete { @@ -48,7 +48,7 @@ interface Complete /** * {@link Mqtt5SubscribeBuilder} that provides additional methods for the first subscription. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Start extends Mqtt5SubscribeBuilder, Mqtt5SubscribeBuilderBase.Start { @@ -56,7 +56,7 @@ interface Start extends Mqtt5SubscribeBuilder, * {@link Mqtt5SubscribeBuilder.Start} that is complete which means all mandatory fields are set. */ // @formatter:off - @DoNotImplement + @ApiStatus.NonExtendable interface Complete extends Mqtt5SubscribeBuilder.Start, Mqtt5SubscribeBuilder.Complete, Mqtt5SubscribeBuilderBase.Start.Complete< Mqtt5SubscribeBuilder.Complete, Mqtt5SubscribeBuilder.Start.Complete> {} @@ -68,7 +68,7 @@ interface Complete extends Mqtt5SubscribeBuilder.Start, Mqtt5SubscribeBuilder.Co * * @param

    the type of the result when the built {@link Mqtt5Subscribe} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends Mqtt5SubscribeBuilderBase> { /** @@ -76,7 +76,7 @@ interface Nested

    extends Mqtt5SubscribeBuilderBase> { * * @param

    the type of the result when the built {@link Mqtt5Subscribe} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Nested

    , Mqtt5SubscribeBuilderBase.Complete> { /** @@ -92,7 +92,7 @@ interface Complete

    extends Nested

    , Mqtt5SubscribeBuilderBase.Complete the type of the result when the built {@link Mqtt5Subscribe} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Start

    extends Nested

    , Mqtt5SubscribeBuilderBase.Start, Nested.Start.Complete

    > { @@ -101,7 +101,7 @@ interface Start

    * * @param

    the type of the result when the built {@link Mqtt5Subscribe} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Nested.Start

    , Nested.Complete

    , Mqtt5SubscribeBuilderBase.Start.Complete, Nested.Start.Complete

    > {} } @@ -113,7 +113,7 @@ interface Complete

    extends Nested.Start

    , Nested.Complete

    , * * @param

    the type of the result when the built {@link Mqtt5Subscribe} is sent by the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Send

    extends Mqtt5SubscribeBuilderBase> { /** @@ -121,7 +121,7 @@ interface Send

    extends Mqtt5SubscribeBuilderBase> { * * @param

    the type of the result when the built {@link Mqtt5Subscribe} is sent by the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Send

    , Mqtt5SubscribeBuilderBase.Complete> { /** @@ -137,7 +137,7 @@ interface Complete

    extends Send

    , Mqtt5SubscribeBuilderBase.Complete the type of the result when the built {@link Mqtt5Subscribe} is sent by the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Start

    extends Send

    , Mqtt5SubscribeBuilderBase.Start, Send.Start.Complete

    > { /** @@ -145,7 +145,7 @@ interface Start

    extends Send

    , Mqtt5SubscribeBuilderBase.Start the type of the result when the built {@link Mqtt5Subscribe} is sent by the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Send.Start

    , Send.Complete

    , Mqtt5SubscribeBuilderBase.Start.Complete, Send.Start.Complete

    > {} } @@ -158,7 +158,7 @@ interface Complete

    extends Send.Start

    , Send.Complete

    , * @param

    the type of the result when the built {@link Mqtt5Subscribe} is applied to the parent. * @since 1.2 */ - @DoNotImplement + @ApiStatus.NonExtendable interface Publishes

    extends Mqtt5SubscribeBuilderBase> { /** @@ -166,7 +166,7 @@ interface Publishes

    extends Mqtt5SubscribeBuilderBase> * * @param

    the type of the result when the built {@link Mqtt5Subscribe} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Publishes

    , Publishes.Args

    , Mqtt5SubscribeBuilderBase.Complete> {} @@ -175,7 +175,7 @@ interface Complete

    * * @param

    the type of the result when the built {@link Mqtt5Subscribe} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Start

    extends Publishes

    , Mqtt5SubscribeBuilderBase.Start, Publishes.Start.Complete

    > { @@ -184,7 +184,7 @@ interface Start

    extends Publishes

    , * * @param

    the type of the result when the built {@link Mqtt5Subscribe} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Publishes.Start

    , Publishes.Complete

    , Mqtt5SubscribeBuilderBase.Start.Complete, Publishes.Start.Complete

    > {} } @@ -195,7 +195,7 @@ interface Complete

    extends Publishes.Start

    , Publishes.Complete

    , * * @param

    the type of the result when the built {@link Mqtt5Subscribe} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Args

    { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilderBase.java index 677ff3a9a..49cf968f7 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilderBase.java @@ -17,9 +17,9 @@ package com.hivemq.client.mqtt.mqtt5.message.subscribe; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -32,7 +32,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5SubscribeBuilderBase> { /** @@ -96,7 +96,7 @@ public interface Mqtt5SubscribeBuilderBase the type of the complete builder. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete> extends Mqtt5SubscribeBuilderBase { /** @@ -128,7 +128,7 @@ interface Complete> extends Mqtt * @param the type of the complete start builder. */ // @formatter:off - @DoNotImplement + @ApiStatus.NonExtendable interface Start< C extends Mqtt5SubscribeBuilderBase.Complete, SC extends Mqtt5SubscribeBuilderBase.Start.Complete> @@ -142,7 +142,7 @@ interface Start< * @param the type of the complete start builder. */ // @formatter:off - @DoNotImplement + @ApiStatus.NonExtendable interface Complete< C extends Mqtt5SubscribeBuilderBase.Complete, SC extends Mqtt5SubscribeBuilderBase.Start.Complete> diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5Subscription.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5Subscription.java index 8fe4bf6e8..b39eaea84 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5Subscription.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5Subscription.java @@ -16,10 +16,10 @@ package com.hivemq.client.mqtt.mqtt5.message.subscribe; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscriptionBuilder; import com.hivemq.client.mqtt.datatypes.MqttQos; import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -28,7 +28,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5Subscription { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilder.java index aaea78f51..f2a816120 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt5.message.subscribe; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,13 +26,13 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5SubscriptionBuilder extends Mqtt5SubscriptionBuilderBase { /** * {@link Mqtt5Subscription} that is complete which means all mandatory fields are set. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete extends Mqtt5SubscriptionBuilder, Mqtt5SubscriptionBuilderBase.Complete { @@ -50,7 +50,7 @@ interface Complete * * @param

    the type of the result when the built {@link Mqtt5Subscription} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends Mqtt5SubscriptionBuilderBase> { /** @@ -58,7 +58,7 @@ interface Nested

    extends Mqtt5SubscriptionBuilderBase> { * * @param

    the type of the result when the built {@link Mqtt5Subscription} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Nested

    , Mqtt5SubscriptionBuilderBase.Complete> { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilderBase.java index fccf9a76e..a0a2fa7e6 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilderBase.java @@ -17,10 +17,10 @@ package com.hivemq.client.mqtt.mqtt5.message.subscribe; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttQos; import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; import com.hivemq.client.mqtt.datatypes.MqttTopicFilterBuilder; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -30,7 +30,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5SubscriptionBuilderBase> { /** @@ -69,7 +69,7 @@ public interface Mqtt5SubscriptionBuilderBase the type of the complete builder. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete> extends Mqtt5SubscriptionBuilderBase { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAck.java index f0bb0fadf..93db18c67 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAck.java @@ -16,12 +16,12 @@ package com.hivemq.client.mqtt.mqtt5.message.unsubscribe; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -33,7 +33,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5UnsubAck extends Mqtt5Message { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5Unsubscribe.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5Unsubscribe.java index deef107fe..2c9774340 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5Unsubscribe.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5Unsubscribe.java @@ -16,13 +16,13 @@ package com.hivemq.client.mqtt.mqtt5.message.unsubscribe; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribeBuilder; import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -33,7 +33,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5Unsubscribe extends Mqtt5Message { /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilder.java index 3255a2774..edb2ace04 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilder.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt.mqtt5.message.unsubscribe; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -26,13 +26,13 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5UnsubscribeBuilder extends Mqtt5UnsubscribeBuilderBase { /** * {@link Mqtt5UnsubscribeBuilder} that is complete which means all mandatory fields are set. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete extends Mqtt5UnsubscribeBuilder, Mqtt5UnsubscribeBuilderBase.Complete { @@ -48,7 +48,7 @@ interface Complete /** * {@link Mqtt5UnsubscribeBuilder} that provides additional methods for the first Topic Filter. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Start extends Mqtt5UnsubscribeBuilder, Mqtt5UnsubscribeBuilderBase.Start {} @@ -57,7 +57,7 @@ interface Start * * @param

    the type of the result when the built {@link Mqtt5Unsubscribe} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Nested

    extends Mqtt5UnsubscribeBuilderBase> { /** @@ -65,7 +65,7 @@ interface Nested

    extends Mqtt5UnsubscribeBuilderBase> { * * @param

    the type of the result when the built {@link Mqtt5Unsubscribe} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Nested

    , Mqtt5UnsubscribeBuilderBase.Complete> { /** @@ -81,7 +81,7 @@ interface Complete

    extends Nested

    , Mqtt5UnsubscribeBuilderBase.Complete the type of the result when the built {@link Mqtt5Unsubscribe} is applied to the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Start

    extends Nested

    , Mqtt5UnsubscribeBuilderBase.Start> {} } @@ -91,7 +91,7 @@ interface Start

    extends Nested

    , Mqtt5UnsubscribeBuilderBase.Start the type of the result when the built {@link Mqtt5Unsubscribe} is sent by the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Send

    extends Mqtt5UnsubscribeBuilderBase> { /** @@ -99,7 +99,7 @@ interface Send

    extends Mqtt5UnsubscribeBuilderBase> { * * @param

    the type of the result when the built {@link Mqtt5Unsubscribe} is sent by the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete

    extends Send

    , Mqtt5UnsubscribeBuilderBase.Complete> { /** @@ -116,7 +116,7 @@ interface Complete

    extends Send

    , Mqtt5UnsubscribeBuilderBase.Complete the type of the result when the built {@link Mqtt5Unsubscribe} is sent by the parent. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Start

    extends Send

    , Mqtt5UnsubscribeBuilderBase.Start> {} } } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilderBase.java index 4b79645de..a4ae0da8a 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilderBase.java @@ -17,12 +17,12 @@ package com.hivemq.client.mqtt.mqtt5.message.unsubscribe; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.annotations.DoNotImplement; import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; import com.hivemq.client.mqtt.datatypes.MqttTopicFilterBuilder; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -35,7 +35,7 @@ * @author Silvio Giebl * @since 1.0 */ -@DoNotImplement +@ApiStatus.NonExtendable public interface Mqtt5UnsubscribeBuilderBase> { /** @@ -118,7 +118,7 @@ public interface Mqtt5UnsubscribeBuilderBase the type of the complete builder. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Complete> extends Mqtt5UnsubscribeBuilderBase { /** @@ -148,7 +148,7 @@ interface Complete> extends Mq * * @param the type of the complete builder. */ - @DoNotImplement + @ApiStatus.NonExtendable interface Start> extends Mqtt5UnsubscribeBuilderBase { /** diff --git a/src/main/java/com/hivemq/client/util/TypeSwitch.java b/src/main/java/com/hivemq/client/util/TypeSwitch.java index c72c60c05..cbe5f921c 100644 --- a/src/main/java/com/hivemq/client/util/TypeSwitch.java +++ b/src/main/java/com/hivemq/client/util/TypeSwitch.java @@ -16,6 +16,7 @@ package com.hivemq.client.util; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -37,6 +38,7 @@ * @param the super type to switch over. * @author Silvio Giebl */ +@ApiStatus.NonExtendable public interface TypeSwitch { /** From 40b5e3afc0dc86550275ba6e23bc73c95e4d4841 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Mon, 16 Nov 2020 01:04:10 +0100 Subject: [PATCH 16/62] Replaced Immutable with Unmodifiable annotation --- .../hivemq/client/annotations/Immutable.java | 30 ------------------- .../internal/mqtt/MqttExecutorConfigImpl.java | 2 ++ .../internal/mqtt/MqttProxyConfigImpl.java | 2 ++ .../internal/mqtt/MqttTlsConfigImpl.java | 2 ++ .../mqtt/MqttTransportConfigImpl.java | 2 ++ .../mqtt/MqttWebSocketConfigImpl.java | 2 ++ .../mqtt/advanced/MqttAdvancedConfig.java | 2 ++ .../interceptor/MqttClientInterceptors.java | 2 ++ .../datatypes/MqttClientIdentifierImpl.java | 4 +-- .../datatypes/MqttSharedTopicFilterImpl.java | 4 +-- .../mqtt/datatypes/MqttTopicFilterImpl.java | 4 +-- .../mqtt/datatypes/MqttTopicImpl.java | 4 +-- .../datatypes/MqttUserPropertiesImpl.java | 4 +-- .../mqtt/datatypes/MqttUserPropertyImpl.java | 4 +-- .../mqtt/datatypes/MqttUtf8StringImpl.java | 4 +-- .../MqttMessageWithUserProperties.java | 6 ++-- .../internal/mqtt/message/auth/MqttAuth.java | 4 +-- .../mqtt/message/auth/MqttEnhancedAuth.java | 4 +-- .../mqtt/message/auth/MqttSimpleAuth.java | 4 +-- .../auth/mqtt3/Mqtt3SimpleAuthView.java | 4 +-- .../mqtt/message/connect/MqttConnAck.java | 4 +-- .../connect/MqttConnAckRestrictions.java | 4 +-- .../mqtt/message/connect/MqttConnect.java | 4 +-- .../connect/MqttConnectRestrictions.java | 4 +-- .../message/connect/MqttStatefulConnect.java | 4 +-- .../connect/mqtt3/Mqtt3ConnAckView.java | 4 +-- .../connect/mqtt3/Mqtt3ConnectView.java | 4 +-- .../message/disconnect/MqttDisconnect.java | 4 +-- .../disconnect/mqtt3/Mqtt3DisconnectView.java | 4 +-- .../mqtt/message/ping/MqttPingReq.java | 4 +-- .../mqtt/message/ping/MqttPingResp.java | 4 +-- .../message/ping/mqtt3/Mqtt3PingReqView.java | 4 +-- .../message/ping/mqtt3/Mqtt3PingRespView.java | 4 +-- .../mqtt/message/publish/MqttPubAck.java | 4 +-- .../mqtt/message/publish/MqttPubComp.java | 4 +-- .../mqtt/message/publish/MqttPubRec.java | 4 +-- .../mqtt/message/publish/MqttPubRel.java | 4 +-- .../mqtt/message/publish/MqttPublish.java | 4 +-- .../message/publish/MqttStatefulPublish.java | 4 +-- .../mqtt/message/publish/MqttWillPublish.java | 4 +-- .../publish/mqtt3/Mqtt3PubAckView.java | 4 +-- .../publish/mqtt3/Mqtt3PubCompView.java | 4 +-- .../publish/mqtt3/Mqtt3PubRecView.java | 4 +-- .../publish/mqtt3/Mqtt3PubRelView.java | 4 +-- .../publish/mqtt3/Mqtt3PublishView.java | 4 +-- .../subscribe/MqttStatefulSubscribe.java | 4 +-- .../mqtt/message/subscribe/MqttSubAck.java | 4 +-- .../mqtt/message/subscribe/MqttSubscribe.java | 4 +-- .../message/subscribe/MqttSubscription.java | 4 +-- .../subscribe/mqtt3/Mqtt3SubAckView.java | 6 ++-- .../subscribe/mqtt3/Mqtt3SubscribeView.java | 4 +-- .../mqtt3/Mqtt3SubscriptionView.java | 2 ++ .../unsubscribe/MqttStatefulUnsubscribe.java | 4 +-- .../message/unsubscribe/MqttUnsubAck.java | 4 +-- .../message/unsubscribe/MqttUnsubscribe.java | 4 +-- .../unsubscribe/mqtt3/Mqtt3UnsubAckView.java | 4 +-- .../mqtt3/Mqtt3UnsubscribeView.java | 4 +-- .../mqtt/mqtt3/Mqtt3ClientConfigView.java | 7 ++--- .../util/collections/ImmutableArray.java | 4 +-- .../util/collections/ImmutableElement.java | 4 +-- .../collections/ImmutableEmptyIntList.java | 4 +-- .../util/collections/ImmutableEmptyList.java | 4 +-- .../util/collections/ImmutableIntArray.java | 4 +-- .../util/collections/ImmutableIntElement.java | 4 +-- .../util/collections/ImmutableIntList.java | 2 ++ .../util/collections/ImmutableList.java | 4 +-- .../hivemq/client/mqtt/MqttClientConfig.java | 6 ++-- .../com/hivemq/client/mqtt/MqttTlsConfig.java | 6 ++-- .../client/mqtt/datatypes/MqttTopic.java | 4 +-- .../mqtt/datatypes/MqttTopicFilter.java | 4 +-- .../mqtt3/message/subscribe/Mqtt3SubAck.java | 4 +-- .../message/subscribe/Mqtt3Subscribe.java | 4 +-- .../message/unsubscribe/Mqtt3Unsubscribe.java | 4 +-- .../mqtt5/datatypes/Mqtt5UserProperties.java | 4 +-- .../mqtt5/message/subscribe/Mqtt5SubAck.java | 4 +-- .../message/subscribe/Mqtt5Subscribe.java | 4 +-- .../message/unsubscribe/Mqtt5UnsubAck.java | 4 +-- .../message/unsubscribe/Mqtt5Unsubscribe.java | 4 +-- 78 files changed, 159 insertions(+), 172 deletions(-) delete mode 100644 src/main/java/com/hivemq/client/annotations/Immutable.java diff --git a/src/main/java/com/hivemq/client/annotations/Immutable.java b/src/main/java/com/hivemq/client/annotations/Immutable.java deleted file mode 100644 index 400561cbc..000000000 --- a/src/main/java/com/hivemq/client/annotations/Immutable.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2018-present HiveMQ and the HiveMQ Community - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.hivemq.client.annotations; - -import java.lang.annotation.*; - -/** - * Documents that the annotated type is immutable. This means that its state can not be seen to change and can not be - * changed by callers. - * - * @author Silvio Giebl - */ -@Documented -@Retention(RetentionPolicy.CLASS) -@Target({ElementType.TYPE, ElementType.TYPE_USE}) -public @interface Immutable {} diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImpl.java index 45f9d775f..f3cebdf8f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImpl.java @@ -20,6 +20,7 @@ import io.reactivex.Scheduler; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.util.Objects; import java.util.Optional; @@ -29,6 +30,7 @@ /** * @author Silvio Giebl */ +@Unmodifiable public class MqttExecutorConfigImpl implements MqttExecutorConfig { public static final int DEFAULT_NETTY_THREADS = 0; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImpl.java index 080c3fb0f..3ccc49a00 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImpl.java @@ -20,6 +20,7 @@ import com.hivemq.client.mqtt.MqttProxyProtocol; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.net.InetSocketAddress; import java.util.Objects; @@ -28,6 +29,7 @@ /** * @author Silvio Giebl */ +@Unmodifiable public class MqttProxyConfigImpl implements MqttProxyConfig { private final @NotNull MqttProxyProtocol protocol; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImpl.java index 9f09cdd17..fc4d6b09b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImpl.java @@ -20,6 +20,7 @@ import com.hivemq.client.mqtt.MqttTlsConfig; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import javax.net.ssl.*; import java.util.List; @@ -30,6 +31,7 @@ * @author David Katz * @author Silvio Giebl */ +@Unmodifiable public class MqttTlsConfigImpl implements MqttTlsConfig { static final @Nullable HostnameVerifier DEFAULT_HOSTNAME_VERIFIER; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImpl.java index ba4d282fe..e1605afcf 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImpl.java @@ -23,6 +23,7 @@ import com.hivemq.client.mqtt.MqttWebSocketConfig; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.net.InetSocketAddress; import java.util.Objects; @@ -31,6 +32,7 @@ /** * @author Silvio Giebl */ +@Unmodifiable public class MqttTransportConfigImpl implements MqttTransportConfig { public static final @NotNull MqttTransportConfigImpl DEFAULT = diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImpl.java index b2a08a16f..dd5a10fb6 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImpl.java @@ -19,11 +19,13 @@ import com.hivemq.client.mqtt.MqttWebSocketConfig; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author David Katz * @author Christian Hoff */ +@Unmodifiable public class MqttWebSocketConfigImpl implements MqttWebSocketConfig { static final @NotNull MqttWebSocketConfigImpl DEFAULT = diff --git a/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfig.java b/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfig.java index 3c93ae827..d66083249 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfig.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfig.java @@ -20,12 +20,14 @@ import com.hivemq.client.mqtt.mqtt5.advanced.Mqtt5AdvancedConfig; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.util.Objects; /** * @author Silvio Giebl */ +@Unmodifiable public class MqttAdvancedConfig implements Mqtt5AdvancedConfig { public static final @NotNull MqttAdvancedConfig DEFAULT = new MqttAdvancedConfig(false, false, null); diff --git a/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptors.java b/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptors.java index d2f857942..29c983c77 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptors.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptors.java @@ -23,12 +23,14 @@ import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutgoingQos2Interceptor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.util.Objects; /** * @author Silvio Giebl */ +@Unmodifiable public class MqttClientInterceptors implements Mqtt5ClientInterceptors { private final @Nullable Mqtt5IncomingQos1Interceptor incomingQos1Interceptor; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttClientIdentifierImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttClientIdentifierImpl.java index 96524b3dd..32101efef 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttClientIdentifierImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttClientIdentifierImpl.java @@ -16,20 +16,20 @@ package com.hivemq.client.internal.mqtt.datatypes; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.util.Checks; import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl * @see MqttClientIdentifier * @see MqttUtf8StringImpl */ -@Immutable +@Unmodifiable public class MqttClientIdentifierImpl extends MqttUtf8StringImpl implements MqttClientIdentifier { /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttSharedTopicFilterImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttSharedTopicFilterImpl.java index ac1daba1f..134e47c45 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttSharedTopicFilterImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttSharedTopicFilterImpl.java @@ -16,20 +16,20 @@ package com.hivemq.client.internal.mqtt.datatypes; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.util.ByteArrayUtil; import com.hivemq.client.internal.util.Checks; import com.hivemq.client.mqtt.datatypes.MqttSharedTopicFilter; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl * @see MqttSharedTopicFilter * @see MqttUtf8StringImpl */ -@Immutable +@Unmodifiable public class MqttSharedTopicFilterImpl extends MqttTopicFilterImpl implements MqttSharedTopicFilter { private static final int SHARE_PREFIX_LENGTH = SHARE_PREFIX.length(); diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImpl.java index 1a37b0429..966b647db 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImpl.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.datatypes; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.util.MqttChecks; import com.hivemq.client.internal.util.Checks; import com.hivemq.client.internal.util.collections.ImmutableList; @@ -26,6 +25,7 @@ import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.util.Arrays; @@ -34,7 +34,7 @@ * @see MqttTopicFilter * @see MqttUtf8StringImpl */ -@Immutable +@Unmodifiable public class MqttTopicFilterImpl extends MqttUtf8StringImpl implements MqttTopicFilter { static final int WILDCARD_CHECK_FAILURE = -1; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicImpl.java index 18f11e3f6..9b7d4dcc2 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicImpl.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.datatypes; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.util.Checks; import com.hivemq.client.internal.util.collections.ImmutableList; import com.hivemq.client.mqtt.datatypes.MqttTopic; @@ -24,13 +23,14 @@ import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl * @see MqttTopic * @see MqttUtf8StringImpl */ -@Immutable +@Unmodifiable public class MqttTopicImpl extends MqttUtf8StringImpl implements MqttTopic { /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImpl.java index e3c11e19a..45a5ffe27 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImpl.java @@ -16,18 +16,18 @@ package com.hivemq.client.internal.mqtt.datatypes; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.util.collections.ImmutableList; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl * @see Mqtt5UserProperties */ -@Immutable +@Unmodifiable public class MqttUserPropertiesImpl implements Mqtt5UserProperties { /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertyImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertyImpl.java index 9e48a7d17..4a4521160 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertyImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertyImpl.java @@ -16,19 +16,19 @@ package com.hivemq.client.internal.mqtt.datatypes; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.message.MqttProperty; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperty; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl * @see Mqtt5UserProperty */ -@Immutable +@Unmodifiable public class MqttUserPropertyImpl implements Mqtt5UserProperty { /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUtf8StringImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUtf8StringImpl.java index ba3a92d08..29a64ad15 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUtf8StringImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUtf8StringImpl.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.datatypes; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.util.Checks; import com.hivemq.client.internal.util.Utf8Util; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; @@ -24,6 +23,7 @@ import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; @@ -35,7 +35,7 @@ * @author Silvio Giebl * @see MqttUtf8String */ -@Immutable +@Unmodifiable public class MqttUtf8StringImpl implements MqttUtf8String { /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/MqttMessageWithUserProperties.java b/src/main/java/com/hivemq/client/internal/mqtt/message/MqttMessageWithUserProperties.java index 897a88879..a79a6d07f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/MqttMessageWithUserProperties.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/MqttMessageWithUserProperties.java @@ -165,11 +165,11 @@ public abstract static class WithCodesAndId extends W implements MqttMessage.WithId { private final int packetIdentifier; - private final @NotNull ImmutableList<@NotNull R> reasonCodes; + private final @NotNull ImmutableList reasonCodes; protected WithCodesAndId( final int packetIdentifier, - final @NotNull ImmutableList<@NotNull R> reasonCodes, + final @NotNull ImmutableList reasonCodes, final @Nullable MqttUtf8StringImpl reasonString, final @NotNull MqttUserPropertiesImpl userProperties) { @@ -183,7 +183,7 @@ public int getPacketIdentifier() { return packetIdentifier; } - public @NotNull ImmutableList<@NotNull R> getReasonCodes() { + public @NotNull ImmutableList getReasonCodes() { return reasonCodes; } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuth.java b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuth.java index 7d7a44cad..1ad618a16 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuth.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuth.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.auth; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; @@ -26,6 +25,7 @@ import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5AuthReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.nio.ByteBuffer; import java.util.Objects; @@ -34,7 +34,7 @@ /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttAuth extends MqttMessageWithUserProperties.WithReason.WithCode implements Mqtt5Auth { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttEnhancedAuth.java b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttEnhancedAuth.java index a5bf5ad82..996f19627 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttEnhancedAuth.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttEnhancedAuth.java @@ -16,12 +16,12 @@ package com.hivemq.client.internal.mqtt.message.auth; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; import com.hivemq.client.internal.util.ByteBufferUtil; import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuth; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.nio.ByteBuffer; import java.util.Objects; @@ -30,7 +30,7 @@ /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttEnhancedAuth implements Mqtt5EnhancedAuth { private final @NotNull MqttUtf8StringImpl method; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttSimpleAuth.java b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttSimpleAuth.java index 3a2f46d1c..14d550c5d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttSimpleAuth.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttSimpleAuth.java @@ -16,13 +16,13 @@ package com.hivemq.client.internal.mqtt.message.auth; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; import com.hivemq.client.internal.util.ByteBufferUtil; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.nio.ByteBuffer; import java.util.Objects; @@ -31,7 +31,7 @@ /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttSimpleAuth implements Mqtt5SimpleAuth { private final @Nullable MqttUtf8StringImpl username; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthView.java index 2b13c3b6c..dc1d219e9 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthView.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.auth.mqtt3; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; import com.hivemq.client.internal.mqtt.message.auth.MqttSimpleAuth; import com.hivemq.client.internal.util.Checks; @@ -24,6 +23,7 @@ import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.nio.ByteBuffer; import java.util.Optional; @@ -31,7 +31,7 @@ /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class Mqtt3SimpleAuthView implements Mqtt3SimpleAuth { private static @NotNull MqttSimpleAuth delegate( diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAck.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAck.java index 13c497dd4..ebff487f7 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAck.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAck.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.connect; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttClientIdentifierImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; @@ -29,6 +28,7 @@ import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.util.Objects; import java.util.Optional; @@ -38,7 +38,7 @@ /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttConnAck extends MqttMessageWithUserProperties.WithReason.WithCode implements Mqtt5ConnAck { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckRestrictions.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckRestrictions.java index 40c703269..a8d3df71c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckRestrictions.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckRestrictions.java @@ -16,16 +16,16 @@ package com.hivemq.client.internal.mqtt.message.connect; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.mqtt.datatypes.MqttQos; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttConnAckRestrictions implements Mqtt5ConnAckRestrictions { public static final @NotNull MqttConnAckRestrictions DEFAULT = diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnect.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnect.java index 1933a069b..0dcb5c798 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnect.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnect.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.connect; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.MqttClientConfig; import com.hivemq.client.internal.mqtt.datatypes.MqttClientIdentifierImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; @@ -31,6 +30,7 @@ import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublish; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.util.Objects; import java.util.Optional; @@ -38,7 +38,7 @@ /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttConnect extends MqttMessageWithUserProperties implements Mqtt5Connect { public static final @NotNull MqttConnect DEFAULT = diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictions.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictions.java index 31f9000bd..d034a17f5 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictions.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictions.java @@ -16,15 +16,15 @@ package com.hivemq.client.internal.mqtt.message.connect; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttConnectRestrictions implements Mqtt5ConnectRestrictions { public static final @NotNull MqttConnectRestrictions DEFAULT = diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttStatefulConnect.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttStatefulConnect.java index 9dd27a79e..a65d7a34b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttStatefulConnect.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttStatefulConnect.java @@ -16,17 +16,17 @@ package com.hivemq.client.internal.mqtt.message.connect; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttClientIdentifierImpl; import com.hivemq.client.internal.mqtt.message.MqttStatefulMessage; import com.hivemq.client.internal.mqtt.message.auth.MqttEnhancedAuth; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttStatefulConnect extends MqttStatefulMessage { private final @NotNull MqttClientIdentifierImpl clientIdentifier; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckView.java index a0e8d496b..7a9839496 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckView.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.connect.mqtt3; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; import com.hivemq.client.internal.mqtt.message.connect.MqttConnAckRestrictions; @@ -27,13 +26,14 @@ import io.reactivex.functions.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import static com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAckReturnCode.*; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class Mqtt3ConnAckView implements Mqtt3ConnAck { public static final @NotNull Function MAPPER = Mqtt3ConnAckView::of; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java index 12bc13374..cfbc32a16 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.connect.mqtt3; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.message.auth.MqttSimpleAuth; import com.hivemq.client.internal.mqtt.message.auth.mqtt3.Mqtt3SimpleAuthView; @@ -29,13 +28,14 @@ import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.util.Optional; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class Mqtt3ConnectView implements Mqtt3Connect { public static final @NotNull Mqtt3ConnectView DEFAULT = of(DEFAULT_KEEP_ALIVE, DEFAULT_CLEAN_SESSION, null, null); diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnect.java b/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnect.java index 0805c82d0..f080dadfb 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnect.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnect.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.disconnect; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; @@ -26,6 +25,7 @@ import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.util.Objects; import java.util.Optional; @@ -34,7 +34,7 @@ /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttDisconnect extends MqttMessageWithUserProperties.WithReason.WithCode implements Mqtt5Disconnect { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/mqtt3/Mqtt3DisconnectView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/mqtt3/Mqtt3DisconnectView.java index 30445d6d0..18328d07d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/mqtt3/Mqtt3DisconnectView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/mqtt3/Mqtt3DisconnectView.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.disconnect.mqtt3; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; @@ -24,11 +23,12 @@ import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class Mqtt3DisconnectView implements Mqtt3Disconnect { public static final @NotNull MqttDisconnect DELEGATE = diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/ping/MqttPingReq.java b/src/main/java/com/hivemq/client/internal/mqtt/message/ping/MqttPingReq.java index a9cd0ebfe..5f0e806cb 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/ping/MqttPingReq.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/ping/MqttPingReq.java @@ -16,17 +16,17 @@ package com.hivemq.client.internal.mqtt.message.ping; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.message.MqttMessage; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; import com.hivemq.client.mqtt.mqtt5.message.ping.Mqtt5PingReq; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttPingReq implements MqttMessage, Mqtt5PingReq { public static final @NotNull MqttPingReq INSTANCE = new MqttPingReq(); diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/ping/MqttPingResp.java b/src/main/java/com/hivemq/client/internal/mqtt/message/ping/MqttPingResp.java index 8d0c3d6f4..aadc17795 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/ping/MqttPingResp.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/ping/MqttPingResp.java @@ -16,17 +16,17 @@ package com.hivemq.client.internal.mqtt.message.ping; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.message.MqttMessage; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; import com.hivemq.client.mqtt.mqtt5.message.ping.Mqtt5PingResp; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttPingResp implements MqttMessage, Mqtt5PingResp { public static final @NotNull MqttPingResp INSTANCE = new MqttPingResp(); diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/ping/mqtt3/Mqtt3PingReqView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/ping/mqtt3/Mqtt3PingReqView.java index 9d2f1fd0a..36ec07183 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/ping/mqtt3/Mqtt3PingReqView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/ping/mqtt3/Mqtt3PingReqView.java @@ -16,16 +16,16 @@ package com.hivemq.client.internal.mqtt.message.ping.mqtt3; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; import com.hivemq.client.mqtt.mqtt3.message.ping.Mqtt3PingReq; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class Mqtt3PingReqView implements Mqtt3PingReq { public static final @NotNull Mqtt3PingReqView INSTANCE = new Mqtt3PingReqView(); diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/ping/mqtt3/Mqtt3PingRespView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/ping/mqtt3/Mqtt3PingRespView.java index 7284eff1d..11ae4cf85 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/ping/mqtt3/Mqtt3PingRespView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/ping/mqtt3/Mqtt3PingRespView.java @@ -16,16 +16,16 @@ package com.hivemq.client.internal.mqtt.message.ping.mqtt3; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; import com.hivemq.client.mqtt.mqtt3.message.ping.Mqtt3PingResp; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class Mqtt3PingRespView implements Mqtt3PingResp { public static final @NotNull Mqtt3PingRespView INSTANCE = new Mqtt3PingRespView(); diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAck.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAck.java index 9fe362c8e..016dc6099 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAck.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAck.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.publish; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; @@ -24,11 +23,12 @@ import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAckReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttPubAck extends MqttMessageWithUserProperties.WithReason.WithCode.WithId implements Mqtt5PubAck { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubComp.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubComp.java index 9917936b9..1262a7ea4 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubComp.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubComp.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.publish; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; @@ -24,11 +23,12 @@ import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttPubComp extends MqttMessageWithUserProperties.WithReason.WithCode.WithId implements Mqtt5PubComp { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRec.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRec.java index 0e78ef915..bf365f83a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRec.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRec.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.publish; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; @@ -24,11 +23,12 @@ import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttPubRec extends MqttMessageWithUserProperties.WithReason.WithCode.WithId implements Mqtt5PubRec { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRel.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRel.java index 6f54e54f3..f7437a147 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRel.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRel.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.publish; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; @@ -24,11 +23,12 @@ import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttPubRel extends MqttMessageWithUserProperties.WithReason.WithCode.WithId implements Mqtt5PubRel { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublish.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublish.java index 385079152..11175f942 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublish.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublish.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.publish; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.checkpoint.Confirmable; import com.hivemq.client.internal.mqtt.datatypes.MqttTopicImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; @@ -33,6 +32,7 @@ import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.nio.ByteBuffer; import java.util.Objects; @@ -45,7 +45,7 @@ /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttPublish extends MqttMessageWithUserProperties implements Mqtt5Publish { public static final long NO_MESSAGE_EXPIRY = Long.MAX_VALUE; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttStatefulPublish.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttStatefulPublish.java index 17c6ed990..e3481dbc3 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttStatefulPublish.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttStatefulPublish.java @@ -16,16 +16,16 @@ package com.hivemq.client.internal.mqtt.message.publish; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.message.MqttStatefulMessage; import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.internal.util.collections.ImmutableIntList; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttStatefulPublish extends MqttStatefulMessage.WithId { public static final int NO_PACKET_IDENTIFIER_QOS_0 = -1; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublish.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublish.java index b767658dd..2d5fac3fa 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublish.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublish.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.publish; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttTopicImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; @@ -25,13 +24,14 @@ import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublish; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.nio.ByteBuffer; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttWillPublish extends MqttPublish implements Mqtt5WillPublish { private final long delayInterval; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubAckView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubAckView.java index 46b8c4f52..8575d1381 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubAckView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubAckView.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.publish.mqtt3; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.message.publish.MqttPubAck; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; @@ -24,11 +23,12 @@ import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAckReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class Mqtt3PubAckView implements Mqtt3PubAck { public static final @NotNull Mqtt3PubAckView INSTANCE = new Mqtt3PubAckView(); diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubCompView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubCompView.java index 296d4e13a..052cc1972 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubCompView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubCompView.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.publish.mqtt3; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.message.publish.MqttPubComp; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; @@ -24,11 +23,12 @@ import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class Mqtt3PubCompView implements Mqtt3PubComp { public static final @NotNull Mqtt3PubCompView INSTANCE = new Mqtt3PubCompView(); diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubRecView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubRecView.java index 516f3d9b7..3bf24fe69 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubRecView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubRecView.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.publish.mqtt3; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.message.publish.MqttPubRec; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; @@ -24,11 +23,12 @@ import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class Mqtt3PubRecView implements Mqtt3PubRec { public static final @NotNull Mqtt3PubRecView INSTANCE = new Mqtt3PubRecView(); diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubRelView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubRelView.java index 97652a5ba..a23d4b386 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubRelView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubRelView.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.publish.mqtt3; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.message.publish.MqttPubRel; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; @@ -24,11 +23,12 @@ import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class Mqtt3PubRelView implements Mqtt3PubRel { public static final @NotNull Mqtt3PubRelView INSTANCE = new Mqtt3PubRelView(); diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java index e5861a92a..ab8c1c69e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.publish.mqtt3; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttTopicImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; @@ -30,6 +29,7 @@ import io.reactivex.functions.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.nio.ByteBuffer; import java.util.Optional; @@ -37,7 +37,7 @@ /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class Mqtt3PublishView implements Mqtt3Publish { public static final @NotNull Function MAPPER = Mqtt3PublishView::of; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttStatefulSubscribe.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttStatefulSubscribe.java index 86228ef20..dc2ed5747 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttStatefulSubscribe.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttStatefulSubscribe.java @@ -16,14 +16,14 @@ package com.hivemq.client.internal.mqtt.message.subscribe; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.message.MqttStatefulMessage; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttStatefulSubscribe extends MqttStatefulMessage.WithId { public static final int DEFAULT_NO_SUBSCRIPTION_IDENTIFIER = -1; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubAck.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubAck.java index 888a08328..d9f023daf 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubAck.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubAck.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.subscribe; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; @@ -26,11 +25,12 @@ import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAckReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttSubAck extends MqttMessageWithUserProperties.WithReason.WithCodesAndId implements Mqtt5SubAck { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribe.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribe.java index c6942f2fd..8e26e02aa 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribe.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribe.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.subscribe; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; import com.hivemq.client.internal.util.StringUtil; @@ -24,11 +23,12 @@ import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttSubscribe extends MqttMessageWithUserProperties implements Mqtt5Subscribe { private final @NotNull ImmutableList subscriptions; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscription.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscription.java index 8c35efd44..c29203de3 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscription.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscription.java @@ -16,18 +16,18 @@ package com.hivemq.client.internal.mqtt.message.subscribe; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImpl; import com.hivemq.client.mqtt.datatypes.MqttQos; import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5RetainHandling; import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscription; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttSubscription implements Mqtt5Subscription { private final @NotNull MqttTopicFilterImpl topicFilter; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckView.java index b0a1e831b..8115776dc 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckView.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.subscribe.mqtt3; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; import com.hivemq.client.internal.util.collections.ImmutableList; @@ -27,11 +26,12 @@ import io.reactivex.functions.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class Mqtt3SubAckView implements Mqtt3SubAck { public static final @NotNull Function MAPPER = Mqtt3SubAckView::of; @@ -110,7 +110,7 @@ private Mqtt3SubAckView(final @NotNull MqttSubAck delegate) { } @Override - public @NotNull ImmutableList<@NotNull Mqtt3SubAckReturnCode> getReturnCodes() { + public @NotNull ImmutableList getReturnCodes() { return viewReasonCodes(delegate.getReasonCodes()); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeView.java index 18c7dd1ab..08ac0371c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeView.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.subscribe.mqtt3; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscription; @@ -24,11 +23,12 @@ import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class Mqtt3SubscribeView implements Mqtt3Subscribe { private static @NotNull MqttSubscribe delegate(final @NotNull ImmutableList subscriptions) { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionView.java index 7be68d4eb..a235b8605 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionView.java @@ -24,10 +24,12 @@ import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5RetainHandling; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ +@Unmodifiable public class Mqtt3SubscriptionView implements Mqtt3Subscription { private static @NotNull MqttSubscription delegate( diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttStatefulUnsubscribe.java b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttStatefulUnsubscribe.java index 5cdeb140f..995407365 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttStatefulUnsubscribe.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttStatefulUnsubscribe.java @@ -16,14 +16,14 @@ package com.hivemq.client.internal.mqtt.message.unsubscribe; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.message.MqttStatefulMessage; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttStatefulUnsubscribe extends MqttStatefulMessage.WithId { MqttStatefulUnsubscribe(final @NotNull MqttUnsubscribe unsubscribe, final int packetIdentifier) { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubAck.java b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubAck.java index 6f4c11a6b..1175687f8 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubAck.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubAck.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.unsubscribe; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; @@ -26,11 +25,12 @@ import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttUnsubAck extends MqttMessageWithUserProperties.WithReason.WithCodesAndId implements Mqtt5UnsubAck { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribe.java b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribe.java index 7ba7bf629..2d86714ef 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribe.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribe.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.unsubscribe; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; @@ -25,11 +24,12 @@ import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class MqttUnsubscribe extends MqttMessageWithUserProperties implements Mqtt5Unsubscribe { private final @NotNull ImmutableList topicFilters; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubAckView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubAckView.java index ed8f629d5..b2cc59990 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubAckView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubAckView.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubAck; import com.hivemq.client.internal.util.collections.ImmutableList; @@ -25,11 +24,12 @@ import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class Mqtt3UnsubAckView implements Mqtt3UnsubAck { public static final @NotNull ImmutableList REASON_CODES_ALL_SUCCESS = ImmutableList.of(); diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeView.java index 49da21777..c9e4a1c30 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeView.java @@ -16,7 +16,6 @@ package com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; @@ -24,11 +23,12 @@ import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public class Mqtt3UnsubscribeView implements Mqtt3Unsubscribe { private static @NotNull MqttUnsubscribe delegate(final @NotNull ImmutableList topicFilters) { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java index f20ee80f1..8a966dcf7 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java @@ -16,12 +16,12 @@ package com.hivemq.client.internal.mqtt.mqtt3; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.MqttClientConfig; import com.hivemq.client.internal.mqtt.message.auth.MqttSimpleAuth; import com.hivemq.client.internal.mqtt.message.auth.mqtt3.Mqtt3SimpleAuthView; import com.hivemq.client.internal.mqtt.message.publish.MqttWillPublish; import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; +import com.hivemq.client.internal.util.collections.ImmutableList; import com.hivemq.client.mqtt.MqttClientState; import com.hivemq.client.mqtt.MqttExecutorConfig; import com.hivemq.client.mqtt.MqttTransportConfig; @@ -37,7 +37,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.List; import java.util.Optional; /** @@ -97,12 +96,12 @@ public Mqtt3ClientConfigView(final @NotNull MqttClientConfig delegate) { } @Override - public @Immutable @NotNull List<@NotNull MqttConnectedListener> getConnectedListeners() { + public @NotNull ImmutableList getConnectedListeners() { return delegate.getConnectedListeners(); } @Override - public @Immutable @NotNull List<@NotNull MqttDisconnectedListener> getDisconnectedListeners() { + public @NotNull ImmutableList getDisconnectedListeners() { return delegate.getDisconnectedListeners(); } diff --git a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableArray.java b/src/main/java/com/hivemq/client/internal/util/collections/ImmutableArray.java index aaf7de16c..79547f847 100644 --- a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableArray.java +++ b/src/main/java/com/hivemq/client/internal/util/collections/ImmutableArray.java @@ -16,11 +16,11 @@ package com.hivemq.client.internal.util.collections; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.util.Checks; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.lang.reflect.Array; import java.util.*; @@ -29,7 +29,7 @@ /** * @author Silvio Giebl */ -@Immutable class ImmutableArray implements ImmutableList { +@Unmodifiable class ImmutableArray implements ImmutableList { @Contract("null -> fail") static @NotNull ImmutableList of(final @Nullable Object @Nullable ... elements) { diff --git a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableElement.java b/src/main/java/com/hivemq/client/internal/util/collections/ImmutableElement.java index fb63a7918..4715e4602 100644 --- a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableElement.java +++ b/src/main/java/com/hivemq/client/internal/util/collections/ImmutableElement.java @@ -16,11 +16,11 @@ package com.hivemq.client.internal.util.collections; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.util.Checks; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.lang.reflect.Array; import java.util.List; @@ -31,7 +31,7 @@ /** * @author Silvio Giebl */ -@Immutable class ImmutableElement implements ImmutableList { +@Unmodifiable class ImmutableElement implements ImmutableList { @Contract("null -> fail") static @NotNull ImmutableList of(final @Nullable E e) { diff --git a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableEmptyIntList.java b/src/main/java/com/hivemq/client/internal/util/collections/ImmutableEmptyIntList.java index e4fa2d032..fc80b49fd 100644 --- a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableEmptyIntList.java +++ b/src/main/java/com/hivemq/client/internal/util/collections/ImmutableEmptyIntList.java @@ -16,14 +16,14 @@ package com.hivemq.client.internal.util.collections; -import com.hivemq.client.annotations.Immutable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable class ImmutableEmptyIntList implements ImmutableIntList { +@Unmodifiable class ImmutableEmptyIntList implements ImmutableIntList { static final @NotNull ImmutableEmptyIntList INSTANCE = new ImmutableEmptyIntList(); diff --git a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableEmptyList.java b/src/main/java/com/hivemq/client/internal/util/collections/ImmutableEmptyList.java index 0659753f9..d9c917557 100644 --- a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableEmptyList.java +++ b/src/main/java/com/hivemq/client/internal/util/collections/ImmutableEmptyList.java @@ -16,10 +16,10 @@ package com.hivemq.client.internal.util.collections; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.util.Checks; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.util.List; import java.util.NoSuchElementException; @@ -29,7 +29,7 @@ /** * @author Silvio Giebl */ -@Immutable class ImmutableEmptyList implements ImmutableList { +@Unmodifiable class ImmutableEmptyList implements ImmutableList { private static final @NotNull ImmutableEmptyList INSTANCE = new ImmutableEmptyList(); private static final @NotNull Object @NotNull [] EMPTY = {}; diff --git a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableIntArray.java b/src/main/java/com/hivemq/client/internal/util/collections/ImmutableIntArray.java index fa3bf604b..574a3494d 100644 --- a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableIntArray.java +++ b/src/main/java/com/hivemq/client/internal/util/collections/ImmutableIntArray.java @@ -16,17 +16,17 @@ package com.hivemq.client.internal.util.collections; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.util.Checks; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.util.Arrays; /** * @author Silvio Giebl */ -@Immutable class ImmutableIntArray implements ImmutableIntList { +@Unmodifiable class ImmutableIntArray implements ImmutableIntList { private final int @NotNull [] array; diff --git a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableIntElement.java b/src/main/java/com/hivemq/client/internal/util/collections/ImmutableIntElement.java index f5c79c252..28e4e41b7 100644 --- a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableIntElement.java +++ b/src/main/java/com/hivemq/client/internal/util/collections/ImmutableIntElement.java @@ -16,15 +16,15 @@ package com.hivemq.client.internal.util.collections; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.util.Checks; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; /** * @author Silvio Giebl */ -@Immutable class ImmutableIntElement implements ImmutableIntList { +@Unmodifiable class ImmutableIntElement implements ImmutableIntList { private final int element; diff --git a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableIntList.java b/src/main/java/com/hivemq/client/internal/util/collections/ImmutableIntList.java index 2e6373415..58fab037c 100644 --- a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableIntList.java +++ b/src/main/java/com/hivemq/client/internal/util/collections/ImmutableIntList.java @@ -19,12 +19,14 @@ import com.hivemq.client.internal.util.Checks; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.util.Arrays; /** * @author Silvio Giebl */ +@Unmodifiable public interface ImmutableIntList { static @NotNull ImmutableIntList of() { diff --git a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableList.java b/src/main/java/com/hivemq/client/internal/util/collections/ImmutableList.java index d62fe628f..3d989f125 100644 --- a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableList.java +++ b/src/main/java/com/hivemq/client/internal/util/collections/ImmutableList.java @@ -16,11 +16,11 @@ package com.hivemq.client.internal.util.collections; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.util.Checks; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Unmodifiable; import java.util.*; import java.util.function.Predicate; @@ -29,7 +29,7 @@ /** * @author Silvio Giebl */ -@Immutable +@Unmodifiable public interface ImmutableList<@NotNull E> extends List, RandomAccess { static @NotNull ImmutableList of() { diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java index 9c98b1a1a..c98cce6f6 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java @@ -16,13 +16,13 @@ package com.hivemq.client.mqtt; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnect; import com.hivemq.client.mqtt.lifecycle.MqttConnectedListener; import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedListener; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Unmodifiable; import java.net.InetSocketAddress; import java.util.List; @@ -108,14 +108,14 @@ default int getServerPort() { * ConnAck message is received). * @since 1.1 */ - @Immutable @NotNull List<@NotNull MqttConnectedListener> getConnectedListeners(); + @Unmodifiable @NotNull List<@NotNull MqttConnectedListener> getConnectedListeners(); /** * @return the listeners which are notified (in the order of the list) when this client is disconnected (with or * without a Disconnect message) or the connection fails. * @since 1.1 */ - @Immutable @NotNull List<@NotNull MqttDisconnectedListener> getDisconnectedListeners(); + @Unmodifiable @NotNull List<@NotNull MqttDisconnectedListener> getDisconnectedListeners(); /** * @return the state of the client. diff --git a/src/main/java/com/hivemq/client/mqtt/MqttTlsConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttTlsConfig.java index a9d228ba3..18e46c03f 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttTlsConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttTlsConfig.java @@ -16,10 +16,10 @@ package com.hivemq.client.mqtt; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.MqttTlsConfigImplBuilder; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Unmodifiable; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.KeyManagerFactory; @@ -67,7 +67,7 @@ public interface MqttTlsConfig { * * @return the optional user defined cipher suites. */ - @NotNull Optional<@Immutable List<@NotNull String>> getCipherSuites(); + @NotNull Optional<@Unmodifiable List<@NotNull String>> getCipherSuites(); /** * The optional user defined protocols. If absent, the default protocols of Netty (network communication framework) @@ -75,7 +75,7 @@ public interface MqttTlsConfig { * * @return the optional user defined protocols. */ - @NotNull Optional<@Immutable List<@NotNull String>> getProtocols(); + @NotNull Optional<@Unmodifiable List<@NotNull String>> getProtocols(); /** * @return the TLS handshake timeout in milliseconds. diff --git a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopic.java b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopic.java index 0655be444..25e689b96 100644 --- a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopic.java +++ b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopic.java @@ -16,11 +16,11 @@ package com.hivemq.client.mqtt.datatypes; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttTopicImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttTopicImplBuilder; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Unmodifiable; import java.util.List; @@ -68,7 +68,7 @@ public interface MqttTopic extends MqttUtf8String { /** * @return the levels of this Topic Name. */ - @Immutable @NotNull List<@NotNull String> getLevels(); + @Unmodifiable @NotNull List<@NotNull String> getLevels(); /** * @return a Topic Filter matching only this Topic Name. diff --git a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicFilter.java b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicFilter.java index d5d04490d..5ad4c6e1a 100644 --- a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicFilter.java +++ b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicFilter.java @@ -16,11 +16,11 @@ package com.hivemq.client.mqtt.datatypes; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImplBuilder; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Unmodifiable; import java.util.List; @@ -72,7 +72,7 @@ public interface MqttTopicFilter extends MqttUtf8String { /** * @return the levels of this Topic Filter. */ - @Immutable @NotNull List<@NotNull String> getLevels(); + @Unmodifiable @NotNull List<@NotNull String> getLevels(); /** * @return whether this Topic Filter contains wildcards. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAck.java index 07a156c8f..dfcf61bec 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAck.java @@ -16,11 +16,11 @@ package com.hivemq.client.mqtt.mqtt3.message.subscribe; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Unmodifiable; import java.util.List; @@ -39,7 +39,7 @@ public interface Mqtt3SubAck extends Mqtt3Message { * Subscription} in the corresponding {@link com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe * Subscribe message} in the same order. */ - @Immutable @NotNull List<@NotNull Mqtt3SubAckReturnCode> getReturnCodes(); + @Unmodifiable @NotNull List<@NotNull Mqtt3SubAckReturnCode> getReturnCodes(); @Override default @NotNull Mqtt3MessageType getType() { diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3Subscribe.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3Subscribe.java index cafb13051..283712b82 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3Subscribe.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3Subscribe.java @@ -16,12 +16,12 @@ package com.hivemq.client.mqtt.mqtt3.message.subscribe; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubscribeViewBuilder; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Unmodifiable; import java.util.List; @@ -47,7 +47,7 @@ public interface Mqtt3Subscribe extends Mqtt3Message { * @return the {@link Mqtt3Subscription Subscriptions} of this Subscribe message. The list contains at least one * Subscription. */ - @Immutable @NotNull List<@NotNull ? extends Mqtt3Subscription> getSubscriptions(); + @Unmodifiable @NotNull List<@NotNull ? extends Mqtt3Subscription> getSubscriptions(); @Override default @NotNull Mqtt3MessageType getType() { diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3Unsubscribe.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3Unsubscribe.java index d5ed1cb45..3f66770a1 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3Unsubscribe.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3Unsubscribe.java @@ -16,13 +16,13 @@ package com.hivemq.client.mqtt.mqtt3.message.unsubscribe; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubscribeViewBuilder; import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Unmodifiable; import java.util.List; @@ -48,7 +48,7 @@ public interface Mqtt3Unsubscribe extends Mqtt3Message { /** * @return the Topic Filters of this Unsubscribe message. The list contains at least one Topic Filter. */ - @Immutable @NotNull List<@NotNull ? extends MqttTopicFilter> getTopicFilters(); + @Unmodifiable @NotNull List<@NotNull ? extends MqttTopicFilter> getTopicFilters(); @Override default @NotNull Mqtt3MessageType getType() { diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserProperties.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserProperties.java index 873555a09..d478c8f20 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserProperties.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserProperties.java @@ -16,12 +16,12 @@ package com.hivemq.client.mqtt.mqtt5.datatypes; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; import com.hivemq.client.internal.mqtt.util.MqttChecks; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Unmodifiable; import java.util.Collection; import java.util.List; @@ -74,7 +74,7 @@ public interface Mqtt5UserProperties { /** * @return the User Properties as an immutable list. */ - @Immutable @NotNull List<@NotNull ? extends Mqtt5UserProperty> asList(); + @Unmodifiable @NotNull List<@NotNull ? extends Mqtt5UserProperty> asList(); /** * @return a builder for extending this collection of User Properties. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAck.java index 6d55768d9..f979414df 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAck.java @@ -16,13 +16,13 @@ package com.hivemq.client.mqtt.mqtt5.message.subscribe; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Unmodifiable; import java.util.List; import java.util.Optional; @@ -41,7 +41,7 @@ public interface Mqtt5SubAck extends Mqtt5Message { * Subscription} in the corresponding {@link com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe * Subscribe message} in the same order. */ - @Immutable @NotNull List<@NotNull Mqtt5SubAckReasonCode> getReasonCodes(); + @Unmodifiable @NotNull List<@NotNull Mqtt5SubAckReasonCode> getReasonCodes(); /** * @return the optional reason string of this SubAck message. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5Subscribe.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5Subscribe.java index 96882edb1..7fdc10708 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5Subscribe.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5Subscribe.java @@ -16,13 +16,13 @@ package com.hivemq.client.mqtt.mqtt5.message.subscribe; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribeBuilder; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Unmodifiable; import java.util.List; @@ -48,7 +48,7 @@ public interface Mqtt5Subscribe extends Mqtt5Message { * @return the {@link Mqtt5Subscription Subscriptions} of this Subscribe message. The list contains at least one * Subscription. */ - @Immutable @NotNull List<@NotNull ? extends Mqtt5Subscription> getSubscriptions(); + @Unmodifiable @NotNull List<@NotNull ? extends Mqtt5Subscription> getSubscriptions(); /** * @return the optional user properties of this Subscribe message. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAck.java index 93db18c67..565ba5c75 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAck.java @@ -16,13 +16,13 @@ package com.hivemq.client.mqtt.mqtt5.message.unsubscribe; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Unmodifiable; import java.util.List; import java.util.Optional; @@ -41,7 +41,7 @@ public interface Mqtt5UnsubAck extends Mqtt5Message { * com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe Unsubscribe message} in the same * order. */ - @Immutable @NotNull List<@NotNull Mqtt5UnsubAckReasonCode> getReasonCodes(); + @Unmodifiable @NotNull List<@NotNull Mqtt5UnsubAckReasonCode> getReasonCodes(); /** * @return the optional reason string of this UnsubAck message. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5Unsubscribe.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5Unsubscribe.java index 2c9774340..9d82cf069 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5Unsubscribe.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5Unsubscribe.java @@ -16,7 +16,6 @@ package com.hivemq.client.mqtt.mqtt5.message.unsubscribe; -import com.hivemq.client.annotations.Immutable; import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribeBuilder; import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; @@ -24,6 +23,7 @@ import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Unmodifiable; import java.util.List; @@ -48,7 +48,7 @@ public interface Mqtt5Unsubscribe extends Mqtt5Message { /** * @return the Topic Filters of this Unsubscribe message. The list contains at least one Topic Filter. */ - @Immutable @NotNull List<@NotNull ? extends MqttTopicFilter> getTopicFilters(); + @Unmodifiable @NotNull List<@NotNull ? extends MqttTopicFilter> getTopicFilters(); /** * @return the optional user properties of this Unsubscribe message. From 7746cfd91fc4a9db3ec7748f357a8d17b648eb68 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Mon, 16 Nov 2020 01:07:40 +0100 Subject: [PATCH 17/62] Removed empty ClientModule --- .../internal/mqtt/ioc/ClientComponent.java | 2 +- .../internal/mqtt/ioc/ClientModule.java | 25 ------------------- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 src/main/java/com/hivemq/client/internal/mqtt/ioc/ClientModule.java diff --git a/src/main/java/com/hivemq/client/internal/mqtt/ioc/ClientComponent.java b/src/main/java/com/hivemq/client/internal/mqtt/ioc/ClientComponent.java index b79446b0c..e9bee22dd 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/ioc/ClientComponent.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/ioc/ClientComponent.java @@ -29,7 +29,7 @@ * * @author Silvio Giebl */ -@Subcomponent(modules = {ClientModule.class}) +@Subcomponent @ClientScope public interface ClientComponent { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/ioc/ClientModule.java b/src/main/java/com/hivemq/client/internal/mqtt/ioc/ClientModule.java deleted file mode 100644 index 6ba0c6022..000000000 --- a/src/main/java/com/hivemq/client/internal/mqtt/ioc/ClientModule.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2018-present HiveMQ and the HiveMQ Community - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.hivemq.client.internal.mqtt.ioc; - -import dagger.Module; - -/** - * @author Silvio Giebl - */ -@Module -abstract class ClientModule {} From a9bdcaaeba077cc7fae581025e675db7a3397a18 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Tue, 17 Nov 2020 23:08:40 +0100 Subject: [PATCH 18/62] Added Range annotations --- .../internal/mqtt/MqttBlockingClient.java | 3 -- .../mqtt/MqttClientConnectionConfig.java | 52 ++++++++++--------- .../internal/mqtt/MqttExecutorConfigImpl.java | 7 +-- .../mqtt/MqttExecutorConfigImplBuilder.java | 3 +- .../internal/mqtt/MqttProxyConfigImpl.java | 7 +-- .../mqtt/MqttProxyConfigImplBuilder.java | 4 +- .../internal/mqtt/MqttTlsConfigImpl.java | 10 ++-- .../mqtt/MqttTlsConfigImplBuilder.java | 6 ++- .../mqtt/MqttTransportConfigImpl.java | 13 ++--- .../mqtt/MqttTransportConfigImplBuilder.java | 7 ++- .../mqtt/MqttWebSocketConfigImpl.java | 7 +-- .../mqtt/MqttWebSocketConfigImplBuilder.java | 4 +- .../mqtt/lifecycle/MqttAutoReconnectImpl.java | 14 +++-- .../MqttAutoReconnectImplBuilder.java | 6 ++- .../mqtt/lifecycle/MqttReconnector.java | 7 +-- .../mqtt/message/connect/MqttConnAck.java | 14 ++--- .../connect/MqttConnAckRestrictions.java | 21 ++++---- .../mqtt/message/connect/MqttConnect.java | 14 ++--- .../message/connect/MqttConnectBuilder.java | 8 ++- .../connect/MqttConnectRestrictions.java | 39 +++++++------- .../MqttConnectRestrictionsBuilder.java | 21 +++++--- .../connect/mqtt3/Mqtt3ConnectView.java | 8 +-- .../mqtt3/Mqtt3ConnectViewBuilder.java | 5 +- .../message/disconnect/MqttDisconnect.java | 8 +-- .../disconnect/MqttDisconnectBuilder.java | 5 +- .../mqtt/message/publish/MqttPublish.java | 10 ++-- .../message/publish/MqttPublishBuilder.java | 5 +- .../mqtt/message/publish/MqttWillPublish.java | 10 ++-- .../mqtt/mqtt3/Mqtt3BlockingClientView.java | 3 -- .../internal/util/UnsignedDataTypes.java | 1 + .../client/mqtt/MqttClientBuilderBase.java | 4 +- .../hivemq/client/mqtt/MqttClientConfig.java | 4 +- .../mqtt/MqttClientConnectionConfig.java | 4 +- .../client/mqtt/MqttExecutorConfig.java | 3 +- .../mqtt/MqttExecutorConfigBuilderBase.java | 3 +- .../hivemq/client/mqtt/MqttProxyConfig.java | 3 +- .../com/hivemq/client/mqtt/MqttTlsConfig.java | 5 +- .../client/mqtt/MqttTransportConfig.java | 5 +- .../mqtt/MqttTransportConfigBuilderBase.java | 6 ++- .../client/mqtt/MqttWebSocketConfig.java | 3 +- .../hivemq/client/mqtt/datatypes/MqttQos.java | 3 +- .../mqtt/lifecycle/MqttAutoReconnect.java | 5 +- .../MqttAutoReconnectBuilderBase.java | 5 +- .../mqtt/lifecycle/MqttReconnector.java | 3 +- .../mqtt3/Mqtt3ClientConnectionConfig.java | 4 +- .../mqtt/mqtt3/message/Mqtt3ReturnCode.java | 4 +- .../mqtt3/message/connect/Mqtt3Connect.java | 4 +- .../connect/Mqtt3ConnectBuilderBase.java | 4 +- .../mqtt5/Mqtt5ClientConnectionConfig.java | 17 +++--- .../mqtt/mqtt5/message/Mqtt5ReasonCode.java | 4 +- .../mqtt5/message/connect/Mqtt5ConnAck.java | 6 ++- .../connect/Mqtt5ConnAckRestrictions.java | 7 +-- .../mqtt5/message/connect/Mqtt5Connect.java | 5 +- .../connect/Mqtt5ConnectBuilderBase.java | 7 ++- .../connect/Mqtt5ConnectRestrictions.java | 13 ++--- .../Mqtt5ConnectRestrictionsBuilderBase.java | 19 ++++--- .../message/disconnect/Mqtt5Disconnect.java | 4 +- .../Mqtt5DisconnectBuilderBase.java | 5 +- .../mqtt5/message/publish/Mqtt5Publish.java | 4 +- .../publish/Mqtt5PublishBuilderBase.java | 8 ++- .../message/publish/Mqtt5WillPublish.java | 4 +- 61 files changed, 308 insertions(+), 189 deletions(-) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java index 859f3b16c..418e490ba 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java @@ -319,9 +319,6 @@ public void onError(final @NotNull Throwable t) { public @NotNull Optional receive(final long timeout, final @Nullable TimeUnit timeUnit) throws InterruptedException { - if (timeout < 0) { - throw new IllegalArgumentException("Timeout must be greater than 0."); - } Checks.notNull(timeUnit, "Time unit"); final Entry entry; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConnectionConfig.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConnectionConfig.java index 2a17bbb20..cc96f74d7 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConnectionConfig.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConnectionConfig.java @@ -16,6 +16,7 @@ package com.hivemq.client.internal.mqtt; +import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; import com.hivemq.client.internal.mqtt.handler.publish.outgoing.MqttTopicAliasAutoMapping; import com.hivemq.client.internal.mqtt.handler.publish.outgoing.MqttTopicAliasMapping; import com.hivemq.client.internal.util.UnsignedDataTypes; @@ -26,6 +27,7 @@ import io.netty.channel.Channel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; import java.util.Optional; @@ -49,14 +51,14 @@ public class MqttClientConnectionConfig private static final int FLAG_CLEAN_STOP = 1 << 9; private final @NotNull MqttTransportConfigImpl transportConfig; - private final short keepAlive; - private volatile int sessionExpiryInterval; + private final /*unsigned*/ short keepAlive; + private volatile /*unsigned*/ int sessionExpiryInterval; private final @Nullable Mqtt5EnhancedAuthMechanism enhancedAuthMechanism; - private final short receiveMaximum; - private final int maximumPacketSize; - private final short topicAliasMaximum; - private final short sendMaximum; - private final int sendMaximumPacketSize; + private final /*unsigned*/ short receiveMaximum; + private final @Range(from = 1, to = MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT) int maximumPacketSize; + private final /*unsigned*/ short topicAliasMaximum; + private final /*unsigned*/ short sendMaximum; + private final @Range(from = 1, to = MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT) int sendMaximumPacketSize; private final @Nullable MqttTopicAliasMapping sendTopicAliasMapping; private final @NotNull MqttQos maximumQos; private final @NotNull Channel channel; @@ -64,21 +66,21 @@ public class MqttClientConnectionConfig public MqttClientConnectionConfig( final @NotNull MqttTransportConfigImpl transportConfig, - final int keepAlive, + final @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int keepAlive, final boolean cleanStart, final boolean cleanStop, - final long sessionExpiryInterval, + final @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long sessionExpiryInterval, final boolean hasSimpleAuth, final boolean hasWillPublish, final @Nullable Mqtt5EnhancedAuthMechanism enhancedAuthMechanism, - final int receiveMaximum, - final int maximumPacketSize, - final int topicAliasMaximum, + final @Range(from = 1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int receiveMaximum, + final @Range(from = 1, to = MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT) int maximumPacketSize, + final @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int topicAliasMaximum, final boolean problemInformationRequested, final boolean responseInformationRequested, - final int sendMaximum, - final int sendMaximumPacketSize, - final int sendTopicAliasMaximum, + final @Range(from = 1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int sendMaximum, + final @Range(from = 1, to = MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT) int sendMaximumPacketSize, + final @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int sendTopicAliasMaximum, final @NotNull MqttQos maximumQos, final boolean retainAvailable, final boolean wildcardSubscriptionAvailable, @@ -140,7 +142,7 @@ public MqttClientConnectionConfig( } @Override - public int getKeepAlive() { + public @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getKeepAlive() { return keepAlive & UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE; } @@ -153,11 +155,13 @@ public boolean isCleanStop() { } @Override - public long getSessionExpiryInterval() { + public @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long getSessionExpiryInterval() { return sessionExpiryInterval & UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE; } - public void setSessionExpiryInterval(final long sessionExpiryInterval) { + public void setSessionExpiryInterval( + final @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long sessionExpiryInterval) { + this.sessionExpiryInterval = (int) sessionExpiryInterval; } @@ -191,17 +195,17 @@ public boolean hasWillPublish() { } @Override - public int getReceiveMaximum() { + public @Range(from = 1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getReceiveMaximum() { return receiveMaximum & UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE; } @Override - public int getMaximumPacketSize() { + public @Range(from = 1, to = MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT) int getMaximumPacketSize() { return maximumPacketSize; } @Override - public int getTopicAliasMaximum() { + public @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getTopicAliasMaximum() { return topicAliasMaximum & UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE; } @@ -216,17 +220,17 @@ public boolean isResponseInformationRequested() { } @Override - public int getSendMaximum() { + public @Range(from = 1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getSendMaximum() { return sendMaximum & UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE; } @Override - public int getSendMaximumPacketSize() { + public @Range(from = 1, to = MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT) int getSendMaximumPacketSize() { return sendMaximumPacketSize; } @Override - public int getSendTopicAliasMaximum() { + public @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getSendTopicAliasMaximum() { return (sendTopicAliasMapping == null) ? 0 : sendTopicAliasMapping.getTopicAliasMaximum(); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImpl.java index f3cebdf8f..75892edb9 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImpl.java @@ -20,6 +20,7 @@ import io.reactivex.Scheduler; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; import org.jetbrains.annotations.Unmodifiable; import java.util.Objects; @@ -38,12 +39,12 @@ public class MqttExecutorConfigImpl implements MqttExecutorConfig { new MqttExecutorConfigImpl(null, DEFAULT_NETTY_THREADS, DEFAULT_APPLICATION_SCHEDULER); private final @Nullable Executor nettyExecutor; - private final int nettyThreads; + private final @Range(from = 0, to = Integer.MAX_VALUE) int nettyThreads; private final @NotNull Scheduler applicationScheduler; MqttExecutorConfigImpl( final @Nullable Executor nettyExecutor, - final int nettyThreads, + final @Range(from = 0, to = Integer.MAX_VALUE) int nettyThreads, final @NotNull Scheduler applicationScheduler) { this.nettyExecutor = nettyExecutor; @@ -65,7 +66,7 @@ public class MqttExecutorConfigImpl implements MqttExecutorConfig { return (nettyThreads == DEFAULT_NETTY_THREADS) ? OptionalInt.empty() : OptionalInt.of(nettyThreads); } - public int getRawNettyThreads() { + public @Range(from = 0, to = Integer.MAX_VALUE) int getRawNettyThreads() { return nettyThreads; } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImplBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImplBuilder.java index f480190c6..c1eaa791f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImplBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImplBuilder.java @@ -21,6 +21,7 @@ import io.reactivex.Scheduler; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; import java.util.concurrent.Executor; import java.util.function.Function; @@ -31,7 +32,7 @@ public abstract class MqttExecutorConfigImplBuilder> { private @Nullable Executor nettyExecutor; - private int nettyThreads = MqttExecutorConfigImpl.DEFAULT_NETTY_THREADS; + private @Range(from = 0, to = Integer.MAX_VALUE) int nettyThreads = MqttExecutorConfigImpl.DEFAULT_NETTY_THREADS; private @NotNull Scheduler applicationScheduler = MqttExecutorConfigImpl.DEFAULT_APPLICATION_SCHEDULER; MqttExecutorConfigImplBuilder() {} diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImpl.java index 3ccc49a00..b1f510cdf 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImpl.java @@ -20,6 +20,7 @@ import com.hivemq.client.mqtt.MqttProxyProtocol; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; import org.jetbrains.annotations.Unmodifiable; import java.net.InetSocketAddress; @@ -36,14 +37,14 @@ public class MqttProxyConfigImpl implements MqttProxyConfig { private final @NotNull InetSocketAddress address; private final @Nullable String username; private final @Nullable String password; - private final int handshakeTimeoutMs; + private final @Range(from = 0, to = Integer.MAX_VALUE) int handshakeTimeoutMs; MqttProxyConfigImpl( final @NotNull MqttProxyProtocol protocol, final @NotNull InetSocketAddress address, final @Nullable String username, final @Nullable String password, - final int handshakeTimeoutMs) { + final @Range(from = 0, to = Integer.MAX_VALUE) int handshakeTimeoutMs) { this.protocol = protocol; this.address = address; @@ -81,7 +82,7 @@ public class MqttProxyConfigImpl implements MqttProxyConfig { } @Override - public int getHandshakeTimeoutMs() { + public @Range(from = 0, to = Integer.MAX_VALUE) int getHandshakeTimeoutMs() { return handshakeTimeoutMs; } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImplBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImplBuilder.java index d074c9e06..a6966a7af 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImplBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImplBuilder.java @@ -22,6 +22,7 @@ import com.hivemq.client.mqtt.MqttProxyProtocol; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -39,7 +40,8 @@ public abstract class MqttProxyConfigImplBuilder cipherSuites; private final @Nullable ImmutableList protocols; - private final int handshakeTimeoutMs; + private final @Range(from = 0, to = Integer.MAX_VALUE) int handshakeTimeoutMs; private final @Nullable HostnameVerifier hostnameVerifier; MqttTlsConfigImpl( @@ -62,7 +62,7 @@ public class MqttTlsConfigImpl implements MqttTlsConfig { final @Nullable TrustManagerFactory trustManagerFactory, final @Nullable ImmutableList cipherSuites, final @Nullable ImmutableList protocols, - final int handshakeTimeoutMs, + final @Range(from = 0, to = Integer.MAX_VALUE) int handshakeTimeoutMs, final @Nullable HostnameVerifier hostnameVerifier) { this.keyManagerFactory = keyManagerFactory; @@ -110,7 +110,7 @@ public class MqttTlsConfigImpl implements MqttTlsConfig { } @Override - public long getHandshakeTimeoutMs() { + public @Range(from = 0, to = Integer.MAX_VALUE) int getHandshakeTimeoutMs() { return handshakeTimeoutMs; } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImplBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImplBuilder.java index c3b4913ba..c143c47e4 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImplBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImplBuilder.java @@ -21,6 +21,7 @@ import com.hivemq.client.mqtt.MqttTlsConfigBuilder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.KeyManagerFactory; @@ -38,7 +39,8 @@ public abstract class MqttTlsConfigImplBuilder cipherSuites; private @Nullable ImmutableList protocols; - private int handshakeTimeoutMs = (int) MqttTlsConfigImpl.DEFAULT_HANDSHAKE_TIMEOUT_MS; + private @Range(from = 0, to = Integer.MAX_VALUE) int handshakeTimeoutMs = + MqttTlsConfigImpl.DEFAULT_HANDSHAKE_TIMEOUT_MS; private @Nullable HostnameVerifier hostnameVerifier = MqttTlsConfigImpl.DEFAULT_HOSTNAME_VERIFIER; MqttTlsConfigImplBuilder() {} @@ -49,7 +51,7 @@ public abstract class MqttTlsConfigImplBuilder> { - private long initialDelayNanos = MqttAutoReconnectImpl.DEFAULT_START_DELAY_NANOS; - private long maxDelayNanos = MqttAutoReconnectImpl.DEFAULT_MAX_DELAY_NANOS; + private @Range(from = 1, to = Long.MAX_VALUE) long initialDelayNanos = + MqttAutoReconnectImpl.DEFAULT_START_DELAY_NANOS; + private @Range(from = 0, to = Long.MAX_VALUE) long maxDelayNanos = MqttAutoReconnectImpl.DEFAULT_MAX_DELAY_NANOS; MqttAutoReconnectImplBuilder() {} diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttReconnector.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttReconnector.java index f45b60db0..e042bf64c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttReconnector.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttReconnector.java @@ -28,6 +28,7 @@ import io.netty.channel.EventLoop; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; @@ -39,7 +40,7 @@ public class MqttReconnector implements Mqtt5Reconnector { private final @NotNull EventLoop eventLoop; - private final int attempts; + private final @Range(from = 0, to = Integer.MAX_VALUE) int attempts; private boolean reconnect = DEFAULT_RECONNECT; private @Nullable CompletableFuture future; private boolean resubscribeIfSessionExpired = DEFAULT_RESUBSCRIBE_IF_SESSION_EXPIRED; @@ -52,7 +53,7 @@ public class MqttReconnector implements Mqtt5Reconnector { public MqttReconnector( final @NotNull EventLoop eventLoop, - final int attempts, + final @Range(from = 0, to = Integer.MAX_VALUE) int attempts, final @NotNull MqttConnect connect, final @NotNull MqttTransportConfigImpl transportConfig) { @@ -63,7 +64,7 @@ public MqttReconnector( } @Override - public int getAttempts() { + public @Range(from = 0, to = Integer.MAX_VALUE) int getAttempts() { checkInEventLoop(); return attempts; } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAck.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAck.java index ebff487f7..6a7121e80 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAck.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAck.java @@ -21,6 +21,7 @@ import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; import com.hivemq.client.internal.util.StringUtil; +import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuth; @@ -28,6 +29,7 @@ import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; import org.jetbrains.annotations.Unmodifiable; import java.util.Objects; @@ -46,8 +48,8 @@ public class MqttConnAck extends MqttMessageWithUserProperties.WithReason.WithCo public static final int KEEP_ALIVE_FROM_CONNECT = -1; private final boolean sessionPresent; - private final long sessionExpiryInterval; - private final int serverKeepAlive; + private final @Range(from = -1, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long sessionExpiryInterval; + private final @Range(from = -1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int serverKeepAlive; private final @Nullable MqttClientIdentifierImpl assignedClientIdentifier; private final @Nullable Mqtt5EnhancedAuth enhancedAuth; private final @NotNull MqttConnAckRestrictions restrictions; @@ -57,8 +59,8 @@ public class MqttConnAck extends MqttMessageWithUserProperties.WithReason.WithCo public MqttConnAck( final @NotNull Mqtt5ConnAckReasonCode reasonCode, final boolean sessionPresent, - final long sessionExpiryInterval, - final int serverKeepAlive, + final @Range(from = -1, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long sessionExpiryInterval, + final @Range(from = -1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int serverKeepAlive, final @Nullable MqttClientIdentifierImpl assignedClientIdentifier, final @Nullable Mqtt5EnhancedAuth enhancedAuth, final @NotNull MqttConnAckRestrictions restrictions, @@ -89,7 +91,7 @@ public boolean isSessionPresent() { OptionalLong.of(sessionExpiryInterval); } - public long getRawSessionExpiryInterval() { + public @Range(from = -1, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long getRawSessionExpiryInterval() { return sessionExpiryInterval; } @@ -98,7 +100,7 @@ public long getRawSessionExpiryInterval() { return (serverKeepAlive == KEEP_ALIVE_FROM_CONNECT) ? OptionalInt.empty() : OptionalInt.of(serverKeepAlive); } - public int getRawServerKeepAlive() { + public @Range(from = -1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getRawServerKeepAlive() { return serverKeepAlive; } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckRestrictions.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckRestrictions.java index a8d3df71c..dade827a2 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckRestrictions.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckRestrictions.java @@ -16,10 +16,13 @@ package com.hivemq.client.internal.mqtt.message.connect; +import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.mqtt.datatypes.MqttQos; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; import org.jetbrains.annotations.Unmodifiable; /** @@ -34,9 +37,9 @@ public class MqttConnAckRestrictions implements Mqtt5ConnAckRestrictions { DEFAULT_WILDCARD_SUBSCRIPTION_AVAILABLE, DEFAULT_SHARED_SUBSCRIPTION_AVAILABLE, DEFAULT_SUBSCRIPTION_IDENTIFIERS_AVAILABLE); - private final int receiveMaximum; - private final int maximumPacketSize; - private final int topicAliasMaximum; + private final @Range(from = 1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int receiveMaximum; + private final @Range(from = 1, to = MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT) int maximumPacketSize; + private final @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int topicAliasMaximum; private final @NotNull MqttQos maximumQos; private final boolean retainAvailable; private final boolean wildcardSubscriptionAvailable; @@ -44,9 +47,9 @@ public class MqttConnAckRestrictions implements Mqtt5ConnAckRestrictions { private final boolean subscriptionIdentifiersAvailable; public MqttConnAckRestrictions( - final int receiveMaximum, - final int maximumPacketSize, - final int topicAliasMaximum, + final @Range(from = 1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int receiveMaximum, + final @Range(from = 1, to = MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT) int maximumPacketSize, + final @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int topicAliasMaximum, final @NotNull MqttQos maximumQos, final boolean retainAvailable, final boolean wildcardSubscriptionAvailable, @@ -64,17 +67,17 @@ public MqttConnAckRestrictions( } @Override - public int getReceiveMaximum() { + public @Range(from = 1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getReceiveMaximum() { return receiveMaximum; } @Override - public int getMaximumPacketSize() { + public @Range(from = 1, to = MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT) int getMaximumPacketSize() { return maximumPacketSize; } @Override - public int getTopicAliasMaximum() { + public @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getTopicAliasMaximum() { return topicAliasMaximum; } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnect.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnect.java index 0dcb5c798..970c96e66 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnect.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnect.java @@ -24,12 +24,14 @@ import com.hivemq.client.internal.mqtt.message.auth.MqttSimpleAuth; import com.hivemq.client.internal.mqtt.message.publish.MqttWillPublish; import com.hivemq.client.internal.util.StringUtil; +import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublish; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; import org.jetbrains.annotations.Unmodifiable; import java.util.Objects; @@ -45,18 +47,18 @@ public class MqttConnect extends MqttMessageWithUserProperties implements Mqtt5C new MqttConnect(DEFAULT_KEEP_ALIVE, DEFAULT_CLEAN_START, DEFAULT_SESSION_EXPIRY_INTERVAL, MqttConnectRestrictions.DEFAULT, null, null, null, MqttUserPropertiesImpl.NO_USER_PROPERTIES); - private final int keepAlive; + private final @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int keepAlive; private final boolean cleanStart; - private final long sessionExpiryInterval; + private final @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long sessionExpiryInterval; private final @NotNull MqttConnectRestrictions restrictions; private final @Nullable MqttSimpleAuth simpleAuth; private final @Nullable Mqtt5EnhancedAuthMechanism enhancedAuthMechanism; private final @Nullable MqttWillPublish willPublish; public MqttConnect( - final int keepAlive, + final @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int keepAlive, final boolean cleanStart, - final long sessionExpiryInterval, + final @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long sessionExpiryInterval, final @NotNull MqttConnectRestrictions restrictions, final @Nullable MqttSimpleAuth simpleAuth, final @Nullable Mqtt5EnhancedAuthMechanism enhancedAuthMechanism, @@ -74,7 +76,7 @@ public MqttConnect( } @Override - public int getKeepAlive() { + public @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getKeepAlive() { return keepAlive; } @@ -84,7 +86,7 @@ public boolean isCleanStart() { } @Override - public long getSessionExpiryInterval() { + public @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long getSessionExpiryInterval() { return sessionExpiryInterval; } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectBuilder.java index 884c9b242..06181f9ed 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectBuilder.java @@ -25,6 +25,7 @@ import com.hivemq.client.internal.mqtt.message.publish.MqttWillPublish; import com.hivemq.client.internal.mqtt.util.MqttChecks; import com.hivemq.client.internal.util.Checks; +import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; @@ -33,6 +34,7 @@ import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; import java.util.function.Function; @@ -41,9 +43,11 @@ */ public abstract class MqttConnectBuilder> { - private int keepAlive = MqttConnect.DEFAULT_KEEP_ALIVE; + private @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int keepAlive = + MqttConnect.DEFAULT_KEEP_ALIVE; private boolean cleanStart = MqttConnect.DEFAULT_CLEAN_START; - private long sessionExpiryInterval = MqttConnect.DEFAULT_SESSION_EXPIRY_INTERVAL; + private @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long sessionExpiryInterval = + MqttConnect.DEFAULT_SESSION_EXPIRY_INTERVAL; private @NotNull MqttConnectRestrictions restrictions = MqttConnectRestrictions.DEFAULT; private @Nullable MqttSimpleAuth simpleAuth; private @Nullable Mqtt5EnhancedAuthMechanism enhancedAuthMechanism; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictions.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictions.java index d034a17f5..a0bbfafd4 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictions.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictions.java @@ -16,9 +16,12 @@ package com.hivemq.client.internal.mqtt.message.connect; +import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; import org.jetbrains.annotations.Unmodifiable; /** @@ -32,22 +35,22 @@ public class MqttConnectRestrictions implements Mqtt5ConnectRestrictions { DEFAULT_SEND_MAXIMUM_PACKET_SIZE, DEFAULT_TOPIC_ALIAS_MAXIMUM, DEFAULT_SEND_TOPIC_ALIAS_MAXIMUM, DEFAULT_REQUEST_PROBLEM_INFORMATION, DEFAULT_REQUEST_RESPONSE_INFORMATION); - private final int receiveMaximum; - private final int sendMaximum; - private final int maximumPacketSize; - private final int sendMaximumPacketSize; - private final int topicAliasMaximum; - private final int sendTopicAliasMaximum; + private final @Range(from = 1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int receiveMaximum; + private final @Range(from = 1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int sendMaximum; + private final @Range(from = 1, to = MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT) int maximumPacketSize; + private final @Range(from = 1, to = MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT) int sendMaximumPacketSize; + private final @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int topicAliasMaximum; + private final @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int sendTopicAliasMaximum; private final boolean requestProblemInformation; private final boolean requestResponseInformation; public MqttConnectRestrictions( - final int receiveMaximum, - final int sendMaximum, - final int maximumPacketSize, - final int sendMaximumPacketSize, - final int topicAliasMaximum, - final int sendTopicAliasMaximum, + final @Range(from = 1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int receiveMaximum, + final @Range(from = 1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int sendMaximum, + final @Range(from = 1, to = MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT) int maximumPacketSize, + final @Range(from = 1, to = MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT) int sendMaximumPacketSize, + final @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int topicAliasMaximum, + final @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int sendTopicAliasMaximum, final boolean requestProblemInformation, final boolean requestResponseInformation) { @@ -62,32 +65,32 @@ public MqttConnectRestrictions( } @Override - public int getReceiveMaximum() { + public @Range(from = 1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getReceiveMaximum() { return receiveMaximum; } @Override - public int getSendMaximum() { + public @Range(from = 1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getSendMaximum() { return sendMaximum; } @Override - public int getMaximumPacketSize() { + public @Range(from = 1, to = MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT) int getMaximumPacketSize() { return maximumPacketSize; } @Override - public int getSendMaximumPacketSize() { + public @Range(from = 1, to = MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT) int getSendMaximumPacketSize() { return sendMaximumPacketSize; } @Override - public int getTopicAliasMaximum() { + public @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getTopicAliasMaximum() { return topicAliasMaximum; } @Override - public int getSendTopicAliasMaximum() { + public @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getSendTopicAliasMaximum() { return sendTopicAliasMaximum; } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictionsBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictionsBuilder.java index be9e533af..c4df74c66 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictionsBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictionsBuilder.java @@ -16,10 +16,13 @@ package com.hivemq.client.internal.mqtt.message.connect; +import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; import com.hivemq.client.internal.mqtt.util.MqttChecks; import com.hivemq.client.internal.util.Checks; +import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictionsBuilder; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Range; import java.util.function.Function; @@ -28,12 +31,18 @@ */ public abstract class MqttConnectRestrictionsBuilder> { - private int receiveMaximum = MqttConnectRestrictions.DEFAULT_RECEIVE_MAXIMUM; - private int sendMaximum = MqttConnectRestrictions.DEFAULT_SEND_MAXIMUM; - private int maximumPacketSize = MqttConnectRestrictions.DEFAULT_MAXIMUM_PACKET_SIZE; - private int sendMaximumPacketSize = MqttConnectRestrictions.DEFAULT_SEND_MAXIMUM_PACKET_SIZE; - private int topicAliasMaximum = MqttConnectRestrictions.DEFAULT_TOPIC_ALIAS_MAXIMUM; - private int sendTopicAliasMaximum = MqttConnectRestrictions.DEFAULT_SEND_TOPIC_ALIAS_MAXIMUM; + private @Range(from = 1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int receiveMaximum = + MqttConnectRestrictions.DEFAULT_RECEIVE_MAXIMUM; + private @Range(from = 1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int sendMaximum = + MqttConnectRestrictions.DEFAULT_SEND_MAXIMUM; + private @Range(from = 1, to = MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT) int maximumPacketSize = + MqttConnectRestrictions.DEFAULT_MAXIMUM_PACKET_SIZE; + private @Range(from = 1, to = MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT) int sendMaximumPacketSize = + MqttConnectRestrictions.DEFAULT_SEND_MAXIMUM_PACKET_SIZE; + private @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int topicAliasMaximum = + MqttConnectRestrictions.DEFAULT_TOPIC_ALIAS_MAXIMUM; + private @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int sendTopicAliasMaximum = + MqttConnectRestrictions.DEFAULT_SEND_TOPIC_ALIAS_MAXIMUM; private boolean requestProblemInformation = MqttConnectRestrictions.DEFAULT_REQUEST_PROBLEM_INFORMATION; private boolean requestResponseInformation = MqttConnectRestrictions.DEFAULT_REQUEST_RESPONSE_INFORMATION; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java index cfbc32a16..b8c492703 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java @@ -23,11 +23,13 @@ import com.hivemq.client.internal.mqtt.message.connect.MqttConnectRestrictions; import com.hivemq.client.internal.mqtt.message.publish.MqttWillPublish; import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; +import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; import org.jetbrains.annotations.Unmodifiable; import java.util.Optional; @@ -41,7 +43,7 @@ public class Mqtt3ConnectView implements Mqtt3Connect { public static final @NotNull Mqtt3ConnectView DEFAULT = of(DEFAULT_KEEP_ALIVE, DEFAULT_CLEAN_SESSION, null, null); private static @NotNull MqttConnect delegate( - final int keepAlive, + final @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int keepAlive, final boolean cleanSession, final @Nullable MqttSimpleAuth simpleAuth, final @Nullable MqttWillPublish willPublish) { @@ -52,7 +54,7 @@ public class Mqtt3ConnectView implements Mqtt3Connect { } static @NotNull Mqtt3ConnectView of( - final int keepAlive, + final @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int keepAlive, final boolean cleanSession, final @Nullable MqttSimpleAuth simpleAuth, final @Nullable MqttWillPublish willPublish) { @@ -71,7 +73,7 @@ private Mqtt3ConnectView(final @NotNull MqttConnect delegate) { } @Override - public int getKeepAlive() { + public @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getKeepAlive() { return delegate.getKeepAlive(); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewBuilder.java index 81325a6c2..5629405af 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewBuilder.java @@ -24,11 +24,13 @@ import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishViewBuilder; import com.hivemq.client.internal.util.Checks; +import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnectBuilder; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; import java.util.function.Function; @@ -37,7 +39,8 @@ */ public abstract class Mqtt3ConnectViewBuilder> { - private int keepAliveSeconds = Mqtt3ConnectView.DEFAULT_KEEP_ALIVE; + private @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int keepAliveSeconds = + Mqtt3ConnectView.DEFAULT_KEEP_ALIVE; private boolean cleanSession = Mqtt3ConnectView.DEFAULT_CLEAN_SESSION; private @Nullable MqttSimpleAuth simpleAuth; private @Nullable MqttWillPublish willPublish; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnect.java b/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnect.java index f080dadfb..75def00c3 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnect.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnect.java @@ -20,11 +20,13 @@ import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; import com.hivemq.client.internal.util.StringUtil; +import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; import org.jetbrains.annotations.Unmodifiable; import java.util.Objects; @@ -43,12 +45,12 @@ public class MqttDisconnect extends MqttMessageWithUserProperties.WithReason.Wit new MqttDisconnect(DEFAULT_REASON_CODE, SESSION_EXPIRY_INTERVAL_FROM_CONNECT, null, null, MqttUserPropertiesImpl.NO_USER_PROPERTIES); - private final long sessionExpiryInterval; + private final @Range(from = -1, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long sessionExpiryInterval; private final @Nullable MqttUtf8StringImpl serverReference; public MqttDisconnect( final @NotNull Mqtt5DisconnectReasonCode reasonCode, - final long sessionExpiryInterval, + final @Range(from = -1, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long sessionExpiryInterval, final @Nullable MqttUtf8StringImpl serverReference, final @Nullable MqttUtf8StringImpl reasonString, final @NotNull MqttUserPropertiesImpl userProperties) { @@ -64,7 +66,7 @@ public MqttDisconnect( OptionalLong.of(sessionExpiryInterval); } - public long getRawSessionExpiryInterval() { + public @Range(from = -1, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long getRawSessionExpiryInterval() { return sessionExpiryInterval; } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnectBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnectBuilder.java index 16beb24ac..d9ee206d7 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnectBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnectBuilder.java @@ -22,12 +22,14 @@ import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; import com.hivemq.client.internal.mqtt.util.MqttChecks; import com.hivemq.client.internal.util.Checks; +import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectBuilder; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; import java.util.function.Consumer; import java.util.function.Function; @@ -38,7 +40,8 @@ public abstract class MqttDisconnectBuilder> { private @NotNull Mqtt5DisconnectReasonCode reasonCode = MqttDisconnect.DEFAULT_REASON_CODE; - private long sessionExpiryInterval = MqttDisconnect.SESSION_EXPIRY_INTERVAL_FROM_CONNECT; + private @Range(from = -1, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long sessionExpiryInterval = + MqttDisconnect.SESSION_EXPIRY_INTERVAL_FROM_CONNECT; private @Nullable MqttUtf8StringImpl serverReference; private @Nullable MqttUtf8StringImpl reasonString; private @NotNull MqttUserPropertiesImpl userProperties = MqttUserPropertiesImpl.NO_USER_PROPERTIES; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublish.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublish.java index 11175f942..5fe0db3d9 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublish.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublish.java @@ -24,6 +24,7 @@ import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; import com.hivemq.client.internal.util.ByteBufferUtil; import com.hivemq.client.internal.util.StringUtil; +import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.internal.util.collections.ImmutableIntList; import com.hivemq.client.mqtt.datatypes.MqttQos; import com.hivemq.client.mqtt.datatypes.MqttTopic; @@ -32,6 +33,7 @@ import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; import org.jetbrains.annotations.Unmodifiable; import java.nio.ByteBuffer; @@ -48,13 +50,13 @@ @Unmodifiable public class MqttPublish extends MqttMessageWithUserProperties implements Mqtt5Publish { - public static final long NO_MESSAGE_EXPIRY = Long.MAX_VALUE; + public static final long NO_MESSAGE_EXPIRY = -1; private final @NotNull MqttTopicImpl topic; private final @Nullable ByteBuffer payload; private final @NotNull MqttQos qos; private final boolean retain; - private final long messageExpiryInterval; + private final @Range(from = -1, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long messageExpiryInterval; private final @Nullable Mqtt5PayloadFormatIndicator payloadFormatIndicator; private final @Nullable MqttUtf8StringImpl contentType; private final @Nullable MqttTopicImpl responseTopic; @@ -67,7 +69,7 @@ public MqttPublish( final @Nullable ByteBuffer payload, final @NotNull MqttQos qos, final boolean retain, - final long messageExpiryInterval, + final @Range(from = -1, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long messageExpiryInterval, final @Nullable Mqtt5PayloadFormatIndicator payloadFormatIndicator, final @Nullable MqttUtf8StringImpl contentType, final @Nullable MqttTopicImpl responseTopic, @@ -123,7 +125,7 @@ public boolean isRetain() { OptionalLong.of(messageExpiryInterval); } - public long getRawMessageExpiryInterval() { + public @Range(from = -1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) long getRawMessageExpiryInterval() { return messageExpiryInterval; } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishBuilder.java index fe603468a..841506633 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishBuilder.java @@ -20,6 +20,7 @@ import com.hivemq.client.internal.mqtt.util.MqttChecks; import com.hivemq.client.internal.util.ByteBufferUtil; import com.hivemq.client.internal.util.Checks; +import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.mqtt.datatypes.MqttQos; import com.hivemq.client.mqtt.datatypes.MqttTopic; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; @@ -29,6 +30,7 @@ import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublishBuilder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; import java.nio.ByteBuffer; import java.util.function.Function; @@ -244,7 +246,8 @@ public Send(final @NotNull Function parentConsumer) { private static abstract class WillBase> extends MqttPublishBuilder { - private long delayInterval = MqttWillPublish.DEFAULT_DELAY_INTERVAL; + private @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long delayInterval = + MqttWillPublish.DEFAULT_DELAY_INTERVAL; WillBase() {} diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublish.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublish.java index 2d5fac3fa..f2fc5b995 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublish.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublish.java @@ -19,11 +19,13 @@ import com.hivemq.client.internal.mqtt.datatypes.MqttTopicImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.mqtt.datatypes.MqttQos; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PayloadFormatIndicator; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublish; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; import org.jetbrains.annotations.Unmodifiable; import java.nio.ByteBuffer; @@ -34,20 +36,20 @@ @Unmodifiable public class MqttWillPublish extends MqttPublish implements Mqtt5WillPublish { - private final long delayInterval; + private final @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long delayInterval; public MqttWillPublish( final @NotNull MqttTopicImpl topic, final @Nullable ByteBuffer payload, final @NotNull MqttQos qos, final boolean isRetain, - final long messageExpiryInterval, + final @Range(from = -1, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long messageExpiryInterval, final @Nullable Mqtt5PayloadFormatIndicator payloadFormatIndicator, final @Nullable MqttUtf8StringImpl contentType, final @Nullable MqttTopicImpl responseTopic, final @Nullable ByteBuffer correlationData, final @NotNull MqttUserPropertiesImpl userProperties, - final long delayInterval) { + final @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long delayInterval) { super(topic, payload, qos, isRetain, messageExpiryInterval, payloadFormatIndicator, contentType, responseTopic, correlationData, userProperties, null); @@ -55,7 +57,7 @@ public MqttWillPublish( } @Override - public long getDelayInterval() { + public @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long getDelayInterval() { return delayInterval; } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java index d2fe7c861..0d2e5c068 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java @@ -189,9 +189,6 @@ private static class PublishesView implements Publishes { public @NotNull Optional receive( final long timeout, final @Nullable TimeUnit timeUnit) throws InterruptedException { - if (timeout < 0) { - throw new IllegalArgumentException("Timeout must be greater than 0."); - } Checks.notNull(timeUnit, "Time unit"); try { diff --git a/src/main/java/com/hivemq/client/internal/util/UnsignedDataTypes.java b/src/main/java/com/hivemq/client/internal/util/UnsignedDataTypes.java index feea0d948..1b5d1a0ca 100644 --- a/src/main/java/com/hivemq/client/internal/util/UnsignedDataTypes.java +++ b/src/main/java/com/hivemq/client/internal/util/UnsignedDataTypes.java @@ -21,6 +21,7 @@ */ public final class UnsignedDataTypes { + public static final short UNSIGNED_BYTE_MAX_VALUE = 0xFF; public static final int UNSIGNED_SHORT_MAX_VALUE = 0xFFFF; public static final long UNSIGNED_INT_MAX_VALUE = 0xFFFF_FFFFL; diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java index 7dbf47adc..2efb2488e 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java @@ -17,6 +17,7 @@ package com.hivemq.client.mqtt; import com.hivemq.client.annotations.CheckReturnValue; +import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnect; import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnectBuilder; @@ -25,6 +26,7 @@ import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -93,7 +95,7 @@ public interface MqttClientBuilderBase> { * @return the builder. */ @CheckReturnValue - @NotNull B serverPort(int port); + @NotNull B serverPort(@Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int port); /** * Sets the {@link MqttClientConfig#getTlsConfig() transport layer security configuration} to the default diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java index c98cce6f6..c9d4c541f 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java @@ -16,12 +16,14 @@ package com.hivemq.client.mqtt; +import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnect; import com.hivemq.client.mqtt.lifecycle.MqttConnectedListener; import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedListener; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Range; import org.jetbrains.annotations.Unmodifiable; import java.net.InetSocketAddress; @@ -68,7 +70,7 @@ public interface MqttClientConfig { /** * @return the server port the client connects to. */ - default int getServerPort() { + default @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getServerPort() { return getServerAddress().getPort(); } diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientConnectionConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttClientConnectionConfig.java index fda278677..9cf567c0a 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientConnectionConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientConnectionConfig.java @@ -16,8 +16,10 @@ package com.hivemq.client.mqtt; +import com.hivemq.client.internal.util.UnsignedDataTypes; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Range; /** * Connection configuration of an {@link MqttClient}. @@ -37,7 +39,7 @@ public interface MqttClientConnectionConfig { /** * @return the keep alive in seconds that is used while the client is connected. */ - int getKeepAlive(); + @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getKeepAlive(); /** * @return whether the client connected with simple authentication and/or authorization related data. diff --git a/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfig.java index 20701f147..a322309c3 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfig.java @@ -21,6 +21,7 @@ import io.reactivex.schedulers.Schedulers; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Range; import java.util.Optional; import java.util.OptionalInt; @@ -54,7 +55,7 @@ public interface MqttExecutorConfig { /** * @return the optional user defined amount of threads Netty (network communication framework) will use. */ - @NotNull OptionalInt getNettyThreads(); + @Range(from = 1, to = Integer.MAX_VALUE) @NotNull OptionalInt getNettyThreads(); /** * @return the {@link Scheduler} used for executing application specific code, such as callbacks. diff --git a/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfigBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfigBuilderBase.java index 3697ab312..74538fd1c 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfigBuilderBase.java @@ -21,6 +21,7 @@ import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; import java.util.concurrent.Executor; @@ -52,7 +53,7 @@ public interface MqttExecutorConfigBuilderBasetrue an existing session is cleared. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java index acda3e9d0..02795f4de 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java @@ -17,6 +17,7 @@ package com.hivemq.client.mqtt.mqtt3.message.connect; import com.hivemq.client.annotations.CheckReturnValue; +import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuthBuilder; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; @@ -24,6 +25,7 @@ import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; /** * Builder base for a {@link Mqtt3Connect}. @@ -44,7 +46,7 @@ public interface Mqtt3ConnectBuilderBase> { * @return the builder. */ @CheckReturnValue - @NotNull B keepAlive(int keepAlive); + @NotNull B keepAlive(@Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int keepAlive); /** * Disables the {@link Mqtt3Connect#getKeepAlive() keep alive} by setting it to {@link Mqtt3Connect#NO_KEEP_ALIVE}. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConnectionConfig.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConnectionConfig.java index 54ea81ada..a9619552c 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConnectionConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConnectionConfig.java @@ -16,11 +16,14 @@ package com.hivemq.client.mqtt.mqtt5; +import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.mqtt.MqttClientConnectionConfig; import com.hivemq.client.mqtt.datatypes.MqttQos; import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Range; import java.util.Optional; @@ -36,7 +39,7 @@ public interface Mqtt5ClientConnectionConfig extends MqttClientConnectionConfig /** * @return the session expiry interval in seconds. */ - long getSessionExpiryInterval(); + @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long getSessionExpiryInterval(); /** * @return the optional enhanced auth mechanism that is used for enhanced authentication and/or authorization. @@ -69,7 +72,7 @@ interface RestrictionsForServer { * @return the maximum amount of not acknowledged publishes with QoS 1 or 2 the client accepts from the server * concurrently. */ - int getReceiveMaximum(); + @Range(from = 1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getReceiveMaximum(); /** * Returns the maximum packet size the client accepts from the server. @@ -79,7 +82,7 @@ interface RestrictionsForServer { * * @return the maximum packet size the client accepts from the server. */ - int getMaximumPacketSize(); + @Range(from = 1, to = MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT) int getMaximumPacketSize(); /** * Returns the maximum amount of topic aliases the client accepts from the server. @@ -89,7 +92,7 @@ interface RestrictionsForServer { * * @return the maximum amount of topic aliases the client accepts from the server. */ - int getTopicAliasMaximum(); + @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getTopicAliasMaximum(); /** * Returns whether the client requested problem information from the server. @@ -129,7 +132,7 @@ interface RestrictionsForClient { * @return the maximum amount of not acknowledged publishes with QoS 1 or 2 the client sends to the server * concurrently. */ - int getSendMaximum(); + @Range(from = 1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getSendMaximum(); /** * Returns the maximum packet size the client sends to the server. @@ -140,7 +143,7 @@ interface RestrictionsForClient { * * @return the maximum packet size the client sends to the server. */ - int getSendMaximumPacketSize(); + @Range(from = 1, to = MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT) int getSendMaximumPacketSize(); /** * Returns the maximum amount of topic aliases the client sends to the server. @@ -151,7 +154,7 @@ interface RestrictionsForClient { * * @return the maximum amount of topic aliases the client sends to the server. */ - int getSendTopicAliasMaximum(); + @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getSendTopicAliasMaximum(); /** * Returns the maximum {@link MqttQos QoS} the server accepts from the client. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5ReasonCode.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5ReasonCode.java index b0b9d5641..aca77fed5 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5ReasonCode.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5ReasonCode.java @@ -16,7 +16,9 @@ package com.hivemq.client.mqtt.mqtt5.message; +import com.hivemq.client.internal.util.UnsignedDataTypes; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.Range; /** * Reason Code according to the MQTT 5 specification. @@ -30,7 +32,7 @@ public interface Mqtt5ReasonCode { /** * @return the byte code of this Reason Code. */ - int getCode(); + @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_BYTE_MAX_VALUE) int getCode(); /** * @return whether this Reason Code is an Error Code. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAck.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAck.java index 452cf0286..38a66e0b8 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAck.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAck.java @@ -16,6 +16,7 @@ package com.hivemq.client.mqtt.mqtt5.message.connect; +import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; import com.hivemq.client.mqtt.datatypes.MqttUtf8String; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; @@ -24,6 +25,7 @@ import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuth; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Range; import java.util.Optional; import java.util.OptionalInt; @@ -52,12 +54,12 @@ public interface Mqtt5ConnAck extends Mqtt5Message { * @return the optional session expiry interval set from the server. If absent, the session expiry interval from the * Connect message is used. */ - @NotNull OptionalLong getSessionExpiryInterval(); + @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) @NotNull OptionalLong getSessionExpiryInterval(); /** * @return the optional keep alive set from the server. If absent, the keep alive from the Connect message is used. */ - @NotNull OptionalInt getServerKeepAlive(); + @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) @NotNull OptionalInt getServerKeepAlive(); /** * @return the optional client identifier assigned by the server. If absent, the client identifier from the Connect diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckRestrictions.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckRestrictions.java index 587de52e4..3f31cebdf 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckRestrictions.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckRestrictions.java @@ -21,6 +21,7 @@ import com.hivemq.client.mqtt.datatypes.MqttQos; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Range; /** * Restrictions for the client set by the server in an {@link Mqtt5ConnAck MQTT 5 ConnAck message}. @@ -73,19 +74,19 @@ public interface Mqtt5ConnAckRestrictions { * @return the maximum amount of not acknowledged publishes with QoS 1 or 2 the server accepts concurrently. The * default is {@link #DEFAULT_RECEIVE_MAXIMUM}. */ - int getReceiveMaximum(); + @Range(from = 1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getReceiveMaximum(); /** * @return the maximum packet size the server accepts from the client. The default is {@link * #DEFAULT_MAXIMUM_PACKET_SIZE_NO_LIMIT}. */ - int getMaximumPacketSize(); + @Range(from = 1, to = MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT) int getMaximumPacketSize(); /** * @return the maximum amount of topic aliases the server accepts from the client. The default is {@link * #DEFAULT_TOPIC_ALIAS_MAXIMUM}. */ - int getTopicAliasMaximum(); + @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getTopicAliasMaximum(); /** * @return the maximum QoS the server accepts from the client. The default is {@link #DEFAULT_MAXIMUM_QOS}. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5Connect.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5Connect.java index 7b98008a9..fb2321904 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5Connect.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5Connect.java @@ -26,6 +26,7 @@ import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublish; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Range; import java.util.Optional; @@ -71,7 +72,7 @@ public interface Mqtt5Connect extends Mqtt5Message { /** * @return the keep alive in seconds the client wants to use. */ - int getKeepAlive(); + @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getKeepAlive(); /** * @return whether the client has no session present or wants to clear a present session. @@ -82,7 +83,7 @@ public interface Mqtt5Connect extends Mqtt5Message { * @return the session expiry interval in seconds the client wants to use. The default is {@link * #DEFAULT_SESSION_EXPIRY_INTERVAL}. If it is {@link #NO_SESSION_EXPIRY} the session does not expire. */ - long getSessionExpiryInterval(); + @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long getSessionExpiryInterval(); /** * @return the restrictions set from the client. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilderBase.java index b765132ee..195cd4093 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilderBase.java @@ -17,6 +17,7 @@ package com.hivemq.client.mqtt.mqtt5.message.connect; import com.hivemq.client.annotations.CheckReturnValue; +import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; @@ -27,6 +28,7 @@ import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Range; /** * Builder base for a {@link Mqtt5Connect}. @@ -47,7 +49,7 @@ public interface Mqtt5ConnectBuilderBase> { * @return the builder. */ @CheckReturnValue - @NotNull B keepAlive(int keepAlive); + @NotNull B keepAlive(@Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int keepAlive); /** * Disables the {@link Mqtt5Connect#getKeepAlive() keep alive} by setting it to {@link Mqtt5Connect#NO_KEEP_ALIVE}. @@ -75,7 +77,8 @@ public interface Mqtt5ConnectBuilderBase> { * @return teh builder. */ @CheckReturnValue - @NotNull B sessionExpiryInterval(long sessionExpiryInterval); + @NotNull B sessionExpiryInterval( + @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long sessionExpiryInterval); /** * Disables the {@link Mqtt5Connect#getSessionExpiryInterval() session expiry} by setting it to {@link diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictions.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictions.java index 8ac932fb4..70e6b7eef 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictions.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictions.java @@ -21,6 +21,7 @@ import com.hivemq.client.internal.util.UnsignedDataTypes; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Range; /** * Restrictions set by the client in an {@link Mqtt5Connect MQTT 5 Connect message}. @@ -98,7 +99,7 @@ public interface Mqtt5ConnectRestrictions { * @return the maximum amount of not acknowledged publishes with QoS 1 or 2 the client accepts from the server * concurrently. */ - int getReceiveMaximum(); + @Range(from = 1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getReceiveMaximum(); /** * Returns the maximum amount of not acknowledged publishes with QoS 1 or 2 the client sends to the server @@ -110,7 +111,7 @@ public interface Mqtt5ConnectRestrictions { * @return the maximum amount of not acknowledged publishes with QoS 1 or 2 the client sends to the server * concurrently. */ - int getSendMaximum(); + @Range(from = 1, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getSendMaximum(); /** * Returns the maximum packet size the client accepts from the server. The default is {@link @@ -118,7 +119,7 @@ public interface Mqtt5ConnectRestrictions { * * @return the maximum packet size the client accepts from the server. */ - int getMaximumPacketSize(); + @Range(from = 1, to = MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT) int getMaximumPacketSize(); /** * Returns the maximum packet size the client sends to the server. The default is {@link @@ -129,7 +130,7 @@ public interface Mqtt5ConnectRestrictions { * * @return the maximum packet size the client sends to the server. */ - int getSendMaximumPacketSize(); + @Range(from = 1, to = MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT) int getSendMaximumPacketSize(); /** * Returns the maximum amount of topic aliases the client accepts from the server. The default is {@link @@ -137,7 +138,7 @@ public interface Mqtt5ConnectRestrictions { * * @return the maximum amount of topic aliases the client accepts from the server. */ - int getTopicAliasMaximum(); + @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getTopicAliasMaximum(); /** * Returns the maximum amount of topic aliases the client sends to the server. The default is {@link @@ -148,7 +149,7 @@ public interface Mqtt5ConnectRestrictions { * * @return the maximum amount of topic aliases the client sends to the server. */ - int getSendTopicAliasMaximum(); + @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getSendTopicAliasMaximum(); /** * Returns whether the client requests problem information from the server. The default is {@link diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilderBase.java index 51518d154..472761549 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilderBase.java @@ -17,8 +17,11 @@ package com.hivemq.client.mqtt.mqtt5.message.connect; import com.hivemq.client.annotations.CheckReturnValue; +import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client.internal.util.UnsignedDataTypes; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Range; /** * Builder base for {@link Mqtt5ConnectRestrictions}. @@ -39,7 +42,7 @@ public interface Mqtt5ConnectRestrictionsBuilderBase> extends Mqtt5P * @return the builder. */ @CheckReturnValue - @NotNull C messageExpiryInterval(long messageExpiryInterval); + @NotNull C messageExpiryInterval( + @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long messageExpiryInterval); /** * Disables the {@link Mqtt5Publish#getMessageExpiryInterval() message expiry}. @@ -257,7 +260,8 @@ interface Complete> extends Mqtt5PublishBuilderBa * @return the builder. */ @CheckReturnValue - @NotNull C delayInterval(long delayInterval); + @NotNull C delayInterval( + @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long delayInterval); } } } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5WillPublish.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5WillPublish.java index 2df4d207e..7e3807cee 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5WillPublish.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5WillPublish.java @@ -17,8 +17,10 @@ package com.hivemq.client.mqtt.mqtt5.message.publish; import com.hivemq.client.internal.mqtt.message.publish.MqttPublishBuilder; +import com.hivemq.client.internal.util.UnsignedDataTypes; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Range; /** * MQTT 5 Will Publish which can be a part of an {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect MQTT 5 @@ -47,7 +49,7 @@ public interface Mqtt5WillPublish extends Mqtt5Publish { /** * @return the delay of this Will Publish. The default is {@link #DEFAULT_DELAY_INTERVAL}. */ - long getDelayInterval(); + @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_INT_MAX_VALUE) long getDelayInterval(); /** * Creates a builder for extending this Will Publish. From a36cc5d2170b41ae82af36e20d87961e03663369 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Wed, 18 Nov 2020 09:34:28 +0100 Subject: [PATCH 19/62] AsyncClient.Mqtt3/5SubscribeAndCallbackBuilder -> .SubscribeBuilder AsyncClient.Mqtt3/5SubscribeAndCallbackBuilder.Call -> .SubscribeBuilder.AfterComplete AsyncClient.Mqtt3/5SubscribeAndCallbackBuilder.Call.Ex -> .SubscribeBuilder.AfterCallback --- .../client/internal/mqtt/MqttAsyncClient.java | 17 ++-- .../mqtt/mqtt3/Mqtt3AsyncClientView.java | 19 ++-- .../client/mqtt/mqtt3/Mqtt3AsyncClient.java | 87 +++++++++---------- .../client/mqtt/mqtt5/Mqtt5AsyncClient.java | 87 +++++++++---------- 4 files changed, 97 insertions(+), 113 deletions(-) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java index 0410b03bb..51face0ef 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java @@ -174,8 +174,8 @@ public class MqttAsyncClient implements Mqtt5AsyncClient { } @Override - public @NotNull MqttSubscribeAndCallbackBuilder subscribeWith() { - return new MqttSubscribeAndCallbackBuilder(); + public @NotNull SubscribeBuilder subscribeWith() { + return new SubscribeBuilder(); } @Override @@ -310,32 +310,33 @@ public void onComplete() {} public void onError(final @NotNull Throwable t) {} } - private class MqttSubscribeAndCallbackBuilder extends MqttSubscribeBuilder - implements Mqtt5SubscribeAndCallbackBuilder.Start.Complete, Mqtt5SubscribeAndCallbackBuilder.Call.Ex { + private class SubscribeBuilder extends MqttSubscribeBuilder + implements Mqtt5AsyncClient.SubscribeBuilder.Start.Complete, + Mqtt5AsyncClient.SubscribeBuilder.AfterCallback { private @Nullable Consumer callback; private @Nullable Executor executor; private boolean manualAcknowledgement; @Override - protected @NotNull MqttSubscribeAndCallbackBuilder self() { + protected @NotNull SubscribeBuilder self() { return this; } @Override - public @NotNull MqttSubscribeAndCallbackBuilder callback(final @Nullable Consumer callback) { + public @NotNull SubscribeBuilder callback(final @Nullable Consumer callback) { this.callback = Checks.notNull(callback, "Callback"); return this; } @Override - public @NotNull MqttSubscribeAndCallbackBuilder executor(final @Nullable Executor executor) { + public @NotNull SubscribeBuilder executor(final @Nullable Executor executor) { this.executor = Checks.notNull(executor, "Executor"); return this; } @Override - public @NotNull MqttSubscribeAndCallbackBuilder manualAcknowledgement(final boolean manualAcknowledgement) { + public @NotNull SubscribeBuilder manualAcknowledgement(final boolean manualAcknowledgement) { this.manualAcknowledgement = manualAcknowledgement; return this; } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java index f1cafc064..8232b97a5 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java @@ -159,8 +159,8 @@ public class Mqtt3AsyncClientView implements Mqtt3AsyncClient { } @Override - public @NotNull Mqtt3SubscribeViewAndCallbackBuilder subscribeWith() { - return new Mqtt3SubscribeViewAndCallbackBuilder(); + public @NotNull SubscribeViewBuilder subscribeWith() { + return new SubscribeViewBuilder(); } @Override @@ -273,35 +273,32 @@ public void publishes( return new Mqtt3BlockingClientView(delegate.toBlocking()); } - private class Mqtt3SubscribeViewAndCallbackBuilder - extends Mqtt3SubscribeViewBuilder - implements Mqtt3SubscribeAndCallbackBuilder.Start.Complete, Mqtt3SubscribeAndCallbackBuilder.Call.Ex { + private class SubscribeViewBuilder extends Mqtt3SubscribeViewBuilder + implements SubscribeBuilder.Start.Complete, SubscribeBuilder.AfterCallback { private @Nullable Consumer callback; private @Nullable Executor executor; private boolean manualAcknowledgement; @Override - protected @NotNull Mqtt3SubscribeViewAndCallbackBuilder self() { + protected @NotNull SubscribeViewBuilder self() { return this; } @Override - public @NotNull Mqtt3SubscribeViewAndCallbackBuilder callback(final @Nullable Consumer callback) { + public @NotNull SubscribeViewBuilder callback(final @Nullable Consumer callback) { this.callback = Checks.notNull(callback, "Callback"); return this; } @Override - public @NotNull Mqtt3SubscribeViewAndCallbackBuilder executor(final @Nullable Executor executor) { + public @NotNull SubscribeViewBuilder executor(final @Nullable Executor executor) { this.executor = Checks.notNull(executor, "Executor"); return this; } @Override - public @NotNull Mqtt3SubscribeViewAndCallbackBuilder manualAcknowledgement( - final boolean manualAcknowledgement) { - + public @NotNull SubscribeViewBuilder manualAcknowledgement(final boolean manualAcknowledgement) { this.manualAcknowledgement = manualAcknowledgement; return this; } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java index 62cec6d96..9440d89c2 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java @@ -182,8 +182,8 @@ public interface Mqtt3AsyncClient extends Mqtt3Client { * Fluent counterpart of {@link #subscribe(Mqtt3Subscribe)}, {@link #subscribe(Mqtt3Subscribe, Consumer, boolean)} * and {@link #subscribe(Mqtt3Subscribe, Consumer, Executor, boolean)}. *

    - * Calling {@link Mqtt3SubscribeAndCallbackBuilder.Complete#send()} on the returned builder has the same effect as - * calling one of the following methods: + * Calling {@link SubscribeBuilder.Complete#send()} on the returned builder has the same effect as calling one of + * the following methods: *

      *
    • {@link #subscribe(Mqtt3Subscribe)} if no callback has been supplied to the builder *
    • {@link #subscribe(Mqtt3Subscribe, Consumer)} if only a callback has been supplied to the builder @@ -197,7 +197,7 @@ public interface Mqtt3AsyncClient extends Mqtt3Client { * @see #subscribe(Mqtt3Subscribe, Consumer, Executor, boolean) */ @CheckReturnValue - Mqtt3SubscribeAndCallbackBuilder.@NotNull Start subscribeWith(); + SubscribeBuilder.@NotNull Start subscribeWith(); /** * Globally consumes all incoming Publish messages matching the given filter. @@ -333,37 +333,30 @@ void publishes( * #subscribe(Mqtt3Subscribe, Consumer, Executor, boolean)} call. */ @ApiStatus.NonExtendable - interface Mqtt3SubscribeAndCallbackBuilder - extends Mqtt3SubscribeBuilderBase { + interface SubscribeBuilder extends Mqtt3SubscribeBuilderBase { /** - * {@link Mqtt3SubscribeAndCallbackBuilder} that is complete which means all mandatory fields are set. + * {@link SubscribeBuilder} that is complete which means all mandatory fields are set. */ @ApiStatus.NonExtendable - interface Complete extends Mqtt3SubscribeAndCallbackBuilder, Mqtt3SubscribeAndCallbackBuilder.Call, - Mqtt3SubscribeBuilderBase {} + interface Complete + extends SubscribeBuilder, AfterComplete, Mqtt3SubscribeBuilderBase {} /** - * {@link Mqtt3SubscribeAndCallbackBuilder} that provides additional methods for the first subscription. + * {@link SubscribeBuilder} that provides additional methods for the first subscription. */ - // @formatter:off @ApiStatus.NonExtendable - interface Start extends Mqtt3SubscribeAndCallbackBuilder, - Mqtt3SubscribeBuilderBase.Start< - Mqtt3SubscribeAndCallbackBuilder.Complete, Mqtt3SubscribeAndCallbackBuilder.Start.Complete> { - // @formatter:on + interface Start extends SubscribeBuilder, + Mqtt3SubscribeBuilderBase.Start { /** - * {@link Mqtt3SubscribeAndCallbackBuilder.Start} that is complete which means all mandatory fields are - * set. + * {@link SubscribeBuilder.Start} that is complete which means all mandatory fields are set. */ // @formatter:off @ApiStatus.NonExtendable - interface Complete extends - Mqtt3SubscribeAndCallbackBuilder.Start, Mqtt3SubscribeAndCallbackBuilder.Complete, + interface Complete extends SubscribeBuilder.Start, SubscribeBuilder.Complete, Mqtt3SubscribeBuilderBase.Start.Complete< - Mqtt3SubscribeAndCallbackBuilder.Complete, - Mqtt3SubscribeAndCallbackBuilder.Start.Complete> {} + SubscribeBuilder.Complete, SubscribeBuilder.Start.Complete> {} // @formatter:on } @@ -373,7 +366,7 @@ interface Complete extends * boolean)} call. */ @ApiStatus.NonExtendable - interface Call { + interface AfterComplete { /** * Sets a callback for the matching Publish messages consumed via the subscriptions. @@ -382,7 +375,7 @@ interface Call { * @return the builder. */ @CheckReturnValue - @NotNull Ex callback(@NotNull Consumer callback); + @NotNull AfterCallback callback(@NotNull Consumer callback); /** * Builds the {@link Mqtt3Subscribe} and applies it and additional arguments to a {@link @@ -393,34 +386,34 @@ interface Call { * {@link #subscribe(Mqtt3Subscribe, Consumer, Executor, boolean)}. */ @NotNull CompletableFuture send(); + } + + /** + * Builder for additional arguments alongside the {@link Mqtt3Subscribe} that are applied to a {@link + * #subscribe(Mqtt3Subscribe, Consumer, Executor, boolean)} call. + */ + @ApiStatus.NonExtendable + interface AfterCallback extends AfterComplete { + + /** + * Sets an executor to execute the callback for the matching Publish messages consumed via the + * subscriptions. + * + * @param executor the executor to execute the callback for the matching Publish messages. + * @return the builder. + */ + @CheckReturnValue + @NotNull AfterCallback executor(@NotNull Executor executor); /** - * Builder for additional arguments alongside the {@link Mqtt3Subscribe} that are applied to a {@link - * #subscribe(Mqtt3Subscribe, Consumer, Executor, boolean)} call. + * Sets whether the matching Publish messages consumed via the subscriptions are acknowledged manually. + * + * @param manualAcknowledgement whether the matching Publish messages are acknowledged manually. + * @return the builder. + * @since 1.2 */ - @ApiStatus.NonExtendable - interface Ex extends Call { - - /** - * Sets an executor to execute the callback for the matching Publish messages consumed via the - * subscriptions. - * - * @param executor the executor to execute the callback for the matching Publish messages. - * @return the builder. - */ - @CheckReturnValue - @NotNull Ex executor(@NotNull Executor executor); - - /** - * Sets whether the matching Publish messages consumed via the subscriptions are acknowledged manually. - * - * @param manualAcknowledgement whether the matching Publish messages are acknowledged manually. - * @return the builder. - * @since 1.2 - */ - @CheckReturnValue - @NotNull Ex manualAcknowledgement(boolean manualAcknowledgement); - } + @CheckReturnValue + @NotNull AfterCallback manualAcknowledgement(boolean manualAcknowledgement); } } } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5AsyncClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5AsyncClient.java index 2e5374ad7..16ab6e273 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5AsyncClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5AsyncClient.java @@ -186,8 +186,8 @@ public interface Mqtt5AsyncClient extends Mqtt5Client { * Fluent counterpart of {@link #subscribe(Mqtt5Subscribe)}, {@link #subscribe(Mqtt5Subscribe, Consumer, boolean)} * and {@link #subscribe(Mqtt5Subscribe, Consumer, Executor, boolean)}. *

      - * Calling {@link Mqtt5SubscribeAndCallbackBuilder.Complete#send()} on the returned builder has the same effect as - * calling one of the following methods: + * Calling {@link SubscribeBuilder.Complete#send()} on the returned builder has the same effect as calling one of + * the following methods: *

        *
      • {@link #subscribe(Mqtt5Subscribe)} if no callback has been supplied to the builder *
      • {@link #subscribe(Mqtt5Subscribe, Consumer)} if only a callback has been supplied to the builder @@ -201,7 +201,7 @@ public interface Mqtt5AsyncClient extends Mqtt5Client { * @see #subscribe(Mqtt5Subscribe, Consumer, Executor, boolean) */ @CheckReturnValue - Mqtt5SubscribeAndCallbackBuilder.@NotNull Start subscribeWith(); + SubscribeBuilder.@NotNull Start subscribeWith(); /** * Globally consumes all incoming Publish messages matching the given filter. @@ -380,37 +380,30 @@ void publishes( * #subscribe(Mqtt5Subscribe, Consumer, Executor, boolean)} call. */ @ApiStatus.NonExtendable - interface Mqtt5SubscribeAndCallbackBuilder - extends Mqtt5SubscribeBuilderBase { + interface SubscribeBuilder extends Mqtt5SubscribeBuilderBase { /** - * {@link Mqtt5SubscribeAndCallbackBuilder} that is complete which means all mandatory fields are set. + * {@link SubscribeBuilder} that is complete which means all mandatory fields are set. */ @ApiStatus.NonExtendable - interface Complete extends Mqtt5SubscribeAndCallbackBuilder, Mqtt5SubscribeAndCallbackBuilder.Call, - Mqtt5SubscribeBuilderBase.Complete {} + interface Complete extends SubscribeBuilder, AfterComplete, + Mqtt5SubscribeBuilderBase.Complete {} /** - * {@link Mqtt5SubscribeAndCallbackBuilder} that provides additional methods for the first subscription. + * {@link SubscribeBuilder} that provides additional methods for the first subscription. */ - // @formatter:off @ApiStatus.NonExtendable - interface Start extends Mqtt5SubscribeAndCallbackBuilder, - Mqtt5SubscribeBuilderBase.Start< - Mqtt5SubscribeAndCallbackBuilder.Complete, Mqtt5SubscribeAndCallbackBuilder.Start.Complete> { - // @formatter:on + interface Start extends SubscribeBuilder, + Mqtt5SubscribeBuilderBase.Start { /** - * {@link Mqtt5SubscribeAndCallbackBuilder.Start} that is complete which means all mandatory fields are - * set. + * {@link SubscribeBuilder.Start} that is complete which means all mandatory fields are set. */ // @formatter:off @ApiStatus.NonExtendable - interface Complete extends - Mqtt5SubscribeAndCallbackBuilder.Start, Mqtt5SubscribeAndCallbackBuilder.Complete, + interface Complete extends SubscribeBuilder.Start, SubscribeBuilder.Complete, Mqtt5SubscribeBuilderBase.Start.Complete< - Mqtt5SubscribeAndCallbackBuilder.Complete, - Mqtt5SubscribeAndCallbackBuilder.Start.Complete> {} + SubscribeBuilder.Complete, SubscribeBuilder.Start.Complete> {} // @formatter:on } @@ -420,7 +413,7 @@ interface Complete extends * boolean)} call. */ @ApiStatus.NonExtendable - interface Call { + interface AfterComplete { /** * Sets a callback for the matching Publish messages consumed via the subscriptions. @@ -429,7 +422,7 @@ interface Call { * @return the builder. */ @CheckReturnValue - @NotNull Ex callback(@NotNull Consumer callback); + @NotNull AfterCallback callback(@NotNull Consumer callback); /** * Builds the {@link Mqtt5Subscribe} and applies it and additional arguments to a {@link @@ -440,34 +433,34 @@ interface Call { * {@link #subscribe(Mqtt5Subscribe, Consumer, Executor, boolean)}. */ @NotNull CompletableFuture send(); + } + + /** + * Builder for additional arguments alongside the {@link Mqtt5Subscribe} that are applied to a {@link + * #subscribe(Mqtt5Subscribe, Consumer, Executor, boolean)} call. + */ + @ApiStatus.NonExtendable + interface AfterCallback extends AfterComplete { + + /** + * Sets an executor to execute the callback for the matching Publish messages consumed via the + * subscriptions. + * + * @param executor the executor to execute the callback for the matching Publish messages. + * @return the builder. + */ + @CheckReturnValue + @NotNull AfterCallback executor(@NotNull Executor executor); /** - * Builder for additional arguments alongside the {@link Mqtt5Subscribe} that are applied to a {@link - * #subscribe(Mqtt5Subscribe, Consumer, Executor, boolean)} call. + * Sets whether the matching Publish messages consumed via the subscriptions are acknowledged manually. + * + * @param manualAcknowledgement whether the matching Publish messages are acknowledged manually. + * @return the builder. + * @since 1.2 */ - @ApiStatus.NonExtendable - interface Ex extends Call { - - /** - * Sets an executor to execute the callback for the matching Publish messages consumed via the - * subscriptions. - * - * @param executor the executor to execute the callback for the matching Publish messages. - * @return the builder. - */ - @CheckReturnValue - @NotNull Ex executor(@NotNull Executor executor); - - /** - * Sets whether the matching Publish messages consumed via the subscriptions are acknowledged manually. - * - * @param manualAcknowledgement whether the matching Publish messages are acknowledged manually. - * @return the builder. - * @since 1.2 - */ - @CheckReturnValue - @NotNull Ex manualAcknowledgement(boolean manualAcknowledgement); - } + @CheckReturnValue + @NotNull AfterCallback manualAcknowledgement(boolean manualAcknowledgement); } } } From 962484e54fb50c8ca28ca12e416cc2b2a4e7b773 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Wed, 18 Nov 2020 09:39:38 +0100 Subject: [PATCH 20/62] Mqtt3/5SubscribeBuilder.Publishes.Args -> .Publishes.AfterComplete --- .../mqtt/message/subscribe/MqttSubscribeBuilder.java | 3 ++- .../message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java | 3 ++- .../mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java | 6 +++--- .../mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilder.java | 6 +++--- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilder.java index 22fd7e71f..9f0560e04 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilder.java @@ -218,7 +218,8 @@ public Send(final @NotNull Function parentConsumer) { } public static abstract class Publishes

        extends MqttSubscribeBuilder> - implements Mqtt5SubscribeBuilder.Publishes.Start.Complete

        , Mqtt5SubscribeBuilder.Publishes.Args

        { + implements Mqtt5SubscribeBuilder.Publishes.Start.Complete

        , + Mqtt5SubscribeBuilder.Publishes.AfterComplete

        { protected boolean manualAcknowledgement; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java index d0d755551..907318c65 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java @@ -191,7 +191,8 @@ public Send(final @NotNull Function parentConsume } public static abstract class Publishes

        extends Mqtt3SubscribeViewBuilder> - implements Mqtt3SubscribeBuilder.Publishes.Start.Complete

        , Mqtt3SubscribeBuilder.Publishes.Args

        { + implements Mqtt3SubscribeBuilder.Publishes.Start.Complete

        , + Mqtt3SubscribeBuilder.Publishes.AfterComplete

        { protected boolean manualAcknowledgement; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java index 4c4cacc76..540f1e46a 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java @@ -167,7 +167,7 @@ interface Publishes

        extends Mqtt3SubscribeBuilderBase> */ @ApiStatus.NonExtendable interface Complete

        - extends Publishes

        , Publishes.Args

        , Mqtt3SubscribeBuilderBase> {} + extends Publishes

        , AfterComplete

        , Mqtt3SubscribeBuilderBase> {} /** * {@link Publishes} that provides additional methods for the first subscription. @@ -195,7 +195,7 @@ interface Complete

        extends Publishes.Start

        , Publishes.Complete

        , * @param

        the type of the result when the built {@link Mqtt3Subscribe} is applied to the parent. */ @ApiStatus.NonExtendable - interface Args

        { + interface AfterComplete

        { /** * Sets whether the matching Publish messages consumed via the subscriptions are acknowledged manually. @@ -204,7 +204,7 @@ interface Args

        { * @return the builder. */ @CheckReturnValue - @NotNull Args

        manualAcknowledgement(boolean manualAcknowledgement); + @NotNull AfterComplete

        manualAcknowledgement(boolean manualAcknowledgement); /** * Builds the {@link Mqtt3Subscribe} and applies it and additional arguments to the parent. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilder.java index 05f8f1c48..5104ce81d 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilder.java @@ -168,7 +168,7 @@ interface Publishes

        extends Mqtt5SubscribeBuilderBase> */ @ApiStatus.NonExtendable interface Complete

        - extends Publishes

        , Publishes.Args

        , Mqtt5SubscribeBuilderBase.Complete> {} + extends Publishes

        , AfterComplete

        , Mqtt5SubscribeBuilderBase.Complete> {} /** * {@link Publishes} that provides additional methods for the first subscription. @@ -196,7 +196,7 @@ interface Complete

        extends Publishes.Start

        , Publishes.Complete

        , * @param

        the type of the result when the built {@link Mqtt5Subscribe} is applied to the parent. */ @ApiStatus.NonExtendable - interface Args

        { + interface AfterComplete

        { /** * Sets whether the matching Publish messages consumed via the subscriptions are acknowledged manually. @@ -205,7 +205,7 @@ interface Args

        { * @return the builder. */ @CheckReturnValue - @NotNull Args

        manualAcknowledgement(boolean manualAcknowledgement); + @NotNull AfterComplete

        manualAcknowledgement(boolean manualAcknowledgement); /** * Builds the {@link Mqtt5Subscribe} and applies it and additional arguments to the parent. From fb951cfbc7224f765b619a82e903e90b2455c90c Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Wed, 18 Nov 2020 23:22:31 +0100 Subject: [PATCH 21/62] Add Mqtt3SubscribeBuilderBase.Complete --- .../client/mqtt/mqtt3/Mqtt3AsyncClient.java | 4 ++-- .../subscribe/Mqtt3SubscribeBuilder.java | 9 +++++---- .../subscribe/Mqtt3SubscribeBuilderBase.java | 17 +++++++++++++---- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java index 9440d89c2..3af499b92 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java @@ -339,8 +339,8 @@ interface SubscribeBuilder extends Mqtt3SubscribeBuilderBase {} + interface Complete extends SubscribeBuilder, AfterComplete, + Mqtt3SubscribeBuilderBase.Complete {} /** * {@link SubscribeBuilder} that provides additional methods for the first subscription. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java index 540f1e46a..a0cbc40f1 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java @@ -33,7 +33,8 @@ public interface Mqtt3SubscribeBuilder extends Mqtt3SubscribeBuilderBase { + interface Complete + extends Mqtt3SubscribeBuilder, Mqtt3SubscribeBuilderBase.Complete { /** * Builds the {@link Mqtt3Subscribe}. @@ -76,7 +77,7 @@ interface Nested

        extends Mqtt3SubscribeBuilderBase> { * @param

        the type of the result when the built {@link Mqtt3Subscribe} is applied to the parent. */ @ApiStatus.NonExtendable - interface Complete

        extends Nested

        , Mqtt3SubscribeBuilderBase> { + interface Complete

        extends Nested

        , Mqtt3SubscribeBuilderBase.Complete> { /** * Builds the {@link Mqtt3Subscribe} and applies it to the parent. @@ -121,7 +122,7 @@ interface Send

        extends Mqtt3SubscribeBuilderBase> { * @param

        the type of the result when the built {@link Mqtt3Subscribe} is sent by the parent. */ @ApiStatus.NonExtendable - interface Complete

        extends Send

        , Mqtt3SubscribeBuilderBase> { + interface Complete

        extends Send

        , Mqtt3SubscribeBuilderBase.Complete> { /** * Builds the {@link Mqtt3Subscribe} and applies it to the parent which then sends the Subscribe message. @@ -167,7 +168,7 @@ interface Publishes

        extends Mqtt3SubscribeBuilderBase> */ @ApiStatus.NonExtendable interface Complete

        - extends Publishes

        , AfterComplete

        , Mqtt3SubscribeBuilderBase> {} + extends Publishes

        , AfterComplete

        , Mqtt3SubscribeBuilderBase.Complete> {} /** * {@link Publishes} that provides additional methods for the first subscription. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java index 04446d6b9..62e8f3c8a 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java @@ -31,7 +31,7 @@ * @since 1.0 */ @ApiStatus.NonExtendable -public interface Mqtt3SubscribeBuilderBase> { +public interface Mqtt3SubscribeBuilderBase> { /** * Adds a {@link Mqtt3Subscription} to the {@link Mqtt3Subscribe#getSubscriptions() list of subscriptions}. At least @@ -89,6 +89,14 @@ public interface Mqtt3SubscribeBuilderBase subscriptions); + /** + * {@link Mqtt3SubscribeBuilderBase} that is complete which means all mandatory fields are set. + * + * @param the type of the complete builder. + */ + @ApiStatus.NonExtendable + interface Complete> extends Mqtt3SubscribeBuilderBase {} + /** * {@link Mqtt3SubscribeBuilderBase} that provides additional methods for the first subscription. * @@ -98,7 +106,7 @@ public interface Mqtt3SubscribeBuilderBase, + C extends Mqtt3SubscribeBuilderBase.Complete, SC extends Mqtt3SubscribeBuilderBase.Start.Complete> extends Mqtt3SubscribeBuilderBase, Mqtt3SubscriptionBuilderBase { // @formatter:on @@ -112,9 +120,10 @@ interface Start< // @formatter:off @ApiStatus.NonExtendable interface Complete< - C extends Mqtt3SubscribeBuilderBase, + C extends Mqtt3SubscribeBuilderBase.Complete, SC extends Mqtt3SubscribeBuilderBase.Start.Complete> - extends Mqtt3SubscribeBuilderBase.Start, Mqtt3SubscriptionBuilderBase.Complete {} + extends Mqtt3SubscribeBuilderBase.Start, Mqtt3SubscribeBuilderBase.Complete, + Mqtt3SubscriptionBuilderBase.Complete {} // @formatter:on } } From 48524120500806c17f27cb639611e820af2411a6 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Wed, 18 Nov 2020 23:28:18 +0100 Subject: [PATCH 22/62] Add Mqtt3UnsubscribeBuilderBase.Complete --- .../message/unsubscribe/Mqtt3UnsubscribeBuilder.java | 9 +++++---- .../unsubscribe/Mqtt3UnsubscribeBuilderBase.java | 12 ++++++++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilder.java index 7aaa52926..163f21ef5 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilder.java @@ -33,7 +33,8 @@ public interface Mqtt3UnsubscribeBuilder extends Mqtt3UnsubscribeBuilderBase { + interface Complete + extends Mqtt3UnsubscribeBuilder, Mqtt3UnsubscribeBuilderBase.Complete { /** * Builds the {@link Mqtt3Unsubscribe}. @@ -65,7 +66,7 @@ interface Nested

        extends Mqtt3UnsubscribeBuilderBase> { * @param

        the type of the result when the built {@link Mqtt3Unsubscribe} is applied to the parent. */ @ApiStatus.NonExtendable - interface Complete

        extends Nested

        , Mqtt3UnsubscribeBuilderBase> { + interface Complete

        extends Nested

        , Mqtt3UnsubscribeBuilderBase.Complete> { /** * Builds the {@link Mqtt3Unsubscribe} and applies it to the parent. @@ -99,7 +100,7 @@ interface Send

        extends Mqtt3UnsubscribeBuilderBase> { * @param

        the type of the result when the built {@link Mqtt3Unsubscribe} is sent by the parent. */ @ApiStatus.NonExtendable - interface Complete

        extends Send

        , Mqtt3UnsubscribeBuilderBase> { + interface Complete

        extends Send

        , Mqtt3UnsubscribeBuilderBase.Complete> { /** * Builds the {@link Mqtt3Unsubscribe} and applies it to the parent which then sends the Unsubscribe @@ -130,7 +131,7 @@ interface SendVoid extends Mqtt3UnsubscribeBuilderBase { * {@link SendVoid} that is complete which means all mandatory fields are set. */ @ApiStatus.NonExtendable - interface Complete extends SendVoid, Mqtt3UnsubscribeBuilderBase { + interface Complete extends SendVoid, Mqtt3UnsubscribeBuilderBase.Complete { /** * Builds the {@link Mqtt3Unsubscribe} and applies it to the parent which then sends the Unsubscribe message diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java index d0294c685..d1572f640 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java @@ -34,7 +34,7 @@ * @since 1.0 */ @ApiStatus.NonExtendable -public interface Mqtt3UnsubscribeBuilderBase> { +public interface Mqtt3UnsubscribeBuilderBase> { /** * Adds a {@link MqttTopicFilter Topic Filter} to the {@link Mqtt3Unsubscribe#getTopicFilters() list of Topic @@ -111,13 +111,21 @@ public interface Mqtt3UnsubscribeBuilderBase the type of the complete builder. + */ + @ApiStatus.NonExtendable + interface Complete> extends Mqtt3UnsubscribeBuilderBase {} + /** * {@link Mqtt3UnsubscribeBuilderBase} that provides additional methods for the first Topic Filter. * * @param the type of the complete builder. */ @ApiStatus.NonExtendable - interface Start> extends Mqtt3UnsubscribeBuilderBase { + interface Start> extends Mqtt3UnsubscribeBuilderBase { /** * Sets the mandatory {@link Mqtt3Unsubscribe#getTopicFilters() first Topic Filter}. From 97ddc5cc612f341e0d83cfc5673cdc4f4ff2d5dd Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Wed, 18 Nov 2020 23:31:21 +0100 Subject: [PATCH 23/62] Add Mqtt5SimpleAuthBuilderBase.Complete --- .../mqtt5/message/auth/Mqtt5SimpleAuthBuilder.java | 5 +++-- .../mqtt5/message/auth/Mqtt5SimpleAuthBuilderBase.java | 10 +++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilder.java index 759f6def0..ae116249d 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilder.java @@ -33,7 +33,8 @@ public interface Mqtt5SimpleAuthBuilder extends Mqtt5SimpleAuthBuilderBase { + interface Complete + extends Mqtt5SimpleAuthBuilder, Mqtt5SimpleAuthBuilderBase.Complete { /** * Builds the {@link Mqtt5SimpleAuth}. @@ -58,7 +59,7 @@ interface Nested

        extends Mqtt5SimpleAuthBuilderBase> { * @param

        the type of the result when the built {@link Mqtt5SimpleAuth} is applied to the parent. */ @ApiStatus.NonExtendable - interface Complete

        extends Nested

        , Mqtt5SimpleAuthBuilderBase> { + interface Complete

        extends Nested

        , Mqtt5SimpleAuthBuilderBase.Complete> { /** * Builds the {@link Mqtt5SimpleAuth} and applies it to the parent. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilderBase.java index 07d030377..a52245701 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilderBase.java @@ -31,7 +31,7 @@ * @since 1.0 */ @ApiStatus.NonExtendable -public interface Mqtt5SimpleAuthBuilderBase> { +public interface Mqtt5SimpleAuthBuilderBase> { /** * Sets the {@link Mqtt5SimpleAuth#getUsername() username}. At least the username or the password is mandatory. @@ -68,4 +68,12 @@ public interface Mqtt5SimpleAuthBuilderBase the type of the complete builder. + */ + @ApiStatus.NonExtendable + interface Complete> extends Mqtt5SimpleAuthBuilderBase {} } From 79699531af7f93692eb95dae57f64ff22b11aa49 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Wed, 18 Nov 2020 23:33:55 +0100 Subject: [PATCH 24/62] Add MqttTopicBuilderBase.Complete --- .../hivemq/client/mqtt/datatypes/MqttTopicBuilder.java | 4 ++-- .../client/mqtt/datatypes/MqttTopicBuilderBase.java | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicBuilder.java b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicBuilder.java index d86d1b0f9..3dbf156d2 100644 --- a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicBuilder.java @@ -50,7 +50,7 @@ public interface MqttTopicBuilder extends MqttTopicBuilderBase { + interface Complete extends MqttTopicBuilder, MqttTopicBuilderBase.Complete { /** * Builds the {@link MqttTopic}. @@ -75,7 +75,7 @@ interface Nested

        extends MqttTopicBuilderBase> { * @param

        the type of the result when the built {@link MqttTopic} is applied to the parent. */ @ApiStatus.NonExtendable - interface Complete

        extends Nested

        , MqttTopicBuilderBase> { + interface Complete

        extends Nested

        , MqttTopicBuilderBase.Complete> { /** * Builds the {@link MqttTopic} and applies it to the parent. diff --git a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicBuilderBase.java index f3de563cb..a3bd94ead 100644 --- a/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/datatypes/MqttTopicBuilderBase.java @@ -28,7 +28,7 @@ * @since 1.0 */ @ApiStatus.NonExtendable -public interface MqttTopicBuilderBase> { +public interface MqttTopicBuilderBase> { /** * Adds a {@link MqttTopic#getLevels() Topic level}. @@ -38,4 +38,10 @@ public interface MqttTopicBuilderBase> { */ @CheckReturnValue @NotNull C addLevel(@NotNull String topicLevel); + + /** + * {@link MqttTopicBuilderBase} that is complete which means all mandatory fields are set. + */ + @ApiStatus.NonExtendable + interface Complete> extends MqttTopicBuilderBase {} } From 0cd435a1a6dae1285ef822e570660ad281b7ce30 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Sat, 21 Nov 2020 18:01:27 +0100 Subject: [PATCH 25/62] Add With postfix to nested builder methods in ClientBuilder and TransportConfigBuilder --- .../client/mqtt/examples/Mqtt5Features.java | 2 +- .../mqtt/examples/ReconnectStrategy.java | 4 ++-- .../internal/mqtt/MqttRxClientBuilder.java | 6 ++--- .../mqtt/MqttRxClientBuilderBase.java | 23 ++++++++----------- .../mqtt/MqttTransportConfigImplBuilder.java | 10 ++++---- .../mqtt/mqtt3/Mqtt3RxClientViewBuilder.java | 4 ++-- .../client/mqtt/MqttClientBuilderBase.java | 16 ++++++------- .../mqtt/MqttTransportConfigBuilderBase.java | 10 ++++---- .../client/mqtt/mqtt3/Mqtt3ClientBuilder.java | 4 ++-- .../client/mqtt/mqtt5/Mqtt5ClientBuilder.java | 6 ++--- 10 files changed, 41 insertions(+), 44 deletions(-) diff --git a/examples/src/main/java/com/hivemq/client/mqtt/examples/Mqtt5Features.java b/examples/src/main/java/com/hivemq/client/mqtt/examples/Mqtt5Features.java index 24ef04973..5ad1cad62 100644 --- a/examples/src/main/java/com/hivemq/client/mqtt/examples/Mqtt5Features.java +++ b/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() diff --git a/examples/src/main/java/com/hivemq/client/mqtt/examples/ReconnectStrategy.java b/examples/src/main/java/com/hivemq/client/mqtt/examples/ReconnectStrategy.java index 51e839834..83703a532 100644 --- a/examples/src/main/java/com/hivemq/client/mqtt/examples/ReconnectStrategy.java +++ b/examples/src/main/java/com/hivemq/client/mqtt/examples/ReconnectStrategy.java @@ -42,7 +42,7 @@ 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(); } @@ -50,7 +50,7 @@ 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() diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilder.java index 66fed3ee6..6d98185bd 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilder.java @@ -61,7 +61,7 @@ public MqttRxClientBuilder() {} } @Override - public MqttAdvancedConfigBuilder.@NotNull Nested advancedConfig() { + public MqttAdvancedConfigBuilder.@NotNull Nested advancedConfigWith() { return new MqttAdvancedConfigBuilder.Nested<>(advancedConfig, this::advancedConfig); } @@ -72,7 +72,7 @@ public MqttRxClientBuilder() {} } @Override - public MqttSimpleAuthBuilder.@NotNull Nested simpleAuth() { + public MqttSimpleAuthBuilder.@NotNull Nested simpleAuthWith() { return new MqttSimpleAuthBuilder.Nested<>(this::simpleAuth); } @@ -90,7 +90,7 @@ public MqttRxClientBuilder() {} } @Override - public MqttPublishBuilder.@NotNull WillNested willPublish() { + public MqttPublishBuilder.@NotNull WillNested willPublishWith() { return new MqttPublishBuilder.WillNested<>(this::willPublish); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java index 59a163797..c19a559b5 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java @@ -97,10 +97,9 @@ 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 @@ -108,10 +107,9 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase clie 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 transportConfig() { + public MqttTransportConfigImplBuilder.@NotNull Nested transportConfigWith() { return new MqttTransportConfigImplBuilder.Nested<>(this, this::transportConfig); } @@ -136,11 +134,11 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase clie return self(); } - public MqttExecutorConfigImplBuilder.@NotNull Nested executorConfig() { + public MqttExecutorConfigImplBuilder.@NotNull Nested 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 automaticReconnect() { + public MqttAutoReconnectImplBuilder.@NotNull Nested 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.builder().add(autoReconnect) - .addAll(disconnectedListenersBuilder.build()) - .build(); + return ImmutableList.builder(disconnectedListenersBuilder.getSize() + 1).add( + autoReconnect).addAll(disconnectedListenersBuilder.build()).build(); } protected @NotNull MqttClientConfig buildClientConfig( diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImplBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImplBuilder.java index e353c2c84..5fc660394 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImplBuilder.java +++ b/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 tlsConfig() { + public MqttTlsConfigImplBuilder.@NotNull Nested 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 webSocketConfig() { + public MqttWebSocketConfigImplBuilder.@NotNull Nested webSocketConfigWith() { return new MqttWebSocketConfigImplBuilder.Nested<>(webSocketConfig, this::webSocketConfig); } @@ -212,7 +212,7 @@ private int getLocalPort() { return self(); } - public MqttProxyConfigImplBuilder.@NotNull Nested proxyConfig() { + public MqttProxyConfigImplBuilder.@NotNull Nested proxyConfigWith() { return new MqttProxyConfigImplBuilder.Nested<>(proxyConfig, this::proxyConfig); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewBuilder.java index 69d1759d8..e0b08d57a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewBuilder.java +++ b/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 simpleAuth() { + public Mqtt3SimpleAuthViewBuilder.@NotNull Nested simpleAuthWith() { return new Mqtt3SimpleAuthViewBuilder.Nested<>(this::simpleAuth); } @@ -67,7 +67,7 @@ public Mqtt3RxClientViewBuilder(final @NotNull MqttRxClientBuilderBase client } @Override - public Mqtt3PublishViewBuilder.@NotNull WillNested willPublish() { + public Mqtt3PublishViewBuilder.@NotNull WillNested willPublishWith() { return new Mqtt3PublishViewBuilder.WillNested<>(this::willPublish); } diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java index 2efb2488e..4541717dc 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java @@ -107,7 +107,7 @@ public interface MqttClientBuilderBase> { * @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> { * @since 1.1 */ @CheckReturnValue - MqttTlsConfigBuilder.@NotNull Nested tlsConfig(); + MqttTlsConfigBuilder.@NotNull Nested tlsConfigWith(); /** * Sets the {@link MqttClientConfig#getWebSocketConfig() WebSocket transport configuration} to the default @@ -141,7 +141,7 @@ public interface MqttClientBuilderBase> { * @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> { * @since 1.1 */ @CheckReturnValue - MqttWebSocketConfigBuilder.@NotNull Nested webSocketConfig(); + MqttWebSocketConfigBuilder.@NotNull Nested webSocketConfigWith(); /** * Sets the {@link MqttClientConfig#getTransportConfig() transport configuration}. @@ -188,7 +188,7 @@ public interface MqttClientBuilderBase> { * @since 1.1 */ @CheckReturnValue - MqttTransportConfigBuilder.@NotNull Nested transportConfig(); + MqttTransportConfigBuilder.@NotNull Nested transportConfigWith(); /** * Sets the {@link MqttClientConfig#getExecutorConfig() executor configuration}. @@ -209,7 +209,7 @@ public interface MqttClientBuilderBase> { * @see #executorConfig(MqttExecutorConfig) */ @CheckReturnValue - MqttExecutorConfigBuilder.@NotNull Nested executorConfig(); + MqttExecutorConfigBuilder.@NotNull Nested executorConfigWith(); /** * Uses automatic reconnect with the default configuration. @@ -218,7 +218,7 @@ public interface MqttClientBuilderBase> { * @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> { * @since 1.1 */ @CheckReturnValue - MqttAutoReconnectBuilder.@NotNull Nested automaticReconnect(); + MqttAutoReconnectBuilder.@NotNull Nested automaticReconnectWith(); /** * Adds a listener which is notified when the client is connected (a successful ConnAck message is received). diff --git a/src/main/java/com/hivemq/client/mqtt/MqttTransportConfigBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttTransportConfigBuilderBase.java index 25b62dde9..8efa58510 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttTransportConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttTransportConfigBuilderBase.java @@ -126,7 +126,7 @@ public interface MqttTransportConfigBuilderBase tlsConfig(); + MqttTlsConfigBuilder.@NotNull Nested tlsConfigWith(); /** * Sets the {@link MqttTransportConfig#getWebSocketConfig() WebSocket transport configuration} to the default @@ -157,7 +157,7 @@ public interface MqttTransportConfigBuilderBase webSocketConfig(); + MqttWebSocketConfigBuilder.@NotNull Nested webSocketConfigWith(); /** * Sets the optional {@link MqttTransportConfig#getProxyConfig() proxy configuration}. @@ -203,7 +203,7 @@ public interface MqttTransportConfigBuilderBase proxyConfig(); + MqttProxyConfigBuilder.@NotNull Nested proxyConfigWith(); /** * Sets the {@link MqttTransportConfig#getSocketConnectTimeoutMs() timeout for connecting the socket to the diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientBuilder.java index f3e9e480f..fd4e465cc 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientBuilder.java @@ -59,7 +59,7 @@ public interface Mqtt3ClientBuilder extends MqttClientBuilderBase simpleAuth(); + Mqtt3SimpleAuthBuilder.@NotNull Nested simpleAuthWith(); /** * Sets the optional {@link Mqtt3ClientConfig#getWillPublish() Will Publish}. @@ -83,7 +83,7 @@ public interface Mqtt3ClientBuilder extends MqttClientBuilderBase willPublish(); + Mqtt3WillPublishBuilder.@NotNull Nested willPublishWith(); /** * Builds the {@link Mqtt3Client}. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientBuilder.java index e9ef751ce..a3aa644ea 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientBuilder.java @@ -57,7 +57,7 @@ public interface Mqtt5ClientBuilder extends MqttClientBuilderBase advancedConfig(); + Mqtt5AdvancedConfigBuilder.@NotNull Nested advancedConfigWith(); /** * Sets the optional {@link Mqtt5ClientConfig#getSimpleAuth() simple authentication and/or authorization related @@ -83,7 +83,7 @@ public interface Mqtt5ClientBuilder extends MqttClientBuilderBase simpleAuth(); + Mqtt5SimpleAuthBuilder.@NotNull Nested simpleAuthWith(); /** * Sets the {@link Mqtt5ClientConfig#getEnhancedAuthMechanism() enhanced authentication and/or authorization @@ -119,7 +119,7 @@ public interface Mqtt5ClientBuilder extends MqttClientBuilderBase willPublish(); + Mqtt5WillPublishBuilder.@NotNull Nested willPublishWith(); /** * Builds the {@link Mqtt5Client}. From 9281fbdcf40e77f117c55d702b118e29f664f300 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Sat, 21 Nov 2020 18:22:49 +0100 Subject: [PATCH 26/62] Add With postfix to nested builder methods in Reconnector and AdvancedConfigBuilder --- .../internal/mqtt/advanced/MqttAdvancedConfigBuilder.java | 2 +- .../hivemq/client/internal/mqtt/lifecycle/MqttReconnector.java | 2 +- .../internal/mqtt/lifecycle/mqtt3/Mqtt3ReconnectorView.java | 2 +- .../java/com/hivemq/client/mqtt/lifecycle/MqttReconnector.java | 2 +- .../hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3Reconnector.java | 2 +- .../mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java | 2 +- .../hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5Reconnector.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfigBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfigBuilder.java index 11f3042f1..f9fb33b66 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfigBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfigBuilder.java @@ -60,7 +60,7 @@ public abstract class MqttAdvancedConfigBuilder interceptors() { + public MqttClientInterceptorsBuilder.@NotNull Nested interceptorsWith() { return new MqttClientInterceptorsBuilder.Nested<>(interceptors, this::interceptors); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttReconnector.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttReconnector.java index e042bf64c..4a4cda741 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttReconnector.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttReconnector.java @@ -151,7 +151,7 @@ public long getDelay(final @NotNull TimeUnit timeUnit) { } @Override - public MqttTransportConfigImplBuilder.@NotNull Nested transportConfig() { + public MqttTransportConfigImplBuilder.@NotNull Nested transportConfigWith() { checkInEventLoop(); return new MqttTransportConfigImplBuilder.Nested<>(transportConfig, this::transportConfig); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ReconnectorView.java b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ReconnectorView.java index 1cb413768..69d18603e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ReconnectorView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ReconnectorView.java @@ -108,7 +108,7 @@ public long getDelay(final @NotNull TimeUnit timeUnit) { } @Override - public MqttTransportConfigImplBuilder.@NotNull Nested transportConfig() { + public MqttTransportConfigImplBuilder.@NotNull Nested transportConfigWith() { return new MqttTransportConfigImplBuilder.Nested<>(getTransportConfig(), this::transportConfig); } diff --git a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttReconnector.java b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttReconnector.java index 3b097a078..d707f2314 100644 --- a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttReconnector.java +++ b/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttReconnector.java @@ -205,7 +205,7 @@ public interface MqttReconnector { * @see #transportConfig(MqttTransportConfig) */ @CheckReturnValue - MqttTransportConfigBuilder.@NotNull Nested transportConfig(); + MqttTransportConfigBuilder.@NotNull Nested transportConfigWith(); /** * Returns the currently set transport configuration the client will try to reconnect with. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3Reconnector.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3Reconnector.java index 5bae944ae..e9d107982 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3Reconnector.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3Reconnector.java @@ -60,7 +60,7 @@ public interface Mqtt3Reconnector extends MqttReconnector { @Override @CheckReturnValue - MqttTransportConfigBuilder.@NotNull Nested transportConfig(); + MqttTransportConfigBuilder.@NotNull Nested transportConfigWith(); /** * Sets a different Connect message the client will try to reconnect with. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java index 706ddf932..aa7a67519 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java @@ -71,5 +71,5 @@ public interface Mqtt5AdvancedConfigBuilderBase interceptors(); + Mqtt5ClientInterceptorsBuilder.@NotNull Nested interceptorsWith(); } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5Reconnector.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5Reconnector.java index fa25654cb..be56a2fa6 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5Reconnector.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5Reconnector.java @@ -60,7 +60,7 @@ public interface Mqtt5Reconnector extends MqttReconnector { @Override @CheckReturnValue - MqttTransportConfigBuilder.@NotNull Nested transportConfig(); + MqttTransportConfigBuilder.@NotNull Nested transportConfigWith(); /** * Sets a different Connect message the client will try to reconnect with. From f86f591e2b637020c35c87ef112c510050872473 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Sat, 21 Nov 2020 22:07:00 +0100 Subject: [PATCH 27/62] Add With postfix to nested builder methods in message builders --- .../hivemq/client/mqtt/examples/Mqtt5Features.java | 10 +++++----- .../client/mqtt/examples/ReconnectStrategy.java | 2 +- .../mqtt/message/auth/MqttAuthBuilder.java | 2 +- .../mqtt/message/connect/MqttConnectBuilder.java | 8 ++++---- .../connect/mqtt3/Mqtt3ConnectViewBuilder.java | 4 ++-- .../message/disconnect/MqttDisconnectBuilder.java | 2 +- .../mqtt/message/publish/MqttPubAckBuilder.java | 2 +- .../mqtt/message/publish/MqttPubCompBuilder.java | 2 +- .../mqtt/message/publish/MqttPubRecBuilder.java | 2 +- .../mqtt/message/publish/MqttPubRelBuilder.java | 2 +- .../mqtt/message/publish/MqttPublishBuilder.java | 6 +++--- .../publish/mqtt3/Mqtt3PublishViewBuilder.java | 2 +- .../message/subscribe/MqttSubscribeBuilder.java | 6 +++--- .../message/subscribe/MqttSubscriptionBuilder.java | 2 +- .../subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java | 4 ++-- .../mqtt3/Mqtt3SubscriptionViewBuilder.java | 2 +- .../unsubscribe/MqttUnsubscribeBuilder.java | 6 +++--- .../mqtt3/Mqtt3UnsubscribeViewBuilder.java | 4 ++-- .../message/connect/Mqtt3ConnectBuilderBase.java | 4 ++-- .../message/publish/Mqtt3PublishBuilderBase.java | 2 +- .../subscribe/Mqtt3SubscribeBuilderBase.java | 2 +- .../subscribe/Mqtt3SubscriptionBuilderBase.java | 2 +- .../unsubscribe/Mqtt3UnsubscribeBuilderBase.java | 4 ++-- .../mqtt/mqtt5/message/auth/Mqtt5AuthBuilder.java | 2 +- .../message/connect/Mqtt5ConnectBuilderBase.java | 8 ++++---- .../disconnect/Mqtt5DisconnectBuilderBase.java | 2 +- .../mqtt5/message/publish/Mqtt5PubAckBuilder.java | 2 +- .../mqtt5/message/publish/Mqtt5PubCompBuilder.java | 2 +- .../mqtt5/message/publish/Mqtt5PubRecBuilder.java | 2 +- .../mqtt5/message/publish/Mqtt5PubRelBuilder.java | 2 +- .../message/publish/Mqtt5PublishBuilderBase.java | 6 +++--- .../subscribe/Mqtt5SubscribeBuilderBase.java | 4 ++-- .../subscribe/Mqtt5SubscriptionBuilderBase.java | 2 +- .../unsubscribe/Mqtt5UnsubscribeBuilderBase.java | 6 +++--- .../decoder/mqtt5/AbstractMqtt5DecoderTest.java | 2 +- .../encoder/mqtt3/Mqtt3ConnectEncoderTest.java | 4 ++-- .../subscribe/MqttSubscribeBuilderTest.java | 2 +- .../mqtt3/Mqtt3SubscribeViewBuilderTest.java | 2 +- .../unsubscribe/MqttUnsubscribeBuilderTest.java | 14 +++++++------- .../mqtt3/Mqtt3UnsubscribeViewBuilderTest.java | 14 +++++++------- 40 files changed, 79 insertions(+), 79 deletions(-) diff --git a/examples/src/main/java/com/hivemq/client/mqtt/examples/Mqtt5Features.java b/examples/src/main/java/com/hivemq/client/mqtt/examples/Mqtt5Features.java index 5ad1cad62..1aaeeddc1 100644 --- a/examples/src/main/java/com/hivemq/client/mqtt/examples/Mqtt5Features.java +++ b/examples/src/main/java/com/hivemq/client/mqtt/examples/Mqtt5Features.java @@ -46,7 +46,7 @@ public static void main(final String[] args)throws InterruptedException { final Mqtt5ConnAck connAck = client.toBlocking().connectWith() .cleanStart(false) // resume a previous session .sessionExpiryInterval(30) // keep session state for 30s - .restrictions() + .restrictionsWith() .receiveMaximum(10) // receive max. 10 concurrent messages .sendMaximum(10) // send max. 10 concurrent messages .maximumPacketSize(10_240) // receive messages with max size of 10KB @@ -54,14 +54,14 @@ public static void main(final String[] args)throws InterruptedException { .topicAliasMaximum(0) // the server should not use topic aliases .sendTopicAliasMaximum(8) // use up to 8 aliases for the most used topics (automatically traced) .applyRestrictions() - .willPublish() + .willPublishWith() .topic("demo/topic/will") .qos(MqttQos.EXACTLY_ONCE) .payload("rip".getBytes()) .contentType("text/plain") // our payload is text .messageExpiryInterval(120) // not so important, expire message after 2min if can not be delivered .delayInterval(30) // delay sending out the will message so we can try to reconnect immediately - .userProperties() // add some user properties to the will message + .userPropertiesWith() // add some user properties to the will message .add("sender", "demo-sender-1") .add("receiver", "you") .applyUserProperties() @@ -89,7 +89,7 @@ public static void main(final String[] args)throws InterruptedException { .retain(true) .contentType("text/plain") // our payload is text .messageExpiryInterval(120) // not so important, expire message after 2min if can not be delivered - .userProperties() // add some user properties to the message + .userPropertiesWith() // add some user properties to the message .add("sender", "demo-sender-1") .add("receiver", "you") .applyUserProperties() @@ -108,7 +108,7 @@ public static void main(final String[] args)throws InterruptedException { client2.publishWith() .topic("demo/topic/a") .retain(true) - .userProperties() + .userPropertiesWith() .add("sender", "demo-sender-2") .add("receiver", "you") .applyUserProperties() diff --git a/examples/src/main/java/com/hivemq/client/mqtt/examples/ReconnectStrategy.java b/examples/src/main/java/com/hivemq/client/mqtt/examples/ReconnectStrategy.java index 83703a532..2dd44f828 100644 --- a/examples/src/main/java/com/hivemq/client/mqtt/examples/ReconnectStrategy.java +++ b/examples/src/main/java/com/hivemq/client/mqtt/examples/ReconnectStrategy.java @@ -81,7 +81,7 @@ private static void completelyCustom() { .reconnectWhen(getOAuthToken(), (token, throwable) -> { // first reconnect would be delayed 2s but OAuth server needs more time if (token != null) { context5.getReconnector().connectWith() - .simpleAuth().password(token).applySimpleAuth() // set OAuth token as password + .simpleAuthWith().password(token).applySimpleAuth() // set OAuth token as password .applyConnect(); } else { context5.getReconnector().reconnect(false); // cancel reconnect if OAuth query failed diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuthBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuthBuilder.java index 9294f60fa..ef5738f6d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuthBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuthBuilder.java @@ -79,7 +79,7 @@ public MqttAuthBuilder(final @NotNull Mqtt5AuthReasonCode reasonCode, final @Not } @Override - public MqttUserPropertiesImplBuilder.@NotNull Nested userProperties() { + public MqttUserPropertiesImplBuilder.@NotNull Nested userPropertiesWith() { return new MqttUserPropertiesImplBuilder.Nested<>(userProperties, this::userProperties); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectBuilder.java index 06181f9ed..26f0e118e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectBuilder.java @@ -99,7 +99,7 @@ public abstract class MqttConnectBuilder> { return self(); } - public MqttConnectRestrictionsBuilder.@NotNull Nested restrictions() { + public MqttConnectRestrictionsBuilder.@NotNull Nested restrictionsWith() { return new MqttConnectRestrictionsBuilder.Nested<>(restrictions, this::restrictions); } @@ -108,7 +108,7 @@ public abstract class MqttConnectBuilder> { return self(); } - public MqttSimpleAuthBuilder.@NotNull Nested simpleAuth() { + public MqttSimpleAuthBuilder.@NotNull Nested simpleAuthWith() { return new MqttSimpleAuthBuilder.Nested<>(this::simpleAuth); } @@ -123,7 +123,7 @@ public abstract class MqttConnectBuilder> { return self(); } - public MqttPublishBuilder.@NotNull WillNested willPublish() { + public MqttPublishBuilder.@NotNull WillNested willPublishWith() { return new MqttPublishBuilder.WillNested<>(this::willPublish); } @@ -132,7 +132,7 @@ public abstract class MqttConnectBuilder> { return self(); } - public MqttUserPropertiesImplBuilder.@NotNull Nested userProperties() { + public MqttUserPropertiesImplBuilder.@NotNull Nested userPropertiesWith() { return new MqttUserPropertiesImplBuilder.Nested<>(userProperties, this::userProperties); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewBuilder.java index 5629405af..5953d9118 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewBuilder.java @@ -78,7 +78,7 @@ public abstract class Mqtt3ConnectViewBuilder simpleAuth() { + public Mqtt3SimpleAuthViewBuilder.@NotNull Nested simpleAuthWith() { return new Mqtt3SimpleAuthViewBuilder.Nested<>(this::simpleAuth); } @@ -88,7 +88,7 @@ public abstract class Mqtt3ConnectViewBuilder willPublish() { + public Mqtt3PublishViewBuilder.@NotNull WillNested willPublishWith() { return new Mqtt3PublishViewBuilder.WillNested<>(this::willPublish); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnectBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnectBuilder.java index d9ee206d7..b3a039138 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnectBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnectBuilder.java @@ -98,7 +98,7 @@ public abstract class MqttDisconnectBuilder> return self(); } - public MqttUserPropertiesImplBuilder.@NotNull Nested userProperties() { + public MqttUserPropertiesImplBuilder.@NotNull Nested userPropertiesWith() { return new MqttUserPropertiesImplBuilder.Nested<>(userProperties, this::userProperties); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAckBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAckBuilder.java index 121ebe04b..c4408e969 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAckBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAckBuilder.java @@ -67,7 +67,7 @@ public MqttPubAckBuilder(final @NotNull MqttStatefulPublish publish) { } @Override - public MqttUserPropertiesImplBuilder.@NotNull Nested userProperties() { + public MqttUserPropertiesImplBuilder.@NotNull Nested userPropertiesWith() { return new MqttUserPropertiesImplBuilder.Nested<>(userProperties, this::userProperties); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubCompBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubCompBuilder.java index 7a9d9d1d9..f797ed606 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubCompBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubCompBuilder.java @@ -65,7 +65,7 @@ public MqttPubCompBuilder(final @NotNull MqttPubRel pubRel) { } @Override - public MqttUserPropertiesImplBuilder.@NotNull Nested userProperties() { + public MqttUserPropertiesImplBuilder.@NotNull Nested userPropertiesWith() { return new MqttUserPropertiesImplBuilder.Nested<>(userProperties, this::userProperties); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRecBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRecBuilder.java index c0c67ca13..239571369 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRecBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRecBuilder.java @@ -67,7 +67,7 @@ public MqttPubRecBuilder(final @NotNull MqttStatefulPublish publish) { } @Override - public MqttUserPropertiesImplBuilder.@NotNull Nested userProperties() { + public MqttUserPropertiesImplBuilder.@NotNull Nested userPropertiesWith() { return new MqttUserPropertiesImplBuilder.Nested<>(userProperties, this::userProperties); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRelBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRelBuilder.java index 5ce1e346d..70dfc3df3 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRelBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRelBuilder.java @@ -65,7 +65,7 @@ public MqttPubRelBuilder(final @NotNull MqttPubRec pubRec) { } @Override - public MqttUserPropertiesImplBuilder.@NotNull Nested userProperties() { + public MqttUserPropertiesImplBuilder.@NotNull Nested userPropertiesWith() { return new MqttUserPropertiesImplBuilder.Nested<>(userProperties, this::userProperties); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishBuilder.java index 841506633..2475421b1 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishBuilder.java @@ -91,7 +91,7 @@ public abstract class MqttPublishBuilder> { return self(); } - public MqttTopicImplBuilder.@NotNull Nested topic() { + public MqttTopicImplBuilder.@NotNull Nested topicWith() { return new MqttTopicImplBuilder.Nested<>(this::topic); } @@ -140,7 +140,7 @@ public abstract class MqttPublishBuilder> { return self(); } - public MqttTopicImplBuilder.@NotNull Nested responseTopic() { + public MqttTopicImplBuilder.@NotNull Nested responseTopicWith() { return new MqttTopicImplBuilder.Nested<>(this::responseTopic); } @@ -159,7 +159,7 @@ public abstract class MqttPublishBuilder> { return self(); } - public MqttUserPropertiesImplBuilder.@NotNull Nested userProperties() { + public MqttUserPropertiesImplBuilder.@NotNull Nested userPropertiesWith() { return new MqttUserPropertiesImplBuilder.Nested<>(userProperties, this::userProperties); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewBuilder.java index ef68aa515..484f23f82 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewBuilder.java @@ -66,7 +66,7 @@ public abstract class Mqtt3PublishViewBuilder topic() { + public MqttTopicImplBuilder.@NotNull Nested topicWith() { return new MqttTopicImplBuilder.Nested<>(this::topic); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilder.java index 9f0560e04..3d1c4bd19 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilder.java @@ -62,7 +62,7 @@ protected MqttSubscribeBuilder() { return self(); } - public MqttSubscriptionBuilder.@NotNull Nested addSubscription() { + public MqttSubscriptionBuilder.@NotNull Nested addSubscriptionWith() { return new MqttSubscriptionBuilder.Nested<>(this::addSubscription); } @@ -101,7 +101,7 @@ protected MqttSubscribeBuilder() { return self(); } - public MqttUserPropertiesImplBuilder.@NotNull Nested userProperties() { + public MqttUserPropertiesImplBuilder.@NotNull Nested userPropertiesWith() { return new MqttUserPropertiesImplBuilder.Nested<>(userProperties, this::userProperties); } @@ -129,7 +129,7 @@ private void buildFirstSubscription() { return self(); } - public MqttTopicFilterImplBuilder.@NotNull Nested topicFilter() { + public MqttTopicFilterImplBuilder.@NotNull Nested topicFilterWith() { return new MqttTopicFilterImplBuilder.Nested<>(this::topicFilter); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscriptionBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscriptionBuilder.java index 085e9024e..3a1078931 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscriptionBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscriptionBuilder.java @@ -63,7 +63,7 @@ public abstract class MqttSubscriptionBuilder topicFilter() { + public MqttTopicFilterImplBuilder.@NotNull Nested topicFilterWith() { return new MqttTopicFilterImplBuilder.Nested<>(this::topicFilter); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java index 907318c65..8fb163a97 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java @@ -58,7 +58,7 @@ protected Mqtt3SubscribeViewBuilder() { return self(); } - public Mqtt3SubscriptionViewBuilder.@NotNull Nested addSubscription() { + public Mqtt3SubscriptionViewBuilder.@NotNull Nested addSubscriptionWith() { return new Mqtt3SubscriptionViewBuilder.Nested<>(this::addSubscription); } @@ -116,7 +116,7 @@ private void buildFirstSubscription() { return self(); } - public MqttTopicFilterImplBuilder.@NotNull Nested topicFilter() { + public MqttTopicFilterImplBuilder.@NotNull Nested topicFilterWith() { return new MqttTopicFilterImplBuilder.Nested<>(this::topicFilter); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewBuilder.java index 08cf4309f..1f5156f1b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewBuilder.java @@ -58,7 +58,7 @@ public abstract class Mqtt3SubscriptionViewBuilder topicFilter() { + public MqttTopicFilterImplBuilder.@NotNull Nested topicFilterWith() { return new MqttTopicFilterImplBuilder.Nested<>(this::topicFilter); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilder.java index 42a0529cf..26654208f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilder.java @@ -65,7 +65,7 @@ public abstract class MqttUnsubscribeBuilder return self(); } - public MqttTopicFilterImplBuilder.@NotNull Nested addTopicFilter() { + public MqttTopicFilterImplBuilder.@NotNull Nested addTopicFilterWith() { return new MqttTopicFilterImplBuilder.Nested<>(this::addTopicFilter); } @@ -107,7 +107,7 @@ public abstract class MqttUnsubscribeBuilder return self(); } - public MqttUserPropertiesImplBuilder.@NotNull Nested userProperties() { + public MqttUserPropertiesImplBuilder.@NotNull Nested userPropertiesWith() { return new MqttUserPropertiesImplBuilder.Nested<>(userProperties, this::userProperties); } @@ -119,7 +119,7 @@ public abstract class MqttUnsubscribeBuilder return addTopicFilter(topicFilter); } - public MqttTopicFilterImplBuilder.@NotNull Nested topicFilter() { + public MqttTopicFilterImplBuilder.@NotNull Nested topicFilterWith() { return new MqttTopicFilterImplBuilder.Nested<>(this::topicFilter); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilder.java index 29e98aa8a..68d9b73b1 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilder.java @@ -62,7 +62,7 @@ public abstract class Mqtt3UnsubscribeViewBuilder addTopicFilter() { + public MqttTopicFilterImplBuilder.@NotNull Nested addTopicFilterWith() { return new MqttTopicFilterImplBuilder.Nested<>(this::addTopicFilter); } @@ -107,7 +107,7 @@ public abstract class Mqtt3UnsubscribeViewBuilder topicFilter() { + public MqttTopicFilterImplBuilder.@NotNull Nested topicFilterWith() { return new MqttTopicFilterImplBuilder.Nested<>(this::topicFilter); } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java index 02795f4de..c7455d830 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java @@ -86,7 +86,7 @@ public interface Mqtt3ConnectBuilderBase> { * @see #simpleAuth(Mqtt3SimpleAuth) */ @CheckReturnValue - Mqtt3SimpleAuthBuilder.@NotNull Nested simpleAuth(); + Mqtt3SimpleAuthBuilder.@NotNull Nested simpleAuthWith(); /** * Sets the optional {@link Mqtt3Connect#getWillPublish() Will Publish}. @@ -108,5 +108,5 @@ public interface Mqtt3ConnectBuilderBase> { * @see #willPublish(Mqtt3Publish) */ @CheckReturnValue - Mqtt3WillPublishBuilder.@NotNull Nested willPublish(); + Mqtt3WillPublishBuilder.@NotNull Nested willPublishWith(); } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishBuilderBase.java index d6a0fa4f2..12b8e053f 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishBuilderBase.java @@ -64,7 +64,7 @@ public interface Mqtt3PublishBuilderBase topic(); + MqttTopicBuilder.@NotNull Nested topicWith(); /** * {@link Mqtt3PublishBuilderBase} that is complete which means all mandatory fields are set. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java index 62e8f3c8a..8e04e8797 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java @@ -54,7 +54,7 @@ public interface Mqtt3SubscribeBuilderBase addSubscription(); + Mqtt3SubscriptionBuilder.@NotNull Nested addSubscriptionWith(); /** * Adds {@link Mqtt3Subscription}s to the {@link Mqtt3Subscribe#getSubscriptions() list of subscriptions}. At least diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilderBase.java index 257b9cdd4..bb75f1fbf 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilderBase.java @@ -62,7 +62,7 @@ public interface Mqtt3SubscriptionBuilderBase topicFilter(); + MqttTopicFilterBuilder.@NotNull Nested topicFilterWith(); /** * {@link Mqtt3SubscriptionBuilderBase} that is complete which means all mandatory fields are set. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java index d1572f640..d9288fd5f 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java @@ -67,7 +67,7 @@ public interface Mqtt3UnsubscribeBuilderBase addTopicFilter(); + MqttTopicFilterBuilder.@NotNull Nested addTopicFilterWith(); /** * Adds {@link MqttTopicFilter Topic Filters} to the {@link Mqtt3Unsubscribe#getTopicFilters() list of Topic @@ -156,6 +156,6 @@ interface Start> extends Mqtt3 * @see #addTopicFilter(MqttTopicFilter) */ @CheckReturnValue - MqttTopicFilterBuilder.@NotNull Nested topicFilter(); + MqttTopicFilterBuilder.@NotNull Nested topicFilterWith(); } } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthBuilder.java index 346db16a0..7d22541a0 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthBuilder.java @@ -75,5 +75,5 @@ public interface Mqtt5AuthBuilder extends Mqtt5EnhancedAuthBuilder { * @see #userProperties(Mqtt5UserProperties) */ @CheckReturnValue - Mqtt5UserPropertiesBuilder.@NotNull Nested userProperties(); + Mqtt5UserPropertiesBuilder.@NotNull Nested userPropertiesWith(); } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilderBase.java index 195cd4093..306b37e6f 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilderBase.java @@ -108,7 +108,7 @@ public interface Mqtt5ConnectBuilderBase> { * @see #restrictions(Mqtt5ConnectRestrictions) */ @CheckReturnValue - Mqtt5ConnectRestrictionsBuilder.@NotNull Nested restrictions(); + Mqtt5ConnectRestrictionsBuilder.@NotNull Nested restrictionsWith(); /** * Sets the optional {@link Mqtt5Connect#getSimpleAuth() simple authentication and/or authorization related data}. @@ -131,7 +131,7 @@ public interface Mqtt5ConnectBuilderBase> { * @see #simpleAuth(Mqtt5SimpleAuth) */ @CheckReturnValue - Mqtt5SimpleAuthBuilder.@NotNull Nested simpleAuth(); + Mqtt5SimpleAuthBuilder.@NotNull Nested simpleAuthWith(); /** * Sets the {@link Mqtt5Connect#getEnhancedAuthMechanism() enhanced authentication and/or authorization mechanism}. @@ -163,7 +163,7 @@ public interface Mqtt5ConnectBuilderBase> { * @see #willPublish(Mqtt5Publish) */ @CheckReturnValue - Mqtt5WillPublishBuilder.@NotNull Nested willPublish(); + Mqtt5WillPublishBuilder.@NotNull Nested willPublishWith(); /** * Sets the {@link Mqtt5Connect#getUserProperties() User Properties}. @@ -184,5 +184,5 @@ public interface Mqtt5ConnectBuilderBase> { * @see #userProperties(Mqtt5UserProperties) */ @CheckReturnValue - Mqtt5UserPropertiesBuilder.@NotNull Nested userProperties(); + Mqtt5UserPropertiesBuilder.@NotNull Nested userPropertiesWith(); } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilderBase.java index bcb02ed10..020aab56b 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilderBase.java @@ -121,5 +121,5 @@ public interface Mqtt5DisconnectBuilderBase userProperties(); + Mqtt5UserPropertiesBuilder.@NotNull Nested userPropertiesWith(); } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckBuilder.java index 16b1a565d..8e1d44a6b 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckBuilder.java @@ -75,5 +75,5 @@ public interface Mqtt5PubAckBuilder { * @see #userProperties(Mqtt5UserProperties) */ @CheckReturnValue - Mqtt5UserPropertiesBuilder.@NotNull Nested userProperties(); + Mqtt5UserPropertiesBuilder.@NotNull Nested userPropertiesWith(); } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompBuilder.java index 4bf0a16ef..ed757bac1 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompBuilder.java @@ -67,7 +67,7 @@ public interface Mqtt5PubCompBuilder { * @see #userProperties(Mqtt5UserProperties) */ @CheckReturnValue - Mqtt5UserPropertiesBuilder.@NotNull Nested userProperties(); + Mqtt5UserPropertiesBuilder.@NotNull Nested userPropertiesWith(); /** * @return the Reason Code of the PubComp message. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecBuilder.java index 4b2e1bcf5..0825b8c92 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecBuilder.java @@ -75,5 +75,5 @@ public interface Mqtt5PubRecBuilder { * @see #userProperties(Mqtt5UserProperties) */ @CheckReturnValue - Mqtt5UserPropertiesBuilder.@NotNull Nested userProperties(); + Mqtt5UserPropertiesBuilder.@NotNull Nested userPropertiesWith(); } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelBuilder.java index 62e422004..d07a25c93 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelBuilder.java @@ -67,7 +67,7 @@ public interface Mqtt5PubRelBuilder { * @see #userProperties(Mqtt5UserProperties) */ @CheckReturnValue - Mqtt5UserPropertiesBuilder.@NotNull Nested userProperties(); + Mqtt5UserPropertiesBuilder.@NotNull Nested userPropertiesWith(); /** * @return the Reason Code of the PubRel message. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishBuilderBase.java index 8fe1b7101..c4ef19e0b 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PublishBuilderBase.java @@ -69,7 +69,7 @@ public interface Mqtt5PublishBuilderBase topic(); + MqttTopicBuilder.@NotNull Nested topicWith(); /** * {@link Mqtt5PublishBuilderBase} that is complete which means all mandatory fields are set. @@ -191,7 +191,7 @@ interface Complete> extends Mqtt5P * @see #responseTopic(MqttTopic) */ @CheckReturnValue - MqttTopicBuilder.@NotNull Nested responseTopic(); + MqttTopicBuilder.@NotNull Nested responseTopicWith(); /** * Sets the optional {@link Mqtt5Publish#getCorrelationData() correlation data}. @@ -232,7 +232,7 @@ interface Complete> extends Mqtt5P * @see #userProperties(Mqtt5UserProperties) */ @CheckReturnValue - Mqtt5UserPropertiesBuilder.@NotNull Nested userProperties(); + Mqtt5UserPropertiesBuilder.@NotNull Nested userPropertiesWith(); } /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilderBase.java index 49cf968f7..910906c93 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilderBase.java @@ -56,7 +56,7 @@ public interface Mqtt5SubscribeBuilderBase addSubscription(); + Mqtt5SubscriptionBuilder.@NotNull Nested addSubscriptionWith(); /** * Adds {@link Mqtt5Subscription}s to the {@link Mqtt5Subscribe#getSubscriptions() list of subscriptions}. At least @@ -118,7 +118,7 @@ interface Complete> extends Mqtt * @see #userProperties(Mqtt5UserProperties) */ @CheckReturnValue - Mqtt5UserPropertiesBuilder.@NotNull Nested userProperties(); + Mqtt5UserPropertiesBuilder.@NotNull Nested userPropertiesWith(); } /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilderBase.java index a0a2fa7e6..4b40f9350 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilderBase.java @@ -62,7 +62,7 @@ public interface Mqtt5SubscriptionBuilderBase topicFilter(); + MqttTopicFilterBuilder.@NotNull Nested topicFilterWith(); /** * {@link Mqtt5SubscriptionBuilderBase} that is complete which means all mandatory fields are set. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilderBase.java index a4ae0da8a..4b96ad576 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilderBase.java @@ -69,7 +69,7 @@ public interface Mqtt5UnsubscribeBuilderBase addTopicFilter(); + MqttTopicFilterBuilder.@NotNull Nested addTopicFilterWith(); /** * Adds {@link MqttTopicFilter Topic Filters} to the {@link Mqtt5Unsubscribe#getTopicFilters() list of Topic @@ -140,7 +140,7 @@ interface Complete> extends Mq * @see #userProperties(Mqtt5UserProperties) */ @CheckReturnValue - Mqtt5UserPropertiesBuilder.@NotNull Nested userProperties(); + Mqtt5UserPropertiesBuilder.@NotNull Nested userPropertiesWith(); } /** @@ -180,6 +180,6 @@ interface Start> extends Mqtt5 * @see #addTopicFilter(MqttTopicFilter) */ @CheckReturnValue - MqttTopicFilterBuilder.@NotNull Nested topicFilter(); + MqttTopicFilterBuilder.@NotNull Nested topicFilterWith(); } } diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/AbstractMqtt5DecoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/AbstractMqtt5DecoderTest.java index 812065e55..c14820d3c 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/AbstractMqtt5DecoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/AbstractMqtt5DecoderTest.java @@ -30,7 +30,7 @@ abstract class AbstractMqtt5DecoderTest extends AbstractMqttDecoderTest { private static @NotNull MqttConnect createConnect(final int maximumPacketSize) { - return new MqttConnectBuilder.Default().restrictions() + return new MqttConnectBuilder.Default().restrictionsWith() .maximumPacketSize(maximumPacketSize) .topicAliasMaximum(3) .requestResponseInformation(true) diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3ConnectEncoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3ConnectEncoderTest.java index a22542143..e03b6985f 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3ConnectEncoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3ConnectEncoderTest.java @@ -68,13 +68,13 @@ void matchesPaho( Mqtt3ConnectViewBuilder.Default connectBuilder = new Mqtt3ConnectViewBuilder.Default().cleanSession(cleanSession).keepAlive(keepAliveInterval); if (hasAuth) { - connectBuilder = connectBuilder.simpleAuth() + connectBuilder = connectBuilder.simpleAuthWith() .username(userName) .password(password.getBytes(StandardCharsets.UTF_8)) .applySimpleAuth(); } if (hasWill) { - connectBuilder = connectBuilder.willPublish() + connectBuilder = connectBuilder.willPublishWith() .topic(willTopic) .qos(Objects.requireNonNull(MqttQos.fromCode(willQos))) .payload(willMessage.getBytes(StandardCharsets.UTF_8)) diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilderTest.java index 06ed580a0..c4bf82007 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilderTest.java @@ -137,7 +137,7 @@ void addSubscription_fluent_subscription_is_finished_if_fluent_addSubscription_i final Mqtt5SubscribeBuilder.Complete subscribeBuilder = Mqtt5Subscribe.builder().topicFilter("fluent"); final Mqtt5Subscribe mqtt5Subscribe = - subscribeBuilder.addSubscription().topicFilter("test").applySubscription().build(); + subscribeBuilder.addSubscriptionWith().topicFilter("test").applySubscription().build(); final List subscriptions = mqtt5Subscribe.getSubscriptions(); assertEquals(2, subscriptions.size()); diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilderTest.java index af3d3f48b..f6e253307 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilderTest.java @@ -125,7 +125,7 @@ void addSubscription_fluent_subscription_is_finished_if_fluent_addSubscription_i final Mqtt3SubscribeBuilder.Complete subscribeBuilder = Mqtt3Subscribe.builder().topicFilter("fluent"); final Mqtt3Subscribe Mqtt3Subscribe = - subscribeBuilder.addSubscription().topicFilter("test").applySubscription().build(); + subscribeBuilder.addSubscriptionWith().topicFilter("test").applySubscription().build(); final List subscriptions = Mqtt3Subscribe.getSubscriptions(); assertEquals(2, subscriptions.size()); diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilderTest.java index c04731cd2..dbdeb81a1 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilderTest.java @@ -95,7 +95,7 @@ void addTopicFilter_fluent_topic_is_finished_if_addTopicFilter_is_used_string() void addTopicFilter_nested_topic_builder_is_used_with_and_then_addTopicFilter_mqtttopic() { final Mqtt5Unsubscribe subscribe = Mqtt5Unsubscribe.builder() - .topicFilter() + .topicFilterWith() .addLevel("first") .addLevel("second") .multiLevelWildcard() @@ -114,7 +114,7 @@ void addTopicFilter_nested_topic_builder_is_used_with_and_then_addTopicFilter_mq void addTopicFilter_nested_topic_builder_is_used_and_then_addTopicFilter_string() { final Mqtt5Unsubscribe subscribe = Mqtt5Unsubscribe.builder() - .topicFilter() + .topicFilterWith() .addLevel("first") .addLevel("second") .multiLevelWildcard() @@ -135,7 +135,7 @@ void addTopicFilter_fluent_topic_is_finished_if_addTopicFilter_is_used_second_ti final Mqtt5Unsubscribe subscribe = Mqtt5Unsubscribe.builder() .topicFilter("test") .addTopicFilter(MqttTopicFilter.of("firstAdd")) - .addTopicFilter() + .addTopicFilterWith() .addLevel("nested") .applyTopicFilter() .addTopicFilter(MqttTopicFilter.of("secondAdd")) @@ -156,7 +156,7 @@ void addTopicFilter_fluent_topic_is_finished_if_addTopicFilter_is_used_second_ti final Mqtt5Unsubscribe subscribe = Mqtt5Unsubscribe.builder() .topicFilter("test") .addTopicFilter("firstAdd") - .addTopicFilter() + .addTopicFilterWith() .addLevel("nested") .applyTopicFilter() .addTopicFilter("secondAdd") @@ -176,7 +176,7 @@ void addTopicFilter_fluent_topic_is_finished_if_fluent_addTopicFilter_is_used() final Mqtt5Unsubscribe subscribe = Mqtt5Unsubscribe.builder() .topicFilter("test") - .addTopicFilter() + .addTopicFilterWith() .addLevel("first") .addLevel("second") .multiLevelWildcard() @@ -323,7 +323,7 @@ void addTopicFilters_nested_topic_builder_is_used_and_then_addTopicFilters() { ImmutableList.of(MqttTopicFilter.of("test"), MqttTopicFilter.of("list"), MqttTopicFilter.of("element")); final Mqtt5Unsubscribe subscribe = Mqtt5Unsubscribe.builder() - .topicFilter() + .topicFilterWith() .addLevel("first") .addLevel("second") .multiLevelWildcard() @@ -350,7 +350,7 @@ void addTopicFilters_fluent_topic_is_finished_if_addTopicFilters_is_used_second_ final Mqtt5Unsubscribe subscribe = Mqtt5Unsubscribe.builder() .topicFilter("fluent") .addTopicFilters(topics) - .addTopicFilter() + .addTopicFilterWith() .addLevel("nested") .applyTopicFilter() .addTopicFilters(topics2) diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilderTest.java index b59475d83..71a4cef8e 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilderTest.java @@ -95,7 +95,7 @@ void addTopicFilter_fluent_topic_is_finished_if_addTopicFilter_is_used_string() void addTopicFilter_nested_topic_builder_is_used_with_and_then_addTopicFilter_mqtttopic() { final Mqtt3Unsubscribe subscribe = Mqtt3Unsubscribe.builder() - .topicFilter() + .topicFilterWith() .addLevel("first") .addLevel("second") .multiLevelWildcard() @@ -114,7 +114,7 @@ void addTopicFilter_nested_topic_builder_is_used_with_and_then_addTopicFilter_mq void addTopicFilter_nested_topic_builder_is_used_and_then_addTopicFilter_string() { final Mqtt3Unsubscribe subscribe = Mqtt3Unsubscribe.builder() - .topicFilter() + .topicFilterWith() .addLevel("first") .addLevel("second") .multiLevelWildcard() @@ -135,7 +135,7 @@ void addTopicFilter_fluent_topic_is_finished_if_addTopicFilter_is_used_second_ti final Mqtt3Unsubscribe subscribe = Mqtt3Unsubscribe.builder() .topicFilter("test") .addTopicFilter(MqttTopicFilter.of("firstAdd")) - .addTopicFilter() + .addTopicFilterWith() .addLevel("nested") .applyTopicFilter() .addTopicFilter(MqttTopicFilter.of("secondAdd")) @@ -156,7 +156,7 @@ void addTopicFilter_fluent_topic_is_finished_if_addTopicFilter_is_used_second_ti final Mqtt3Unsubscribe subscribe = Mqtt3Unsubscribe.builder() .topicFilter("test") .addTopicFilter("firstAdd") - .addTopicFilter() + .addTopicFilterWith() .addLevel("nested") .applyTopicFilter() .addTopicFilter("secondAdd") @@ -176,7 +176,7 @@ void addTopicFilter_fluent_topic_is_finished_if_fluent_addTopicFilter_is_used() final Mqtt3Unsubscribe subscribe = Mqtt3Unsubscribe.builder() .topicFilter("test") - .addTopicFilter() + .addTopicFilterWith() .addLevel("first") .addLevel("second") .multiLevelWildcard() @@ -323,7 +323,7 @@ void addTopicFilters_nested_topic_builder_is_used_and_then_addTopicFilters() { ImmutableList.of(MqttTopicFilter.of("test"), MqttTopicFilter.of("list"), MqttTopicFilter.of("element")); final Mqtt3Unsubscribe subscribe = Mqtt3Unsubscribe.builder() - .topicFilter() + .topicFilterWith() .addLevel("first") .addLevel("second") .multiLevelWildcard() @@ -350,7 +350,7 @@ void addTopicFilters_fluent_topic_is_finished_if_addTopicFilters_is_used_second_ final Mqtt3Unsubscribe subscribe = Mqtt3Unsubscribe.builder() .topicFilter("fluent") .addTopicFilters(topics) - .addTopicFilter() + .addTopicFilterWith() .addLevel("nested") .applyTopicFilter() .addTopicFilters(topics2) From 5d755c90344a8f6389e1a82365207705e3a19869 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Sun, 22 Nov 2020 17:19:14 +0100 Subject: [PATCH 28/62] Mqtt5RetainHandling.SEND_IF_SUBSCRIPTION_DOES_NOT_EXIST -> SEND_IF_NEW_SUBSCRIPTION --- .../mqtt/mqtt5/message/subscribe/Mqtt5RetainHandling.java | 6 +++--- .../mqtt/codec/encoder/mqtt5/Mqtt5SubscribeEncoderTest.java | 2 +- .../mqtt5/message/subscribe/Mqtt5RetainHandlingTest.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandling.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandling.java index 4e1b941db..aff193abf 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandling.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandling.java @@ -33,7 +33,7 @@ public enum Mqtt5RetainHandling { /** * Send retained messages for the current subscription only if the subscription does not currently exist. */ - SEND_IF_SUBSCRIPTION_DOES_NOT_EXIST, + SEND_IF_NEW_SUBSCRIPTION, /** * Do not send retained messages for the current subscription. */ @@ -55,8 +55,8 @@ public int getCode() { public static @Nullable Mqtt5RetainHandling fromCode(final int code) { if (code == SEND.getCode()) { return SEND; - } else if (code == SEND_IF_SUBSCRIPTION_DOES_NOT_EXIST.getCode()) { - return SEND_IF_SUBSCRIPTION_DOES_NOT_EXIST; + } else if (code == SEND_IF_NEW_SUBSCRIPTION.getCode()) { + return SEND_IF_NEW_SUBSCRIPTION; } else if (code == DO_NOT_SEND.getCode()) { return DO_NOT_SEND; } diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5SubscribeEncoderTest.java b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5SubscribeEncoderTest.java index 1ff1cd840..009d9d288 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5SubscribeEncoderTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5SubscribeEncoderTest.java @@ -88,7 +88,7 @@ void encode_allProperties() { final MqttTopicFilterImpl topicFiler = MqttTopicFilterImpl.of("topic/#"); final MqttQos qos = MqttQos.AT_LEAST_ONCE; final boolean isNoLocal = true; - final Mqtt5RetainHandling retainHandling = Mqtt5RetainHandling.SEND_IF_SUBSCRIPTION_DOES_NOT_EXIST; + final Mqtt5RetainHandling retainHandling = Mqtt5RetainHandling.SEND_IF_NEW_SUBSCRIPTION; final boolean isRetainAsPublished = true; final ImmutableList subscriptions = ImmutableList.of(new MqttSubscription(topicFiler, qos, isNoLocal, retainHandling, isRetainAsPublished)); diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandlingTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandlingTest.java index 627b06f24..9166514a2 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandlingTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandlingTest.java @@ -37,7 +37,7 @@ void getCode_send() { @Test void getCode_sendIfSubscriptionDoesNotExist() { - assertEquals(0x01, Mqtt5RetainHandling.SEND_IF_SUBSCRIPTION_DOES_NOT_EXIST.getCode()); + assertEquals(0x01, Mqtt5RetainHandling.SEND_IF_NEW_SUBSCRIPTION.getCode()); } @Test From cb64c3b53da59c1297724429aac7a5d1f8ca4b6b Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Sun, 22 Nov 2020 17:37:47 +0100 Subject: [PATCH 29/62] Simplified Mqtt5RetainHandling.getCode --- .../message/subscribe/Mqtt5RetainHandling.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandling.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandling.java index aff193abf..d5871e380 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandling.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandling.java @@ -16,6 +16,7 @@ package com.hivemq.client.mqtt.mqtt5.message.subscribe; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** @@ -39,6 +40,8 @@ public enum Mqtt5RetainHandling { */ DO_NOT_SEND; + private static final @NotNull Mqtt5RetainHandling @NotNull [] VALUES = values(); + /** * @return the byte code of this Retain Handling. */ @@ -53,13 +56,9 @@ public int getCode() { * @return the Retain Handling belonging to the byte code or null if the byte code is not a valid Retain Handling. */ public static @Nullable Mqtt5RetainHandling fromCode(final int code) { - if (code == SEND.getCode()) { - return SEND; - } else if (code == SEND_IF_NEW_SUBSCRIPTION.getCode()) { - return SEND_IF_NEW_SUBSCRIPTION; - } else if (code == DO_NOT_SEND.getCode()) { - return DO_NOT_SEND; + if (code < 0 || code >= VALUES.length) { + return null; } - return null; + return VALUES[code]; } } From ea150bc9658537cb71316ea62061dde6c2f9206a Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Sun, 22 Nov 2020 22:18:38 +0100 Subject: [PATCH 30/62] Refactored MqttCommonReasonCode -> MqttReasonCodes --- .../subscribe/MqttSubscriptionHandler.java | 6 +- .../mqtt/message/MqttCommonReasonCode.java | 75 ------ .../mqtt/message/MqttReasonCodes.java | 85 +++++++ .../message/auth/Mqtt5AuthReasonCode.java | 13 +- .../connect/Mqtt5ConnAckReasonCode.java | 50 ++-- .../disconnect/Mqtt5DisconnectReasonCode.java | 66 +++-- .../publish/Mqtt5PubAckReasonCode.java | 24 +- .../publish/Mqtt5PubCompReasonCode.java | 11 +- .../publish/Mqtt5PubRecReasonCode.java | 24 +- .../publish/Mqtt5PubRelReasonCode.java | 11 +- .../subscribe/Mqtt5SubAckReasonCode.java | 30 +-- .../unsubscribe/Mqtt5UnsubAckReasonCode.java | 20 +- .../message/MqttCommonReasonCodeTest.java | 148 ----------- .../mqtt/message/MqttReasonCodesTest.java | 238 ++++++++++++++++++ 14 files changed, 431 insertions(+), 370 deletions(-) delete mode 100644 src/main/java/com/hivemq/client/internal/mqtt/message/MqttCommonReasonCode.java create mode 100644 src/main/java/com/hivemq/client/internal/mqtt/message/MqttReasonCodes.java delete mode 100644 src/test/java/com/hivemq/client/internal/mqtt/message/MqttCommonReasonCodeTest.java create mode 100644 src/test/java/com/hivemq/client/internal/mqtt/message/MqttReasonCodesTest.java diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscriptionHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscriptionHandler.java index 01dbec647..7efc22084 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscriptionHandler.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscriptionHandler.java @@ -28,7 +28,7 @@ import com.hivemq.client.internal.mqtt.handler.publish.incoming.MqttIncomingPublishFlows; import com.hivemq.client.internal.mqtt.handler.publish.incoming.MqttSubscribedPublishFlow; import com.hivemq.client.internal.mqtt.ioc.ClientScope; -import com.hivemq.client.internal.mqtt.message.MqttCommonReasonCode; +import com.hivemq.client.internal.mqtt.message.MqttReasonCodes; import com.hivemq.client.internal.mqtt.message.subscribe.MqttStatefulSubscribe; import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; @@ -243,7 +243,7 @@ private void readSubAck(final @NotNull ChannelHandlerContext ctx, final @NotNull final ImmutableList reasonCodes = subAck.getReasonCodes(); final boolean countNotMatching = subscribeWithFlow.subscribe.getSubscriptions().size() != reasonCodes.size(); - final boolean allErrors = MqttCommonReasonCode.allErrors(subAck.getReasonCodes()); + final boolean allErrors = MqttReasonCodes.allErrors(subAck.getReasonCodes()); incomingPublishFlows.subAck(subscribeWithFlow.subscribe, subscribeWithFlow.subscriptionIdentifier, reasonCodes); @@ -290,7 +290,7 @@ private void readUnsubAck(final @NotNull ChannelHandlerContext ctx, final @NotNu final ImmutableList reasonCodes = unsubAck.getReasonCodes(); final boolean countNotMatching = unsubscribeWithFlow.unsubscribe.getTopicFilters().size() != reasonCodes.size(); - final boolean allErrors = MqttCommonReasonCode.allErrors(unsubAck.getReasonCodes()); + final boolean allErrors = MqttReasonCodes.allErrors(unsubAck.getReasonCodes()); if ((reasonCodes == Mqtt3UnsubAckView.REASON_CODES_ALL_SUCCESS) || !(countNotMatching || allErrors)) { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/MqttCommonReasonCode.java b/src/main/java/com/hivemq/client/internal/mqtt/message/MqttCommonReasonCode.java deleted file mode 100644 index 0a0357b29..000000000 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/MqttCommonReasonCode.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2018-present HiveMQ and the HiveMQ Community - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.hivemq.client.internal.mqtt.message; - -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; -import org.jetbrains.annotations.NotNull; - -/** - * MQTT Reason Codes that are used in 2 ore more MQTT packets according to the MQTT 5 specification. - * - * @author Silvio Giebl - */ -public enum MqttCommonReasonCode implements Mqtt5ReasonCode { - - SUCCESS(0x00), - NO_MATCHING_SUBSCRIBERS(0x10), - UNSPECIFIED_ERROR(0x80), - MALFORMED_PACKET(0x81), - PROTOCOL_ERROR(0x82), - IMPLEMENTATION_SPECIFIC_ERROR(0x83), - NOT_AUTHORIZED(0x87), - SERVER_BUSY(0x89), - BAD_AUTHENTICATION_METHOD(0x8C), - TOPIC_FILTER_INVALID(0x8F), - TOPIC_NAME_INVALID(0x90), - PACKET_IDENTIFIER_IN_USE(0x91), - PACKET_IDENTIFIER_NOT_FOUND(0x92), - PACKET_TOO_LARGE(0x95), - QUOTA_EXCEEDED(0x97), - PAYLOAD_FORMAT_INVALID(0x99), - RETAIN_NOT_SUPPORTED(0x9A), - QOS_NOT_SUPPORTED(0x9B), - USE_ANOTHER_SERVER(0x9C), - SERVER_MOVED(0x9D), - SHARED_SUBSCRIPTIONS_NOT_SUPPORTED(0x9E), - CONNECTION_RATE_EXCEEDED(0x9F), - SUBSCRIPTION_IDENTIFIERS_NOT_SUPPORTED(0xA1), - WILDCARD_SUBSCRIPTIONS_NOT_SUPPORTED(0xA2); - - private final int code; - - MqttCommonReasonCode(final int code) { - this.code = code; - } - - @Override - public int getCode() { - return code; - } - - public static boolean allErrors(final @NotNull ImmutableList reasonCodes) { - //noinspection ForLoopReplaceableByForEach - for (int i = 0; i < reasonCodes.size(); i++) { - if (!reasonCodes.get(i).isError()) { - return false; - } - } - return true; - } -} diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/MqttReasonCodes.java b/src/main/java/com/hivemq/client/internal/mqtt/message/MqttReasonCodes.java new file mode 100644 index 000000000..9901f1479 --- /dev/null +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/MqttReasonCodes.java @@ -0,0 +1,85 @@ +/* + * Copyright 2018-present HiveMQ and the HiveMQ Community + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.hivemq.client.internal.mqtt.message; + +import com.hivemq.client.internal.util.collections.ImmutableList; +import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; +import org.jetbrains.annotations.NotNull; + +/** + * MQTT Reason Codes according to the MQTT 5 specification. + * + * @author Silvio Giebl + */ +public class MqttReasonCodes { + + public static final int SUCCESS = 0x00; + public static final int GRANTED_QOS_1 = 0x01; + public static final int GRANTED_QOS_2 = 0x02; + public static final int DISCONNECT_WITH_WILL_MESSAGE = 0x04; + public static final int NO_MATCHING_SUBSCRIBERS = 0x10; + public static final int NO_SUBSCRIPTIONS_EXISTED = 0x11; + public static final int CONTINUE_AUTHENTICATION = 0x18; + public static final int REAUTHENTICATE = 0x19; + public static final int UNSPECIFIED_ERROR = 0x80; + public static final int MALFORMED_PACKET = 0x81; + public static final int PROTOCOL_ERROR = 0x82; + public static final int IMPLEMENTATION_SPECIFIC_ERROR = 0x83; + public static final int UNSUPPORTED_PROTOCOL_VERSION = 0x84; + public static final int CLIENT_IDENTIFIER_NOT_VALID = 0x85; + public static final int BAD_USER_NAME_OR_PASSWORD = 0x86; + public static final int NOT_AUTHORIZED = 0x87; + public static final int SERVER_UNAVAILABLE = 0x88; + public static final int SERVER_BUSY = 0x89; + public static final int BANNED = 0x8A; + public static final int SERVER_SHUTTING_DOWN = 0x8B; + public static final int BAD_AUTHENTICATION_METHOD = 0x8C; + public static final int KEEP_ALIVE_TIMEOUT = 0x8D; + public static final int SESSION_TAKEN_OVER = 0x8E; + public static final int TOPIC_FILTER_INVALID = 0x8F; + public static final int TOPIC_NAME_INVALID = 0x90; + public static final int PACKET_IDENTIFIER_IN_USE = 0x91; + public static final int PACKET_IDENTIFIER_NOT_FOUND = 0x92; + public static final int RECEIVE_MAXIMUM_EXCEEDED = 0x93; + public static final int TOPIC_ALIAS_INVALID = 0x94; + public static final int PACKET_TOO_LARGE = 0x95; + public static final int MESSAGE_RATE_TOO_HIGH = 0x96; + public static final int QUOTA_EXCEEDED = 0x97; + public static final int ADMINISTRATIVE_ACTION = 0x98; + public static final int PAYLOAD_FORMAT_INVALID = 0x99; + public static final int RETAIN_NOT_SUPPORTED = 0x9A; + public static final int QOS_NOT_SUPPORTED = 0x9B; + public static final int USE_ANOTHER_SERVER = 0x9C; + public static final int SERVER_MOVED = 0x9D; + public static final int SHARED_SUBSCRIPTIONS_NOT_SUPPORTED = 0x9E; + public static final int CONNECTION_RATE_EXCEEDED = 0x9F; + public static final int MAXIMUM_CONNECT_TIME = 0xA0; + public static final int SUBSCRIPTION_IDENTIFIERS_NOT_SUPPORTED = 0xA1; + public static final int WILDCARD_SUBSCRIPTIONS_NOT_SUPPORTED = 0xA2; + + public static boolean allErrors(final @NotNull ImmutableList reasonCodes) { + //noinspection ForLoopReplaceableByForEach + for (int i = 0; i < reasonCodes.size(); i++) { + if (!reasonCodes.get(i).isError()) { + return false; + } + } + return true; + } + + private MqttReasonCodes() {} +} diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthReasonCode.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthReasonCode.java index f0ac07583..2cefe9016 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthReasonCode.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthReasonCode.java @@ -16,9 +16,8 @@ package com.hivemq.client.mqtt.mqtt5.message.auth; -import com.hivemq.client.internal.mqtt.message.MqttCommonReasonCode; +import com.hivemq.client.internal.mqtt.message.MqttReasonCodes; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** @@ -32,15 +31,15 @@ public enum Mqtt5AuthReasonCode implements Mqtt5ReasonCode { /** * Authentication is successful. */ - SUCCESS(MqttCommonReasonCode.SUCCESS), + SUCCESS(MqttReasonCodes.SUCCESS), /** * Continue the authentication with another step. */ - CONTINUE_AUTHENTICATION(0x18), + CONTINUE_AUTHENTICATION(MqttReasonCodes.CONTINUE_AUTHENTICATION), /** * Initiate a re-authentication. */ - REAUTHENTICATE(0x19); + REAUTHENTICATE(MqttReasonCodes.REAUTHENTICATE); private final int code; @@ -48,10 +47,6 @@ public enum Mqtt5AuthReasonCode implements Mqtt5ReasonCode { this.code = code; } - Mqtt5AuthReasonCode(final @NotNull MqttCommonReasonCode reasonCode) { - this(reasonCode.getCode()); - } - @Override public int getCode() { return code; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCode.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCode.java index 060b647ce..cde804931 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCode.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCode.java @@ -16,7 +16,7 @@ package com.hivemq.client.mqtt.mqtt5.message.connect; -import com.hivemq.client.internal.mqtt.message.MqttCommonReasonCode; +import com.hivemq.client.internal.mqtt.message.MqttReasonCodes; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -32,91 +32,91 @@ public enum Mqtt5ConnAckReasonCode implements Mqtt5ReasonCode { /** * The connection is accepted. */ - SUCCESS(MqttCommonReasonCode.SUCCESS), + SUCCESS(MqttReasonCodes.SUCCESS), /** * The server either does not want to reveal the reason for the failure or none of the other reason codes apply. */ - UNSPECIFIED_ERROR(MqttCommonReasonCode.UNSPECIFIED_ERROR), + UNSPECIFIED_ERROR(MqttReasonCodes.UNSPECIFIED_ERROR), /** * The CONNECT packet could not be parsed correctly according to the MQTT specification. */ - MALFORMED_PACKET(MqttCommonReasonCode.MALFORMED_PACKET), + MALFORMED_PACKET(MqttReasonCodes.MALFORMED_PACKET), /** * The CONNECT packet contained data that is not allowed by the MQTT protocol. */ - PROTOCOL_ERROR(MqttCommonReasonCode.PROTOCOL_ERROR), + PROTOCOL_ERROR(MqttReasonCodes.PROTOCOL_ERROR), /** * The CONNECT packet is valid but is not accepted by the server. */ - IMPLEMENTATION_SPECIFIC_ERROR(MqttCommonReasonCode.IMPLEMENTATION_SPECIFIC_ERROR), + IMPLEMENTATION_SPECIFIC_ERROR(MqttReasonCodes.IMPLEMENTATION_SPECIFIC_ERROR), /** * The server does not support the version of the MQTT protocol requested by the client. */ - UNSUPPORTED_PROTOCOL_VERSION(0x84), + UNSUPPORTED_PROTOCOL_VERSION(MqttReasonCodes.UNSUPPORTED_PROTOCOL_VERSION), /** * The client identifier is formed correctly but is not accepted by the server. */ - CLIENT_IDENTIFIER_NOT_VALID(0x85), + CLIENT_IDENTIFIER_NOT_VALID(MqttReasonCodes.CLIENT_IDENTIFIER_NOT_VALID), /** * The server does not accept the user name or password specified by the client. */ - BAD_USER_NAME_OR_PASSWORD(0x86), + BAD_USER_NAME_OR_PASSWORD(MqttReasonCodes.BAD_USER_NAME_OR_PASSWORD), /** * The client is not authorized to connect. */ - NOT_AUTHORIZED(MqttCommonReasonCode.NOT_AUTHORIZED), + NOT_AUTHORIZED(MqttReasonCodes.NOT_AUTHORIZED), /** * The MQTT service is not available. */ - SERVER_UNAVAILABLE(0x88), + SERVER_UNAVAILABLE(MqttReasonCodes.SERVER_UNAVAILABLE), /** * The server is busy. Try again later. */ - SERVER_BUSY(MqttCommonReasonCode.SERVER_BUSY), + SERVER_BUSY(MqttReasonCodes.SERVER_BUSY), /** * This client has been banned by administrative action. Contact the server administrator. */ - BANNED(0x8A), + BANNED(MqttReasonCodes.BANNED), /** * The authentication method is not supported or does not match the authentication method currently in use. */ - BAD_AUTHENTICATION_METHOD(MqttCommonReasonCode.BAD_AUTHENTICATION_METHOD), + BAD_AUTHENTICATION_METHOD(MqttReasonCodes.BAD_AUTHENTICATION_METHOD), /** * The Will topic name is formed correctly but is not accepted by the server. */ - TOPIC_NAME_INVALID(MqttCommonReasonCode.TOPIC_NAME_INVALID), + TOPIC_NAME_INVALID(MqttReasonCodes.TOPIC_NAME_INVALID), /** * The CONNECT packet exceeded the maximum permissible size. */ - PACKET_TOO_LARGE(MqttCommonReasonCode.PACKET_TOO_LARGE), + PACKET_TOO_LARGE(MqttReasonCodes.PACKET_TOO_LARGE), /** * An implementation or administrative imposed limit has been exceeded. */ - QUOTA_EXCEEDED(MqttCommonReasonCode.QUOTA_EXCEEDED), + QUOTA_EXCEEDED(MqttReasonCodes.QUOTA_EXCEEDED), /** * The Will payload does not match the specified payload format indicator. */ - PAYLOAD_FORMAT_INVALID(MqttCommonReasonCode.PAYLOAD_FORMAT_INVALID), + PAYLOAD_FORMAT_INVALID(MqttReasonCodes.PAYLOAD_FORMAT_INVALID), /** * The server does not support retained messages, but the Will retain flag was set. */ - RETAIN_NOT_SUPPORTED(MqttCommonReasonCode.RETAIN_NOT_SUPPORTED), + RETAIN_NOT_SUPPORTED(MqttReasonCodes.RETAIN_NOT_SUPPORTED), /** * The server does not support the QoS of the Will. */ - QOS_NOT_SUPPORTED(MqttCommonReasonCode.QOS_NOT_SUPPORTED), + QOS_NOT_SUPPORTED(MqttReasonCodes.QOS_NOT_SUPPORTED), /** * The client should temporarily use another server. */ - USE_ANOTHER_SERVER(MqttCommonReasonCode.USE_ANOTHER_SERVER), + USE_ANOTHER_SERVER(MqttReasonCodes.USE_ANOTHER_SERVER), /** * The client should permanently use another server. */ - SERVER_MOVED(MqttCommonReasonCode.SERVER_MOVED), + SERVER_MOVED(MqttReasonCodes.SERVER_MOVED), /** * The connection rate limit has been exceeded. */ - CONNECTION_RATE_EXCEEDED(MqttCommonReasonCode.CONNECTION_RATE_EXCEEDED); + CONNECTION_RATE_EXCEEDED(MqttReasonCodes.CONNECTION_RATE_EXCEEDED); private final int code; @@ -124,10 +124,6 @@ public enum Mqtt5ConnAckReasonCode implements Mqtt5ReasonCode { this.code = code; } - Mqtt5ConnAckReasonCode(final @NotNull MqttCommonReasonCode reasonCode) { - this(reasonCode.getCode()); - } - @Override public int getCode() { return code; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectReasonCode.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectReasonCode.java index b0953ae59..8513f7c21 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectReasonCode.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectReasonCode.java @@ -16,7 +16,7 @@ package com.hivemq.client.mqtt.mqtt5.message.disconnect; -import com.hivemq.client.internal.mqtt.message.MqttCommonReasonCode; +import com.hivemq.client.internal.mqtt.message.MqttReasonCodes; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -34,127 +34,127 @@ public enum Mqtt5DisconnectReasonCode implements Mqtt5ReasonCode { /** * Disconnect normally. The server must not publish the Will message. */ - NORMAL_DISCONNECTION(0x00), + NORMAL_DISCONNECTION(MqttReasonCodes.SUCCESS), /** * Disconnect normally. The server must also publish the Will message. */ - DISCONNECT_WITH_WILL_MESSAGE(0x04), + DISCONNECT_WITH_WILL_MESSAGE(MqttReasonCodes.DISCONNECT_WITH_WILL_MESSAGE), /** * The sender either does not want to reveal the reason for the disconnect or none of the other reason codes apply. */ - UNSPECIFIED_ERROR(MqttCommonReasonCode.UNSPECIFIED_ERROR), + UNSPECIFIED_ERROR(MqttReasonCodes.UNSPECIFIED_ERROR), /** * A packet could not be parsed correctly according to the MQTT specification. */ - MALFORMED_PACKET(MqttCommonReasonCode.MALFORMED_PACKET), + MALFORMED_PACKET(MqttReasonCodes.MALFORMED_PACKET), /** * A packet contained data that is not allowed by the MQTT protocol or is inconsistent with the state of the * receiver. */ - PROTOCOL_ERROR(MqttCommonReasonCode.PROTOCOL_ERROR), + PROTOCOL_ERROR(MqttReasonCodes.PROTOCOL_ERROR), /** * A packet is valid but can not be processed by the implementation of the receiver. */ - IMPLEMENTATION_SPECIFIC_ERROR(MqttCommonReasonCode.IMPLEMENTATION_SPECIFIC_ERROR), + IMPLEMENTATION_SPECIFIC_ERROR(MqttReasonCodes.IMPLEMENTATION_SPECIFIC_ERROR), /** * The client is not authorized to perform a request. */ - NOT_AUTHORIZED(MqttCommonReasonCode.NOT_AUTHORIZED), + NOT_AUTHORIZED(MqttReasonCodes.NOT_AUTHORIZED), /** * The server is busy and can not continue processing requests from the client. */ - SERVER_BUSY(MqttCommonReasonCode.SERVER_BUSY), + SERVER_BUSY(MqttReasonCodes.SERVER_BUSY), /** * The server is shutting down. */ - SERVER_SHUTTING_DOWN(0x8B), + SERVER_SHUTTING_DOWN(MqttReasonCodes.SERVER_SHUTTING_DOWN), /** * The authentication method is not supported or does not match the authentication method currently in use. */ - BAD_AUTHENTICATION_METHOD(MqttCommonReasonCode.BAD_AUTHENTICATION_METHOD), + BAD_AUTHENTICATION_METHOD(MqttReasonCodes.BAD_AUTHENTICATION_METHOD), /** * The connection is closed because no packet has been received for 1.5 times the keep alive time. */ - KEEP_ALIVE_TIMEOUT(0x8D), + KEEP_ALIVE_TIMEOUT(MqttReasonCodes.KEEP_ALIVE_TIMEOUT), /** * Another client using the same client identifier has connected. */ - SESSION_TAKEN_OVER(0x8E), + SESSION_TAKEN_OVER(MqttReasonCodes.SESSION_TAKEN_OVER), /** * A packet contained a topic filter that is formed correctly but is not accepted by the server. */ - TOPIC_FILTER_INVALID(MqttCommonReasonCode.TOPIC_FILTER_INVALID), + TOPIC_FILTER_INVALID(MqttReasonCodes.TOPIC_FILTER_INVALID), /** * A packet contained a topic name that is formed correctly but is not accepted by the receiver. */ - TOPIC_NAME_INVALID(MqttCommonReasonCode.TOPIC_NAME_INVALID), + TOPIC_NAME_INVALID(MqttReasonCodes.TOPIC_NAME_INVALID), /** * The receiver has received more publications for which it has not sent PUBACK or PUBCOMP than allowed by the * receive maximum it sent in the CONNECT or CONNACK packet. */ - RECEIVE_MAXIMUM_EXCEEDED(0x93), + RECEIVE_MAXIMUM_EXCEEDED(MqttReasonCodes.RECEIVE_MAXIMUM_EXCEEDED), /** * The receiver has received a PUBLISH packet containing a topic alias which is greater than the maximum topic alias * it sent in the CONNECT or CONNACK packet. */ - TOPIC_ALIAS_INVALID(0x94), + TOPIC_ALIAS_INVALID(MqttReasonCodes.TOPIC_ALIAS_INVALID), /** * The receiver has received a packet with a greater size than allowed by the maximum packet size it sent in the * CONNECT or CONNACK packet. */ - PACKET_TOO_LARGE(MqttCommonReasonCode.PACKET_TOO_LARGE), + PACKET_TOO_LARGE(MqttReasonCodes.PACKET_TOO_LARGE), /** * The received data rate is too high. */ - MESSAGE_RATE_TOO_HIGH(0x96), + MESSAGE_RATE_TOO_HIGH(MqttReasonCodes.MESSAGE_RATE_TOO_HIGH), /** * An implementation or administrative imposed limit has been exceeded. */ - QUOTA_EXCEEDED(MqttCommonReasonCode.QUOTA_EXCEEDED), + QUOTA_EXCEEDED(MqttReasonCodes.QUOTA_EXCEEDED), /** * The connection is closed due to an administrative action. */ - ADMINISTRATIVE_ACTION(0x98), + ADMINISTRATIVE_ACTION(MqttReasonCodes.ADMINISTRATIVE_ACTION), /** * A payload does not match the specified payload format indicator. */ - PAYLOAD_FORMAT_INVALID(MqttCommonReasonCode.PAYLOAD_FORMAT_INVALID), + PAYLOAD_FORMAT_INVALID(MqttReasonCodes.PAYLOAD_FORMAT_INVALID), /** * The server does not support retained messages. */ - RETAIN_NOT_SUPPORTED(MqttCommonReasonCode.RETAIN_NOT_SUPPORTED), + RETAIN_NOT_SUPPORTED(MqttReasonCodes.RETAIN_NOT_SUPPORTED), /** * The client specified a QoS greater than the maximum QoS the server sent in the CONNACK packet. */ - QOS_NOT_SUPPORTED(MqttCommonReasonCode.QOS_NOT_SUPPORTED), + QOS_NOT_SUPPORTED(MqttReasonCodes.QOS_NOT_SUPPORTED), /** * The client should temporarily use another server. */ - USE_ANOTHER_SERVER(MqttCommonReasonCode.USE_ANOTHER_SERVER), + USE_ANOTHER_SERVER(MqttReasonCodes.USE_ANOTHER_SERVER), /** * The client should permanently use another server. */ - SERVER_MOVED(MqttCommonReasonCode.SERVER_MOVED), + SERVER_MOVED(MqttReasonCodes.SERVER_MOVED), /** * The server does not support shared subscriptions. */ - SHARED_SUBSCRIPTIONS_NOT_SUPPORTED(MqttCommonReasonCode.SHARED_SUBSCRIPTIONS_NOT_SUPPORTED), + SHARED_SUBSCRIPTIONS_NOT_SUPPORTED(MqttReasonCodes.SHARED_SUBSCRIPTIONS_NOT_SUPPORTED), /** * The connection is closed because the connection rate is too high. */ - CONNECTION_RATE_EXCEEDED(MqttCommonReasonCode.CONNECTION_RATE_EXCEEDED), + CONNECTION_RATE_EXCEEDED(MqttReasonCodes.CONNECTION_RATE_EXCEEDED), /** * The maximum connection time authorized for this connection has been exceeded. */ - MAXIMUM_CONNECT_TIME(0xA0), + MAXIMUM_CONNECT_TIME(MqttReasonCodes.MAXIMUM_CONNECT_TIME), /** * The server does not support subscription identifiers. */ - SUBSCRIPTION_IDENTIFIERS_NOT_SUPPORTED(MqttCommonReasonCode.SUBSCRIPTION_IDENTIFIERS_NOT_SUPPORTED), + SUBSCRIPTION_IDENTIFIERS_NOT_SUPPORTED(MqttReasonCodes.SUBSCRIPTION_IDENTIFIERS_NOT_SUPPORTED), /** * The server does not support wildcard subscriptions. */ - WILDCARD_SUBSCRIPTIONS_NOT_SUPPORTED(MqttCommonReasonCode.WILDCARD_SUBSCRIPTIONS_NOT_SUPPORTED); + WILDCARD_SUBSCRIPTIONS_NOT_SUPPORTED(MqttReasonCodes.WILDCARD_SUBSCRIPTIONS_NOT_SUPPORTED); private final int code; @@ -162,10 +162,6 @@ public enum Mqtt5DisconnectReasonCode implements Mqtt5ReasonCode { this.code = code; } - Mqtt5DisconnectReasonCode(final @NotNull MqttCommonReasonCode reasonCode) { - this(reasonCode.getCode()); - } - @Override public int getCode() { return code; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckReasonCode.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckReasonCode.java index 73c22050b..77be8cf8a 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckReasonCode.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckReasonCode.java @@ -16,7 +16,7 @@ package com.hivemq.client.mqtt.mqtt5.message.publish; -import com.hivemq.client.internal.mqtt.message.MqttCommonReasonCode; +import com.hivemq.client.internal.mqtt.message.MqttReasonCodes; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -34,40 +34,40 @@ public enum Mqtt5PubAckReasonCode implements Mqtt5ReasonCode { /** * The message is accepted. Publication of the QoS 1 message proceeds. */ - SUCCESS(MqttCommonReasonCode.SUCCESS), + SUCCESS(MqttReasonCodes.SUCCESS), /** * The message is accepted but there are no subscribers. */ - NO_MATCHING_SUBSCRIBERS(MqttCommonReasonCode.NO_MATCHING_SUBSCRIBERS), + NO_MATCHING_SUBSCRIBERS(MqttReasonCodes.NO_MATCHING_SUBSCRIBERS), /** * The receiver either does not want to reveal the reason for the failure or none of the other reason codes apply. */ - UNSPECIFIED_ERROR(MqttCommonReasonCode.UNSPECIFIED_ERROR), + UNSPECIFIED_ERROR(MqttReasonCodes.UNSPECIFIED_ERROR), /** * The PUBLISH packet is valid but is not accepted by the receiver. */ - IMPLEMENTATION_SPECIFIC_ERROR(MqttCommonReasonCode.IMPLEMENTATION_SPECIFIC_ERROR), + IMPLEMENTATION_SPECIFIC_ERROR(MqttReasonCodes.IMPLEMENTATION_SPECIFIC_ERROR), /** * The sender is not authorized to make the publication. */ - NOT_AUTHORIZED(MqttCommonReasonCode.NOT_AUTHORIZED), + NOT_AUTHORIZED(MqttReasonCodes.NOT_AUTHORIZED), /** * The topic name is formed correctly but is not accepted by the receiver. */ - TOPIC_NAME_INVALID(MqttCommonReasonCode.TOPIC_NAME_INVALID), + TOPIC_NAME_INVALID(MqttReasonCodes.TOPIC_NAME_INVALID), /** * The packet identifier is already in use. This might indicate a mismatch between the session state on the client * and server. */ - PACKET_IDENTIFIER_IN_USE(MqttCommonReasonCode.PACKET_IDENTIFIER_IN_USE), + PACKET_IDENTIFIER_IN_USE(MqttReasonCodes.PACKET_IDENTIFIER_IN_USE), /** * An implementation or administrative imposed limit has been exceeded. */ - QUOTA_EXCEEDED(MqttCommonReasonCode.QUOTA_EXCEEDED), + QUOTA_EXCEEDED(MqttReasonCodes.QUOTA_EXCEEDED), /** * The payload does not match the specified payload format indicator. */ - PAYLOAD_FORMAT_INVALID(MqttCommonReasonCode.PAYLOAD_FORMAT_INVALID); + PAYLOAD_FORMAT_INVALID(MqttReasonCodes.PAYLOAD_FORMAT_INVALID); private static final @NotNull Mqtt5PubAckReasonCode @NotNull [] VALUES = values(); @@ -77,10 +77,6 @@ public enum Mqtt5PubAckReasonCode implements Mqtt5ReasonCode { this.code = code; } - Mqtt5PubAckReasonCode(final @NotNull MqttCommonReasonCode reasonCode) { - this(reasonCode.getCode()); - } - @Override public int getCode() { return code; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompReasonCode.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompReasonCode.java index 256ca13cd..a478ac52f 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompReasonCode.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompReasonCode.java @@ -16,9 +16,8 @@ package com.hivemq.client.mqtt.mqtt5.message.publish; -import com.hivemq.client.internal.mqtt.message.MqttCommonReasonCode; +import com.hivemq.client.internal.mqtt.message.MqttReasonCodes; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** @@ -32,12 +31,12 @@ public enum Mqtt5PubCompReasonCode implements Mqtt5ReasonCode { /** * Packet identifier released. Publication of the QoS 2 message is complete. */ - SUCCESS(MqttCommonReasonCode.SUCCESS), + SUCCESS(MqttReasonCodes.SUCCESS), /** * The packet identifier is not known. This is not an error during recovery, but at other times indicates a mismatch * between the session state on the client and server. */ - PACKET_IDENTIFIER_NOT_FOUND(MqttCommonReasonCode.PACKET_IDENTIFIER_NOT_FOUND); + PACKET_IDENTIFIER_NOT_FOUND(MqttReasonCodes.PACKET_IDENTIFIER_NOT_FOUND); private final int code; @@ -45,10 +44,6 @@ public enum Mqtt5PubCompReasonCode implements Mqtt5ReasonCode { this.code = code; } - Mqtt5PubCompReasonCode(final @NotNull MqttCommonReasonCode reasonCode) { - this(reasonCode.getCode()); - } - @Override public int getCode() { return code; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecReasonCode.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecReasonCode.java index 50533a3d5..f3ba26b93 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecReasonCode.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecReasonCode.java @@ -16,7 +16,7 @@ package com.hivemq.client.mqtt.mqtt5.message.publish; -import com.hivemq.client.internal.mqtt.message.MqttCommonReasonCode; +import com.hivemq.client.internal.mqtt.message.MqttReasonCodes; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -34,40 +34,40 @@ public enum Mqtt5PubRecReasonCode implements Mqtt5ReasonCode { /** * The message is accepted. Publication of the QoS 2 message proceeds. */ - SUCCESS(MqttCommonReasonCode.SUCCESS), + SUCCESS(MqttReasonCodes.SUCCESS), /** * The message is accepted but there are no subscribers. */ - NO_MATCHING_SUBSCRIBERS(MqttCommonReasonCode.NO_MATCHING_SUBSCRIBERS), + NO_MATCHING_SUBSCRIBERS(MqttReasonCodes.NO_MATCHING_SUBSCRIBERS), /** * The receiver either does not want to reveal the reason for the failure or none of the other reason codes apply. */ - UNSPECIFIED_ERROR(MqttCommonReasonCode.UNSPECIFIED_ERROR), + UNSPECIFIED_ERROR(MqttReasonCodes.UNSPECIFIED_ERROR), /** * The PUBLISH packet is valid but is not accepted by the receiver. */ - IMPLEMENTATION_SPECIFIC_ERROR(MqttCommonReasonCode.IMPLEMENTATION_SPECIFIC_ERROR), + IMPLEMENTATION_SPECIFIC_ERROR(MqttReasonCodes.IMPLEMENTATION_SPECIFIC_ERROR), /** * The sender is not authorized to make the publication. */ - NOT_AUTHORIZED(MqttCommonReasonCode.NOT_AUTHORIZED), + NOT_AUTHORIZED(MqttReasonCodes.NOT_AUTHORIZED), /** * The topic name is formed correctly but is not accepted by the receiver. */ - TOPIC_NAME_INVALID(MqttCommonReasonCode.TOPIC_NAME_INVALID), + TOPIC_NAME_INVALID(MqttReasonCodes.TOPIC_NAME_INVALID), /** * The packet identifier is already in use. This might indicate a mismatch between the session state on the client * and server. */ - PACKET_IDENTIFIER_IN_USE(MqttCommonReasonCode.PACKET_IDENTIFIER_IN_USE), + PACKET_IDENTIFIER_IN_USE(MqttReasonCodes.PACKET_IDENTIFIER_IN_USE), /** * An implementation or administrative imposed limit has been exceeded. */ - QUOTA_EXCEEDED(MqttCommonReasonCode.QUOTA_EXCEEDED), + QUOTA_EXCEEDED(MqttReasonCodes.QUOTA_EXCEEDED), /** * The payload does not match the specified payload format indicator. */ - PAYLOAD_FORMAT_INVALID(MqttCommonReasonCode.PAYLOAD_FORMAT_INVALID); + PAYLOAD_FORMAT_INVALID(MqttReasonCodes.PAYLOAD_FORMAT_INVALID); private static final @NotNull Mqtt5PubRecReasonCode @NotNull [] VALUES = values(); @@ -77,10 +77,6 @@ public enum Mqtt5PubRecReasonCode implements Mqtt5ReasonCode { this.code = code; } - Mqtt5PubRecReasonCode(final @NotNull MqttCommonReasonCode reasonCode) { - this(reasonCode.getCode()); - } - @Override public int getCode() { return code; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelReasonCode.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelReasonCode.java index 2b608a045..c020c8277 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelReasonCode.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelReasonCode.java @@ -16,9 +16,8 @@ package com.hivemq.client.mqtt.mqtt5.message.publish; -import com.hivemq.client.internal.mqtt.message.MqttCommonReasonCode; +import com.hivemq.client.internal.mqtt.message.MqttReasonCodes; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** @@ -32,12 +31,12 @@ public enum Mqtt5PubRelReasonCode implements Mqtt5ReasonCode { /** * Message released. */ - SUCCESS(MqttCommonReasonCode.SUCCESS), + SUCCESS(MqttReasonCodes.SUCCESS), /** * The packet identifier is not known. This is not an error during recovery, but at other times indicates a mismatch * between the session state on the client and server. */ - PACKET_IDENTIFIER_NOT_FOUND(MqttCommonReasonCode.PACKET_IDENTIFIER_NOT_FOUND); + PACKET_IDENTIFIER_NOT_FOUND(MqttReasonCodes.PACKET_IDENTIFIER_NOT_FOUND); private final int code; @@ -45,10 +44,6 @@ public enum Mqtt5PubRelReasonCode implements Mqtt5ReasonCode { this.code = code; } - Mqtt5PubRelReasonCode(final @NotNull MqttCommonReasonCode reasonCode) { - this(reasonCode.getCode()); - } - @Override public int getCode() { return code; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCode.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCode.java index ad5edd91b..4313f04ba 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCode.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCode.java @@ -16,7 +16,7 @@ package com.hivemq.client.mqtt.mqtt5.message.subscribe; -import com.hivemq.client.internal.mqtt.message.MqttCommonReasonCode; +import com.hivemq.client.internal.mqtt.message.MqttReasonCodes; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -33,52 +33,52 @@ public enum Mqtt5SubAckReasonCode implements Mqtt5ReasonCode { * The subscription is accepted and the maximum QoS sent will be QoS 0 (this might be a lower QoS than was * requested). */ - GRANTED_QOS_0(0x00), + GRANTED_QOS_0(MqttReasonCodes.SUCCESS), /** * The subscription is accepted and the maximum QoS sent will be QoS 1 (this might be a lower QoS than was * requested). */ - GRANTED_QOS_1(0x01), + GRANTED_QOS_1(MqttReasonCodes.GRANTED_QOS_1), /** * The subscription is accepted and the maximum QoS sent will be QoS 2. */ - GRANTED_QOS_2(0x02), + GRANTED_QOS_2(MqttReasonCodes.GRANTED_QOS_2), /** * The server either does not want to reveal the reason for the failure or none of the other reason codes apply. */ - UNSPECIFIED_ERROR(MqttCommonReasonCode.UNSPECIFIED_ERROR), + UNSPECIFIED_ERROR(MqttReasonCodes.UNSPECIFIED_ERROR), /** * The SUBSCRIBE packet is valid but is not accepted by the server. */ - IMPLEMENTATION_SPECIFIC_ERROR(MqttCommonReasonCode.IMPLEMENTATION_SPECIFIC_ERROR), + IMPLEMENTATION_SPECIFIC_ERROR(MqttReasonCodes.IMPLEMENTATION_SPECIFIC_ERROR), /** * The client is not authorized to make the subscription. */ - NOT_AUTHORIZED(MqttCommonReasonCode.NOT_AUTHORIZED), + NOT_AUTHORIZED(MqttReasonCodes.NOT_AUTHORIZED), /** * The topic filter is formed correctly but is not accepted by the server (for this client). */ - TOPIC_FILTER_INVALID(MqttCommonReasonCode.TOPIC_FILTER_INVALID), + TOPIC_FILTER_INVALID(MqttReasonCodes.TOPIC_FILTER_INVALID), /** * The specified packet identifier is already in use. */ - PACKET_IDENTIFIER_IN_USE(MqttCommonReasonCode.PACKET_IDENTIFIER_IN_USE), + PACKET_IDENTIFIER_IN_USE(MqttReasonCodes.PACKET_IDENTIFIER_IN_USE), /** * An implementation or administrative imposed limit has been exceeded. */ - QUOTA_EXCEEDED(MqttCommonReasonCode.QUOTA_EXCEEDED), + QUOTA_EXCEEDED(MqttReasonCodes.QUOTA_EXCEEDED), /** * The server does not support shared subscriptions (for this client). */ - SHARED_SUBSCRIPTIONS_NOT_SUPPORTED(MqttCommonReasonCode.SHARED_SUBSCRIPTIONS_NOT_SUPPORTED), + SHARED_SUBSCRIPTIONS_NOT_SUPPORTED(MqttReasonCodes.SHARED_SUBSCRIPTIONS_NOT_SUPPORTED), /** * The server does not support subscription identifiers (for this client). */ - SUBSCRIPTION_IDENTIFIERS_NOT_SUPPORTED(MqttCommonReasonCode.SUBSCRIPTION_IDENTIFIERS_NOT_SUPPORTED), + SUBSCRIPTION_IDENTIFIERS_NOT_SUPPORTED(MqttReasonCodes.SUBSCRIPTION_IDENTIFIERS_NOT_SUPPORTED), /** * The server does not support wildcard subscriptions (for this client). */ - WILDCARD_SUBSCRIPTIONS_NOT_SUPPORTED(MqttCommonReasonCode.WILDCARD_SUBSCRIPTIONS_NOT_SUPPORTED); + WILDCARD_SUBSCRIPTIONS_NOT_SUPPORTED(MqttReasonCodes.WILDCARD_SUBSCRIPTIONS_NOT_SUPPORTED); private static final @NotNull Mqtt5SubAckReasonCode @NotNull [] VALUES = values(); @@ -88,10 +88,6 @@ public enum Mqtt5SubAckReasonCode implements Mqtt5ReasonCode { this.code = code; } - Mqtt5SubAckReasonCode(final @NotNull MqttCommonReasonCode reasonCode) { - this(reasonCode.getCode()); - } - @Override public int getCode() { return code; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCode.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCode.java index ac7407550..e8892df00 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCode.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCode.java @@ -16,7 +16,7 @@ package com.hivemq.client.mqtt.mqtt5.message.unsubscribe; -import com.hivemq.client.internal.mqtt.message.MqttCommonReasonCode; +import com.hivemq.client.internal.mqtt.message.MqttReasonCodes; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -32,31 +32,31 @@ public enum Mqtt5UnsubAckReasonCode implements Mqtt5ReasonCode { /** * The subscription is deleted. */ - SUCCESS(MqttCommonReasonCode.SUCCESS), + SUCCESS(MqttReasonCodes.SUCCESS), /** * No matching topic filter is being used by the client. */ - NO_SUBSCRIPTIONS_EXISTED(0x11), + NO_SUBSCRIPTIONS_EXISTED(MqttReasonCodes.NO_SUBSCRIPTIONS_EXISTED), /** * The server either does not want to reveal the reason for the failure or none of the other reason codes apply. */ - UNSPECIFIED_ERROR(MqttCommonReasonCode.UNSPECIFIED_ERROR), + UNSPECIFIED_ERROR(MqttReasonCodes.UNSPECIFIED_ERROR), /** * The UNSUBSCRIBE packet is valid but is not accepted by the server. */ - IMPLEMENTATION_SPECIFIC_ERROR(MqttCommonReasonCode.IMPLEMENTATION_SPECIFIC_ERROR), + IMPLEMENTATION_SPECIFIC_ERROR(MqttReasonCodes.IMPLEMENTATION_SPECIFIC_ERROR), /** * The client is not authorized to unsubscribe. */ - NOT_AUTHORIZED(MqttCommonReasonCode.NOT_AUTHORIZED), + NOT_AUTHORIZED(MqttReasonCodes.NOT_AUTHORIZED), /** * The topic filter is formed correctly but is not accepted by the server (for this client). */ - TOPIC_FILTER_INVALID(MqttCommonReasonCode.TOPIC_FILTER_INVALID), + TOPIC_FILTER_INVALID(MqttReasonCodes.TOPIC_FILTER_INVALID), /** * The specified packet identifier is already in use. */ - PACKET_IDENTIFIER_IN_USE(MqttCommonReasonCode.PACKET_IDENTIFIER_IN_USE); + PACKET_IDENTIFIER_IN_USE(MqttReasonCodes.PACKET_IDENTIFIER_IN_USE); private static final @NotNull Mqtt5UnsubAckReasonCode @NotNull [] VALUES = values(); @@ -66,10 +66,6 @@ public enum Mqtt5UnsubAckReasonCode implements Mqtt5ReasonCode { this.code = code; } - Mqtt5UnsubAckReasonCode(final @NotNull MqttCommonReasonCode reasonCode) { - this(reasonCode.getCode()); - } - @Override public int getCode() { return code; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/MqttCommonReasonCodeTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/MqttCommonReasonCodeTest.java deleted file mode 100644 index 28eaf3d5c..000000000 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/MqttCommonReasonCodeTest.java +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Copyright 2018-present HiveMQ and the HiveMQ Community - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.hivemq.client.internal.mqtt.message; - -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -/** - * @author Silvio Giebl - */ -class MqttCommonReasonCodeTest { - - @Test - void test_getCode_success() { - assertEquals(0x00, MqttCommonReasonCode.SUCCESS.getCode()); - } - - @Test - void test_getCode_noMatchingSubscribers() { - assertEquals(0x10, MqttCommonReasonCode.NO_MATCHING_SUBSCRIBERS.getCode()); - } - - @Test - void test_getCode_unspecifiedError() { - assertEquals(0x80, MqttCommonReasonCode.UNSPECIFIED_ERROR.getCode()); - } - - @Test - void test_getCode_malformedPacket() { - assertEquals(0x81, MqttCommonReasonCode.MALFORMED_PACKET.getCode()); - } - - @Test - void test_getCode_protocolError() { - assertEquals(0x82, MqttCommonReasonCode.PROTOCOL_ERROR.getCode()); - } - - @Test - void test_getCode_implementationSpecificError() { - assertEquals(0x83, MqttCommonReasonCode.IMPLEMENTATION_SPECIFIC_ERROR.getCode()); - } - - @Test - void test_getCode_notAuthorized() { - assertEquals(0x87, MqttCommonReasonCode.NOT_AUTHORIZED.getCode()); - } - - @Test - void test_getCode_SererBusy() { - assertEquals(0x89, MqttCommonReasonCode.SERVER_BUSY.getCode()); - } - - @Test - void test_getCode_badAuthenticationMethod() { - assertEquals(0x8C, MqttCommonReasonCode.BAD_AUTHENTICATION_METHOD.getCode()); - } - - @Test - void test_getCode_topicFilterInvalid() { - assertEquals(0x8F, MqttCommonReasonCode.TOPIC_FILTER_INVALID.getCode()); - } - - @Test - void test_getCode_TopicNameInvalid() { - assertEquals(0x90, MqttCommonReasonCode.TOPIC_NAME_INVALID.getCode()); - } - - @Test - void test_getCode_packetIdentifierInUse() { - assertEquals(0x91, MqttCommonReasonCode.PACKET_IDENTIFIER_IN_USE.getCode()); - } - - @Test - void test_getCode_packetIdentifierNotFound() { - assertEquals(0x92, MqttCommonReasonCode.PACKET_IDENTIFIER_NOT_FOUND.getCode()); - } - - @Test - void test_getCode_packetTooLarge() { - assertEquals(0x95, MqttCommonReasonCode.PACKET_TOO_LARGE.getCode()); - } - - @Test - void test_getCode_quotaExceeded() { - assertEquals(0x97, MqttCommonReasonCode.QUOTA_EXCEEDED.getCode()); - } - - @Test - void test_getCode_payloadFormatInvalid() { - assertEquals(0x99, MqttCommonReasonCode.PAYLOAD_FORMAT_INVALID.getCode()); - } - - @Test - void test_getCode_retainNotSupported() { - assertEquals(0x9A, MqttCommonReasonCode.RETAIN_NOT_SUPPORTED.getCode()); - } - - @Test - void test_getCode_qosNotSupported() { - assertEquals(0x9B, MqttCommonReasonCode.QOS_NOT_SUPPORTED.getCode()); - } - - @Test - void test_getCode_useAnotherServer() { - assertEquals(0x9C, MqttCommonReasonCode.USE_ANOTHER_SERVER.getCode()); - } - - @Test - void test_getCode_serverMoved() { - assertEquals(0x9D, MqttCommonReasonCode.SERVER_MOVED.getCode()); - } - - @Test - void test_getCode_sharedSubscriptionNotSupported() { - assertEquals(0x9E, MqttCommonReasonCode.SHARED_SUBSCRIPTIONS_NOT_SUPPORTED.getCode()); - } - - @Test - void test_getCode_connectionRateExceeded() { - assertEquals(0x9F, MqttCommonReasonCode.CONNECTION_RATE_EXCEEDED.getCode()); - } - - @Test - void test_getCode_subscriptionIdentifiersNotSupported() { - assertEquals(0xA1, MqttCommonReasonCode.SUBSCRIPTION_IDENTIFIERS_NOT_SUPPORTED.getCode()); - } - - @Test - void test_getCode_wildcardSubscriptionNotSupported() { - assertEquals(0xA2, MqttCommonReasonCode.WILDCARD_SUBSCRIPTIONS_NOT_SUPPORTED.getCode()); - } - -} diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/MqttReasonCodesTest.java b/src/test/java/com/hivemq/client/internal/mqtt/message/MqttReasonCodesTest.java new file mode 100644 index 000000000..5132bf6df --- /dev/null +++ b/src/test/java/com/hivemq/client/internal/mqtt/message/MqttReasonCodesTest.java @@ -0,0 +1,238 @@ +/* + * Copyright 2018-present HiveMQ and the HiveMQ Community + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.hivemq.client.internal.mqtt.message; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +/** + * @author Silvio Giebl + */ +class MqttReasonCodesTest { + + @Test + void test_getCode_success() { + assertEquals(0x00, MqttReasonCodes.SUCCESS); + } + + @Test + void test_getCode_grantedQos1() { + assertEquals(0x01, MqttReasonCodes.GRANTED_QOS_1); + } + + @Test + void test_getCode_grantedQos2() { + assertEquals(0x02, MqttReasonCodes.GRANTED_QOS_2); + } + + @Test + void test_getCode_disconnectWithWillMessage() { + assertEquals(0x04, MqttReasonCodes.DISCONNECT_WITH_WILL_MESSAGE); + } + + @Test + void test_getCode_noMatchingSubscribers() { + assertEquals(0x10, MqttReasonCodes.NO_MATCHING_SUBSCRIBERS); + } + + @Test + void test_getCode_noSubscriptionsExisted() { + assertEquals(0x11, MqttReasonCodes.NO_SUBSCRIPTIONS_EXISTED); + } + + @Test + void test_getCode_continueAuthentication() { + assertEquals(0x18, MqttReasonCodes.CONTINUE_AUTHENTICATION); + } + + @Test + void test_getCode_reauthenticate() { + assertEquals(0x19, MqttReasonCodes.REAUTHENTICATE); + } + + @Test + void test_getCode_unspecifiedError() { + assertEquals(0x80, MqttReasonCodes.UNSPECIFIED_ERROR); + } + + @Test + void test_getCode_malformedPacket() { + assertEquals(0x81, MqttReasonCodes.MALFORMED_PACKET); + } + + @Test + void test_getCode_protocolError() { + assertEquals(0x82, MqttReasonCodes.PROTOCOL_ERROR); + } + + @Test + void test_getCode_implementationSpecificError() { + assertEquals(0x83, MqttReasonCodes.IMPLEMENTATION_SPECIFIC_ERROR); + } + + @Test + void test_getCode_unsupportedProtocolVersion() { + assertEquals(0x84, MqttReasonCodes.UNSUPPORTED_PROTOCOL_VERSION); + } + + @Test + void test_getCode_clientIdentifierNotValid() { + assertEquals(0x85, MqttReasonCodes.CLIENT_IDENTIFIER_NOT_VALID); + } + + @Test + void test_getCode_badUsernameOrPassword() { + assertEquals(0x86, MqttReasonCodes.BAD_USER_NAME_OR_PASSWORD); + } + + @Test + void test_getCode_notAuthorized() { + assertEquals(0x87, MqttReasonCodes.NOT_AUTHORIZED); + } + + @Test + void test_getCode_serverUnavailable() { + assertEquals(0x88, MqttReasonCodes.SERVER_UNAVAILABLE); + } + + @Test + void test_getCode_SererBusy() { + assertEquals(0x89, MqttReasonCodes.SERVER_BUSY); + } + + @Test + void test_getCode_banned() { + assertEquals(0x8A, MqttReasonCodes.BANNED); + } + + @Test + void test_getCode_badAuthenticationMethod() { + assertEquals(0x8C, MqttReasonCodes.BAD_AUTHENTICATION_METHOD); + } + + @Test + void test_getCode_keepAliveTimeout() { + assertEquals(0x8D, MqttReasonCodes.KEEP_ALIVE_TIMEOUT); + } + + @Test + void test_getCode_sessionTakenOver() { + assertEquals(0x8E, MqttReasonCodes.SESSION_TAKEN_OVER); + } + + @Test + void test_getCode_topicFilterInvalid() { + assertEquals(0x8F, MqttReasonCodes.TOPIC_FILTER_INVALID); + } + + @Test + void test_getCode_TopicNameInvalid() { + assertEquals(0x90, MqttReasonCodes.TOPIC_NAME_INVALID); + } + + @Test + void test_getCode_packetIdentifierInUse() { + assertEquals(0x91, MqttReasonCodes.PACKET_IDENTIFIER_IN_USE); + } + + @Test + void test_getCode_packetIdentifierNotFound() { + assertEquals(0x92, MqttReasonCodes.PACKET_IDENTIFIER_NOT_FOUND); + } + + @Test + void test_getCode_receiveMaximumExceeded() { + assertEquals(0x93, MqttReasonCodes.RECEIVE_MAXIMUM_EXCEEDED); + } + + @Test + void test_getCode_topicAliasInvalid() { + assertEquals(0x94, MqttReasonCodes.TOPIC_ALIAS_INVALID); + } + + @Test + void test_getCode_packetTooLarge() { + assertEquals(0x95, MqttReasonCodes.PACKET_TOO_LARGE); + } + + @Test + void test_getCode_messageRateTooHigh() { + assertEquals(0x96, MqttReasonCodes.MESSAGE_RATE_TOO_HIGH); + } + + @Test + void test_getCode_quotaExceeded() { + assertEquals(0x97, MqttReasonCodes.QUOTA_EXCEEDED); + } + + @Test + void test_getCode_administrativeAction() { + assertEquals(0x98, MqttReasonCodes.ADMINISTRATIVE_ACTION); + } + + @Test + void test_getCode_payloadFormatInvalid() { + assertEquals(0x99, MqttReasonCodes.PAYLOAD_FORMAT_INVALID); + } + + @Test + void test_getCode_retainNotSupported() { + assertEquals(0x9A, MqttReasonCodes.RETAIN_NOT_SUPPORTED); + } + + @Test + void test_getCode_qosNotSupported() { + assertEquals(0x9B, MqttReasonCodes.QOS_NOT_SUPPORTED); + } + + @Test + void test_getCode_useAnotherServer() { + assertEquals(0x9C, MqttReasonCodes.USE_ANOTHER_SERVER); + } + + @Test + void test_getCode_serverMoved() { + assertEquals(0x9D, MqttReasonCodes.SERVER_MOVED); + } + + @Test + void test_getCode_sharedSubscriptionNotSupported() { + assertEquals(0x9E, MqttReasonCodes.SHARED_SUBSCRIPTIONS_NOT_SUPPORTED); + } + + @Test + void test_getCode_connectionRateExceeded() { + assertEquals(0x9F, MqttReasonCodes.CONNECTION_RATE_EXCEEDED); + } + + @Test + void test_getCode_maximumConnectTime() { + assertEquals(0xA0, MqttReasonCodes.MAXIMUM_CONNECT_TIME); + } + + @Test + void test_getCode_subscriptionIdentifiersNotSupported() { + assertEquals(0xA1, MqttReasonCodes.SUBSCRIPTION_IDENTIFIERS_NOT_SUPPORTED); + } + + @Test + void test_getCode_wildcardSubscriptionNotSupported() { + assertEquals(0xA2, MqttReasonCodes.WILDCARD_SUBSCRIPTIONS_NOT_SUPPORTED); + } + +} From 51d455ba66c3e59e5677026f0ee94fd7f082fe35 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Sun, 22 Nov 2020 23:03:54 +0100 Subject: [PATCH 31/62] Remove hardcoded message instances from MQTT 3 message exceptions --- .../mqtt3/Mqtt3ExceptionFactory.java | 12 ++++++++---- .../exceptions/Mqtt3DisconnectException.java | 13 ++++++++++--- .../exceptions/Mqtt3PubAckException.java | 11 ++++++++--- .../exceptions/Mqtt3PubRecException.java | 11 ++++++++--- .../exceptions/Mqtt3UnsubAckException.java | 11 ++++++++--- .../Mqtt3DisconnectExceptionTest.java | 19 +++++++++++++------ .../exceptions/Mqtt3PubAckExceptionTest.java | 13 +++++++------ .../exceptions/Mqtt3PubRecExceptionTest.java | 13 +++++++------ .../Mqtt3UnsubAckExceptionTest.java | 17 +++++++++++------ 9 files changed, 80 insertions(+), 40 deletions(-) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java b/src/main/java/com/hivemq/client/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java index 5e3ae4304..eab207be1 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java @@ -18,8 +18,12 @@ import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnAckView; +import com.hivemq.client.internal.mqtt.message.disconnect.mqtt3.Mqtt3DisconnectView; +import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubAckView; +import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubRecView; import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubAckView; +import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; import com.hivemq.client.mqtt.exceptions.MqttSessionExpiredException; import com.hivemq.client.mqtt.mqtt3.exceptions.*; import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5MessageException; @@ -73,15 +77,15 @@ public final class Mqtt3ExceptionFactory { case CONNACK: return new Mqtt3ConnAckException(Mqtt3ConnAckView.of((MqttConnAck) mqttMessage), message, cause); case DISCONNECT: - return new Mqtt3DisconnectException(message, cause); + return new Mqtt3DisconnectException(Mqtt3DisconnectView.INSTANCE, message, cause); case PUBACK: - return new Mqtt3PubAckException(message, cause); + return new Mqtt3PubAckException(Mqtt3PubAckView.INSTANCE, message, cause); case PUBREC: - return new Mqtt3PubRecException(message, cause); + return new Mqtt3PubRecException(Mqtt3PubRecView.INSTANCE, message, cause); case SUBACK: return new Mqtt3SubAckException(Mqtt3SubAckView.of((MqttSubAck) mqttMessage), message, cause); case UNSUBACK: - return new Mqtt3UnsubAckException(message, cause); + return new Mqtt3UnsubAckException(Mqtt3UnsubAckView.INSTANCE, message, cause); default: throw new IllegalStateException(); } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3DisconnectException.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3DisconnectException.java index 14a8bdaf1..4b71206ab 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3DisconnectException.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3DisconnectException.java @@ -16,7 +16,6 @@ package com.hivemq.client.mqtt.mqtt3.exceptions; -import com.hivemq.client.internal.mqtt.message.disconnect.mqtt3.Mqtt3DisconnectView; import com.hivemq.client.mqtt.mqtt3.message.disconnect.Mqtt3Disconnect; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -27,12 +26,20 @@ */ public class Mqtt3DisconnectException extends Mqtt3MessageException { - public Mqtt3DisconnectException(final @Nullable String message, final @Nullable Throwable cause) { + private final @NotNull Mqtt3Disconnect disconnect; + + public Mqtt3DisconnectException( + final @NotNull Mqtt3Disconnect disconnect, + final @Nullable String message, + final @Nullable Throwable cause) { + super(message, cause); + this.disconnect = disconnect; } private Mqtt3DisconnectException(final @NotNull Mqtt3DisconnectException e) { super(e); + disconnect = e.disconnect; } @Override @@ -42,6 +49,6 @@ private Mqtt3DisconnectException(final @NotNull Mqtt3DisconnectException e) { @Override public @NotNull Mqtt3Disconnect getMqttMessage() { - return Mqtt3DisconnectView.INSTANCE; + return disconnect; } } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubAckException.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubAckException.java index 1d9fff3ac..9a7c60cce 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubAckException.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubAckException.java @@ -16,7 +16,6 @@ package com.hivemq.client.mqtt.mqtt3.exceptions; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubAckView; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PubAck; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -27,12 +26,18 @@ */ public class Mqtt3PubAckException extends Mqtt3MessageException { - public Mqtt3PubAckException(final @Nullable String message, final @Nullable Throwable cause) { + private final @NotNull Mqtt3PubAck pubAck; + + public Mqtt3PubAckException( + final @NotNull Mqtt3PubAck pubAck, final @Nullable String message, final @Nullable Throwable cause) { + super(message, cause); + this.pubAck = pubAck; } private Mqtt3PubAckException(final @NotNull Mqtt3PubAckException e) { super(e); + pubAck = e.pubAck; } @Override @@ -42,6 +47,6 @@ private Mqtt3PubAckException(final @NotNull Mqtt3PubAckException e) { @Override public @NotNull Mqtt3PubAck getMqttMessage() { - return Mqtt3PubAckView.INSTANCE; + return pubAck; } } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubRecException.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubRecException.java index d604468b1..6f6c3dc4c 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubRecException.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubRecException.java @@ -16,7 +16,6 @@ package com.hivemq.client.mqtt.mqtt3.exceptions; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubRecView; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PubRec; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -27,12 +26,18 @@ */ public class Mqtt3PubRecException extends Mqtt3MessageException { - public Mqtt3PubRecException(final @Nullable String message, final @Nullable Throwable cause) { + private final @NotNull Mqtt3PubRec pubRec; + + public Mqtt3PubRecException( + final @NotNull Mqtt3PubRec pubRec, final @Nullable String message, final @Nullable Throwable cause) { + super(message, cause); + this.pubRec = pubRec; } private Mqtt3PubRecException(final @NotNull Mqtt3PubRecException e) { super(e); + pubRec = e.pubRec; } @Override @@ -42,6 +47,6 @@ private Mqtt3PubRecException(final @NotNull Mqtt3PubRecException e) { @Override public @NotNull Mqtt3PubRec getMqttMessage() { - return Mqtt3PubRecView.INSTANCE; + return pubRec; } } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3UnsubAckException.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3UnsubAckException.java index 2ec9b6fd8..c7c5e9b7b 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3UnsubAckException.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3UnsubAckException.java @@ -16,7 +16,6 @@ package com.hivemq.client.mqtt.mqtt3.exceptions; -import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -27,12 +26,18 @@ */ public class Mqtt3UnsubAckException extends Mqtt3MessageException { - public Mqtt3UnsubAckException(final @Nullable String message, final @Nullable Throwable cause) { + private final @NotNull Mqtt3UnsubAck unsubAck; + + public Mqtt3UnsubAckException( + final @NotNull Mqtt3UnsubAck unsubAck, final @Nullable String message, final @Nullable Throwable cause) { + super(message, cause); + this.unsubAck = unsubAck; } private Mqtt3UnsubAckException(final @NotNull Mqtt3UnsubAckException e) { super(e); + unsubAck = e.unsubAck; } @Override @@ -42,6 +47,6 @@ private Mqtt3UnsubAckException(final @NotNull Mqtt3UnsubAckException e) { @Override public @NotNull Mqtt3UnsubAck getMqttMessage() { - return Mqtt3UnsubAckView.INSTANCE; + return unsubAck; } } diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3DisconnectExceptionTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3DisconnectExceptionTest.java index 2086e68fe..91a2c7f6e 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3DisconnectExceptionTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3DisconnectExceptionTest.java @@ -16,6 +16,7 @@ package com.hivemq.client.mqtt.mqtt3.exceptions; +import com.hivemq.client.internal.mqtt.message.disconnect.mqtt3.Mqtt3DisconnectView; import com.hivemq.client.internal.util.AsyncRuntimeException; import org.junit.jupiter.api.Test; @@ -28,7 +29,8 @@ class Mqtt3DisconnectExceptionTest { @Test void constructor() { - final Mqtt3DisconnectException exception = new Mqtt3DisconnectException(null, null); + final Mqtt3DisconnectException exception = + new Mqtt3DisconnectException(Mqtt3DisconnectView.INSTANCE, null, null); assertNull(exception.getMessage()); assertNull(exception.getCause()); assertNotNull(exception.getMqttMessage()); @@ -37,7 +39,8 @@ void constructor() { @Test void constructor_message() { - final Mqtt3DisconnectException exception = new Mqtt3DisconnectException("message", null); + final Mqtt3DisconnectException exception = + new Mqtt3DisconnectException(Mqtt3DisconnectView.INSTANCE, "message", null); assertEquals("message", exception.getMessage()); assertNull(exception.getCause()); assertNotNull(exception.getMqttMessage()); @@ -47,7 +50,8 @@ void constructor_message() { @Test void constructor_cause() { final RuntimeException cause = new RuntimeException("cause"); - final Mqtt3DisconnectException exception = new Mqtt3DisconnectException(null, cause); + final Mqtt3DisconnectException exception = + new Mqtt3DisconnectException(Mqtt3DisconnectView.INSTANCE, null, cause); assertNull(exception.getMessage()); assertEquals(cause, exception.getCause()); assertNotNull(exception.getMqttMessage()); @@ -57,7 +61,8 @@ void constructor_cause() { @Test void constructor_message_cause() { final RuntimeException cause = new RuntimeException("cause"); - final Mqtt3DisconnectException exception = new Mqtt3DisconnectException("message", cause); + final Mqtt3DisconnectException exception = + new Mqtt3DisconnectException(Mqtt3DisconnectView.INSTANCE, "message", cause); assertEquals("message", exception.getMessage()); assertEquals(cause, exception.getCause()); assertNotNull(exception.getMqttMessage()); @@ -67,7 +72,8 @@ void constructor_message_cause() { @Test void noStackTrace() { final RuntimeException cause = new RuntimeException("cause"); - final Mqtt3DisconnectException exception = new Mqtt3DisconnectException("message", cause); + final Mqtt3DisconnectException exception = + new Mqtt3DisconnectException(Mqtt3DisconnectView.INSTANCE, "message", cause); assertEquals(0, exception.getStackTrace().length); final Mqtt3DisconnectException thrownException = assertThrows(Mqtt3DisconnectException.class, () -> { throw exception; }); @@ -77,7 +83,8 @@ void noStackTrace() { @Test void fillInStackTrace_newStackTrace() { final RuntimeException cause = new RuntimeException("cause"); - final Mqtt3DisconnectException exception = new Mqtt3DisconnectException("message", cause); + final Mqtt3DisconnectException exception = + new Mqtt3DisconnectException(Mqtt3DisconnectView.INSTANCE, "message", cause); assertEquals(0, exception.getStackTrace().length); final RuntimeException filledException = AsyncRuntimeException.fillInStackTrace(exception); assertTrue(filledException instanceof Mqtt3DisconnectException); diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubAckExceptionTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubAckExceptionTest.java index 7fb8fc250..6e9a8b6eb 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubAckExceptionTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubAckExceptionTest.java @@ -16,6 +16,7 @@ package com.hivemq.client.mqtt.mqtt3.exceptions; +import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubAckView; import com.hivemq.client.internal.util.AsyncRuntimeException; import org.junit.jupiter.api.Test; @@ -28,7 +29,7 @@ class Mqtt3PubAckExceptionTest { @Test void constructor() { - final Mqtt3PubAckException exception = new Mqtt3PubAckException(null, null); + final Mqtt3PubAckException exception = new Mqtt3PubAckException(Mqtt3PubAckView.INSTANCE, null, null); assertNull(exception.getMessage()); assertNull(exception.getCause()); assertNotNull(exception.getMqttMessage()); @@ -37,7 +38,7 @@ void constructor() { @Test void constructor_message() { - final Mqtt3PubAckException exception = new Mqtt3PubAckException("message", null); + final Mqtt3PubAckException exception = new Mqtt3PubAckException(Mqtt3PubAckView.INSTANCE, "message", null); assertEquals("message", exception.getMessage()); assertNull(exception.getCause()); assertNotNull(exception.getMqttMessage()); @@ -47,7 +48,7 @@ void constructor_message() { @Test void constructor_cause() { final RuntimeException cause = new RuntimeException("cause"); - final Mqtt3PubAckException exception = new Mqtt3PubAckException(null, cause); + final Mqtt3PubAckException exception = new Mqtt3PubAckException(Mqtt3PubAckView.INSTANCE, null, cause); assertNull(exception.getMessage()); assertEquals(cause, exception.getCause()); assertNotNull(exception.getMqttMessage()); @@ -57,7 +58,7 @@ void constructor_cause() { @Test void constructor_message_cause() { final RuntimeException cause = new RuntimeException("cause"); - final Mqtt3PubAckException exception = new Mqtt3PubAckException("message", cause); + final Mqtt3PubAckException exception = new Mqtt3PubAckException(Mqtt3PubAckView.INSTANCE, "message", cause); assertEquals("message", exception.getMessage()); assertEquals(cause, exception.getCause()); assertNotNull(exception.getMqttMessage()); @@ -67,7 +68,7 @@ void constructor_message_cause() { @Test void noStackTrace() { final RuntimeException cause = new RuntimeException("cause"); - final Mqtt3PubAckException exception = new Mqtt3PubAckException("message", cause); + final Mqtt3PubAckException exception = new Mqtt3PubAckException(Mqtt3PubAckView.INSTANCE, "message", cause); assertEquals(0, exception.getStackTrace().length); final Mqtt3PubAckException thrownException = assertThrows(Mqtt3PubAckException.class, () -> { throw exception; }); @@ -77,7 +78,7 @@ void noStackTrace() { @Test void fillInStackTrace_newStackTrace() { final RuntimeException cause = new RuntimeException("cause"); - final Mqtt3PubAckException exception = new Mqtt3PubAckException("message", cause); + final Mqtt3PubAckException exception = new Mqtt3PubAckException(Mqtt3PubAckView.INSTANCE, "message", cause); assertEquals(0, exception.getStackTrace().length); final RuntimeException filledException = AsyncRuntimeException.fillInStackTrace(exception); assertTrue(filledException instanceof Mqtt3PubAckException); diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubRecExceptionTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubRecExceptionTest.java index 1cc50469f..5e6e950c2 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubRecExceptionTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubRecExceptionTest.java @@ -16,6 +16,7 @@ package com.hivemq.client.mqtt.mqtt3.exceptions; +import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubRecView; import com.hivemq.client.internal.util.AsyncRuntimeException; import org.junit.jupiter.api.Test; @@ -28,7 +29,7 @@ class Mqtt3PubRecExceptionTest { @Test void constructor() { - final Mqtt3PubRecException exception = new Mqtt3PubRecException(null, null); + final Mqtt3PubRecException exception = new Mqtt3PubRecException(Mqtt3PubRecView.INSTANCE, null, null); assertNull(exception.getMessage()); assertNull(exception.getCause()); assertNotNull(exception.getMqttMessage()); @@ -37,7 +38,7 @@ void constructor() { @Test void constructor_message() { - final Mqtt3PubRecException exception = new Mqtt3PubRecException("message", null); + final Mqtt3PubRecException exception = new Mqtt3PubRecException(Mqtt3PubRecView.INSTANCE, "message", null); assertEquals("message", exception.getMessage()); assertNull(exception.getCause()); assertNotNull(exception.getMqttMessage()); @@ -47,7 +48,7 @@ void constructor_message() { @Test void constructor_cause() { final RuntimeException cause = new RuntimeException("cause"); - final Mqtt3PubRecException exception = new Mqtt3PubRecException(null, cause); + final Mqtt3PubRecException exception = new Mqtt3PubRecException(Mqtt3PubRecView.INSTANCE, null, cause); assertNull(exception.getMessage()); assertEquals(cause, exception.getCause()); assertNotNull(exception.getMqttMessage()); @@ -57,7 +58,7 @@ void constructor_cause() { @Test void constructor_message_cause() { final RuntimeException cause = new RuntimeException("cause"); - final Mqtt3PubRecException exception = new Mqtt3PubRecException("message", cause); + final Mqtt3PubRecException exception = new Mqtt3PubRecException(Mqtt3PubRecView.INSTANCE, "message", cause); assertEquals("message", exception.getMessage()); assertEquals(cause, exception.getCause()); assertNotNull(exception.getMqttMessage()); @@ -67,7 +68,7 @@ void constructor_message_cause() { @Test void noStackTrace() { final RuntimeException cause = new RuntimeException("cause"); - final Mqtt3PubRecException exception = new Mqtt3PubRecException("message", cause); + final Mqtt3PubRecException exception = new Mqtt3PubRecException(Mqtt3PubRecView.INSTANCE, "message", cause); assertEquals(0, exception.getStackTrace().length); final Mqtt3PubRecException thrownException = assertThrows(Mqtt3PubRecException.class, () -> { throw exception; }); @@ -77,7 +78,7 @@ void noStackTrace() { @Test void fillInStackTrace_newStackTrace() { final RuntimeException cause = new RuntimeException("cause"); - final Mqtt3PubRecException exception = new Mqtt3PubRecException("message", cause); + final Mqtt3PubRecException exception = new Mqtt3PubRecException(Mqtt3PubRecView.INSTANCE, "message", cause); assertEquals(0, exception.getStackTrace().length); final RuntimeException filledException = AsyncRuntimeException.fillInStackTrace(exception); assertTrue(filledException instanceof Mqtt3PubRecException); diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3UnsubAckExceptionTest.java b/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3UnsubAckExceptionTest.java index d2478e173..4a624a151 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3UnsubAckExceptionTest.java +++ b/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3UnsubAckExceptionTest.java @@ -16,6 +16,7 @@ package com.hivemq.client.mqtt.mqtt3.exceptions; +import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; import com.hivemq.client.internal.util.AsyncRuntimeException; import org.junit.jupiter.api.Test; @@ -28,7 +29,7 @@ class Mqtt3UnsubAckExceptionTest { @Test void constructor() { - final Mqtt3UnsubAckException exception = new Mqtt3UnsubAckException(null, null); + final Mqtt3UnsubAckException exception = new Mqtt3UnsubAckException(Mqtt3UnsubAckView.INSTANCE, null, null); assertNull(exception.getMessage()); assertNull(exception.getCause()); assertNotNull(exception.getMqttMessage()); @@ -37,7 +38,8 @@ void constructor() { @Test void constructor_message() { - final Mqtt3UnsubAckException exception = new Mqtt3UnsubAckException("message", null); + final Mqtt3UnsubAckException exception = + new Mqtt3UnsubAckException(Mqtt3UnsubAckView.INSTANCE, "message", null); assertEquals("message", exception.getMessage()); assertNull(exception.getCause()); assertNotNull(exception.getMqttMessage()); @@ -47,7 +49,7 @@ void constructor_message() { @Test void constructor_cause() { final RuntimeException cause = new RuntimeException("cause"); - final Mqtt3UnsubAckException exception = new Mqtt3UnsubAckException(null, cause); + final Mqtt3UnsubAckException exception = new Mqtt3UnsubAckException(Mqtt3UnsubAckView.INSTANCE, null, cause); assertNull(exception.getMessage()); assertEquals(cause, exception.getCause()); assertNotNull(exception.getMqttMessage()); @@ -57,7 +59,8 @@ void constructor_cause() { @Test void constructor_message_cause() { final RuntimeException cause = new RuntimeException("cause"); - final Mqtt3UnsubAckException exception = new Mqtt3UnsubAckException("message", cause); + final Mqtt3UnsubAckException exception = + new Mqtt3UnsubAckException(Mqtt3UnsubAckView.INSTANCE, "message", cause); assertEquals("message", exception.getMessage()); assertEquals(cause, exception.getCause()); assertNotNull(exception.getMqttMessage()); @@ -67,7 +70,8 @@ void constructor_message_cause() { @Test void noStackTrace() { final RuntimeException cause = new RuntimeException("cause"); - final Mqtt3UnsubAckException exception = new Mqtt3UnsubAckException("message", cause); + final Mqtt3UnsubAckException exception = + new Mqtt3UnsubAckException(Mqtt3UnsubAckView.INSTANCE, "message", cause); assertEquals(0, exception.getStackTrace().length); final Mqtt3UnsubAckException thrownException = assertThrows(Mqtt3UnsubAckException.class, () -> { throw exception; }); @@ -77,7 +81,8 @@ void noStackTrace() { @Test void fillInStackTrace_newStackTrace() { final RuntimeException cause = new RuntimeException("cause"); - final Mqtt3UnsubAckException exception = new Mqtt3UnsubAckException("message", cause); + final Mqtt3UnsubAckException exception = + new Mqtt3UnsubAckException(Mqtt3UnsubAckView.INSTANCE, "message", cause); assertEquals(0, exception.getStackTrace().length); final RuntimeException filledException = AsyncRuntimeException.fillInStackTrace(exception); assertTrue(filledException instanceof Mqtt3UnsubAckException); From 406bcefbe1ece3965a6898267f30929754a2c4ae Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Mon, 23 Nov 2020 09:46:55 +0100 Subject: [PATCH 32/62] Extend MqttClientBuilderBase from MqttTransportConfigBuilderBase Remove unnecessary methods --- .../client/mqtt/MqttClientBuilderBase.java | 115 +----------------- 1 file changed, 1 insertion(+), 114 deletions(-) diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java index 4541717dc..6e4628812 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java @@ -17,7 +17,6 @@ package com.hivemq.client.mqtt; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnect; import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnectBuilder; @@ -26,10 +25,6 @@ import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.Range; - -import java.net.InetAddress; -import java.net.InetSocketAddress; /** * Builder base for an {@link MqttClient}. @@ -39,7 +34,7 @@ * @since 1.0 */ @ApiStatus.NonExtendable -public interface MqttClientBuilderBase> { +public interface MqttClientBuilderBase> extends MqttTransportConfigBuilderBase { /** * Sets the {@link MqttClientConfig#getClientIdentifier() Client Identifier}. @@ -59,114 +54,6 @@ public interface MqttClientBuilderBase> { @CheckReturnValue @NotNull B identifier(@NotNull MqttClientIdentifier identifier); - /** - * Sets the {@link MqttClientConfig#getServerAddress() server address} to connect to. - * - * @param address the server address. - * @return the builder - * @since 1.1 - */ - @CheckReturnValue - @NotNull B serverAddress(@NotNull InetSocketAddress address); - - /** - * Sets the {@link MqttClientConfig#getServerHost() server host} to connect to. - * - * @param host the server host. - * @return the builder. - */ - @CheckReturnValue - @NotNull B serverHost(@NotNull String host); - - /** - * Sets the {@link MqttClientConfig#getServerHost() server host} to connect to. - * - * @param host the server host. - * @return the builder. - * @since 1.1 - */ - @CheckReturnValue - @NotNull B serverHost(@NotNull InetAddress host); - - /** - * Sets the {@link MqttClientConfig#getServerPort() server port} to connect to. - * - * @param port the server port. - * @return the builder. - */ - @CheckReturnValue - @NotNull B serverPort(@Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int port); - - /** - * Sets the {@link MqttClientConfig#getTlsConfig() transport layer security configuration} to the default - * configuration. - *

        - * This means that the systems default trust store, ciphers and protocols are used. - * - * @return the builder. - * @since 1.1 - */ - @CheckReturnValue - @NotNull B tls(); - - /** - * Sets the optional {@link MqttClientConfig#getTlsConfig() transport layer security configuration}. - * - * @param tlsConfig the transport layer security configuration or null to remove any previously set - * transport layer security configuration. - * @return the builder. - * @since 1.1 - */ - @CheckReturnValue - @NotNull B tlsConfig(@Nullable MqttTlsConfig tlsConfig); - - /** - * Fluent counterpart of {@link #tlsConfig(MqttTlsConfig)}. - *

        - * 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(MqttTlsConfig) - * @since 1.1 - */ - @CheckReturnValue - MqttTlsConfigBuilder.@NotNull Nested tlsConfigWith(); - - /** - * Sets the {@link MqttClientConfig#getWebSocketConfig() WebSocket transport configuration} to the default - * configuration. - * - * @return the builder. - * @since 1.1 - */ - @CheckReturnValue - @NotNull B webSocket(); - - /** - * Sets the optional {@link MqttClientConfig#getWebSocketConfig() WebSocket transport configuration}. - * - * @param webSocketConfig the WebSocket transport configuration or null to remove any previously set - * WebSocket transport configuration. - * @return the builder. - * @since 1.1 - */ - @CheckReturnValue - @NotNull B webSocketConfig(@Nullable MqttWebSocketConfig webSocketConfig); - - /** - * Fluent counterpart of {@link #webSocketConfig(MqttWebSocketConfig)}. - *

        - * Calling {@link MqttWebSocketConfigBuilder.Nested#applyWebSocketConfig()} on the returned builder has the effect - * of extending the current WebSocket transport configuration. - * - * @return the fluent builder for the WebSocket configuration. - * @see #webSocketConfig(MqttWebSocketConfig) - * @since 1.1 - */ - @CheckReturnValue - MqttWebSocketConfigBuilder.@NotNull Nested webSocketConfigWith(); - /** * Sets the {@link MqttClientConfig#getTransportConfig() transport configuration}. * From a54b1330091404cd9c18296860dfbc8d10c0a7e9 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Mon, 23 Nov 2020 09:48:07 +0100 Subject: [PATCH 33/62] Remove methods from MqttClientConfig that are part of MqttTransportConfig --- .../hivemq/client/mqtt/MqttClientConfig.java | 39 ------------------- 1 file changed, 39 deletions(-) diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java index c9d4c541f..d5d6b805c 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java @@ -16,17 +16,14 @@ package com.hivemq.client.mqtt; -import com.hivemq.client.internal.util.UnsignedDataTypes; import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnect; import com.hivemq.client.mqtt.lifecycle.MqttConnectedListener; import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedListener; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Range; import org.jetbrains.annotations.Unmodifiable; -import java.net.InetSocketAddress; import java.util.List; import java.util.Optional; @@ -52,42 +49,6 @@ public interface MqttClientConfig { */ @NotNull Optional getClientIdentifier(); - /** - * @return the server address the client connects to. - * @since 1.1 - */ - default @NotNull InetSocketAddress getServerAddress() { - return getTransportConfig().getServerAddress(); - } - - /** - * @return the server host the clients connects to. - */ - default @NotNull String getServerHost() { - return getServerAddress().getHostString(); - } - - /** - * @return the server port the client connects to. - */ - default @Range(from = 0, to = UnsignedDataTypes.UNSIGNED_SHORT_MAX_VALUE) int getServerPort() { - return getServerAddress().getPort(); - } - - /** - * @return the optional transport layer security configuration of the client. - */ - default @NotNull Optional getTlsConfig() { - return getTransportConfig().getTlsConfig(); - } - - /** - * @return the optional WebSocket configuration of the client. - */ - default @NotNull Optional getWebSocketConfig() { - return getTransportConfig().getWebSocketConfig(); - } - /** * @return the transport configuration of the client. * @since 1.1 From a76b0944b8ac0e150cd19d50eb43cd147b45f0c4 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Tue, 24 Nov 2020 23:03:29 +0100 Subject: [PATCH 34/62] Fixed transport config builder overrides in MqttRxClientBuilderBase --- .../mqtt/MqttRxClientBuilderBase.java | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java index c19a559b5..83273cb3a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java @@ -34,6 +34,7 @@ import java.net.InetAddress; import java.net.InetSocketAddress; +import java.util.concurrent.TimeUnit; /** * @author Silvio Giebl @@ -97,6 +98,30 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase clie return super.serverPort(port); } + @Override + public @NotNull B localAddress(final @Nullable InetSocketAddress address) { + transportConfig = null; + return super.localAddress(address); + } + + @Override + public @NotNull B localAddress(final @Nullable String address) { + transportConfig = null; + return super.localAddress(address); + } + + @Override + public @NotNull B localAddress(final @Nullable InetAddress address) { + transportConfig = null; + return super.localAddress(address); + } + + @Override + public @NotNull B localPort(final int port) { + transportConfig = null; + return super.localPort(port); + } + public @NotNull B tls() { transportConfig = null; return super.tls(); @@ -104,6 +129,7 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase clie @Override public @NotNull B tlsConfig(final @Nullable MqttTlsConfig tlsConfig) { + transportConfig = null; return super.tlsConfig(tlsConfig); } @@ -118,6 +144,24 @@ protected MqttRxClientBuilderBase(final @NotNull MqttRxClientBuilderBase clie return super.webSocketConfig(webSocketConfig); } + @Override + public @NotNull B proxyConfig(final @Nullable MqttProxyConfig proxyConfig) { + transportConfig = null; + return super.proxyConfig(proxyConfig); + } + + @Override + public @NotNull B socketConnectTimeout(final long timeout, final @Nullable TimeUnit timeUnit) { + transportConfig = null; + return super.socketConnectTimeout(timeout, timeUnit); + } + + @Override + public @NotNull B mqttConnectTimeout(final long timeout, final @Nullable TimeUnit timeUnit) { + transportConfig = null; + return super.mqttConnectTimeout(timeout, timeUnit); + } + public @NotNull B transportConfig(final @Nullable MqttTransportConfig transportConfig) { this.transportConfig = Checks.notImplemented(transportConfig, MqttTransportConfigImpl.class, "Transport config"); From 51cc65ada2fe18d3668520d3585f11796f23da9b Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Wed, 25 Nov 2020 00:06:00 +0100 Subject: [PATCH 35/62] Mqtt3RxClient.unsubscribe: Completable -> Single Mqtt3ReactorClient.unsubscribe: Mono -> Mono --- .../mqtt/mqtt3/reactor/Mqtt3ReactorClientView.java | 7 ++++--- .../mqtt/mqtt3/reactor/Mqtt3ReactorClient.java | 7 ++++--- .../unsubscribe/mqtt3/Mqtt3UnsubAckView.java | 3 +++ .../internal/mqtt/mqtt3/Mqtt3RxClientView.java | 14 +++++++++++--- .../hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java | 9 +++++---- .../mqtt3/Mqtt3RxClientViewExceptionsTest.java | 3 ++- 6 files changed, 29 insertions(+), 14 deletions(-) diff --git a/reactor/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/reactor/Mqtt3ReactorClientView.java b/reactor/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/reactor/Mqtt3ReactorClientView.java index 4d062709a..3e0db213b 100644 --- a/reactor/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/reactor/Mqtt3ReactorClientView.java +++ b/reactor/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/reactor/Mqtt3ReactorClientView.java @@ -31,6 +31,7 @@ import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; +import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import com.hivemq.client.mqtt.mqtt3.reactor.Mqtt3ReactorClient; import com.hivemq.client.rx.reactor.FluxWithSingle; @@ -109,12 +110,12 @@ public Mqtt3ReactorClientView(final @NotNull Mqtt3RxClient delegate) { } @Override - public @NotNull Mono unsubscribe(final @NotNull Mqtt3Unsubscribe unsubscribe) { - return RxJava2Adapter.completableToMono(delegate.unsubscribe(unsubscribe)); + public @NotNull Mono unsubscribe(final @NotNull Mqtt3Unsubscribe unsubscribe) { + return RxJava2Adapter.singleToMono(delegate.unsubscribe(unsubscribe)); } @Override - public @NotNull Mqtt3UnsubscribeViewBuilder.Nested> unsubscribeWith() { + public @NotNull Mqtt3UnsubscribeViewBuilder.Nested> unsubscribeWith() { return new Mqtt3UnsubscribeViewBuilder.Nested<>(this::unsubscribe); } diff --git a/reactor/src/main/java/com/hivemq/client/mqtt/mqtt3/reactor/Mqtt3ReactorClient.java b/reactor/src/main/java/com/hivemq/client/mqtt/mqtt3/reactor/Mqtt3ReactorClient.java index ab7f28942..c511508cb 100644 --- a/reactor/src/main/java/com/hivemq/client/mqtt/mqtt3/reactor/Mqtt3ReactorClient.java +++ b/reactor/src/main/java/com/hivemq/client/mqtt/mqtt3/reactor/Mqtt3ReactorClient.java @@ -28,6 +28,7 @@ import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilder; +import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; import com.hivemq.client.rx.reactor.FluxWithSingle; @@ -263,13 +264,13 @@ public interface Mqtt3ReactorClient extends Mqtt3Client { * @param unsubscribe the Unsubscribe message sent to the broker during unsubscribe. * @return the {@link Mono} which *

          - *
        • succeeds when the corresponding UnsubAck message was received or + *
        • succeeds with the UnsubAck message or *
        • errors if an error occurred before the Unsubscribe message was sent or before a UnsubAck message * was received. *
        */ @CheckReturnValue - @NotNull Mono unsubscribe(@NotNull Mqtt3Unsubscribe unsubscribe); + @NotNull Mono unsubscribe(@NotNull Mqtt3Unsubscribe unsubscribe); /** * Fluent counterpart of {@link #unsubscribe(Mqtt3Unsubscribe)}. @@ -282,7 +283,7 @@ public interface Mqtt3ReactorClient extends Mqtt3Client { * @see #unsubscribe(Mqtt3Unsubscribe) */ @CheckReturnValue - @NotNull Mqtt3UnsubscribeBuilder.Nested.Start> unsubscribeWith(); + @NotNull Mqtt3UnsubscribeBuilder.Nested.Start> unsubscribeWith(); /** * Creates a {@link Flux} for publishing the Publish messages emitted by the given {@link Publisher}. diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubAckView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubAckView.java index b2cc59990..cb6b077fb 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubAckView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubAckView.java @@ -21,7 +21,9 @@ import com.hivemq.client.internal.util.collections.ImmutableList; import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; +import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; +import io.reactivex.functions.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; @@ -34,6 +36,7 @@ public class Mqtt3UnsubAckView implements Mqtt3UnsubAck { public static final @NotNull ImmutableList REASON_CODES_ALL_SUCCESS = ImmutableList.of(); public static final @NotNull Mqtt3UnsubAckView INSTANCE = new Mqtt3UnsubAckView(); + public static final @NotNull Function MAPPER = (unsubAck) -> INSTANCE; public static @NotNull MqttUnsubAck delegate(final int packetIdentifier) { return new MqttUnsubAck( diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java index 2eac0943f..51639fb7a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java @@ -30,6 +30,7 @@ import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubAckView; import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubscribeViewBuilder; import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; +import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubscribeViewBuilder; import com.hivemq.client.internal.mqtt.util.MqttChecks; import com.hivemq.client.internal.util.Checks; @@ -41,11 +42,13 @@ import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; +import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; +import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; import com.hivemq.client.rx.FlowableWithSingle; import io.reactivex.Completable; import io.reactivex.Flowable; @@ -72,6 +75,9 @@ public class Mqtt3RxClientView implements Mqtt3RxClient { private static final @NotNull Function> EXCEPTION_MAPPER_SINGLE_SUBACK = e -> Single.error(Mqtt3ExceptionFactory.map(e)); + private static final @NotNull Function> EXCEPTION_MAPPER_SINGLE_UNSUBACK = + e -> Single.error(Mqtt3ExceptionFactory.map(e)); + private static final @NotNull Function> EXCEPTION_MAPPER_FLOWABLE_PUBLISH = e -> Flowable.error(Mqtt3ExceptionFactory.map(e)); @@ -159,14 +165,16 @@ public class Mqtt3RxClientView implements Mqtt3RxClient { } @Override - public @NotNull Completable unsubscribe(final @Nullable Mqtt3Unsubscribe unsubscribe) { + public @NotNull Single unsubscribe(final @Nullable Mqtt3Unsubscribe unsubscribe) { final MqttUnsubscribe mqttUnsubscribe = MqttChecks.unsubscribe(unsubscribe); - return delegate.unsubscribe(mqttUnsubscribe).ignoreElement().onErrorResumeNext(EXCEPTION_MAPPER_COMPLETABLE); + return delegate.unsubscribe(mqttUnsubscribe) + .onErrorResumeNext(EXCEPTION_MAPPER_SINGLE_UNSUBACK) + .map(Mqtt3UnsubAckView.MAPPER); } @Override - public Mqtt3UnsubscribeViewBuilder.@NotNull Nested unsubscribeWith() { + public Mqtt3UnsubscribeViewBuilder.@NotNull Nested> unsubscribeWith() { return new Mqtt3UnsubscribeViewBuilder.Nested<>(this::unsubscribe); } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java index 86938f5a2..e9f0ddead 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java @@ -26,6 +26,7 @@ import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilder; +import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; import com.hivemq.client.rx.FlowableWithSingle; @@ -248,15 +249,15 @@ public interface Mqtt3RxClient extends Mqtt3Client { * asynchronous when subscribing (in terms of Reactive Streams) to the returned {@link Completable}. * * @param unsubscribe the Unsubscribe message sent to the broker during unsubscribe. - * @return the {@link Completable} which + * @return the {@link Single} which *
          - *
        • succeeds when the corresponding UnsubAck message was received or + *
        • succeeds with the UnsubAck message or *
        • errors if an error occurred before the Unsubscribe message was sent or before a UnsubAck message * was received. *
        */ @CheckReturnValue - @NotNull Completable unsubscribe(@NotNull Mqtt3Unsubscribe unsubscribe); + @NotNull Single unsubscribe(@NotNull Mqtt3Unsubscribe unsubscribe); /** * Fluent counterpart of {@link #unsubscribe(Mqtt3Unsubscribe)}. @@ -269,7 +270,7 @@ public interface Mqtt3RxClient extends Mqtt3Client { * @see #unsubscribe(Mqtt3Unsubscribe) */ @CheckReturnValue - Mqtt3UnsubscribeBuilder.Nested.@NotNull Start unsubscribeWith(); + Mqtt3UnsubscribeBuilder.Nested.@NotNull Start> unsubscribeWith(); /** * Creates a {@link Flowable} for publishing the Publish messages emitted by the given {@link Flowable}. diff --git a/src/test/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewExceptionsTest.java b/src/test/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewExceptionsTest.java index 45a9be55e..de3f90c1a 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewExceptionsTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewExceptionsTest.java @@ -116,7 +116,8 @@ void unsubscribe() { given(mqtt5Client.unsubscribe(any())).willReturn(Single.error(mqtt5MessageException)); final Mqtt3Unsubscribe unsubscribe = Mqtt3Unsubscribe.builder().addTopicFilter("topic").build(); - assertMqtt3Exception(() -> mqtt3Client.unsubscribe(unsubscribe).blockingAwait(), mqtt5MessageException); + assertMqtt3Exception( + () -> mqtt3Client.unsubscribe(unsubscribe).ignoreElement().blockingAwait(), mqtt5MessageException); } @Test From 188eece8942e2b2244c671c81e80bbd89ab45d2d Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Wed, 25 Nov 2020 00:11:16 +0100 Subject: [PATCH 36/62] Mqtt3AsyncClient.unsubscribe: CompletableFuture -> CompletableFuture --- .../internal/mqtt/mqtt3/Mqtt3AsyncClientView.java | 10 ++++++---- .../com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java | 7 ++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java index 8232b97a5..024534a0d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java @@ -30,6 +30,7 @@ import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubAckView; import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubscribeViewBuilder; import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; +import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubscribeViewBuilder; import com.hivemq.client.internal.mqtt.util.MqttChecks; import com.hivemq.client.internal.util.Checks; @@ -43,6 +44,7 @@ import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; +import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; @@ -206,22 +208,22 @@ public void publishes( } @Override - public @NotNull CompletableFuture unsubscribe(final @Nullable Mqtt3Unsubscribe unsubscribe) { + public @NotNull CompletableFuture unsubscribe(final @Nullable Mqtt3Unsubscribe unsubscribe) { final MqttUnsubscribe mqttUnsubscribe = MqttChecks.unsubscribe(unsubscribe); - final CompletableFuture future = new CompletableFuture<>(); + final CompletableFuture future = new CompletableFuture<>(); delegate.unsubscribe(mqttUnsubscribe).whenComplete((unsubAck, throwable) -> { if (throwable != null) { future.completeExceptionally(Mqtt3ExceptionFactory.map(throwable)); } else { - future.complete(null); + future.complete(Mqtt3UnsubAckView.INSTANCE); } }); return future; } @Override - public Mqtt3UnsubscribeViewBuilder.@NotNull Send> unsubscribeWith() { + public Mqtt3UnsubscribeViewBuilder.@NotNull Send> unsubscribeWith() { return new Mqtt3UnsubscribeViewBuilder.Send<>(this::unsubscribe); } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java index 3af499b92..eaafe880b 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java @@ -26,6 +26,7 @@ import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilderBase; +import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; import org.jetbrains.annotations.ApiStatus; @@ -265,12 +266,12 @@ void publishes( * @param unsubscribe the Unsubscribe message sent to the broker. * @return a {@link CompletableFuture} which *
          - *
        • completes normally when the corresponding UnsubAck message was received or + *
        • completes normally with the UnsubAck message or *
        • completes exceptionally if an error occurred before the Unsubscribe message was sent or before a * UnsubAck message was received. *
        */ - @NotNull CompletableFuture unsubscribe(@NotNull Mqtt3Unsubscribe unsubscribe); + @NotNull CompletableFuture unsubscribe(@NotNull Mqtt3Unsubscribe unsubscribe); /** * Fluent counterpart of {@link #unsubscribe(Mqtt3Unsubscribe)}. @@ -282,7 +283,7 @@ void publishes( * @see #unsubscribe(Mqtt3Unsubscribe) */ @CheckReturnValue - Mqtt3UnsubscribeBuilder.Send.@NotNull Start> unsubscribeWith(); + Mqtt3UnsubscribeBuilder.Send.@NotNull Start> unsubscribeWith(); /** * Publishes the given Publish message. From e9405c4c305af25a0a89ddabe613cad9450c9586 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Wed, 25 Nov 2020 00:22:31 +0100 Subject: [PATCH 37/62] Mqtt3BlockingClient.unsubscribe: void -> Mqtt3UnsubAck --- .../mqtt3/Mqtt3UnsubscribeViewBuilder.java | 21 --------------- .../mqtt/mqtt3/Mqtt3BlockingClientView.java | 9 ++++--- .../mqtt/mqtt3/Mqtt3BlockingClient.java | 8 +++--- .../unsubscribe/Mqtt3UnsubscribeBuilder.java | 27 ------------------- 4 files changed, 11 insertions(+), 54 deletions(-) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilder.java index 68d9b73b1..0877b876c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilder.java @@ -29,7 +29,6 @@ import org.jetbrains.annotations.Nullable; import java.util.Collection; -import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Stream; @@ -174,24 +173,4 @@ public Send(final @NotNull Function parentConsu return parentConsumer.apply(build()); } } - - public static class SendVoid extends Mqtt3UnsubscribeViewBuilder - implements Mqtt3UnsubscribeBuilder.SendVoid.Complete, Mqtt3UnsubscribeBuilder.SendVoid.Start { - - private final @NotNull Consumer parentConsumer; - - public SendVoid(final @NotNull Consumer parentConsumer) { - this.parentConsumer = parentConsumer; - } - - @Override - @NotNull SendVoid self() { - return this; - } - - @Override - public void send() { - parentConsumer.accept(build()); - } - } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java index 0d2e5c068..f39fe5767 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java @@ -30,6 +30,7 @@ import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubAckView; import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubscribeViewBuilder; import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; +import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubscribeViewBuilder; import com.hivemq.client.internal.mqtt.util.MqttChecks; import com.hivemq.client.internal.util.Checks; @@ -43,6 +44,7 @@ import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; +import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient; import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5MessageException; @@ -115,18 +117,19 @@ public class Mqtt3BlockingClientView implements Mqtt3BlockingClient { } @Override - public void unsubscribe(final @Nullable Mqtt3Unsubscribe unsubscribe) { + public @NotNull Mqtt3UnsubAck unsubscribe(final @Nullable Mqtt3Unsubscribe unsubscribe) { final MqttUnsubscribe mqttUnsubscribe = MqttChecks.unsubscribe(unsubscribe); try { delegate.unsubscribe(mqttUnsubscribe); + return Mqtt3UnsubAckView.INSTANCE; } catch (final Mqtt5MessageException e) { throw Mqtt3ExceptionFactory.mapWithStackTrace(e); } } @Override - public Mqtt3UnsubscribeViewBuilder.@NotNull SendVoid unsubscribeWith() { - return new Mqtt3UnsubscribeViewBuilder.SendVoid(this::unsubscribe); + public Mqtt3UnsubscribeViewBuilder.@NotNull Send unsubscribeWith() { + return new Mqtt3UnsubscribeViewBuilder.Send<>(this::unsubscribe); } @Override diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java index c95f2ed96..a1ce79a58 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java @@ -26,6 +26,7 @@ import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilder; +import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; import org.jetbrains.annotations.ApiStatus; @@ -122,20 +123,21 @@ public interface Mqtt3BlockingClient extends Mqtt3Client { * Unsubscribes this client with the given Unsubscribe message. * * @param unsubscribe the Unsubscribe message sent to the broker. + * @return the UnsubAck message. */ - void unsubscribe(@NotNull Mqtt3Unsubscribe unsubscribe); + @NotNull Mqtt3UnsubAck unsubscribe(@NotNull Mqtt3Unsubscribe unsubscribe); /** * Fluent counterpart of {@link #unsubscribe(Mqtt3Unsubscribe)}. *

        - * Calling {@link Mqtt3UnsubscribeBuilder.SendVoid.Complete#send()} on the returned builder has the same effect as + * Calling {@link Mqtt3UnsubscribeBuilder.Send.Complete#send()} on the returned builder has the same effect as * calling {@link #unsubscribe(Mqtt3Unsubscribe)} with the result of {@link Mqtt3UnsubscribeBuilder.Complete#build()}. * * @return the fluent builder for the Unsubscribe message. * @see #unsubscribe(Mqtt3Unsubscribe) */ @CheckReturnValue - Mqtt3UnsubscribeBuilder.SendVoid.@NotNull Start unsubscribeWith(); + Mqtt3UnsubscribeBuilder.Send.@NotNull Start unsubscribeWith(); /** * Publishes the given Publish message. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilder.java index 163f21ef5..7895eeff0 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilder.java @@ -119,31 +119,4 @@ interface Complete

        extends Send

        , Mqtt3UnsubscribeBuilderBase.Complete extends Send

        , Mqtt3UnsubscribeBuilderBase.Start> {} } - - /** - * Builder for a {@link Mqtt3Unsubscribe} that is applied to a parent {@link com.hivemq.client.mqtt.mqtt3.Mqtt3Client} - * which then sends the Unsubscribe message without returning a result. - */ - @ApiStatus.NonExtendable - interface SendVoid extends Mqtt3UnsubscribeBuilderBase { - - /** - * {@link SendVoid} that is complete which means all mandatory fields are set. - */ - @ApiStatus.NonExtendable - interface Complete extends SendVoid, Mqtt3UnsubscribeBuilderBase.Complete { - - /** - * Builds the {@link Mqtt3Unsubscribe} and applies it to the parent which then sends the Unsubscribe message - * without returning a result. - */ - void send(); - } - - /** - * {@link SendVoid} that provides additional methods for the first Topic Filter. - */ - @ApiStatus.NonExtendable - interface Start extends SendVoid, Mqtt3UnsubscribeBuilderBase.Start {} - } } From aa11357402efa78291474059b2a1b3f5ffcbecd2 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Wed, 25 Nov 2020 00:41:16 +0100 Subject: [PATCH 38/62] Mqtt3AsyncClient.publish: CompletableFuture -> CompletableFuture Mqtt3BlockingClient.publish: void -> Mqtt3PublishResult --- .../mqtt3/Mqtt3PublishViewBuilder.java | 20 ------------------ .../mqtt/mqtt3/Mqtt3AsyncClientView.java | 10 +++++---- .../mqtt/mqtt3/Mqtt3BlockingClientView.java | 10 +++++---- .../client/mqtt/mqtt3/Mqtt3AsyncClient.java | 9 ++++---- .../mqtt/mqtt3/Mqtt3BlockingClient.java | 11 ++++++---- .../message/publish/Mqtt3PublishBuilder.java | 21 ------------------- 6 files changed, 24 insertions(+), 57 deletions(-) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewBuilder.java index 484f23f82..a94457ca5 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewBuilder.java @@ -31,7 +31,6 @@ import org.jetbrains.annotations.Nullable; import java.nio.ByteBuffer; -import java.util.function.Consumer; import java.util.function.Function; /** @@ -156,25 +155,6 @@ public Send(final @NotNull Function parentConsumer) } } - public static class SendVoid extends Base implements Mqtt3PublishBuilder.SendVoid.Complete { - - private final @NotNull Consumer parentConsumer; - - public SendVoid(final @NotNull Consumer parentConsumer) { - this.parentConsumer = parentConsumer; - } - - @Override - protected @NotNull SendVoid self() { - return this; - } - - @Override - public void send() { - parentConsumer.accept(build()); - } - } - private static abstract class WillBase> extends Mqtt3PublishViewBuilder { WillBase() {} diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java index 024534a0d..eb49cba6a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java @@ -24,6 +24,7 @@ import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectViewBuilder; import com.hivemq.client.internal.mqtt.message.disconnect.mqtt3.Mqtt3DisconnectView; import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishResultView; import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishViewBuilder; import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; @@ -42,6 +43,7 @@ import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; +import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; @@ -228,22 +230,22 @@ public void publishes( } @Override - public @NotNull CompletableFuture<@NotNull Mqtt3Publish> publish(final @Nullable Mqtt3Publish publish) { + public @NotNull CompletableFuture<@NotNull Mqtt3PublishResult> publish(final @Nullable Mqtt3Publish publish) { final MqttPublish mqttPublish = MqttChecks.publish(publish); - final CompletableFuture future = new CompletableFuture<>(); + final CompletableFuture future = new CompletableFuture<>(); delegate.publish(mqttPublish).whenComplete((publishResult, throwable) -> { if (throwable != null) { future.completeExceptionally(Mqtt3ExceptionFactory.map(throwable)); } else { - future.complete(Mqtt3PublishView.of(publishResult.getPublish())); + future.complete(Mqtt3PublishResultView.of(publishResult)); } }); return future; } @Override - public Mqtt3PublishViewBuilder.@NotNull Send> publishWith() { + public Mqtt3PublishViewBuilder.@NotNull Send> publishWith() { return new Mqtt3PublishViewBuilder.Send<>(this::publish); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java index f39fe5767..29262029c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java @@ -24,6 +24,7 @@ import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectViewBuilder; import com.hivemq.client.internal.mqtt.message.disconnect.mqtt3.Mqtt3DisconnectView; import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishResultView; import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishViewBuilder; import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; @@ -42,6 +43,7 @@ import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; +import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; @@ -133,18 +135,18 @@ public class Mqtt3BlockingClientView implements Mqtt3BlockingClient { } @Override - public void publish(final @Nullable Mqtt3Publish publish) { + public @NotNull Mqtt3PublishResult publish(final @Nullable Mqtt3Publish publish) { final MqttPublish mqttPublish = MqttChecks.publish(publish); try { - delegate.publish(mqttPublish); + return Mqtt3PublishResultView.of(delegate.publish(mqttPublish)); } catch (final Mqtt5MessageException e) { throw Mqtt3ExceptionFactory.mapWithStackTrace(e); } } @Override - public Mqtt3PublishViewBuilder.@NotNull SendVoid publishWith() { - return new Mqtt3PublishViewBuilder.SendVoid(this::publish); + public Mqtt3PublishViewBuilder.@NotNull Send publishWith() { + return new Mqtt3PublishViewBuilder.Send<>(this::publish); } @Override diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java index eaafe880b..c138838c1 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java @@ -23,6 +23,7 @@ import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnectBuilder; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishBuilder; +import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilderBase; @@ -291,13 +292,13 @@ void publishes( * @param publish the Publish message sent to the broker. * @return a {@link CompletableFuture} which *

          - *
        • completes normally with the same Publish message (for context) if the Publish message was - * successfully published or + *
        • completes normally with the {@link Mqtt3PublishResult} if the Publish message was successfully + * published ({@link Mqtt3PublishResult#getError()} will always be absent) or *
        • completes exceptionally if an error occurred before the Publish message was sent or before an * acknowledgement message was received. *
        */ - @NotNull CompletableFuture<@NotNull Mqtt3Publish> publish(@NotNull Mqtt3Publish publish); + @NotNull CompletableFuture<@NotNull Mqtt3PublishResult> publish(@NotNull Mqtt3Publish publish); /** * Fluent counterpart of {@link #publish(Mqtt3Publish)}. @@ -309,7 +310,7 @@ void publishes( * @see #publish(Mqtt3Publish) */ @CheckReturnValue - Mqtt3PublishBuilder.@NotNull Send> publishWith(); + Mqtt3PublishBuilder.@NotNull Send> publishWith(); /** * Disconnects this client. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java index a1ce79a58..1fef50bd2 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java @@ -23,6 +23,7 @@ import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnectBuilder; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishBuilder; +import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilder; @@ -143,20 +144,22 @@ public interface Mqtt3BlockingClient extends Mqtt3Client { * Publishes the given Publish message. * * @param publish the Publish message sent to the broker. + * @return the {@link Mqtt3PublishResult} if the Publish message was successfully published ({@link + * Mqtt3PublishResult#getError()} will always be absent). */ - void publish(@NotNull Mqtt3Publish publish); + @NotNull Mqtt3PublishResult publish(@NotNull Mqtt3Publish publish); /** * Fluent counterpart of {@link #publish(Mqtt3Publish)}. *

        - * Calling {@link Mqtt3PublishBuilder.SendVoid.Complete#send()} on the returned builder has the same effect as - * calling {@link #publish(Mqtt3Publish)} with the result of {@link Mqtt3PublishBuilder.Complete#build()}. + * Calling {@link Mqtt3PublishBuilder.Send.Complete#send()} on the returned builder has the same effect as calling + * {@link #publish(Mqtt3Publish)} with the result of {@link Mqtt3PublishBuilder.Complete#build()}. * * @return the fluent builder for the Unsubscribe message. * @see #publish(Mqtt3Publish) */ @CheckReturnValue - Mqtt3PublishBuilder.@NotNull SendVoid publishWith(); + Mqtt3PublishBuilder.@NotNull Send publishWith(); /** * Disconnects this client with the given Disconnect message. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishBuilder.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishBuilder.java index 9811105d0..63bc5014c 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishBuilder.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishBuilder.java @@ -94,25 +94,4 @@ interface Complete

        extends Send

        , Mqtt3PublishBuilderBase.Complete { - - /** - * {@link SendVoid} that is complete which means all mandatory fields are set. - */ - @ApiStatus.NonExtendable - interface Complete extends SendVoid, Mqtt3PublishBuilderBase.Complete { - - /** - * Builds the {@link Mqtt3Publish} and applies it to the parent which then sends the Publish message without - * returning a result. - */ - void send(); - } - } } From b196dccbc998b51be4cfd5c90206936afc02ad02 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Sun, 6 Dec 2020 22:40:50 +0100 Subject: [PATCH 39/62] Incoming/Outgoing*Interceptor -> Inbound/Outbound*Interceptor --- .../interceptor/MqttClientInterceptors.java | 64 +++++++++---------- .../MqttClientInterceptorsBuilder.java | 44 ++++++------- .../incoming/MqttIncomingQosHandler.java | 10 +-- .../outgoing/MqttOutgoingQosHandler.java | 12 ++-- .../interceptor/Mqtt5ClientInterceptors.java | 16 ++--- .../Mqtt5ClientInterceptorsBuilderBase.java | 16 ++--- ....java => Mqtt5InboundQos1Interceptor.java} | 2 +- ...java => Mqtt5OutboundQos1Interceptor.java} | 2 +- ....java => Mqtt5InboundQos2Interceptor.java} | 2 +- ...java => Mqtt5OutboundQos2Interceptor.java} | 2 +- 10 files changed, 85 insertions(+), 85 deletions(-) rename src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/{Mqtt5IncomingQos1Interceptor.java => Mqtt5InboundQos1Interceptor.java} (97%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/{Mqtt5OutgoingQos1Interceptor.java => Mqtt5OutboundQos1Interceptor.java} (97%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/{Mqtt5IncomingQos2Interceptor.java => Mqtt5InboundQos2Interceptor.java} (98%) rename src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/{Mqtt5OutgoingQos2Interceptor.java => Mqtt5OutboundQos2Interceptor.java} (98%) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptors.java b/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptors.java index 29c983c77..7214fcd4c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptors.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptors.java @@ -17,10 +17,10 @@ package com.hivemq.client.internal.mqtt.advanced.interceptor; import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.Mqtt5ClientInterceptors; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5IncomingQos1Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5OutgoingQos1Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5IncomingQos2Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutgoingQos2Interceptor; +import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5InboundQos1Interceptor; +import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5OutboundQos1Interceptor; +import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5InboundQos2Interceptor; +import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutboundQos2Interceptor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; @@ -33,41 +33,41 @@ @Unmodifiable public class MqttClientInterceptors implements Mqtt5ClientInterceptors { - private final @Nullable Mqtt5IncomingQos1Interceptor incomingQos1Interceptor; - private final @Nullable Mqtt5OutgoingQos1Interceptor outgoingQos1Interceptor; - private final @Nullable Mqtt5IncomingQos2Interceptor incomingQos2Interceptor; - private final @Nullable Mqtt5OutgoingQos2Interceptor outgoingQos2Interceptor; + private final @Nullable Mqtt5InboundQos1Interceptor inboundQos1Interceptor; + private final @Nullable Mqtt5OutboundQos1Interceptor outboundQos1Interceptor; + private final @Nullable Mqtt5InboundQos2Interceptor inboundQos2Interceptor; + private final @Nullable Mqtt5OutboundQos2Interceptor outboundQos2Interceptor; MqttClientInterceptors( - final @Nullable Mqtt5IncomingQos1Interceptor incomingQos1Interceptor, - final @Nullable Mqtt5OutgoingQos1Interceptor outgoingQos1Interceptor, - final @Nullable Mqtt5IncomingQos2Interceptor incomingQos2Interceptor, - final @Nullable Mqtt5OutgoingQos2Interceptor outgoingQos2Interceptor) { + final @Nullable Mqtt5InboundQos1Interceptor inboundQos1Interceptor, + final @Nullable Mqtt5OutboundQos1Interceptor outboundQos1Interceptor, + final @Nullable Mqtt5InboundQos2Interceptor inboundQos2Interceptor, + final @Nullable Mqtt5OutboundQos2Interceptor outboundQos2Interceptor) { - this.incomingQos1Interceptor = incomingQos1Interceptor; - this.outgoingQos1Interceptor = outgoingQos1Interceptor; - this.incomingQos2Interceptor = incomingQos2Interceptor; - this.outgoingQos2Interceptor = outgoingQos2Interceptor; + this.inboundQos1Interceptor = inboundQos1Interceptor; + this.outboundQos1Interceptor = outboundQos1Interceptor; + this.inboundQos2Interceptor = inboundQos2Interceptor; + this.outboundQos2Interceptor = outboundQos2Interceptor; } @Override - public @Nullable Mqtt5IncomingQos1Interceptor getIncomingQos1Interceptor() { - return incomingQos1Interceptor; + public @Nullable Mqtt5InboundQos1Interceptor getInboundQos1Interceptor() { + return inboundQos1Interceptor; } @Override - public @Nullable Mqtt5OutgoingQos1Interceptor getOutgoingQos1Interceptor() { - return outgoingQos1Interceptor; + public @Nullable Mqtt5OutboundQos1Interceptor getOutboundQos1Interceptor() { + return outboundQos1Interceptor; } @Override - public @Nullable Mqtt5IncomingQos2Interceptor getIncomingQos2Interceptor() { - return incomingQos2Interceptor; + public @Nullable Mqtt5InboundQos2Interceptor getInboundQos2Interceptor() { + return inboundQos2Interceptor; } @Override - public @Nullable Mqtt5OutgoingQos2Interceptor getOutgoingQos2Interceptor() { - return outgoingQos2Interceptor; + public @Nullable Mqtt5OutboundQos2Interceptor getOutboundQos2Interceptor() { + return outboundQos2Interceptor; } @Override @@ -85,18 +85,18 @@ public boolean equals(final @Nullable Object o) { } final MqttClientInterceptors that = (MqttClientInterceptors) o; - return Objects.equals(incomingQos1Interceptor, that.incomingQos1Interceptor) && - Objects.equals(outgoingQos1Interceptor, that.outgoingQos1Interceptor) && - Objects.equals(incomingQos2Interceptor, that.incomingQos2Interceptor) && - Objects.equals(outgoingQos2Interceptor, that.outgoingQos2Interceptor); + return Objects.equals(inboundQos1Interceptor, that.inboundQos1Interceptor) && + Objects.equals(outboundQos1Interceptor, that.outboundQos1Interceptor) && + Objects.equals(inboundQos2Interceptor, that.inboundQos2Interceptor) && + Objects.equals(outboundQos2Interceptor, that.outboundQos2Interceptor); } @Override public int hashCode() { - int result = Objects.hashCode(incomingQos1Interceptor); - result = 31 * result + Objects.hashCode(outgoingQos1Interceptor); - result = 31 * result + Objects.hashCode(incomingQos2Interceptor); - result = 31 * result + Objects.hashCode(outgoingQos2Interceptor); + int result = Objects.hashCode(inboundQos1Interceptor); + result = 31 * result + Objects.hashCode(outboundQos1Interceptor); + result = 31 * result + Objects.hashCode(inboundQos2Interceptor); + result = 31 * result + Objects.hashCode(outboundQos2Interceptor); return result; } } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptorsBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptorsBuilder.java index a308c02f0..30b7c3c04 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptorsBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptorsBuilder.java @@ -17,10 +17,10 @@ package com.hivemq.client.internal.mqtt.advanced.interceptor; import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.Mqtt5ClientInterceptorsBuilder; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5IncomingQos1Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5OutgoingQos1Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5IncomingQos2Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutgoingQos2Interceptor; +import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5InboundQos1Interceptor; +import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5OutboundQos1Interceptor; +import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5InboundQos2Interceptor; +import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutboundQos2Interceptor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -31,47 +31,47 @@ */ public abstract class MqttClientInterceptorsBuilder> { - private @Nullable Mqtt5IncomingQos1Interceptor incomingQos1Interceptor; - private @Nullable Mqtt5OutgoingQos1Interceptor outgoingQos1Interceptor; - private @Nullable Mqtt5IncomingQos2Interceptor incomingQos2Interceptor; - private @Nullable Mqtt5OutgoingQos2Interceptor outgoingQos2Interceptor; + private @Nullable Mqtt5InboundQos1Interceptor inboundQos1Interceptor; + private @Nullable Mqtt5OutboundQos1Interceptor outboundQos1Interceptor; + private @Nullable Mqtt5InboundQos2Interceptor inboundQos2Interceptor; + private @Nullable Mqtt5OutboundQos2Interceptor outboundQos2Interceptor; MqttClientInterceptorsBuilder() {} MqttClientInterceptorsBuilder(final @Nullable MqttClientInterceptors interceptors) { if (interceptors != null) { - incomingQos1Interceptor = interceptors.getIncomingQos1Interceptor(); - outgoingQos1Interceptor = interceptors.getOutgoingQos1Interceptor(); - incomingQos2Interceptor = interceptors.getIncomingQos2Interceptor(); - outgoingQos2Interceptor = interceptors.getOutgoingQos2Interceptor(); + inboundQos1Interceptor = interceptors.getInboundQos1Interceptor(); + outboundQos1Interceptor = interceptors.getOutboundQos1Interceptor(); + inboundQos2Interceptor = interceptors.getInboundQos2Interceptor(); + outboundQos2Interceptor = interceptors.getOutboundQos2Interceptor(); } } abstract @NotNull B self(); - public @NotNull B incomingQos1Interceptor(final @Nullable Mqtt5IncomingQos1Interceptor incomingQos1Interceptor) { - this.incomingQos1Interceptor = incomingQos1Interceptor; + public @NotNull B inboundQos1Interceptor(final @Nullable Mqtt5InboundQos1Interceptor inboundQos1Interceptor) { + this.inboundQos1Interceptor = inboundQos1Interceptor; return self(); } - public @NotNull B outgoingQos1Interceptor(final @Nullable Mqtt5OutgoingQos1Interceptor outgoingQos1Interceptor) { - this.outgoingQos1Interceptor = outgoingQos1Interceptor; + public @NotNull B outboundQos1Interceptor(final @Nullable Mqtt5OutboundQos1Interceptor outboundQos1Interceptor) { + this.outboundQos1Interceptor = outboundQos1Interceptor; return self(); } - public @NotNull B incomingQos2Interceptor(final @Nullable Mqtt5IncomingQos2Interceptor incomingQos2Interceptor) { - this.incomingQos2Interceptor = incomingQos2Interceptor; + public @NotNull B inboundQos2Interceptor(final @Nullable Mqtt5InboundQos2Interceptor inboundQos2Interceptor) { + this.inboundQos2Interceptor = inboundQos2Interceptor; return self(); } - public @NotNull B outgoingQos2Interceptor(final @Nullable Mqtt5OutgoingQos2Interceptor outgoingQos2Interceptor) { - this.outgoingQos2Interceptor = outgoingQos2Interceptor; + public @NotNull B outboundQos2Interceptor(final @Nullable Mqtt5OutboundQos2Interceptor outboundQos2Interceptor) { + this.outboundQos2Interceptor = outboundQos2Interceptor; return self(); } public @NotNull MqttClientInterceptors build() { - return new MqttClientInterceptors(incomingQos1Interceptor, outgoingQos1Interceptor, incomingQos2Interceptor, - outgoingQos2Interceptor); + return new MqttClientInterceptors(inboundQos1Interceptor, outboundQos1Interceptor, inboundQos2Interceptor, + outboundQos2Interceptor); } public static class Default extends MqttClientInterceptorsBuilder diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingQosHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingQosHandler.java index be977d612..8f967da31 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingQosHandler.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingQosHandler.java @@ -29,8 +29,8 @@ import com.hivemq.client.internal.util.collections.IntIndex; import com.hivemq.client.mqtt.MqttVersion; import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5IncomingQos1Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5IncomingQos2Interceptor; +import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5InboundQos1Interceptor; +import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5InboundQos2Interceptor; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; import io.netty.channel.ChannelHandlerContext; @@ -310,7 +310,7 @@ public void onSessionEnd(final @NotNull Throwable cause) { private @NotNull MqttPubAck buildPubAck(final @NotNull MqttPubAckBuilder pubAckBuilder) { final MqttClientInterceptors interceptors = clientConfig.getAdvancedConfig().getInterceptors(); if (interceptors != null) { - final Mqtt5IncomingQos1Interceptor interceptor = interceptors.getIncomingQos1Interceptor(); + final Mqtt5InboundQos1Interceptor interceptor = interceptors.getInboundQos1Interceptor(); if (interceptor != null) { interceptor.onPublish(clientConfig, pubAckBuilder.getPublish().stateless(), pubAckBuilder); } @@ -321,7 +321,7 @@ public void onSessionEnd(final @NotNull Throwable cause) { private @NotNull MqttPubRec buildPubRec(final @NotNull MqttPubRecBuilder pubRecBuilder) { final MqttClientInterceptors interceptors = clientConfig.getAdvancedConfig().getInterceptors(); if (interceptors != null) { - final Mqtt5IncomingQos2Interceptor interceptor = interceptors.getIncomingQos2Interceptor(); + final Mqtt5InboundQos2Interceptor interceptor = interceptors.getInboundQos2Interceptor(); if (interceptor != null) { interceptor.onPublish(clientConfig, pubRecBuilder.getPublish().stateless(), pubRecBuilder); } @@ -332,7 +332,7 @@ public void onSessionEnd(final @NotNull Throwable cause) { private @NotNull MqttPubComp buildPubComp(final @NotNull MqttPubCompBuilder pubCompBuilder) { final MqttClientInterceptors interceptors = clientConfig.getAdvancedConfig().getInterceptors(); if (interceptors != null) { - final Mqtt5IncomingQos2Interceptor interceptor = interceptors.getIncomingQos2Interceptor(); + final Mqtt5InboundQos2Interceptor interceptor = interceptors.getInboundQos2Interceptor(); if (interceptor != null) { interceptor.onPubRel(clientConfig, pubCompBuilder.getPubRel(), pubCompBuilder); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java index 0340a6241..930baff7b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java @@ -43,8 +43,8 @@ import com.hivemq.client.mqtt.MqttClientState; import com.hivemq.client.mqtt.datatypes.MqttQos; import com.hivemq.client.mqtt.exceptions.ConnectionClosedException; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5OutgoingQos1Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutgoingQos2Interceptor; +import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5OutboundQos1Interceptor; +import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutboundQos2Interceptor; import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5PubAckException; import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5PubRecException; import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; @@ -525,7 +525,7 @@ private static void error(final @NotNull ChannelHandlerContext ctx, final @NotNu private void onPubAck(final @NotNull MqttPublish publish, final @NotNull MqttPubAck pubAck) { final MqttClientInterceptors interceptors = clientConfig.getAdvancedConfig().getInterceptors(); if (interceptors != null) { - final Mqtt5OutgoingQos1Interceptor interceptor = interceptors.getOutgoingQos1Interceptor(); + final Mqtt5OutboundQos1Interceptor interceptor = interceptors.getOutboundQos1Interceptor(); if (interceptor != null) { interceptor.onPubAck(clientConfig, publish, pubAck); } @@ -535,7 +535,7 @@ private void onPubAck(final @NotNull MqttPublish publish, final @NotNull MqttPub private void onPubRecError(final @NotNull MqttPublish publish, final @NotNull MqttPubRec pubRec) { final MqttClientInterceptors interceptors = clientConfig.getAdvancedConfig().getInterceptors(); if (interceptors != null) { - final Mqtt5OutgoingQos2Interceptor interceptor = interceptors.getOutgoingQos2Interceptor(); + final Mqtt5OutboundQos2Interceptor interceptor = interceptors.getOutboundQos2Interceptor(); if (interceptor != null) { interceptor.onPubRecError(clientConfig, publish, pubRec); } @@ -546,7 +546,7 @@ private void onPubRecError(final @NotNull MqttPublish publish, final @NotNull Mq final MqttPubRelBuilder pubRelBuilder = new MqttPubRelBuilder(pubRec); final MqttClientInterceptors interceptors = clientConfig.getAdvancedConfig().getInterceptors(); if (interceptors != null) { - final Mqtt5OutgoingQos2Interceptor interceptor = interceptors.getOutgoingQos2Interceptor(); + final Mqtt5OutboundQos2Interceptor interceptor = interceptors.getOutboundQos2Interceptor(); if (interceptor != null) { interceptor.onPubRec(clientConfig, publish, pubRec, pubRelBuilder); } @@ -557,7 +557,7 @@ private void onPubRecError(final @NotNull MqttPublish publish, final @NotNull Mq private void onPubComp(final @NotNull MqttPubRel pubRel, final @NotNull MqttPubComp pubComp) { final MqttClientInterceptors interceptors = clientConfig.getAdvancedConfig().getInterceptors(); if (interceptors != null) { - final Mqtt5OutgoingQos2Interceptor interceptor = interceptors.getOutgoingQos2Interceptor(); + final Mqtt5OutboundQos2Interceptor interceptor = interceptors.getOutboundQos2Interceptor(); if (interceptor != null) { interceptor.onPubComp(clientConfig, pubRel, pubComp); } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptors.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptors.java index d04ea974b..500cf92f6 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptors.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptors.java @@ -17,10 +17,10 @@ package com.hivemq.client.mqtt.mqtt5.advanced.interceptor; import com.hivemq.client.internal.mqtt.advanced.interceptor.MqttClientInterceptorsBuilder; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5IncomingQos1Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5OutgoingQos1Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5IncomingQos2Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutgoingQos2Interceptor; +import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5InboundQos1Interceptor; +import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5OutboundQos1Interceptor; +import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5InboundQos2Interceptor; +import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutboundQos2Interceptor; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -44,13 +44,13 @@ public interface Mqtt5ClientInterceptors { return new MqttClientInterceptorsBuilder.Default(); } - @Nullable Mqtt5IncomingQos1Interceptor getIncomingQos1Interceptor(); + @Nullable Mqtt5InboundQos1Interceptor getInboundQos1Interceptor(); - @Nullable Mqtt5OutgoingQos1Interceptor getOutgoingQos1Interceptor(); + @Nullable Mqtt5OutboundQos1Interceptor getOutboundQos1Interceptor(); - @Nullable Mqtt5IncomingQos2Interceptor getIncomingQos2Interceptor(); + @Nullable Mqtt5InboundQos2Interceptor getInboundQos2Interceptor(); - @Nullable Mqtt5OutgoingQos2Interceptor getOutgoingQos2Interceptor(); + @Nullable Mqtt5OutboundQos2Interceptor getOutboundQos2Interceptor(); /** * Creates a builder for extending this collection of interceptors. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilderBase.java index a45fa7a86..acfbf02a0 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilderBase.java @@ -17,10 +17,10 @@ package com.hivemq.client.mqtt.mqtt5.advanced.interceptor; import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5IncomingQos1Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5OutgoingQos1Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5IncomingQos2Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutgoingQos2Interceptor; +import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5InboundQos1Interceptor; +import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5OutboundQos1Interceptor; +import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5InboundQos2Interceptor; +import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutboundQos2Interceptor; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -36,14 +36,14 @@ public interface Mqtt5ClientInterceptorsBuilderBase> { @CheckReturnValue - @NotNull B incomingQos1Interceptor(@Nullable Mqtt5IncomingQos1Interceptor incomingQos1Interceptor); + @NotNull B inboundQos1Interceptor(@Nullable Mqtt5InboundQos1Interceptor incomingQos1Interceptor); @CheckReturnValue - @NotNull B outgoingQos1Interceptor(@Nullable Mqtt5OutgoingQos1Interceptor outgoingQos1Interceptor); + @NotNull B outboundQos1Interceptor(@Nullable Mqtt5OutboundQos1Interceptor outgoingQos1Interceptor); @CheckReturnValue - @NotNull B incomingQos2Interceptor(@Nullable Mqtt5IncomingQos2Interceptor incomingQos2Interceptor); + @NotNull B inboundQos2Interceptor(@Nullable Mqtt5InboundQos2Interceptor incomingQos2Interceptor); @CheckReturnValue - @NotNull B outgoingQos2Interceptor(@Nullable Mqtt5OutgoingQos2Interceptor outgoingQos2Interceptor); + @NotNull B outboundQos2Interceptor(@Nullable Mqtt5OutboundQos2Interceptor outgoingQos2Interceptor); } diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5IncomingQos1Interceptor.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5InboundQos1Interceptor.java similarity index 97% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5IncomingQos1Interceptor.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5InboundQos1Interceptor.java index 5ef097c7d..053c821e1 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5IncomingQos1Interceptor.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5InboundQos1Interceptor.java @@ -29,7 +29,7 @@ * @since 1.0 */ @ApiStatus.OverrideOnly -public interface Mqtt5IncomingQos1Interceptor { +public interface Mqtt5InboundQos1Interceptor { /** * Called when a server sent a Publish message with QoS 1. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5OutgoingQos1Interceptor.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5OutboundQos1Interceptor.java similarity index 97% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5OutgoingQos1Interceptor.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5OutboundQos1Interceptor.java index d153baf79..34142ff3d 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5OutgoingQos1Interceptor.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5OutboundQos1Interceptor.java @@ -29,7 +29,7 @@ * @since 1.0 */ @ApiStatus.OverrideOnly -public interface Mqtt5OutgoingQos1Interceptor { +public interface Mqtt5OutboundQos1Interceptor { /** * Called when a server sent a PubAck message for a Publish message with QoS 1. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5IncomingQos2Interceptor.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5InboundQos2Interceptor.java similarity index 98% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5IncomingQos2Interceptor.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5InboundQos2Interceptor.java index c2ee6abda..7699bcaf5 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5IncomingQos2Interceptor.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5InboundQos2Interceptor.java @@ -31,7 +31,7 @@ * @since 1.0 */ @ApiStatus.OverrideOnly -public interface Mqtt5IncomingQos2Interceptor { +public interface Mqtt5InboundQos2Interceptor { /** * Called when a server sent a Publish message with QoS 2. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutgoingQos2Interceptor.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutboundQos2Interceptor.java similarity index 98% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutgoingQos2Interceptor.java rename to src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutboundQos2Interceptor.java index ea0b9b295..c71db1697 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutgoingQos2Interceptor.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutboundQos2Interceptor.java @@ -28,7 +28,7 @@ * @since 1.0 */ @ApiStatus.OverrideOnly -public interface Mqtt5OutgoingQos2Interceptor { +public interface Mqtt5OutboundQos2Interceptor { /** * Called when a server sent a PubRec message for a Publish message with QoS 2. From 235b2b7915bfb1900262c7bf403ea9c973c2255d Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Fri, 18 Dec 2020 11:00:07 +0100 Subject: [PATCH 40/62] Version to 2.0.0 --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index a3c20c04f..7d8b9acb9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -version=1.2.1 -prevVersion=1.2.0 +version=2.0.0 +prevVersion=2.0.0 # # main dependencies # From a5baef110bf61adae377a3b4357a3f53fca081b7 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Sat, 19 Dec 2020 22:30:02 +0100 Subject: [PATCH 41/62] Removed AdvancedConfig.allowServerReAuth and changed Mqtt5EnhancedAuthMechanism.onServerReAuth default impl to deny --- .../mqtt/advanced/MqttAdvancedConfig.java | 21 ++++--------------- .../advanced/MqttAdvancedConfigBuilder.java | 9 +------- .../mqtt/handler/auth/MqttReAuthHandler.java | 5 ----- .../mqtt5/advanced/Mqtt5AdvancedConfig.java | 5 ----- .../Mqtt5AdvancedConfigBuilderBase.java | 9 -------- .../auth/Mqtt5EnhancedAuthMechanism.java | 5 ++--- 6 files changed, 7 insertions(+), 47 deletions(-) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfig.java b/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfig.java index d66083249..d01fe8ea3 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfig.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfig.java @@ -30,27 +30,16 @@ @Unmodifiable public class MqttAdvancedConfig implements Mqtt5AdvancedConfig { - public static final @NotNull MqttAdvancedConfig DEFAULT = new MqttAdvancedConfig(false, false, null); + public static final @NotNull MqttAdvancedConfig DEFAULT = new MqttAdvancedConfig(false, null); - private final boolean allowServerReAuth; private final boolean validatePayloadFormat; private final @Nullable MqttClientInterceptors interceptors; - MqttAdvancedConfig( - final boolean allowServerReAuth, - final boolean validatePayloadFormat, - final @Nullable MqttClientInterceptors interceptors) { - - this.allowServerReAuth = allowServerReAuth; + MqttAdvancedConfig(final boolean validatePayloadFormat, final @Nullable MqttClientInterceptors interceptors) { this.validatePayloadFormat = validatePayloadFormat; this.interceptors = interceptors; } - @Override - public boolean isAllowServerReAuth() { - return allowServerReAuth; - } - @Override public boolean isValidatePayloadFormat() { return validatePayloadFormat; @@ -76,14 +65,12 @@ public boolean equals(final @Nullable Object o) { } final MqttAdvancedConfig that = (MqttAdvancedConfig) o; - return (allowServerReAuth == that.allowServerReAuth) && (validatePayloadFormat == that.validatePayloadFormat) && - Objects.equals(interceptors, that.interceptors); + return (validatePayloadFormat == that.validatePayloadFormat) && Objects.equals(interceptors, that.interceptors); } @Override public int hashCode() { - int result = Boolean.hashCode(allowServerReAuth); - result = 31 * result + Boolean.hashCode(validatePayloadFormat); + int result = Boolean.hashCode(validatePayloadFormat); result = 31 * result + Objects.hashCode(interceptors); return result; } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfigBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfigBuilder.java index f9fb33b66..221e47992 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfigBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfigBuilder.java @@ -31,25 +31,18 @@ */ public abstract class MqttAdvancedConfigBuilder> { - private boolean allowServerReAuth; private boolean validatePayloadFormat; private @Nullable MqttClientInterceptors interceptors; MqttAdvancedConfigBuilder() {} MqttAdvancedConfigBuilder(final @NotNull MqttAdvancedConfig advancedConfig) { - allowServerReAuth = advancedConfig.isAllowServerReAuth(); validatePayloadFormat = advancedConfig.isValidatePayloadFormat(); interceptors = advancedConfig.getInterceptors(); } abstract @NotNull B self(); - public @NotNull B allowServerReAuth(final boolean allowServerReAuth) { - this.allowServerReAuth = allowServerReAuth; - return self(); - } - public @NotNull B validatePayloadFormat(final boolean validatePayloadFormat) { this.validatePayloadFormat = validatePayloadFormat; return self(); @@ -65,7 +58,7 @@ public abstract class MqttAdvancedConfigBuilder implements Mqtt5AdvancedConfigBuilder { diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttReAuthHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttReAuthHandler.java index 3bd0ebcb0..e6ba4f63a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttReAuthHandler.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttReAuthHandler.java @@ -150,11 +150,6 @@ void readAuthSuccess(final @NotNull ChannelHandlerContext ctx, final @NotNull Mq */ @Override void readReAuth(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttAuth auth) { - if (!clientConfig.getAdvancedConfig().isAllowServerReAuth()) { - MqttDisconnectUtil.disconnect(ctx.channel(), Mqtt5DisconnectReasonCode.PROTOCOL_ERROR, - new Mqtt5AuthException(auth, "Must not receive AUTH with reason code REAUTHENTICATE.")); - return; - } if (state != MqttAuthState.NONE) { MqttDisconnectUtil.disconnect(ctx.channel(), Mqtt5DisconnectReasonCode.PROTOCOL_ERROR, new Mqtt5AuthException(auth, diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfig.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfig.java index 2a69e4edb..38d85f2c9 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfig.java @@ -40,11 +40,6 @@ public interface Mqtt5AdvancedConfig { return new MqttAdvancedConfigBuilder.Default(); } - /** - * @return whether server re-authentication is allowed. - */ - boolean isAllowServerReAuth(); - /** * Returns whether the payload format is validated if {@link com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish#getPayloadFormatIndicator * Mqtt5Publish#getPayloadFormatIndicator()} is present. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java index aa7a67519..88daea65b 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java @@ -33,15 +33,6 @@ @ApiStatus.NonExtendable public interface Mqtt5AdvancedConfigBuilderBase> { - /** - * Sets whether {@link Mqtt5AdvancedConfig#isAllowServerReAuth() server re-auth is allowed}. - * - * @param allowServerReAuth whether server re-auth is allowed. - * @return the builder. - */ - @CheckReturnValue - @NotNull B allowServerReAuth(boolean allowServerReAuth); - /** * Sets whether {@link Mqtt5AdvancedConfig#isValidatePayloadFormat() the payload format is validated}. * diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java index b6bec7be8..32aa0de1a 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java @@ -95,8 +95,7 @@ public interface Mqtt5EnhancedAuthMechanism { * Called when a server reauthenticates a client and the client used this enhanced auth mechanism during * connection. *

        - * This is an addition to the MQTT 5 specification and so defaults to {@link #onReAuth(Mqtt5ClientConfig, - * Mqtt5AuthBuilder)}. The feature must be explicitly enabled during client creation. + * This is an addition to the MQTT 5 specification. The default denies the reauthentication. * * @param clientConfig the config of the client. * @param auth the Auth message sent by the server. @@ -109,7 +108,7 @@ public interface Mqtt5EnhancedAuthMechanism { final @NotNull Mqtt5Auth auth, final @NotNull Mqtt5AuthBuilder authBuilder) { - return onReAuth(clientConfig, authBuilder).thenApply(aVoid -> true); + return CompletableFuture.completedFuture(false); } /** From 7bd7865b0a418dc8ad09e453e0a8547a989f0604 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Sat, 19 Dec 2020 22:30:49 +0100 Subject: [PATCH 42/62] Improved javadoc of auth handlers --- .../handler/auth/AbstractMqttAuthHandler.java | 21 +++++--- .../handler/auth/MqttConnectAuthHandler.java | 51 +++++++++++++------ .../mqtt/handler/auth/MqttReAuthHandler.java | 34 ++++++++----- 3 files changed, 70 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/AbstractMqttAuthHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/AbstractMqttAuthHandler.java index b7155f92a..7712de545 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/AbstractMqttAuthHandler.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/AbstractMqttAuthHandler.java @@ -72,7 +72,9 @@ enum MqttAuthState { } /** - * Handles an incoming AUTH message. Sends a DISCONNECT message if the AUTH message is not valid. + * Handles an incoming AUTH message. + *

        + * Sends a DISCONNECT message if the AUTH message is not valid. * * @param ctx the channel handler context. * @param auth the incoming AUTH message. @@ -114,15 +116,18 @@ private boolean validateAuth(final @NotNull ChannelHandlerContext ctx, final @No } /** - * Handles an incoming AUTH message with the Reason Code CONTINUE AUTHENTICATION. + * Handles an incoming AUTH message with the reason code CONTINUE AUTHENTICATION. *

          - *
        • Calls {@link Mqtt5EnhancedAuthMechanism#onContinue(Mqtt5ClientConfig, Mqtt5Auth, Mqtt5AuthBuilder)}.
          • - *
        • Sends a new AUTH message if the enhanced auth mechanism accepted the incoming AUTH message.
          • - *
        • Otherwise sends a DISCONNECT message.
          • + *
        • Sends a DISCONNECT message if client side authentication is pending, or + *
        • Calls {@link Mqtt5EnhancedAuthMechanism#onContinue(Mqtt5ClientConfig, Mqtt5Auth, Mqtt5AuthBuilder)} which + * can add enhanced auth data to the outgoing AUTH message, then + *
        • Sends the AUTH message with the reason code CONTINUE AUTHENTICATION, or + *
        • Sends a DISCONNECT message if the enhanced auth mechanism rejected the incoming AUTH message, which leads + * to {@link #onDisconnectEvent} being called. *
        * * @param ctx the channel handler context. - * @param auth the received AUTH message. + * @param auth the incoming AUTH message. */ private void readAuthContinue(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttAuth auth) { if (state != MqttAuthState.WAIT_FOR_SERVER) { @@ -143,7 +148,7 @@ private void readAuthContinue(final @NotNull ChannelHandlerContext ctx, final @N } /** - * Disconnects on an incoming AUTH message with the Reason Code SUCCESS. + * Handles an incoming AUTH message with the reason code SUCCESS. * * @param ctx the channel handler context. * @param auth the incoming AUTH message. @@ -151,7 +156,7 @@ private void readAuthContinue(final @NotNull ChannelHandlerContext ctx, final @N abstract void readAuthSuccess(@NotNull ChannelHandlerContext ctx, @NotNull MqttAuth auth); /** - * Disconnects on an incoming AUTH message with the Reason Code REAUTHENTICATE. + * Handles an incoming AUTH message with the reason code REAUTHENTICATE. * * @param ctx the channel handler context. * @param auth the incoming AUTH message. diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttConnectAuthHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttConnectAuthHandler.java index b0eb646df..a8c561731 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttConnectAuthHandler.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttConnectAuthHandler.java @@ -75,9 +75,11 @@ public void write( /** * Handles the outgoing CONNECT message. *
          - *
        • Calls {@link Mqtt5EnhancedAuthMechanism#onAuth(Mqtt5ClientConfig, Mqtt5Connect, Mqtt5EnhancedAuthBuilder)} - * which adds enhanced auth data to the CONNECT message.
          • - *
        • Sends the CONNECT message with the enhanced auth data.
          • + *
        • Calls {@link Mqtt5EnhancedAuthMechanism#onAuth(Mqtt5ClientConfig, Mqtt5Connect, Mqtt5EnhancedAuthBuilder)} + * which can add enhanced auth data to the outgoing CONNECT message, then + *
        • Sends the CONNECT message with the enhanced auth data, or + *
        • Closes the connection with a {@link ConnectionFailedException} if the enhanced auth mechanism rejected the + * CONNECT message, which leads to {@link #onDisconnectEvent} being called. *
        * * @param connect the CONNECT message. @@ -108,13 +110,8 @@ public void channelRead(final @NotNull ChannelHandlerContext ctx, final @NotNull /** * Handles the incoming CONNACK message. - *
          - *
        • Calls {@link Mqtt5EnhancedAuthMechanism#onAuthRejected(Mqtt5ClientConfig, Mqtt5ConnAck)} and closes the - * channel if the CONNACK message contains an Error Code.
          • - *
        • Sends a DISCONNECT message if the enhanced auth data of the CONNACK message is not valid.
          • - *
        • Otherwise calls {@link Mqtt5EnhancedAuthMechanism#onAuthSuccess(Mqtt5ClientConfig, Mqtt5ConnAck)}.
          • - *
        • Sends a DISCONNECT message if the enhanced auth mechanism did not accept the enhanced auth data.
          • - *
        + *

        + * Sends a DISCONNECT message if the CONNACK message has a successful reason code but is not valid. * * @param ctx the channel handler context. * @param connAck the received CONNACK message. @@ -129,6 +126,16 @@ private void readConnAck(final @NotNull ChannelHandlerContext ctx, final @NotNul } } + /** + * Handles the incoming CONNACK message with an error reason code. + *

          + *
        • Calls {@link Mqtt5EnhancedAuthMechanism#onAuthRejected(Mqtt5ClientConfig, Mqtt5ConnAck)} and + *
        • Fires a disconnect event with a {@link Mqtt5ConnAckException} which leads to closing the connection. + *
        + * + * @param ctx the channel handler context. + * @param connAck the received CONNACK message. + */ private void readConnAckError(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttConnAck connAck) { callMechanism(() -> authMechanism.onAuthRejected(clientConfig, connAck)); state = MqttAuthState.NONE; @@ -138,6 +145,18 @@ private void readConnAckError(final @NotNull ChannelHandlerContext ctx, final @N MqttDisconnectSource.SERVER); } + /** + * Handles the incoming CONNACK message with a successful reason code. + *
          + *
        • Sends a DISCONNECT message if client side authentication is pending, or + *
        • Calls {@link Mqtt5EnhancedAuthMechanism#onAuthSuccess(Mqtt5ClientConfig, Mqtt5ConnAck)}, then + *
        • Fires the CONNACK message to the next handler, or + *
        • Sends a DISCONNECT message if the enhanced auth mechanism rejected the CONNACK message. + *
        + * + * @param ctx the channel handler context. + * @param connAck the received CONNACK message. + */ private void readConnAckSuccess(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttConnAck connAck) { if (state != MqttAuthState.WAIT_FOR_SERVER) { MqttDisconnectUtil.disconnect(ctx.channel(), Mqtt5DisconnectReasonCode.PROTOCOL_ERROR, @@ -157,7 +176,7 @@ private void readConnAckSuccess(final @NotNull ChannelHandlerContext ctx, final } /** - * Validates the enhanced auth data of an incoming CONNACK message. + * Validates the enhanced auth data of the incoming CONNACK message. *

        * If validation fails, disconnection and closing of the channel is already handled. * @@ -181,7 +200,7 @@ private boolean validateConnAck(final @NotNull ChannelHandlerContext ctx, final } /** - * Disconnects on an incoming AUTH message with the Reason Code SUCCESS. + * Disconnects on an incoming AUTH message with the reason code SUCCESS. * * @param ctx the channel handler context. * @param auth the incoming AUTH message. @@ -193,7 +212,7 @@ void readAuthSuccess(final @NotNull ChannelHandlerContext ctx, final @NotNull Mq } /** - * Disconnects on an incoming AUTH message with the Reason Code REAUTHENTICATE. + * Disconnects on an incoming AUTH message with the reason code REAUTHENTICATE. * * @param ctx the channel handler context. * @param auth the incoming AUTH message. @@ -206,10 +225,10 @@ void readReAuth(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttAut } /** - * Calls {@link Mqtt5EnhancedAuthMechanism#onAuthError(Mqtt5ClientConfig, Throwable)} with the cause why the channel - * was closed if auth is still in progress. + * Calls {@link Mqtt5EnhancedAuthMechanism#onAuthError(Mqtt5ClientConfig, Throwable)} with the cause why the + * connection was disconnected if auth is still in progress. * - * @param disconnectEvent the channel close event. + * @param disconnectEvent the disconnect event. */ @Override protected void onDisconnectEvent( diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttReAuthHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttReAuthHandler.java index e6ba4f63a..f5f1e132d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttReAuthHandler.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttReAuthHandler.java @@ -59,9 +59,15 @@ void reauth(final @NotNull CompletableFlow flow) { } /** - * Sends a AUTH message with the Reason Code REAUTHENTICATE. - *

        - * Calls {@link Mqtt5EnhancedAuthMechanism#onReAuth(Mqtt5ClientConfig, Mqtt5AuthBuilder)}. + *

          + *
        • Errors the flow if the client is not connected, or + *
        • Errors the flow if reauthentication is pending, or + *
        • Calls {@link Mqtt5EnhancedAuthMechanism#onReAuth(Mqtt5ClientConfig, Mqtt5AuthBuilder)} which can add + * enhanced auth data to the outgoing AUTH message, then + *
        • Sends the AUTH message with the reason code REAUTHENTICATE, or + *
        • Calls {@link Mqtt5EnhancedAuthMechanism#onReAuthError(Mqtt5ClientConfig, Throwable)} if the enhanced auth + * mechanism rejected the reauthentication (it does not disconnect). + *
        * * @param flow the flow for the reauth result. */ @@ -102,10 +108,13 @@ public void channelRead(final @NotNull ChannelHandlerContext ctx, final @NotNull } /** - * Handles an incoming AUTH message with the Reason Code SUCCESS. + * Handles an incoming AUTH message with the reason code SUCCESS. *
          - *
        • Calls {@link Mqtt5EnhancedAuthMechanism#onReAuthSuccess(Mqtt5ClientConfig, Mqtt5Auth)}.
          • - *
        • Sends a DISCONNECT message if the enhanced auth mechanism did not accept the AUTH message.
          • + *
        • Sends a DISCONNECT message if client side authentication is pending, or + *
        • Calls {@link Mqtt5EnhancedAuthMechanism#onReAuthSuccess(Mqtt5ClientConfig, Mqtt5Auth)}, then + *
        • Completes the flow, or + *
        • Sends a DISCONNECT message if the enhanced auth mechanism rejected the incoming AUTH message, which leads + * to {@link #onDisconnectEvent} being called. *
        * * @param ctx the channel handler context. @@ -138,11 +147,12 @@ void readAuthSuccess(final @NotNull ChannelHandlerContext ctx, final @NotNull Mq /** * Handles an incoming AUTH message with the Reason Code REAUTHENTICATE. *
          - *
        • Sends a DISCONNECT message if server reauth is not allowed.
          • - *
        • Otherwise calls - * {@link Mqtt5EnhancedAuthMechanism#onServerReAuth(Mqtt5ClientConfig, Mqtt5Auth, Mqtt5AuthBuilder)}.
          • - *
        • Sends a new AUTH message if the enhanced auth mechanism accepted the incoming AUTH message.
          • - *
        • Otherwise sends a DISCONNECT message.
          • + *
        • Sends a DISCONNECT message if reauthentication is already pending, or + *
        • Calls {@link Mqtt5EnhancedAuthMechanism#onServerReAuth(Mqtt5ClientConfig, Mqtt5Auth, Mqtt5AuthBuilder)} + * which can add enhanced auth data to the outgoing AUTH message, then + *
        • Sends the AUTH message with the reason code CONTINUE AUTHENTICATION, or + *
        • Sends a DISCONNECT message if the enhanced auth mechanism rejected the incoming AUTH message, which leads + * to {@link #onDisconnectEvent} being called. *
        * * @param ctx the channel handler context. @@ -188,7 +198,7 @@ private void readDisconnect(final @NotNull ChannelHandlerContext ctx, final @Not /** * Calls {@link Mqtt5EnhancedAuthMechanism#onReAuthError(Mqtt5ClientConfig, Throwable)} with the cause why the - * channel was closed if reauth is still in progress. + * connection was disconnected if reauth is still in progress. * * @param disconnectEvent the channel close event. */ From 2859aa15a574c15adeaa47da21f77fc3e38c7134 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Sat, 19 Dec 2020 23:05:09 +0100 Subject: [PATCH 43/62] jctools.version -> 3.2.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 7d8b9acb9..565f4074b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ prevVersion=2.0.0 rxjava.version=2.2.19 reactive-streams.version=1.0.3 netty.version=4.1.48.Final -jctools.version=2.1.2 +jctools.version=3.2.0 annotations.version=20.1.0 dagger.version=2.27 slf4j.version=1.7.30 From 3a46b33b410faf1e8352a4baec83719e0f39624c Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Sat, 19 Dec 2020 23:12:08 +0100 Subject: [PATCH 44/62] dagger.version -> 2.30.1 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 565f4074b..48760dd53 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ reactive-streams.version=1.0.3 netty.version=4.1.48.Final jctools.version=3.2.0 annotations.version=20.1.0 -dagger.version=2.27 +dagger.version=2.30.1 slf4j.version=1.7.30 reactor.version=3.3.4.RELEASE reactor-adapter.version=3.3.3.RELEASE From 631cc71cfbe84ba3a861f9325a7aecfa520c2fc2 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Sat, 19 Dec 2020 23:13:16 +0100 Subject: [PATCH 45/62] netty.version -> 4.1.56.Final --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 48760dd53..fa46525a3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ prevVersion=2.0.0 # rxjava.version=2.2.19 reactive-streams.version=1.0.3 -netty.version=4.1.48.Final +netty.version=4.1.56.Final jctools.version=3.2.0 annotations.version=20.1.0 dagger.version=2.30.1 From 246d8ec2832a15b252eef6b2896b17d9b216cbcb Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Sat, 19 Dec 2020 23:21:30 +0100 Subject: [PATCH 46/62] reactor.version -> 3.4.1 --- gradle.properties | 3 +-- reactor/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index fa46525a3..9ca6f3b77 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,8 +10,7 @@ jctools.version=3.2.0 annotations.version=20.1.0 dagger.version=2.30.1 slf4j.version=1.7.30 -reactor.version=3.3.4.RELEASE -reactor-adapter.version=3.3.3.RELEASE +reactor.version=3.4.1 # # test dependencies # diff --git a/reactor/build.gradle.kts b/reactor/build.gradle.kts index aa092cecb..c75f58085 100644 --- a/reactor/build.gradle.kts +++ b/reactor/build.gradle.kts @@ -19,7 +19,7 @@ dependencies { api(rootProject) api("io.projectreactor:reactor-core:${property("reactor.version")}") - implementation("io.projectreactor.addons:reactor-adapter:${property("reactor-adapter.version")}") + implementation("io.projectreactor.addons:reactor-adapter:${property("reactor.version")}") implementation("org.jetbrains:annotations:${property("annotations.version")}") } From 001a2c4f6067b143681acd7703acfc0e739e833f Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Sun, 20 Dec 2020 00:56:46 +0100 Subject: [PATCH 47/62] rxjava.version -> 3.0.8 --- build.gradle.kts | 2 +- gradle.properties | 2 +- .../mqtt3/reactor/Mqtt3ReactorClientView.java | 16 +- .../mqtt/reactor/MqttReactorClient.java | 18 +- .../client/internal/mqtt/MqttAsyncClient.java | 18 +- .../internal/mqtt/MqttBlockingClient.java | 6 +- .../internal/mqtt/MqttExecutorConfigImpl.java | 2 +- .../mqtt/MqttExecutorConfigImplBuilder.java | 2 +- .../client/internal/mqtt/MqttRxClient.java | 16 +- .../mqtt3/Mqtt3ExceptionFactory.java | 2 +- .../handler/auth/MqttReAuthCompletable.java | 6 +- .../mqtt/handler/connect/MqttConnAckFlow.java | 4 +- .../handler/connect/MqttConnAckSingle.java | 6 +- .../disconnect/MqttDisconnectCompletable.java | 6 +- .../MqttGlobalIncomingPublishFlowable.java | 2 +- .../incoming/MqttIncomingPublishFlow.java | 6 +- .../publish/outgoing/MqttAckFlowable.java | 4 +- .../publish/outgoing/MqttAckFlowableFlow.java | 4 +- .../publish/outgoing/MqttAckSingle.java | 10 +- .../outgoing/MqttAckSingleFlowable.java | 4 +- .../outgoing/MqttOutgoingQosHandler.java | 4 +- .../outgoing/MqttPublishFlowableAckLink.java | 6 +- .../outgoing/MqttPublishFlowables.java | 4 +- .../handler/subscribe/MqttSubAckSingle.java | 4 +- .../subscribe/MqttSubOrUnsubAckFlow.java | 4 +- .../handler/subscribe/MqttUnsubAckSingle.java | 4 +- .../connect/mqtt3/Mqtt3ConnAckView.java | 2 +- .../publish/mqtt3/Mqtt3PublishResultView.java | 2 +- .../publish/mqtt3/Mqtt3PublishView.java | 2 +- .../subscribe/mqtt3/Mqtt3SubAckView.java | 2 +- .../unsubscribe/mqtt3/Mqtt3UnsubAckView.java | 2 +- .../mqtt/mqtt3/Mqtt3RxClientView.java | 8 +- .../client/internal/rx/CompletableFlow.java | 4 +- .../client/internal/rx/RxFutureConverter.java | 334 ------- .../rx/WithSingleConditionalSubscriber.java | 2 +- .../rx/WithSingleStrictSubscriber.java | 4 +- .../operators/FlowableWithSingleCombine.java | 6 +- .../rx/operators/FlowableWithSingleMap.java | 6 +- .../operators/FlowableWithSingleMapError.java | 10 +- .../FlowableWithSingleObserveOn.java | 2 +- .../client/mqtt/MqttExecutorConfig.java | 4 +- .../mqtt/MqttExecutorConfigBuilderBase.java | 2 +- .../client/mqtt/mqtt3/Mqtt3RxClient.java | 6 +- .../client/mqtt/mqtt5/Mqtt5RxClient.java | 6 +- .../hivemq/client/rx/FlowableWithSingle.java | 16 +- .../rx/FlowableWithSingleSubscriber.java | 2 +- .../client/example/Mqtt3ClientExample.java | 6 +- .../Mqtt3RxClientViewExceptionsTest.java | 6 +- .../internal/rx/RxFutureConverterTest.java | 905 ------------------ .../client/rx/FlowableWithSingleItem.java | 4 +- .../client/rx/FlowableWithSingleSplit.java | 2 +- .../client/rx/FlowableWithSingleTest.java | 14 +- 52 files changed, 141 insertions(+), 1380 deletions(-) delete mode 100644 src/main/java/com/hivemq/client/internal/rx/RxFutureConverter.java delete mode 100644 src/test/java/com/hivemq/client/internal/rx/RxFutureConverterTest.java diff --git a/build.gradle.kts b/build.gradle.kts index c30034384..ef3a104ce 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -74,7 +74,7 @@ allprojects { } dependencies { - api("io.reactivex.rxjava2:rxjava:${property("rxjava.version")}") + api("io.reactivex.rxjava3:rxjava:${property("rxjava.version")}") api("org.reactivestreams:reactive-streams:${property("reactive-streams.version")}") implementation("io.netty:netty-buffer:${property("netty.version")}") diff --git a/gradle.properties b/gradle.properties index 9ca6f3b77..68cad4293 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ prevVersion=2.0.0 # # main dependencies # -rxjava.version=2.2.19 +rxjava.version=3.0.8 reactive-streams.version=1.0.3 netty.version=4.1.56.Final jctools.version=3.2.0 diff --git a/reactor/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/reactor/Mqtt3ReactorClientView.java b/reactor/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/reactor/Mqtt3ReactorClientView.java index 3e0db213b..15c333d9a 100644 --- a/reactor/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/reactor/Mqtt3ReactorClientView.java +++ b/reactor/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/reactor/Mqtt3ReactorClientView.java @@ -35,10 +35,10 @@ import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import com.hivemq.client.mqtt.mqtt3.reactor.Mqtt3ReactorClient; import com.hivemq.client.rx.reactor.FluxWithSingle; -import io.reactivex.Flowable; +import io.reactivex.rxjava3.core.Flowable; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Publisher; -import reactor.adapter.rxjava.RxJava2Adapter; +import reactor.adapter.rxjava.RxJava3Adapter; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -60,7 +60,7 @@ public Mqtt3ReactorClientView(final @NotNull Mqtt3RxClient delegate) { @Override public @NotNull Mono connect(final @NotNull Mqtt3Connect connect) { - return RxJava2Adapter.singleToMono(delegate.connect(connect)); + return RxJava3Adapter.singleToMono(delegate.connect(connect)); } @Override @@ -70,7 +70,7 @@ public Mqtt3ReactorClientView(final @NotNull Mqtt3RxClient delegate) { @Override public @NotNull Mono subscribe(final @NotNull Mqtt3Subscribe subscribe) { - return RxJava2Adapter.singleToMono(delegate.subscribe(subscribe)); + return RxJava3Adapter.singleToMono(delegate.subscribe(subscribe)); } @Override @@ -106,12 +106,12 @@ public Mqtt3ReactorClientView(final @NotNull Mqtt3RxClient delegate) { public @NotNull Flux publishes( final @NotNull MqttGlobalPublishFilter filter, final boolean manualAcknowledgement) { - return RxJava2Adapter.flowableToFlux(delegate.publishes(filter, manualAcknowledgement)); + return RxJava3Adapter.flowableToFlux(delegate.publishes(filter, manualAcknowledgement)); } @Override public @NotNull Mono unsubscribe(final @NotNull Mqtt3Unsubscribe unsubscribe) { - return RxJava2Adapter.singleToMono(delegate.unsubscribe(unsubscribe)); + return RxJava3Adapter.singleToMono(delegate.unsubscribe(unsubscribe)); } @Override @@ -121,12 +121,12 @@ public Mqtt3ReactorClientView(final @NotNull Mqtt3RxClient delegate) { @Override public @NotNull Flux publish(final @NotNull Publisher publisher) { - return RxJava2Adapter.flowableToFlux(delegate.publish(Flowable.fromPublisher(publisher))); + return RxJava3Adapter.flowableToFlux(delegate.publish(Flowable.fromPublisher(publisher))); } @Override public @NotNull Mono disconnect() { - return RxJava2Adapter.completableToMono(delegate.disconnect()); + return RxJava3Adapter.completableToMono(delegate.disconnect()); } @Override diff --git a/reactor/src/main/java/com/hivemq/client/internal/mqtt/reactor/MqttReactorClient.java b/reactor/src/main/java/com/hivemq/client/internal/mqtt/reactor/MqttReactorClient.java index 459abd75d..426160c44 100644 --- a/reactor/src/main/java/com/hivemq/client/internal/mqtt/reactor/MqttReactorClient.java +++ b/reactor/src/main/java/com/hivemq/client/internal/mqtt/reactor/MqttReactorClient.java @@ -38,10 +38,10 @@ import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; import com.hivemq.client.mqtt.mqtt5.reactor.Mqtt5ReactorClient; import com.hivemq.client.rx.reactor.FluxWithSingle; -import io.reactivex.Flowable; +import io.reactivex.rxjava3.core.Flowable; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Publisher; -import reactor.adapter.rxjava.RxJava2Adapter; +import reactor.adapter.rxjava.RxJava3Adapter; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -63,7 +63,7 @@ public MqttReactorClient(final @NotNull Mqtt5RxClient delegate) { @Override public @NotNull Mono connect(final @NotNull Mqtt5Connect connect) { - return RxJava2Adapter.singleToMono(delegate.connect(connect)); + return RxJava3Adapter.singleToMono(delegate.connect(connect)); } @Override @@ -73,7 +73,7 @@ public MqttReactorClient(final @NotNull Mqtt5RxClient delegate) { @Override public @NotNull Mono subscribe(final @NotNull Mqtt5Subscribe subscribe) { - return RxJava2Adapter.singleToMono(delegate.subscribe(subscribe)); + return RxJava3Adapter.singleToMono(delegate.subscribe(subscribe)); } @Override @@ -109,12 +109,12 @@ public MqttReactorClient(final @NotNull Mqtt5RxClient delegate) { public @NotNull Flux publishes( final @NotNull MqttGlobalPublishFilter filter, final boolean manualAcknowledgement) { - return RxJava2Adapter.flowableToFlux(delegate.publishes(filter, manualAcknowledgement)); + return RxJava3Adapter.flowableToFlux(delegate.publishes(filter, manualAcknowledgement)); } @Override public @NotNull Mono unsubscribe(final @NotNull Mqtt5Unsubscribe unsubscribe) { - return RxJava2Adapter.singleToMono(delegate.unsubscribe(unsubscribe)); + return RxJava3Adapter.singleToMono(delegate.unsubscribe(unsubscribe)); } @Override @@ -124,12 +124,12 @@ public MqttReactorClient(final @NotNull Mqtt5RxClient delegate) { @Override public @NotNull Flux publish(final @NotNull Publisher publisher) { - return RxJava2Adapter.flowableToFlux(delegate.publish(Flowable.fromPublisher(publisher))); + return RxJava3Adapter.flowableToFlux(delegate.publish(Flowable.fromPublisher(publisher))); } @Override public @NotNull Mono reauth() { - return RxJava2Adapter.completableToMono(delegate.reauth()); + return RxJava3Adapter.completableToMono(delegate.reauth()); } @Override @@ -139,7 +139,7 @@ public MqttReactorClient(final @NotNull Mqtt5RxClient delegate) { @Override public @NotNull Mono disconnect(final @NotNull Mqtt5Disconnect disconnect) { - return RxJava2Adapter.completableToMono(delegate.disconnect(disconnect)); + return RxJava3Adapter.completableToMono(delegate.disconnect(disconnect)); } @Override diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java index 51face0ef..19747f5bd 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java @@ -27,7 +27,6 @@ import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribeBuilder; import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.rx.RxFutureConverter; import com.hivemq.client.internal.util.Checks; import com.hivemq.client.mqtt.MqttGlobalPublishFilter; import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient; @@ -40,8 +39,8 @@ import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; -import io.reactivex.FlowableSubscriber; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reactivestreams.Subscription; @@ -113,7 +112,7 @@ public class MqttAsyncClient implements Mqtt5AsyncClient { public @NotNull CompletableFuture<@NotNull Mqtt5ConnAck> connect(final @Nullable Mqtt5Connect connect) { final MqttConnect mqttConnect = MqttChecks.connect(connect); - return RxFutureConverter.toFuture(delegate.connect(mqttConnect)); + return delegate.connect(mqttConnect).toCompletionStage().toCompletableFuture(); } @Override @@ -125,7 +124,7 @@ public class MqttAsyncClient implements Mqtt5AsyncClient { public @NotNull CompletableFuture<@NotNull Mqtt5SubAck> subscribe(final @Nullable Mqtt5Subscribe subscribe) { final MqttSubscribe mqttSubscribe = MqttChecks.subscribe(subscribe); - return handleSubAck(RxFutureConverter.toFuture(delegate.subscribe(mqttSubscribe)), mqttSubscribe); + return handleSubAck(delegate.subscribe(mqttSubscribe).toCompletionStage().toCompletableFuture(), mqttSubscribe); } @Override @@ -228,7 +227,8 @@ public void publishes( final MqttUnsubscribe mqttUnsubscribe = MqttChecks.unsubscribe(unsubscribe); - return handleUnsubAck(RxFutureConverter.toFuture(delegate.unsubscribe(mqttUnsubscribe)), mqttUnsubscribe); + return handleUnsubAck( + delegate.unsubscribe(mqttUnsubscribe).toCompletionStage().toCompletableFuture(), mqttUnsubscribe); } @Override @@ -240,7 +240,7 @@ public void publishes( public @NotNull CompletableFuture<@NotNull Mqtt5PublishResult> publish(final @Nullable Mqtt5Publish publish) { final MqttPublish mqttPublish = MqttChecks.publish(publish); - return RxFutureConverter.toFuture(delegate.publish(mqttPublish)); + return delegate.publish(mqttPublish).toCompletionStage().toCompletableFuture(); } @Override @@ -250,7 +250,7 @@ public void publishes( @Override public @NotNull CompletableFuture reauth() { - return RxFutureConverter.toFuture(delegate.reauth()); + return delegate.reauth().toCompletionStage((Void) null).toCompletableFuture(); } @Override @@ -262,7 +262,7 @@ public void publishes( public @NotNull CompletableFuture disconnect(final @Nullable Mqtt5Disconnect disconnect) { final MqttDisconnect mqttDisconnect = MqttChecks.disconnect(disconnect); - return RxFutureConverter.toFuture(delegate.disconnect(mqttDisconnect)); + return delegate.disconnect(mqttDisconnect).toCompletionStage((Void) null).toCompletableFuture(); } @Override diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java index 418e490ba..87955aa72 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java @@ -44,9 +44,9 @@ import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; -import io.reactivex.Flowable; -import io.reactivex.FlowableSubscriber; -import io.reactivex.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reactivestreams.Subscription; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImpl.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImpl.java index 75892edb9..7bb5af7a5 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImpl.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImpl.java @@ -17,7 +17,7 @@ package com.hivemq.client.internal.mqtt; import com.hivemq.client.mqtt.MqttExecutorConfig; -import io.reactivex.Scheduler; +import io.reactivex.rxjava3.core.Scheduler; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImplBuilder.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImplBuilder.java index c1eaa791f..86f5ad687 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImplBuilder.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImplBuilder.java @@ -18,7 +18,7 @@ import com.hivemq.client.internal.util.Checks; import com.hivemq.client.mqtt.MqttExecutorConfigBuilder; -import io.reactivex.Scheduler; +import io.reactivex.rxjava3.core.Scheduler; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java index b946c60bd..08047f767 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java @@ -49,12 +49,12 @@ import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; import com.hivemq.client.rx.FlowableWithSingle; -import io.reactivex.Completable; -import io.reactivex.Flowable; -import io.reactivex.Scheduler; -import io.reactivex.Single; -import io.reactivex.functions.Function; -import io.reactivex.internal.fuseable.ScalarCallable; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reactivestreams.Publisher; @@ -203,9 +203,9 @@ public MqttRxClient(final @NotNull MqttClientConfig clientConfig) { final @NotNull Publisher

        publisher, final @NotNull Function publishMapper) { final Scheduler applicationScheduler = clientConfig.getExecutorConfig().getApplicationScheduler(); - if (publisher instanceof ScalarCallable) { + if (publisher instanceof ScalarSupplier) { //noinspection unchecked - final P publish = ((ScalarCallable

        ) publisher).call(); + final P publish = ((ScalarSupplier

        ) publisher).get(); if (publish == null) { return Flowable.empty(); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java b/src/main/java/com/hivemq/client/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java index eab207be1..253b745d5 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java @@ -28,7 +28,7 @@ import com.hivemq.client.mqtt.mqtt3.exceptions.*; import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5MessageException; import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.functions.Function; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttReAuthCompletable.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttReAuthCompletable.java index f8335c314..5d2ac3008 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttReAuthCompletable.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttReAuthCompletable.java @@ -22,9 +22,9 @@ import com.hivemq.client.internal.rx.CompletableFlow; import io.netty.channel.Channel; import io.netty.channel.ChannelHandler; -import io.reactivex.Completable; -import io.reactivex.CompletableObserver; -import io.reactivex.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.CompletableObserver; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckFlow.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckFlow.java index d7f4f5cdd..863a9cdce 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckFlow.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckFlow.java @@ -17,8 +17,8 @@ package com.hivemq.client.internal.mqtt.handler.connect; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.SingleObserver; +import io.reactivex.rxjava3.disposables.Disposable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java index 398ccaa74..cc4ece51b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java @@ -31,9 +31,9 @@ import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import io.netty.bootstrap.Bootstrap; import io.netty.channel.EventLoop; -import io.reactivex.Single; -import io.reactivex.SingleObserver; -import io.reactivex.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.core.SingleObserver; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectCompletable.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectCompletable.java index 6b70bac2e..5dbdd048d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectCompletable.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectCompletable.java @@ -22,9 +22,9 @@ import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect; import com.hivemq.client.internal.rx.CompletableFlow; import io.netty.channel.Channel; -import io.reactivex.Completable; -import io.reactivex.CompletableObserver; -import io.reactivex.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.CompletableObserver; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlowable.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlowable.java index 05a71dc17..e57ceaa61 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlowable.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlowable.java @@ -21,7 +21,7 @@ import com.hivemq.client.internal.mqtt.ioc.ClientComponent; import com.hivemq.client.mqtt.MqttGlobalPublishFilter; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import io.reactivex.Flowable; +import io.reactivex.rxjava3.core.Flowable; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Subscriber; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlow.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlow.java index a1ed75d3a..a181ee32f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlow.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlow.java @@ -20,9 +20,9 @@ import com.hivemq.client.internal.mqtt.MqttClientConfig; import com.hivemq.client.internal.mqtt.handler.util.FlowWithEventLoop; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import io.reactivex.Emitter; -import io.reactivex.internal.util.BackpressureHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.Emitter; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reactivestreams.Subscriber; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckFlowable.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckFlowable.java index 6c0f4a274..fda8cfea2 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckFlowable.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckFlowable.java @@ -21,8 +21,8 @@ import com.hivemq.client.internal.mqtt.ioc.ClientComponent; import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; -import io.reactivex.Flowable; -import io.reactivex.internal.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Subscriber; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckFlowableFlow.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckFlowableFlow.java index 44d3ef4fe..40c843fa5 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckFlowableFlow.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckFlowableFlow.java @@ -21,8 +21,8 @@ import com.hivemq.client.internal.mqtt.handler.publish.outgoing.MqttPublishFlowableAckLink.LinkedFlow; import com.hivemq.client.internal.mqtt.message.publish.MqttPublishResult; import com.hivemq.client.internal.util.collections.ChunkedArrayQueue; -import io.reactivex.internal.util.BackpressureHelper; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reactivestreams.Subscriber; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckSingle.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckSingle.java index 160d34afa..98c7db0a4 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckSingle.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckSingle.java @@ -23,11 +23,11 @@ import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; import com.hivemq.client.internal.mqtt.message.publish.MqttPublishResult; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; -import io.reactivex.Flowable; -import io.reactivex.Single; -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; -import io.reactivex.internal.disposables.EmptyDisposable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.core.SingleObserver; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.internal.disposables.EmptyDisposable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckSingleFlowable.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckSingleFlowable.java index 0592e148e..7e3432a84 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckSingleFlowable.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckSingleFlowable.java @@ -23,8 +23,8 @@ import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; import com.hivemq.client.internal.mqtt.message.publish.MqttPublishResult; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; -import io.reactivex.Flowable; -import io.reactivex.internal.subscriptions.EmptySubscription; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reactivestreams.Subscriber; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java index 930baff7b..a9aa9a98a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java @@ -51,8 +51,8 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.EventLoop; -import io.reactivex.Flowable; -import io.reactivex.FlowableSubscriber; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.FlowableSubscriber; import org.jctools.queues.SpscUnboundedArrayQueue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPublishFlowableAckLink.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPublishFlowableAckLink.java index b72298d2c..4eccc672e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPublishFlowableAckLink.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPublishFlowableAckLink.java @@ -19,9 +19,9 @@ import com.hivemq.client.internal.logging.InternalLogger; import com.hivemq.client.internal.logging.InternalLoggerFactory; import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import io.reactivex.Flowable; -import io.reactivex.FlowableSubscriber; -import io.reactivex.plugins.RxJavaPlugins; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.plugins.RxJavaPlugins; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reactivestreams.Subscriber; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPublishFlowables.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPublishFlowables.java index f7586fdc3..da0d1e11e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPublishFlowables.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPublishFlowables.java @@ -19,8 +19,8 @@ import com.hivemq.client.internal.logging.InternalLogger; import com.hivemq.client.internal.logging.InternalLoggerFactory; import com.hivemq.client.internal.mqtt.ioc.ClientScope; -import io.reactivex.Flowable; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reactivestreams.Subscriber; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubAckSingle.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubAckSingle.java index 0bb961747..a168ceb27 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubAckSingle.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubAckSingle.java @@ -21,8 +21,8 @@ import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; -import io.reactivex.Single; -import io.reactivex.SingleObserver; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.core.SingleObserver; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubOrUnsubAckFlow.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubOrUnsubAckFlow.java index 0dad079a3..61e716b2b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubOrUnsubAckFlow.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubOrUnsubAckFlow.java @@ -18,8 +18,8 @@ import com.hivemq.client.internal.mqtt.MqttClientConfig; import com.hivemq.client.internal.mqtt.handler.util.FlowWithEventLoop; -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.SingleObserver; +import io.reactivex.rxjava3.disposables.Disposable; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttUnsubAckSingle.java b/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttUnsubAckSingle.java index 95b13e16e..770e70e19 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttUnsubAckSingle.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttUnsubAckSingle.java @@ -21,8 +21,8 @@ import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubAck; import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; -import io.reactivex.Single; -import io.reactivex.SingleObserver; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.core.SingleObserver; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckView.java index 7a9839496..f665dc51d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckView.java @@ -23,7 +23,7 @@ import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAckReturnCode; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckReasonCode; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.functions.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishResultView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishResultView.java index 938ccaa22..e17ffe627 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishResultView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishResultView.java @@ -21,7 +21,7 @@ import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.functions.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java index ab8c1c69e..86c67e0d0 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java @@ -26,7 +26,7 @@ import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublish; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.functions.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckView.java index 8115776dc..687b6078f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckView.java @@ -23,7 +23,7 @@ import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAckReturnCode; import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAckReasonCode; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.functions.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubAckView.java b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubAckView.java index cb6b077fb..d98e4b437 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubAckView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubAckView.java @@ -23,7 +23,7 @@ import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.functions.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java index 51639fb7a..2a3d8c485 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java @@ -50,10 +50,10 @@ import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; import com.hivemq.client.rx.FlowableWithSingle; -import io.reactivex.Completable; -import io.reactivex.Flowable; -import io.reactivex.Single; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.functions.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reactivestreams.Publisher; diff --git a/src/main/java/com/hivemq/client/internal/rx/CompletableFlow.java b/src/main/java/com/hivemq/client/internal/rx/CompletableFlow.java index c6acc42ee..d9d3b1a34 100644 --- a/src/main/java/com/hivemq/client/internal/rx/CompletableFlow.java +++ b/src/main/java/com/hivemq/client/internal/rx/CompletableFlow.java @@ -16,8 +16,8 @@ package com.hivemq.client.internal.rx; -import io.reactivex.CompletableObserver; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.CompletableObserver; +import io.reactivex.rxjava3.disposables.Disposable; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/rx/RxFutureConverter.java b/src/main/java/com/hivemq/client/internal/rx/RxFutureConverter.java deleted file mode 100644 index fa15aff6d..000000000 --- a/src/main/java/com/hivemq/client/internal/rx/RxFutureConverter.java +++ /dev/null @@ -1,334 +0,0 @@ -/* - * Copyright 2018-present HiveMQ and the HiveMQ Community - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.hivemq.client.internal.rx; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.Optional; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.BiConsumer; - -/** - * @author Silvio Giebl - */ -public final class RxFutureConverter { - - public static @NotNull CompletableFuture toFuture(final @NotNull Completable completable) { - return new RxCompletableFuture(completable); - } - - public static @NotNull CompletableFuture<@NotNull Optional> toFuture(final @NotNull Maybe maybe) { - return new RxMaybeFuture<>(maybe); - } - - public static @NotNull CompletableFuture<@NotNull T> toFuture(final @NotNull Single single) { - return new RxSingleFuture<>(single); - } - - private static abstract class RxFuture extends CompletableFuture { - - volatile @Nullable Disposable disposable; - volatile boolean cancelled; - - public void onSubscribe(final @NotNull Disposable d) { - disposable = d; - if (cancelled) { - d.dispose(); - } - } - - public void onError(final @NotNull Throwable e) { - if (!cancelled) { - completeExceptionally(e); - } - } - - @Override - public boolean cancel(final boolean mayInterruptIfRunning) { - cancelled = true; - final Disposable disposable = this.disposable; - if (disposable != null) { - disposable.dispose(); - } - return super.cancel(mayInterruptIfRunning); - } - } - - private static class RxCompletableFuture extends RxFuture implements CompletableObserver { - - RxCompletableFuture(final @NotNull Completable completable) { - completable.subscribe(this); - } - - @Override - public void onComplete() { - if (!cancelled) { - complete(null); - } - } - } - - private static class RxMaybeFuture extends RxFuture> implements MaybeObserver { - - RxMaybeFuture(final @NotNull Maybe maybe) { - maybe.subscribe(this); - } - - @Override - public void onSuccess(final @NotNull T t) { - if (!cancelled) { - complete(Optional.of(t)); - } - } - - @Override - public void onComplete() { - if (!cancelled) { - complete(Optional.empty()); - } - } - } - - private static class RxSingleFuture extends RxFuture implements SingleObserver { - - RxSingleFuture(final @NotNull Single single) { - single.subscribe(this); - } - - @Override - public void onSuccess(final @NotNull T t) { - if (!cancelled) { - complete(t); - } - } - } - - public static @NotNull Completable toCompletable(final @NotNull CompletableFuture future) { - return new FutureCompletable(future); - } - - public static @NotNull Maybe toMaybe(final @NotNull CompletableFuture<@NotNull Optional> future) { - return new FutureMaybe<>(future); - } - - public static @NotNull Single toSingle(final @NotNull CompletableFuture<@NotNull T> future) { - return new FutureSingle<>(future); - } - - private static final int INITIAL = 0; - private static final int SUBSCRIBED_OR_COMPLETE = 1; - private static final int SUBSCRIBED_AND_COMPLETE_OR_CANCELLED = 2; - - private static boolean checkComplete(final @NotNull AtomicInteger done) { - return !done.compareAndSet(INITIAL, SUBSCRIBED_OR_COMPLETE) && - done.compareAndSet(SUBSCRIBED_OR_COMPLETE, SUBSCRIBED_AND_COMPLETE_OR_CANCELLED); - } - - private static void dispose(final @NotNull AtomicInteger done, final @NotNull CompletableFuture future) { - done.set(SUBSCRIBED_AND_COMPLETE_OR_CANCELLED); - future.cancel(false); - } - - private static boolean isDisposed(final @NotNull AtomicInteger done) { - return done.get() == SUBSCRIBED_AND_COMPLETE_OR_CANCELLED; - } - - private static class FutureCompletable extends Completable implements Disposable, BiConsumer { - - private final @NotNull CompletableFuture future; - private volatile @Nullable CompletableObserver observer; - private volatile @Nullable Throwable throwable; - private final @NotNull AtomicInteger done = new AtomicInteger(INITIAL); - - FutureCompletable(final @NotNull CompletableFuture future) { - this.future = future; - future.whenComplete(this); - } - - @Override - protected void subscribeActual(final @NotNull CompletableObserver observer) { - this.observer = observer; - observer.onSubscribe(this); - if (checkComplete(done)) { - complete(observer, throwable); - } - } - - @Override - public void dispose() { - RxFutureConverter.dispose(done, future); - } - - @Override - public boolean isDisposed() { - return RxFutureConverter.isDisposed(done); - } - - @Override - public void accept(final @Nullable Object o, final @Nullable Throwable throwable) { - this.throwable = throwable; - if (checkComplete(done)) { - final CompletableObserver observer = this.observer; - assert observer != null; - complete(observer, throwable); - } - } - - private static void complete(final @NotNull CompletableObserver observer, final @Nullable Throwable throwable) { - if (throwable == null) { - observer.onComplete(); - } else { - observer.onError(throwable); - } - } - } - - private static class FutureMaybe extends Maybe implements Disposable, BiConsumer, Throwable> { - - private final @NotNull CompletableFuture> future; - private volatile @Nullable MaybeObserver observer; - private volatile @Nullable T t; - private volatile @Nullable Throwable throwable; - private final @NotNull AtomicInteger done = new AtomicInteger(INITIAL); - - FutureMaybe(final @NotNull CompletableFuture> future) { - this.future = future; - future.whenComplete(this); - } - - @Override - protected void subscribeActual(final @NotNull MaybeObserver observer) { - this.observer = observer; - observer.onSubscribe(this); - if (checkComplete(done)) { - complete(observer, t, throwable); - } - } - - @Override - public void dispose() { - RxFutureConverter.dispose(done, future); - } - - @Override - public boolean isDisposed() { - return RxFutureConverter.isDisposed(done); - } - - @Override - @SuppressWarnings("OptionalAssignedToNull") - public void accept(final @Nullable Optional t, final @Nullable Throwable throwable) { - final T t1; - final Throwable throwable1; - if (throwable == null) { - if (t == null) { - t1 = null; - throwable1 = new NullPointerException(); - } else { - t1 = t.orElse(null); - throwable1 = null; - } - } else { - t1 = null; - throwable1 = throwable; - } - this.t = t1; - this.throwable = throwable1; - if (checkComplete(done)) { - final MaybeObserver observer = this.observer; - assert observer != null; - complete(observer, t1, throwable1); - } - } - - private static void complete( - final @NotNull MaybeObserver observer, - final @Nullable T t, - final @Nullable Throwable throwable) { - - if (throwable != null) { - observer.onError(throwable); - } else if (t != null) { - observer.onSuccess(t); - } else { - observer.onComplete(); - } - } - } - - private static class FutureSingle extends Single implements Disposable, BiConsumer { - - private final @NotNull CompletableFuture future; - private volatile @Nullable SingleObserver observer; - private volatile @Nullable T t; - private volatile @Nullable Throwable throwable; - private final @NotNull AtomicInteger done = new AtomicInteger(INITIAL); - - FutureSingle(final @NotNull CompletableFuture future) { - this.future = future; - future.whenComplete(this); - } - - @Override - protected void subscribeActual(final @NotNull SingleObserver observer) { - this.observer = observer; - observer.onSubscribe(this); - if (checkComplete(done)) { - complete(observer, t, throwable); - } - } - - @Override - public void dispose() { - RxFutureConverter.dispose(done, future); - } - - @Override - public boolean isDisposed() { - return RxFutureConverter.isDisposed(done); - } - - @Override - public void accept(final @Nullable T t, final @Nullable Throwable throwable) { - this.t = t; - this.throwable = throwable; - if (checkComplete(done)) { - final SingleObserver observer = this.observer; - assert observer != null; - complete(observer, t, throwable); - } - } - - private static void complete( - final @NotNull SingleObserver observer, - final @Nullable T t, - final @Nullable Throwable throwable) { - - if (t != null) { - observer.onSuccess(t); - } else { - observer.onError((throwable != null) ? throwable : new NullPointerException()); - } - } - } - - private RxFutureConverter() {} -} diff --git a/src/main/java/com/hivemq/client/internal/rx/WithSingleConditionalSubscriber.java b/src/main/java/com/hivemq/client/internal/rx/WithSingleConditionalSubscriber.java index a874ad7c2..d108c7d84 100644 --- a/src/main/java/com/hivemq/client/internal/rx/WithSingleConditionalSubscriber.java +++ b/src/main/java/com/hivemq/client/internal/rx/WithSingleConditionalSubscriber.java @@ -17,7 +17,7 @@ package com.hivemq.client.internal.rx; import com.hivemq.client.rx.FlowableWithSingleSubscriber; -import io.reactivex.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/rx/WithSingleStrictSubscriber.java b/src/main/java/com/hivemq/client/internal/rx/WithSingleStrictSubscriber.java index 587b7a840..31aa2b257 100644 --- a/src/main/java/com/hivemq/client/internal/rx/WithSingleStrictSubscriber.java +++ b/src/main/java/com/hivemq/client/internal/rx/WithSingleStrictSubscriber.java @@ -18,8 +18,8 @@ import com.hivemq.client.rx.FlowableWithSingleSubscriber; import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; -import io.reactivex.internal.subscriptions.SubscriptionHelper; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reactivestreams.Subscription; diff --git a/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleCombine.java b/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleCombine.java index 2a6485a4f..5ad5d6438 100644 --- a/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleCombine.java +++ b/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleCombine.java @@ -20,9 +20,9 @@ import com.hivemq.client.rx.FlowableWithSingle; import com.hivemq.client.rx.FlowableWithSingleSubscriber; import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; -import io.reactivex.Flowable; -import io.reactivex.internal.fuseable.ConditionalSubscriber; -import io.reactivex.internal.util.BackpressureHelper; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.internal.util.BackpressureHelper; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reactivestreams.Subscriber; diff --git a/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleMap.java b/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleMap.java index 1c26f0646..ffd923a5f 100644 --- a/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleMap.java +++ b/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleMap.java @@ -21,9 +21,9 @@ import com.hivemq.client.rx.FlowableWithSingle; import com.hivemq.client.rx.FlowableWithSingleSubscriber; import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reactivestreams.Subscriber; diff --git a/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleMapError.java b/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleMapError.java index f27ba8cbb..3f1ed32eb 100644 --- a/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleMapError.java +++ b/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleMapError.java @@ -21,11 +21,11 @@ import com.hivemq.client.rx.FlowableWithSingle; import com.hivemq.client.rx.FlowableWithSingleSubscriber; import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; -import io.reactivex.FlowableSubscriber; -import io.reactivex.exceptions.CompositeException; -import io.reactivex.exceptions.Exceptions; -import io.reactivex.functions.Function; -import io.reactivex.internal.fuseable.ConditionalSubscriber; +import io.reactivex.rxjava3.core.FlowableSubscriber; +import io.reactivex.rxjava3.exceptions.CompositeException; +import io.reactivex.rxjava3.exceptions.Exceptions; +import io.reactivex.rxjava3.functions.Function; +import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reactivestreams.Subscriber; diff --git a/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleObserveOn.java b/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleObserveOn.java index 0394f62da..3fcec3107 100644 --- a/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleObserveOn.java +++ b/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleObserveOn.java @@ -18,7 +18,7 @@ import com.hivemq.client.rx.FlowableWithSingle; import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; -import io.reactivex.Scheduler; +import io.reactivex.rxjava3.core.Scheduler; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Subscriber; diff --git a/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfig.java index a322309c3..483eb5361 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfig.java @@ -17,8 +17,8 @@ package com.hivemq.client.mqtt; import com.hivemq.client.internal.mqtt.MqttExecutorConfigImplBuilder; -import io.reactivex.Scheduler; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfigBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfigBuilderBase.java index 74538fd1c..689ea794f 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttExecutorConfigBuilderBase.java @@ -17,7 +17,7 @@ package com.hivemq.client.mqtt; import com.hivemq.client.annotations.CheckReturnValue; -import io.reactivex.Scheduler; +import io.reactivex.rxjava3.core.Scheduler; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java index e9f0ddead..7d34d490e 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java @@ -30,9 +30,9 @@ import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; import com.hivemq.client.rx.FlowableWithSingle; -import io.reactivex.Completable; -import io.reactivex.Flowable; -import io.reactivex.Single; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Single; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Publisher; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java index b299ba20e..7f6d20724 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java +++ b/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java @@ -32,9 +32,9 @@ import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubscribeBuilder; import com.hivemq.client.rx.FlowableWithSingle; -import io.reactivex.Completable; -import io.reactivex.Flowable; -import io.reactivex.Single; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Single; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Publisher; diff --git a/src/main/java/com/hivemq/client/rx/FlowableWithSingle.java b/src/main/java/com/hivemq/client/rx/FlowableWithSingle.java index d5454f073..900088bee 100644 --- a/src/main/java/com/hivemq/client/rx/FlowableWithSingle.java +++ b/src/main/java/com/hivemq/client/rx/FlowableWithSingle.java @@ -24,14 +24,14 @@ import com.hivemq.client.internal.util.Checks; import com.hivemq.client.rx.reactivestreams.PublisherWithSingle; import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; -import io.reactivex.Flowable; -import io.reactivex.Scheduler; -import io.reactivex.annotations.BackpressureKind; -import io.reactivex.annotations.BackpressureSupport; -import io.reactivex.annotations.SchedulerSupport; -import io.reactivex.functions.Action; -import io.reactivex.functions.Consumer; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.annotations.BackpressureKind; +import io.reactivex.rxjava3.annotations.BackpressureSupport; +import io.reactivex.rxjava3.annotations.SchedulerSupport; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.functions.Action; +import io.reactivex.rxjava3.functions.Consumer; +import io.reactivex.rxjava3.functions.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reactivestreams.Subscriber; diff --git a/src/main/java/com/hivemq/client/rx/FlowableWithSingleSubscriber.java b/src/main/java/com/hivemq/client/rx/FlowableWithSingleSubscriber.java index 2f54963b6..42a7e4e96 100644 --- a/src/main/java/com/hivemq/client/rx/FlowableWithSingleSubscriber.java +++ b/src/main/java/com/hivemq/client/rx/FlowableWithSingleSubscriber.java @@ -17,7 +17,7 @@ package com.hivemq.client.rx; import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; -import io.reactivex.FlowableSubscriber; +import io.reactivex.rxjava3.core.FlowableSubscriber; /** * Represents a Reactive-Streams inspired {@link WithSingleSubscriber} that is RxJava 2 only and weakens rules for diff --git a/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java b/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java index adfc326f9..8a7a0e1b2 100644 --- a/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java +++ b/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java @@ -29,9 +29,9 @@ import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscription; -import io.reactivex.Completable; -import io.reactivex.Flowable; -import io.reactivex.Single; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Single; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewExceptionsTest.java b/src/test/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewExceptionsTest.java index de3f90c1a..ca45620b8 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewExceptionsTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewExceptionsTest.java @@ -32,9 +32,9 @@ import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import com.hivemq.client.rx.FlowableWithSingleSplit; -import io.reactivex.Completable; -import io.reactivex.Flowable; -import io.reactivex.Single; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Single; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/rx/RxFutureConverterTest.java b/src/test/java/com/hivemq/client/internal/rx/RxFutureConverterTest.java deleted file mode 100644 index 7c9b0df71..000000000 --- a/src/test/java/com/hivemq/client/internal/rx/RxFutureConverterTest.java +++ /dev/null @@ -1,905 +0,0 @@ -/* - * Copyright 2018-present HiveMQ and the HiveMQ Community - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.hivemq.client.internal.rx; - -import io.reactivex.*; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.junit.jupiter.api.Test; - -import java.util.Optional; -import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicInteger; - -import static org.junit.jupiter.api.Assertions.*; - -/** - * @author Silvio Giebl - */ -class RxFutureConverterTest { - - @Test - void toFuture_completable_immediate() { - final CompletableFuture future = RxFutureConverter.toFuture(Completable.complete()); - assertTrue(future.isDone()); - } - - @Test - void toFuture_completable_immediate_error() { - final CompletableFuture future = RxFutureConverter.toFuture(Completable.error(new Exception("test"))); - assertTrue(future.isDone()); - assertTrue(future.isCompletedExceptionally()); - final ExecutionException exception = assertThrows(ExecutionException.class, future::get); - assertEquals("test", exception.getCause().getMessage()); - } - - @Test - void toFuture_completable() throws InterruptedException { - final CountDownLatch emitLatch = new CountDownLatch(1); - final CountDownLatch completedLatch = new CountDownLatch(1); - final Completable completable = Completable.create(emitter -> { - emitLatch.await(1, TimeUnit.SECONDS); - emitter.onComplete(); - completedLatch.countDown(); - }).subscribeOn(Schedulers.single()); - - final CompletableFuture future = RxFutureConverter.toFuture(completable); - assertFalse(future.isDone()); - - emitLatch.countDown(); - assertTrue(completedLatch.await(1, TimeUnit.SECONDS)); - assertTrue(future.isDone()); - } - - @Test - void toFuture_completable_error() throws InterruptedException { - final CountDownLatch emitLatch = new CountDownLatch(1); - final CountDownLatch completedLatch = new CountDownLatch(1); - final Completable completable = Completable.create(emitter -> { - emitLatch.await(1, TimeUnit.SECONDS); - emitter.onError(new Exception("test")); - completedLatch.countDown(); - }).subscribeOn(Schedulers.single()); - - final CompletableFuture future = RxFutureConverter.toFuture(completable); - assertFalse(future.isDone()); - - emitLatch.countDown(); - assertTrue(completedLatch.await(1, TimeUnit.SECONDS)); - assertTrue(future.isDone()); - assertTrue(future.isCompletedExceptionally()); - final ExecutionException exception = assertThrows(ExecutionException.class, future::get); - assertEquals("test", exception.getCause().getMessage()); - } - - @Test - void toFuture_completable_cancel() throws InterruptedException { - final CountDownLatch subscribeLatch = new CountDownLatch(1); - final CountDownLatch emitLatch = new CountDownLatch(1); - final CountDownLatch completedLatch = new CountDownLatch(1); - final Completable completable = Completable.create(emitter -> { - subscribeLatch.countDown(); - try { - emitLatch.await(1, TimeUnit.SECONDS); - } catch (InterruptedException e) { - // ignore - } - if (emitter.isDisposed()) { - completedLatch.countDown(); - } - }).subscribeOn(Schedulers.single()); - - final CompletableFuture future = RxFutureConverter.toFuture(completable); - assertFalse(future.isDone()); - - assertTrue(subscribeLatch.await(1, TimeUnit.SECONDS)); - assertTrue(future.cancel(false)); - - emitLatch.countDown(); - assertTrue(completedLatch.await(1, TimeUnit.SECONDS)); - assertTrue(future.isDone()); - assertThrows(CancellationException.class, future::get); - } - - @Test - void toFuture_completable_cancel_before_onSubscribe() throws InterruptedException { - final CountDownLatch subscribeLatch = new CountDownLatch(1); - final CountDownLatch cancelLatch = new CountDownLatch(1); - final CountDownLatch completedLatch = new CountDownLatch(1); - final Completable completable = new Completable() { - @Override - protected void subscribeActual(final @NotNull CompletableObserver observer) { - subscribeLatch.countDown(); - final Thread thread = new Thread(() -> { - try { - assertTrue(cancelLatch.await(1, TimeUnit.SECONDS)); - } catch (final InterruptedException e) { - fail(e); - } - final Disposable disposable = new TestDisposable(); - observer.onSubscribe(disposable); - assertTrue(disposable.isDisposed()); - completedLatch.countDown(); - }); - thread.setUncaughtExceptionHandler((t, e) -> e.printStackTrace()); - thread.start(); - } - }; - - final CompletableFuture future = RxFutureConverter.toFuture(completable); - assertFalse(future.isDone()); - - assertTrue(subscribeLatch.await(1, TimeUnit.SECONDS)); - assertTrue(future.cancel(false)); - cancelLatch.countDown(); - - assertTrue(completedLatch.await(1, TimeUnit.SECONDS)); - assertTrue(future.isDone()); - assertThrows(CancellationException.class, future::get); - } - - @Test - void toFuture_maybe_immediate() throws ExecutionException, InterruptedException { - final CompletableFuture> future = RxFutureConverter.toFuture(Maybe.just("maybe")); - assertTrue(future.isDone()); - final Optional optional = future.get(); - assertNotNull(optional); - assertTrue(optional.isPresent()); - assertEquals("maybe", optional.get()); - } - - @Test - void toFuture_maybe_immediate_empty() throws ExecutionException, InterruptedException { - final CompletableFuture> future = RxFutureConverter.toFuture(Maybe.empty()); - assertTrue(future.isDone()); - final Optional optional = future.get(); - assertNotNull(optional); - assertFalse(optional.isPresent()); - } - - @Test - void toFuture_maybe_immediate_error() { - final CompletableFuture> future = - RxFutureConverter.toFuture(Maybe.error(new Exception("test"))); - assertTrue(future.isDone()); - assertTrue(future.isCompletedExceptionally()); - final ExecutionException exception = assertThrows(ExecutionException.class, future::get); - assertEquals("test", exception.getCause().getMessage()); - } - - @Test - void toFuture_maybe() throws InterruptedException, ExecutionException { - final CountDownLatch emitLatch = new CountDownLatch(1); - final CountDownLatch completedLatch = new CountDownLatch(1); - final Maybe maybe = Maybe.create(emitter -> { - emitLatch.await(1, TimeUnit.SECONDS); - emitter.onSuccess("maybe"); - completedLatch.countDown(); - }).subscribeOn(Schedulers.single()); - - final CompletableFuture> future = RxFutureConverter.toFuture(maybe); - assertFalse(future.isDone()); - - emitLatch.countDown(); - assertTrue(completedLatch.await(1, TimeUnit.SECONDS)); - assertTrue(future.isDone()); - final Optional optional = future.get(); - assertNotNull(optional); - assertTrue(optional.isPresent()); - assertEquals("maybe", optional.get()); - } - - @Test - void toFuture_maybe_empty() throws InterruptedException, ExecutionException { - final CountDownLatch emitLatch = new CountDownLatch(1); - final CountDownLatch completedLatch = new CountDownLatch(1); - final Maybe maybe = Maybe.create(emitter -> { - emitLatch.await(1, TimeUnit.SECONDS); - emitter.onComplete(); - completedLatch.countDown(); - }).subscribeOn(Schedulers.single()); - - final CompletableFuture> future = RxFutureConverter.toFuture(maybe); - assertFalse(future.isDone()); - - emitLatch.countDown(); - assertTrue(completedLatch.await(1, TimeUnit.SECONDS)); - assertTrue(future.isDone()); - final Optional optional = future.get(); - assertNotNull(optional); - assertFalse(optional.isPresent()); - } - - @Test - void toFuture_maybe_cancel() throws InterruptedException { - final CountDownLatch subscribeLatch = new CountDownLatch(1); - final CountDownLatch emitLatch = new CountDownLatch(1); - final CountDownLatch completedLatch = new CountDownLatch(1); - final Maybe completable = Maybe.create(emitter -> { - subscribeLatch.countDown(); - try { - emitLatch.await(1, TimeUnit.SECONDS); - } catch (InterruptedException e) { - // ignore - } - if (emitter.isDisposed()) { - completedLatch.countDown(); - } - }).subscribeOn(Schedulers.single()); - - final CompletableFuture> future = RxFutureConverter.toFuture(completable); - assertFalse(future.isDone()); - - assertTrue(subscribeLatch.await(1, TimeUnit.SECONDS)); - future.cancel(false); - - emitLatch.countDown(); - assertTrue(completedLatch.await(1, TimeUnit.SECONDS)); - assertTrue(future.isDone()); - assertThrows(CancellationException.class, future::get); - } - - @Test - void toFuture_maybe_cancel_before_onSubscribe() throws InterruptedException { - final CountDownLatch subscribeLatch = new CountDownLatch(1); - final CountDownLatch cancelLatch = new CountDownLatch(1); - final CountDownLatch completedLatch = new CountDownLatch(1); - final Maybe maybe = new Maybe() { - @Override - protected void subscribeActual(final @NotNull MaybeObserver observer) { - subscribeLatch.countDown(); - final Thread thread = new Thread(() -> { - try { - assertTrue(cancelLatch.await(1, TimeUnit.SECONDS)); - } catch (final InterruptedException e) { - fail(e); - } - final Disposable disposable = new TestDisposable(); - observer.onSubscribe(disposable); - assertTrue(disposable.isDisposed()); - completedLatch.countDown(); - }); - thread.setUncaughtExceptionHandler((t, e) -> e.printStackTrace()); - thread.start(); - } - }; - - final CompletableFuture> future = RxFutureConverter.toFuture(maybe); - assertFalse(future.isDone()); - - assertTrue(subscribeLatch.await(1, TimeUnit.SECONDS)); - assertTrue(future.cancel(false)); - cancelLatch.countDown(); - - assertTrue(completedLatch.await(1, TimeUnit.SECONDS)); - assertTrue(future.isDone()); - assertThrows(CancellationException.class, future::get); - } - - @Test - void toFuture_maybe_error() throws InterruptedException { - final CountDownLatch emitLatch = new CountDownLatch(1); - final CountDownLatch completedLatch = new CountDownLatch(1); - final Maybe maybe = Maybe.create(emitter -> { - emitLatch.await(1, TimeUnit.SECONDS); - emitter.onError(new Exception("test")); - completedLatch.countDown(); - }).subscribeOn(Schedulers.single()); - - final CompletableFuture> future = RxFutureConverter.toFuture(maybe); - assertFalse(future.isDone()); - - emitLatch.countDown(); - assertTrue(completedLatch.await(1, TimeUnit.SECONDS)); - assertTrue(future.isDone()); - assertTrue(future.isCompletedExceptionally()); - final ExecutionException exception = assertThrows(ExecutionException.class, future::get); - assertEquals("test", exception.getCause().getMessage()); - } - - @Test - void toFuture_single_immediate() throws ExecutionException, InterruptedException { - final CompletableFuture future = RxFutureConverter.toFuture(Single.just("single")); - assertTrue(future.isDone()); - assertEquals("single", future.get()); - } - - @Test - void toFuture_single_immediate_error() { - final CompletableFuture future = RxFutureConverter.toFuture(Single.error(new Exception("test"))); - assertTrue(future.isDone()); - assertTrue(future.isCompletedExceptionally()); - final ExecutionException exception = assertThrows(ExecutionException.class, future::get); - assertEquals("test", exception.getCause().getMessage()); - } - - @Test - void toFuture_single() throws InterruptedException, ExecutionException { - final CountDownLatch emitLatch = new CountDownLatch(1); - final CountDownLatch completedLatch = new CountDownLatch(1); - final Single single = Single.create(emitter -> { - emitLatch.await(1, TimeUnit.SECONDS); - emitter.onSuccess("single"); - completedLatch.countDown(); - }).subscribeOn(Schedulers.single()); - - final CompletableFuture future = RxFutureConverter.toFuture(single); - assertFalse(future.isDone()); - - emitLatch.countDown(); - assertTrue(completedLatch.await(1, TimeUnit.SECONDS)); - assertTrue(future.isDone()); - assertEquals("single", future.get()); - } - - @Test - void toFuture_single_error() throws InterruptedException { - final CountDownLatch emitLatch = new CountDownLatch(1); - final CountDownLatch completedLatch = new CountDownLatch(1); - final Single single = Single.create(emitter -> { - emitLatch.await(1, TimeUnit.SECONDS); - emitter.onError(new Exception("test")); - completedLatch.countDown(); - }).subscribeOn(Schedulers.single()); - - final CompletableFuture future = RxFutureConverter.toFuture(single); - assertFalse(future.isDone()); - - emitLatch.countDown(); - assertTrue(completedLatch.await(1, TimeUnit.SECONDS)); - assertTrue(future.isDone()); - assertTrue(future.isCompletedExceptionally()); - final ExecutionException exception = assertThrows(ExecutionException.class, future::get); - assertEquals("test", exception.getCause().getMessage()); - } - - @Test - void toFuture_single_cancel() throws InterruptedException { - final CountDownLatch subscribeLatch = new CountDownLatch(1); - final CountDownLatch emitLatch = new CountDownLatch(1); - final CountDownLatch completedLatch = new CountDownLatch(1); - final Single completable = Single.create(emitter -> { - subscribeLatch.countDown(); - try { - emitLatch.await(1, TimeUnit.SECONDS); - } catch (InterruptedException e) { - // ignore - } - if (emitter.isDisposed()) { - completedLatch.countDown(); - } - }).subscribeOn(Schedulers.single()); - - final CompletableFuture future = RxFutureConverter.toFuture(completable); - assertFalse(future.isDone()); - - assertTrue(subscribeLatch.await(1, TimeUnit.SECONDS)); - future.cancel(false); - - emitLatch.countDown(); - assertTrue(completedLatch.await(1, TimeUnit.SECONDS)); - assertTrue(future.isDone()); - assertThrows(CancellationException.class, future::get); - } - - @Test - void toFuture_single_cancel_before_onSubscribe() throws InterruptedException { - final CountDownLatch subscribeLatch = new CountDownLatch(1); - final CountDownLatch cancelLatch = new CountDownLatch(1); - final CountDownLatch completedLatch = new CountDownLatch(1); - final Single single = new Single() { - @Override - protected void subscribeActual(final @NotNull SingleObserver observer) { - subscribeLatch.countDown(); - final Thread thread = new Thread(() -> { - try { - assertTrue(cancelLatch.await(1, TimeUnit.SECONDS)); - } catch (final InterruptedException e) { - fail(e); - } - final Disposable disposable = new TestDisposable(); - observer.onSubscribe(disposable); - assertTrue(disposable.isDisposed()); - completedLatch.countDown(); - }); - thread.setUncaughtExceptionHandler((t, e) -> e.printStackTrace()); - thread.start(); - } - }; - - final CompletableFuture future = RxFutureConverter.toFuture(single); - assertFalse(future.isDone()); - - assertTrue(subscribeLatch.await(1, TimeUnit.SECONDS)); - assertTrue(future.cancel(false)); - cancelLatch.countDown(); - - assertTrue(completedLatch.await(1, TimeUnit.SECONDS)); - assertTrue(future.isDone()); - assertThrows(CancellationException.class, future::get); - } - - @Test - void toCompletable_immediate() { - final Completable completable = RxFutureConverter.toCompletable(CompletableFuture.completedFuture("test")); - - final AtomicInteger counter = new AtomicInteger(); - completable.subscribe(new TestCompletableObserver() { - @Override - public void onComplete() { - assertNotNull(disposable); - assertTrue(disposable.isDisposed()); - counter.incrementAndGet(); - } - }); - assertEquals(1, counter.get()); - } - - @Test - void toCompletable_immediate_error() { - final CompletableFuture future = new CompletableFuture<>(); - future.completeExceptionally(new Exception("test")); - final Completable completable = RxFutureConverter.toCompletable(future); - - final AtomicInteger counter = new AtomicInteger(); - completable.subscribe(new TestCompletableObserver() { - @Override - public void onError(final @NotNull Throwable e) { - assertNotNull(disposable); - assertTrue(disposable.isDisposed()); - assertEquals("test", e.getMessage()); - counter.incrementAndGet(); - } - }); - assertEquals(1, counter.get()); - } - - @Test - void toCompletable() { - final CompletableFuture future = new CompletableFuture<>(); - final Completable completable = RxFutureConverter.toCompletable(future); - - final AtomicInteger counter = new AtomicInteger(); - final TestCompletableObserver observer = new TestCompletableObserver() { - @Override - public void onComplete() { - assertNotNull(disposable); - assertTrue(disposable.isDisposed()); - counter.incrementAndGet(); - } - }; - completable.subscribe(observer); - assertNotNull(observer.disposable); - assertFalse(observer.disposable.isDisposed()); - assertEquals(0, counter.get()); - - future.complete("test"); - assertEquals(1, counter.get()); - } - - @Test - void toCompletable_error() { - final CompletableFuture future = new CompletableFuture<>(); - final Completable completable = RxFutureConverter.toCompletable(future); - - final AtomicInteger counter = new AtomicInteger(); - final TestCompletableObserver observer = new TestCompletableObserver() { - @Override - public void onError(final @NotNull Throwable e) { - assertNotNull(disposable); - assertTrue(disposable.isDisposed()); - assertEquals("test", e.getMessage()); - counter.incrementAndGet(); - } - }; - completable.subscribe(observer); - assertNotNull(observer.disposable); - assertFalse(observer.disposable.isDisposed()); - assertEquals(0, counter.get()); - - future.completeExceptionally(new Exception("test")); - assertEquals(1, counter.get()); - } - - @Test - void toCompletable_dispose() { - final CompletableFuture future = new CompletableFuture<>(); - final Completable completable = RxFutureConverter.toCompletable(future); - - final AtomicInteger counter = new AtomicInteger(); - final TestCompletableObserver observer = new TestCompletableObserver() { - @Override - public void onComplete() { - counter.incrementAndGet(); - } - }; - completable.subscribe(observer); - assertNotNull(observer.disposable); - assertFalse(observer.disposable.isDisposed()); - assertEquals(0, counter.get()); - - observer.disposable.dispose(); - assertTrue(observer.disposable.isDisposed()); - assertTrue(future.isCancelled()); - future.complete("test"); - assertEquals(0, counter.get()); - } - - @Test - void toMaybe_immediate() { - final Maybe maybe = RxFutureConverter.toMaybe(CompletableFuture.completedFuture(Optional.of("test"))); - - final AtomicInteger counter = new AtomicInteger(); - maybe.subscribe(new TestMaybeObserver() { - @Override - public void onSuccess(final @NotNull String s) { - assertNotNull(disposable); - assertTrue(disposable.isDisposed()); - assertEquals("test", s); - counter.incrementAndGet(); - } - }); - assertEquals(1, counter.get()); - } - - @Test - void toMaybe_immediate_empty() { - final Maybe maybe = RxFutureConverter.toMaybe(CompletableFuture.completedFuture(Optional.empty())); - - final AtomicInteger counter = new AtomicInteger(); - maybe.subscribe(new TestMaybeObserver() { - @Override - public void onComplete() { - assertNotNull(disposable); - assertTrue(disposable.isDisposed()); - counter.incrementAndGet(); - } - }); - assertEquals(1, counter.get()); - } - - @Test - void toMaybe_immediate_null() { - final Maybe maybe = RxFutureConverter.toMaybe(CompletableFuture.completedFuture(null)); - - final AtomicInteger counter = new AtomicInteger(); - maybe.subscribe(new TestMaybeObserver() { - @Override - public void onError(final @NotNull Throwable e) { - assertNotNull(disposable); - assertTrue(disposable.isDisposed()); - assertTrue(e instanceof NullPointerException); - counter.incrementAndGet(); - } - }); - assertEquals(1, counter.get()); - } - - @Test - void toMaybe_immediate_error() { - final CompletableFuture> future = new CompletableFuture<>(); - future.completeExceptionally(new Exception("test")); - final Maybe maybe = RxFutureConverter.toMaybe(future); - - final AtomicInteger counter = new AtomicInteger(); - maybe.subscribe(new TestMaybeObserver() { - @Override - public void onError(final @NotNull Throwable e) { - assertNotNull(disposable); - assertTrue(disposable.isDisposed()); - assertEquals("test", e.getMessage()); - counter.incrementAndGet(); - } - }); - assertEquals(1, counter.get()); - } - - @Test - void toMaybe() { - final CompletableFuture> future = new CompletableFuture<>(); - final Maybe maybe = RxFutureConverter.toMaybe(future); - - final AtomicInteger counter = new AtomicInteger(); - final TestMaybeObserver observer = new TestMaybeObserver() { - @Override - public void onSuccess(final @NotNull String s) { - assertNotNull(disposable); - assertTrue(disposable.isDisposed()); - assertEquals("test", s); - counter.incrementAndGet(); - } - }; - maybe.subscribe(observer); - assertNotNull(observer.disposable); - assertFalse(observer.disposable.isDisposed()); - assertEquals(0, counter.get()); - - future.complete(Optional.of("test")); - assertEquals(1, counter.get()); - } - - @Test - void toMaybe_empty() { - final CompletableFuture> future = new CompletableFuture<>(); - final Maybe maybe = RxFutureConverter.toMaybe(future); - - final AtomicInteger counter = new AtomicInteger(); - final TestMaybeObserver observer = new TestMaybeObserver() { - @Override - public void onComplete() { - assertNotNull(disposable); - assertTrue(disposable.isDisposed()); - counter.incrementAndGet(); - } - }; - maybe.subscribe(observer); - assertNotNull(observer.disposable); - assertFalse(observer.disposable.isDisposed()); - assertEquals(0, counter.get()); - - future.complete(Optional.empty()); - assertEquals(1, counter.get()); - } - - @Test - void toMaybe_null() { - final CompletableFuture> future = new CompletableFuture<>(); - final Maybe maybe = RxFutureConverter.toMaybe(future); - - final AtomicInteger counter = new AtomicInteger(); - final TestMaybeObserver observer = new TestMaybeObserver() { - @Override - public void onError(final @NotNull Throwable e) { - assertNotNull(disposable); - assertTrue(disposable.isDisposed()); - assertTrue(e instanceof NullPointerException); - counter.incrementAndGet(); - } - }; - maybe.subscribe(observer); - assertNotNull(observer.disposable); - assertFalse(observer.disposable.isDisposed()); - assertEquals(0, counter.get()); - - future.complete(null); - assertEquals(1, counter.get()); - } - - @Test - void toMaybe_error() { - final CompletableFuture> future = new CompletableFuture<>(); - final Maybe maybe = RxFutureConverter.toMaybe(future); - - final AtomicInteger counter = new AtomicInteger(); - final TestMaybeObserver observer = new TestMaybeObserver() { - @Override - public void onError(final @NotNull Throwable e) { - assertNotNull(disposable); - assertTrue(disposable.isDisposed()); - assertEquals("test", e.getMessage()); - counter.incrementAndGet(); - } - }; - maybe.subscribe(observer); - assertNotNull(observer.disposable); - assertFalse(observer.disposable.isDisposed()); - assertEquals(0, counter.get()); - - future.completeExceptionally(new Exception("test")); - assertEquals(1, counter.get()); - } - - @Test - void toMaybe_dispose() { - final CompletableFuture> future = new CompletableFuture<>(); - final Maybe completable = RxFutureConverter.toMaybe(future); - - final AtomicInteger counter = new AtomicInteger(); - final TestMaybeObserver observer = new TestMaybeObserver() { - @Override - public void onSuccess(final @NotNull String s) { - assertNotNull(disposable); - assertTrue(disposable.isDisposed()); - counter.incrementAndGet(); - } - }; - completable.subscribe(observer); - assertNotNull(observer.disposable); - assertFalse(observer.disposable.isDisposed()); - assertEquals(0, counter.get()); - - observer.disposable.dispose(); - assertTrue(future.isCancelled()); - future.complete(Optional.of("test")); - assertEquals(0, counter.get()); - } - - @Test - void toSingle_immediate() { - final Single single = RxFutureConverter.toSingle(CompletableFuture.completedFuture("test")); - - final AtomicInteger counter = new AtomicInteger(); - single.subscribe(new TestSingleObserver() { - @Override - public void onSuccess(final @NotNull String s) { - assertNotNull(disposable); - assertTrue(disposable.isDisposed()); - assertEquals("test", s); - counter.incrementAndGet(); - } - }); - assertEquals(1, counter.get()); - } - - @Test - void toSingle_immediate_error() { - final CompletableFuture future = new CompletableFuture<>(); - future.completeExceptionally(new Exception("test")); - final Single single = RxFutureConverter.toSingle(future); - - final AtomicInteger counter = new AtomicInteger(); - single.subscribe(new TestSingleObserver() { - @Override - public void onError(final @NotNull Throwable e) { - assertNotNull(disposable); - assertTrue(disposable.isDisposed()); - assertEquals("test", e.getMessage()); - counter.incrementAndGet(); - } - }); - assertEquals(1, counter.get()); - } - - @Test - void toSingle() { - final CompletableFuture future = new CompletableFuture<>(); - final Single single = RxFutureConverter.toSingle(future); - - final AtomicInteger counter = new AtomicInteger(); - final TestSingleObserver observer = new TestSingleObserver() { - @Override - public void onSuccess(final @NotNull String s) { - assertNotNull(disposable); - assertTrue(disposable.isDisposed()); - assertEquals("test", s); - counter.incrementAndGet(); - } - }; - single.subscribe(observer); - assertNotNull(observer.disposable); - assertFalse(observer.disposable.isDisposed()); - assertEquals(0, counter.get()); - - future.complete("test"); - assertEquals(1, counter.get()); - } - - @Test - void toSingle_error() { - final CompletableFuture future = new CompletableFuture<>(); - final Single single = RxFutureConverter.toSingle(future); - - final AtomicInteger counter = new AtomicInteger(); - final TestSingleObserver observer = new TestSingleObserver() { - @Override - public void onError(final @NotNull Throwable e) { - assertNotNull(disposable); - assertTrue(disposable.isDisposed()); - assertEquals("test", e.getMessage()); - counter.incrementAndGet(); - } - }; - single.subscribe(observer); - assertNotNull(observer.disposable); - assertFalse(observer.disposable.isDisposed()); - assertEquals(0, counter.get()); - - future.completeExceptionally(new Exception("test")); - assertEquals(1, counter.get()); - } - - @Test - void toSingle_dispose() { - final CompletableFuture future = new CompletableFuture<>(); - final Single single = RxFutureConverter.toSingle(future); - - final AtomicInteger counter = new AtomicInteger(); - final TestSingleObserver observer = new TestSingleObserver() { - @Override - public void onSuccess(final @NotNull String s) { - counter.incrementAndGet(); - } - }; - single.subscribe(observer); - assertNotNull(observer.disposable); - assertFalse(observer.disposable.isDisposed()); - assertEquals(0, counter.get()); - - observer.disposable.dispose(); - assertTrue(future.isCancelled()); - future.complete("test"); - assertEquals(0, counter.get()); - } - - private static class TestDisposable implements Disposable { - - private volatile boolean disposed; - - @Override - public void dispose() { - disposed = true; - } - - @Override - public boolean isDisposed() { - return disposed; - } - } - - private static abstract class TestCompletableObserver implements CompletableObserver { - - @Nullable Disposable disposable; - - @Override - public void onSubscribe(final @NotNull Disposable d) { - disposable = d; - } - - @Override - public void onComplete() {} - - @Override - public void onError(final @NotNull Throwable e) {} - } - - private static abstract class TestMaybeObserver implements MaybeObserver { - - @Nullable Disposable disposable; - - @Override - public void onSubscribe(final @NotNull Disposable d) { - disposable = d; - } - - @Override - public void onSuccess(final @NotNull T t) {} - - @Override - public void onComplete() {} - - @Override - public void onError(final @NotNull Throwable e) {} - } - - private static abstract class TestSingleObserver implements SingleObserver { - - @Nullable Disposable disposable; - - @Override - public void onSubscribe(final @NotNull Disposable d) { - disposable = d; - } - - @Override - public void onSuccess(final @NotNull T t) {} - - @Override - public void onError(final @NotNull Throwable e) {} - } -} \ No newline at end of file diff --git a/src/test/java/com/hivemq/client/rx/FlowableWithSingleItem.java b/src/test/java/com/hivemq/client/rx/FlowableWithSingleItem.java index 2018e9d7e..ca84cd597 100644 --- a/src/test/java/com/hivemq/client/rx/FlowableWithSingleItem.java +++ b/src/test/java/com/hivemq/client/rx/FlowableWithSingleItem.java @@ -17,8 +17,8 @@ package com.hivemq.client.rx; import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; -import io.reactivex.Flowable; -import io.reactivex.FlowableSubscriber; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.FlowableSubscriber; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reactivestreams.Subscriber; diff --git a/src/test/java/com/hivemq/client/rx/FlowableWithSingleSplit.java b/src/test/java/com/hivemq/client/rx/FlowableWithSingleSplit.java index f13683c92..013ead311 100644 --- a/src/test/java/com/hivemq/client/rx/FlowableWithSingleSplit.java +++ b/src/test/java/com/hivemq/client/rx/FlowableWithSingleSplit.java @@ -17,7 +17,7 @@ package com.hivemq.client.rx; import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; -import io.reactivex.Flowable; +import io.reactivex.rxjava3.core.Flowable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reactivestreams.Subscriber; diff --git a/src/test/java/com/hivemq/client/rx/FlowableWithSingleTest.java b/src/test/java/com/hivemq/client/rx/FlowableWithSingleTest.java index 0fc3b0474..37982094a 100644 --- a/src/test/java/com/hivemq/client/rx/FlowableWithSingleTest.java +++ b/src/test/java/com/hivemq/client/rx/FlowableWithSingleTest.java @@ -18,9 +18,9 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; -import io.reactivex.BackpressureStrategy; -import io.reactivex.Flowable; -import io.reactivex.schedulers.Schedulers; +import io.reactivex.rxjava3.core.BackpressureStrategy; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.schedulers.Schedulers; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.function.ThrowingSupplier; @@ -156,8 +156,8 @@ void observeBothOn_delayError() throws InterruptedException { .awaitCount(3) .assertValueAt(2, "next2") .await() - .assertError(IllegalArgumentException.class) - .assertErrorMessage("test"); + .assertError(throwable -> (throwable instanceof IllegalArgumentException) && + throwable.getMessage().equals("test")); executorService.shutdown(); } @@ -195,8 +195,8 @@ void observeBothOn_delayError_bufferSize() throws InterruptedException { .awaitCount(1024) .assertValueCount(1024) .await() - .assertError(IllegalArgumentException.class) - .assertErrorMessage("test"); + .assertError(throwable -> (throwable instanceof IllegalArgumentException) && + throwable.getMessage().equals("test")); executorService.shutdown(); } From bf881e700315ccf5248bd4fbd5915848dfd31499 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Sun, 20 Dec 2020 00:59:55 +0100 Subject: [PATCH 48/62] Formatting --- .../java/com/hivemq/client/example/Mqtt3ClientExample.java | 4 ++-- .../client/internal/mqtt/MqttTransportConfigImplTest.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java b/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java index 8a7a0e1b2..da31a029b 100644 --- a/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java +++ b/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java @@ -105,8 +105,8 @@ Completable subscribeTo( "' received count: " + receivedCount); } else { System.out.println("received message without payload on topic '" + publish.getTopic() + "'"); - } - }); + } + }); // define what to do when we disconnect, this does not disconnect yet final Completable disconnectScenario = diff --git a/src/test/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImplTest.java b/src/test/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImplTest.java index c71ac425a..d26ffe16c 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImplTest.java +++ b/src/test/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImplTest.java @@ -37,7 +37,8 @@ void equals() throws NoSuchAlgorithmException { final TrustManagerFactory tmf1 = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); final TrustManagerFactory tmf2 = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); - EqualsVerifier.forClass(MqttTransportConfigImpl.class).suppress(Warning.STRICT_INHERITANCE) + EqualsVerifier.forClass(MqttTransportConfigImpl.class) + .suppress(Warning.STRICT_INHERITANCE) .withIgnoredAnnotations(NotNull.class) // EqualsVerifier thinks @NotNull Optional is @NotNull .withNonnullFields("serverAddress") .withPrefabValues(KeyManagerFactory.class, kmf1, kmf2) From 074ab31d81b17b2fcf9c3ae22d837e7a8d0270f4 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Sun, 20 Dec 2020 01:36:32 +0100 Subject: [PATCH 49/62] Updated test dependencies and gradle plugins --- gradle.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 68cad4293..2ff177d23 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,16 +14,16 @@ reactor.version=3.4.1 # # test dependencies # -junit-jupiter.version=5.5.1 -equalsverifier.version=3.1.7 -mockito.version=2.18.3 -guava.version=24.1-jre -bouncycastle.version=1.59 -paho.version=1.2.0 +junit-jupiter.version=5.7.0 +equalsverifier.version=3.5 +mockito.version=3.6.28 +guava.version=30.1-jre +bouncycastle.version=1.67 +paho.version=1.2.5 # # plugins # -plugin.shadow.version=5.2.0 +plugin.shadow.version=6.1.0 plugin.bnd.version=5.3.0 plugin.license.version=0.15.0 plugin.bintray.version=1.8.5 From d0dc865ab670c687942128813a66b8f71dfb87d8 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Sun, 20 Dec 2020 20:58:54 +0100 Subject: [PATCH 50/62] MqttClientConfig.getClientIdentifier -> getIdentifier --- .../com/hivemq/client/internal/mqtt/MqttClientConfig.java | 2 +- .../client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java | 4 ++-- .../java/com/hivemq/client/mqtt/MqttClientBuilderBase.java | 4 ++-- src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java index 5682fbc36..47ecc3c51 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java @@ -102,7 +102,7 @@ public MqttClientConfig( } @Override - public @NotNull Optional getClientIdentifier() { + public @NotNull Optional getIdentifier() { return (clientIdentifier == MqttClientIdentifierImpl.REQUEST_CLIENT_IDENTIFIER_FROM_SERVER) ? Optional.empty() : Optional.of(clientIdentifier); } diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java index 8a966dcf7..66c1b934d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java +++ b/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java @@ -56,8 +56,8 @@ public Mqtt3ClientConfigView(final @NotNull MqttClientConfig delegate) { } @Override - public @NotNull Optional getClientIdentifier() { - return delegate.getClientIdentifier(); + public @NotNull Optional getIdentifier() { + return delegate.getIdentifier(); } @Override diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java index 6e4628812..357c5dba4 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientBuilderBase.java @@ -37,7 +37,7 @@ public interface MqttClientBuilderBase> extends MqttTransportConfigBuilderBase { /** - * Sets the {@link MqttClientConfig#getClientIdentifier() Client Identifier}. + * Sets the {@link MqttClientConfig#getIdentifier() Client Identifier}. * * @param identifier the string representation of the Client Identifier. * @return the builder. @@ -46,7 +46,7 @@ public interface MqttClientBuilderBase> exten @NotNull B identifier(@NotNull String identifier); /** - * Sets the {@link MqttClientConfig#getClientIdentifier() Client Identifier}. + * Sets the {@link MqttClientConfig#getIdentifier() Client Identifier}. * * @param identifier the Client Identifier. * @return the builder. diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java b/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java index d5d6b805c..0bd7188bb 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java +++ b/src/main/java/com/hivemq/client/mqtt/MqttClientConfig.java @@ -47,7 +47,7 @@ public interface MqttClientConfig { * * @return the (currently not present) identifier of the client. */ - @NotNull Optional getClientIdentifier(); + @NotNull Optional getIdentifier(); /** * @return the transport configuration of the client. From 44b4dbf767dde906da5fbc762534066e740cb2c9 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Mon, 21 Dec 2020 23:07:36 +0100 Subject: [PATCH 51/62] com.hivemq.client -> com.hivemq.client2 hivemq-mqtt-client -> hivemq-mqtt-client2 --- README.md | 60 ++++++++-------- build.gradle.kts | 12 ++-- epoll/build.gradle.kts | 2 +- examples/build.gradle.kts | 2 +- .../mqtt/examples/AsyncDemo.java | 8 +-- .../mqtt/examples/Mqtt5Features.java | 22 +++--- .../mqtt/examples/ReconnectStrategy.java | 8 +-- .../mqtt/examples/RequestResponse.java | 8 +-- gradle/japicc.gradle.kts | 2 +- proxy/build.gradle.kts | 2 +- reactor/build.gradle.kts | 8 +-- .../mqtt3/reactor/Mqtt3ReactorClientView.java | 42 +++++------ .../mqtt/reactor/MqttReactorClient.java | 48 ++++++------- .../CoreWithSingleConditionalSubscriber.java | 4 +- .../CoreWithSingleStrictSubscriber.java | 8 +-- .../operators/FluxWithSingleCombine.java | 8 +-- .../reactor/operators/FluxWithSingleFrom.java | 8 +-- .../reactor/operators/FluxWithSingleMap.java | 10 +-- .../operators/FluxWithSingleOperator.java | 4 +- .../operators/FluxWithSinglePublishOn.java | 6 +- .../mqtt3/reactor/Mqtt3ReactorClient.java | 50 ++++++------- .../mqtt5/reactor/Mqtt5ReactorClient.java | 58 +++++++-------- .../rx/reactor/CorePublisherWithSingle.java | 6 +- .../rx/reactor/CoreWithSingleSubscriber.java | 4 +- .../rx/reactor/FluxWithSingle.java | 18 ++--- .../rx/reactor/FluxWithSingleItem.java | 2 +- .../rx/reactor/FluxWithSingleSplit.java | 4 +- .../rx/reactor/FluxWithSingleTest.java | 4 +- settings.gradle.kts | 2 +- .../annotations/CheckReturnValue.java | 2 +- .../internal/annotations/CallByThread.java | 2 +- .../internal/annotations/NotThreadSafe.java | 2 +- .../internal/annotations/ThreadSafe.java | 2 +- .../internal/checkpoint/Confirmable.java | 2 +- .../internal/logging/InternalLogger.java | 2 +- .../logging/InternalLoggerFactory.java | 4 +- .../internal/logging/InternalNoopLogger.java | 2 +- .../internal/logging/InternalSlf4jLogger.java | 2 +- .../internal/mqtt/MqttAsyncClient.java | 50 ++++++------- .../internal/mqtt/MqttBlockingClient.java | 60 ++++++++-------- .../internal/mqtt/MqttClientConfig.java | 44 ++++++------ .../mqtt/MqttClientConnectionConfig.java | 20 +++--- .../internal/mqtt/MqttExecutorConfigImpl.java | 4 +- .../mqtt/MqttExecutorConfigImplBuilder.java | 6 +- .../internal/mqtt/MqttProxyConfigImpl.java | 6 +- .../mqtt/MqttProxyConfigImplBuilder.java | 10 +-- .../internal/mqtt/MqttRxClient.java | 70 +++++++++--------- .../internal/mqtt/MqttRxClientBuilder.java | 32 ++++----- .../mqtt/MqttRxClientBuilderBase.java | 30 ++++---- .../internal/mqtt/MqttTlsConfigImpl.java | 6 +- .../mqtt/MqttTlsConfigImplBuilder.java | 8 +-- .../mqtt/MqttTransportConfigImpl.java | 12 ++-- .../mqtt/MqttTransportConfigImplBuilder.java | 16 ++--- .../mqtt/MqttWebSocketConfigImpl.java | 4 +- .../mqtt/MqttWebSocketConfigImplBuilder.java | 6 +- .../mqtt/advanced/MqttAdvancedConfig.java | 6 +- .../advanced/MqttAdvancedConfigBuilder.java | 12 ++-- .../interceptor/MqttClientInterceptors.java | 12 ++-- .../MqttClientInterceptorsBuilder.java | 12 ++-- .../internal/mqtt/codec/MqttCodecModule.java | 18 ++--- .../mqtt/codec/decoder/MqttDecoder.java | 22 +++--- .../codec/decoder/MqttDecoderContext.java | 4 +- .../codec/decoder/MqttDecoderException.java | 4 +- .../codec/decoder/MqttMessageDecoder.java | 4 +- .../codec/decoder/MqttMessageDecoderUtil.java | 8 +-- .../codec/decoder/MqttMessageDecoders.java | 2 +- .../codec/decoder/MqttPingRespDecoder.java | 10 +-- .../mqtt3/Mqtt3ClientMessageDecoders.java | 8 +-- .../decoder/mqtt3/Mqtt3ConnAckDecoder.java | 20 +++--- .../mqtt3/Mqtt3MessageDecoderUtil.java | 4 +- .../decoder/mqtt3/Mqtt3PubAckDecoder.java | 16 ++--- .../decoder/mqtt3/Mqtt3PubCompDecoder.java | 16 ++--- .../decoder/mqtt3/Mqtt3PubRecDecoder.java | 16 ++--- .../decoder/mqtt3/Mqtt3PubRelDecoder.java | 16 ++--- .../decoder/mqtt3/Mqtt3PublishDecoder.java | 22 +++--- .../decoder/mqtt3/Mqtt3SubAckDecoder.java | 22 +++--- .../decoder/mqtt3/Mqtt3UnsubAckDecoder.java | 16 ++--- .../codec/decoder/mqtt5/Mqtt5AuthDecoder.java | 32 ++++----- .../mqtt5/Mqtt5ClientMessageDecoders.java | 8 +-- .../decoder/mqtt5/Mqtt5ConnAckDecoder.java | 40 +++++------ .../decoder/mqtt5/Mqtt5DisconnectDecoder.java | 32 ++++----- .../mqtt5/Mqtt5MessageDecoderUtil.java | 26 +++---- .../decoder/mqtt5/Mqtt5PubAckDecoder.java | 34 ++++----- .../decoder/mqtt5/Mqtt5PubCompDecoder.java | 34 ++++----- .../decoder/mqtt5/Mqtt5PubRecDecoder.java | 34 ++++----- .../decoder/mqtt5/Mqtt5PubRelDecoder.java | 34 ++++----- .../decoder/mqtt5/Mqtt5PublishDecoder.java | 40 +++++------ .../decoder/mqtt5/Mqtt5SubAckDecoder.java | 32 ++++----- .../decoder/mqtt5/Mqtt5UnsubAckDecoder.java | 32 ++++----- .../mqtt/codec/encoder/MqttEncoder.java | 8 +-- .../codec/encoder/MqttEncoderContext.java | 4 +- .../codec/encoder/MqttMessageEncoder.java | 4 +- .../codec/encoder/MqttMessageEncoderUtil.java | 12 ++-- .../codec/encoder/MqttMessageEncoders.java | 2 +- .../codec/encoder/MqttPingReqEncoder.java | 6 +- .../mqtt3/Mqtt3ClientMessageEncoders.java | 8 +-- .../encoder/mqtt3/Mqtt3ConnectEncoder.java | 20 +++--- .../encoder/mqtt3/Mqtt3DisconnectEncoder.java | 10 +-- .../encoder/mqtt3/Mqtt3MessageEncoder.java | 12 ++-- .../encoder/mqtt3/Mqtt3PubAckEncoder.java | 8 +-- .../encoder/mqtt3/Mqtt3PubCompEncoder.java | 8 +-- .../encoder/mqtt3/Mqtt3PubRecEncoder.java | 8 +-- .../encoder/mqtt3/Mqtt3PubRelEncoder.java | 8 +-- .../encoder/mqtt3/Mqtt3PublishEncoder.java | 16 ++--- .../encoder/mqtt3/Mqtt3SubscribeEncoder.java | 12 ++-- .../mqtt3/Mqtt3UnsubscribeEncoder.java | 12 ++-- .../codec/encoder/mqtt5/Mqtt5AuthEncoder.java | 14 ++-- .../mqtt5/Mqtt5ClientMessageEncoders.java | 8 +-- .../encoder/mqtt5/Mqtt5ConnectEncoder.java | 38 +++++----- .../encoder/mqtt5/Mqtt5DisconnectEncoder.java | 18 ++--- .../mqtt5/Mqtt5MessageEncoderUtil.java | 10 +-- ...Mqtt5MessageWithUserPropertiesEncoder.java | 24 +++---- .../encoder/mqtt5/Mqtt5PubAckEncoder.java | 10 +-- .../encoder/mqtt5/Mqtt5PubCompEncoder.java | 10 +-- .../encoder/mqtt5/Mqtt5PubRecEncoder.java | 10 +-- .../encoder/mqtt5/Mqtt5PubRelEncoder.java | 10 +-- .../encoder/mqtt5/Mqtt5PublishEncoder.java | 28 ++++---- .../encoder/mqtt5/Mqtt5SubscribeEncoder.java | 20 +++--- .../mqtt5/Mqtt5UnsubscribeEncoder.java | 12 ++-- .../mqtt/datatypes/MqttBinaryData.java | 4 +- .../datatypes/MqttClientIdentifierImpl.java | 6 +- .../datatypes/MqttSharedTopicFilterImpl.java | 8 +-- .../mqtt/datatypes/MqttTopicFilterImpl.java | 12 ++-- .../datatypes/MqttTopicFilterImplBuilder.java | 8 +-- .../mqtt/datatypes/MqttTopicImpl.java | 8 +-- .../mqtt/datatypes/MqttTopicImplBuilder.java | 6 +- .../mqtt/datatypes/MqttTopicIterator.java | 4 +- .../mqtt/datatypes/MqttTopicLevel.java | 4 +- .../mqtt/datatypes/MqttTopicLevels.java | 4 +- .../datatypes/MqttUserPropertiesImpl.java | 6 +- .../MqttUserPropertiesImplBuilder.java | 16 ++--- .../mqtt/datatypes/MqttUserPropertyImpl.java | 6 +- .../mqtt/datatypes/MqttUtf8StringImpl.java | 8 +-- .../datatypes/MqttVariableByteInteger.java | 2 +- .../exceptions/MqttClientStateExceptions.java | 4 +- .../mqtt3/Mqtt3ExceptionFactory.java | 26 +++---- .../mqtt/handler/MqttChannelInitializer.java | 38 +++++----- .../handler/MqttConnectionAwareHandler.java | 4 +- .../internal/mqtt/handler/MqttSession.java | 24 +++---- .../mqtt/handler/MqttSessionAwareHandler.java | 6 +- .../handler/auth/AbstractMqttAuthHandler.java | 36 +++++----- .../mqtt/handler/auth/MqttAuthHandler.java | 2 +- .../handler/auth/MqttConnectAuthHandler.java | 48 ++++++------- .../auth/MqttDisconnectOnAuthHandler.java | 14 ++-- .../handler/auth/MqttReAuthCompletable.java | 10 +-- .../mqtt/handler/auth/MqttReAuthHandler.java | 38 +++++----- .../mqtt/handler/connect/MqttConnAckFlow.java | 4 +- .../handler/connect/MqttConnAckSingle.java | 32 ++++----- .../handler/connect/MqttConnectHandler.java | 58 +++++++-------- .../disconnect/MqttDisconnectCompletable.java | 12 ++-- .../disconnect/MqttDisconnectEvent.java | 12 ++-- .../disconnect/MqttDisconnectHandler.java | 50 ++++++------- .../disconnect/MqttDisconnectUtil.java | 14 ++-- .../mqtt/handler/ping/MqttPingHandler.java | 18 ++--- .../proxy/MqttProxyAdapterHandler.java | 4 +- .../handler/proxy/MqttProxyInitializer.java | 6 +- .../MqttGlobalIncomingPublishFlow.java | 10 +-- .../MqttGlobalIncomingPublishFlowable.java | 12 ++-- .../MqttIncomingPublishConfirmable.java | 4 +- .../incoming/MqttIncomingPublishFlow.java | 10 +-- .../incoming/MqttIncomingPublishFlows.java | 30 ++++---- .../incoming/MqttIncomingPublishService.java | 22 +++--- .../incoming/MqttIncomingQosHandler.java | 38 +++++----- .../MqttStatefulPublishWithFlows.java | 10 +-- .../incoming/MqttSubscribedPublishFlow.java | 18 ++--- .../MqttSubscribedPublishFlowTree.java | 26 +++---- .../MqttSubscribedPublishFlowable.java | 18 ++--- .../incoming/MqttSubscribedPublishFlows.java | 8 +-- .../handler/publish/outgoing/MqttAckFlow.java | 10 +-- .../publish/outgoing/MqttAckFlowable.java | 12 ++-- .../publish/outgoing/MqttAckFlowableFlow.java | 12 ++-- .../publish/outgoing/MqttAckSingle.java | 16 ++--- .../outgoing/MqttAckSingleFlowable.java | 18 ++--- .../outgoing/MqttOutgoingQosHandler.java | 70 +++++++++--------- .../outgoing/MqttPubOrRelWithFlow.java | 4 +- .../publish/outgoing/MqttPubRelWithFlow.java | 8 +-- .../outgoing/MqttPublishFlowableAckLink.java | 8 +-- .../outgoing/MqttPublishFlowables.java | 8 +-- .../publish/outgoing/MqttPublishWithFlow.java | 4 +- .../outgoing/MqttTopicAliasAutoMapping.java | 8 +-- .../outgoing/MqttTopicAliasMapping.java | 4 +- .../handler/subscribe/MqttSubAckSingle.java | 12 ++-- .../subscribe/MqttSubOrUnsubAckFlow.java | 6 +- .../subscribe/MqttSubOrUnsubWithFlow.java | 4 +- .../subscribe/MqttSubscribeWithFlow.java | 6 +- .../subscribe/MqttSubscriptionFlow.java | 2 +- .../subscribe/MqttSubscriptionHandler.java | 66 ++++++++--------- .../handler/subscribe/MqttUnsubAckSingle.java | 12 ++-- .../subscribe/MqttUnsubscribeWithFlow.java | 6 +- .../handler/tls/MqttTlsAdapterHandler.java | 2 +- .../mqtt/handler/tls/MqttTlsInitializer.java | 8 +-- .../mqtt/handler/util/FlowWithEventLoop.java | 4 +- .../util/MqttTimeoutInboundHandler.java | 12 ++-- .../handler/websocket/MqttWebSocketCodec.java | 4 +- .../websocket/MqttWebSocketInitializer.java | 12 ++-- .../MqttWebsocketHandshakeHandler.java | 2 +- .../internal/mqtt/ioc/ClientComponent.java | 10 +-- .../internal/mqtt/ioc/ClientScope.java | 2 +- .../mqtt/ioc/ConnectionComponent.java | 8 +-- .../internal/mqtt/ioc/ConnectionModule.java | 14 ++-- .../internal/mqtt/ioc/ConnectionScope.java | 2 +- .../internal/mqtt/ioc/SingletonComponent.java | 2 +- .../mqtt/lifecycle/MqttAutoReconnectImpl.java | 10 +-- .../MqttAutoReconnectImplBuilder.java | 6 +- .../lifecycle/MqttConnectedContextImpl.java | 16 ++--- .../MqttDisconnectedContextImpl.java | 14 ++-- .../mqtt/lifecycle/MqttReconnector.java | 22 +++--- .../mqtt3/Mqtt3ConnectedContextView.java | 18 ++--- .../mqtt3/Mqtt3DisconnectedContextView.java | 16 ++--- .../lifecycle/mqtt3/Mqtt3ReconnectorView.java | 22 +++--- .../internal/mqtt/message/MqttMessage.java | 6 +- .../MqttMessageWithUserProperties.java | 16 ++--- .../internal/mqtt/message/MqttProperty.java | 2 +- .../mqtt/message/MqttReasonCodes.java | 6 +- .../mqtt/message/MqttStatefulMessage.java | 6 +- .../internal/mqtt/message/auth/MqttAuth.java | 16 ++--- .../mqtt/message/auth/MqttAuthBuilder.java | 20 +++--- .../mqtt/message/auth/MqttAuthProperty.java | 4 +- .../mqtt/message/auth/MqttEnhancedAuth.java | 8 +-- .../message/auth/MqttEnhancedAuthBuilder.java | 10 +-- .../mqtt/message/auth/MqttSimpleAuth.java | 10 +-- .../message/auth/MqttSimpleAuthBuilder.java | 12 ++-- .../auth/mqtt3/Mqtt3SimpleAuthView.java | 12 ++-- .../mqtt3/Mqtt3SimpleAuthViewBuilder.java | 12 ++-- .../mqtt/message/connect/MqttConnAck.java | 26 +++---- .../message/connect/MqttConnAckProperty.java | 4 +- .../connect/MqttConnAckRestrictions.java | 10 +-- .../mqtt/message/connect/MqttConnect.java | 30 ++++---- .../message/connect/MqttConnectBuilder.java | 36 +++++----- .../message/connect/MqttConnectProperty.java | 4 +- .../connect/MqttConnectRestrictions.java | 8 +-- .../MqttConnectRestrictionsBuilder.java | 12 ++-- .../message/connect/MqttStatefulConnect.java | 8 +-- .../connect/mqtt3/Mqtt3ConnAckView.java | 20 +++--- .../connect/mqtt3/Mqtt3ConnectView.java | 26 +++---- .../mqtt3/Mqtt3ConnectViewBuilder.java | 28 ++++---- .../message/disconnect/MqttDisconnect.java | 20 +++--- .../disconnect/MqttDisconnectBuilder.java | 26 +++---- .../disconnect/MqttDisconnectProperty.java | 4 +- .../disconnect/mqtt3/Mqtt3DisconnectView.java | 12 ++-- .../mqtt/message/ping/MqttPingReq.java | 8 +-- .../mqtt/message/ping/MqttPingResp.java | 8 +-- .../message/ping/mqtt3/Mqtt3PingReqView.java | 6 +- .../message/ping/mqtt3/Mqtt3PingRespView.java | 6 +- .../mqtt/message/publish/MqttPubAck.java | 12 ++-- .../message/publish/MqttPubAckBuilder.java | 20 +++--- .../message/publish/MqttPubAckProperty.java | 4 +- .../mqtt/message/publish/MqttPubComp.java | 12 ++-- .../message/publish/MqttPubCompBuilder.java | 18 ++--- .../message/publish/MqttPubCompProperty.java | 4 +- .../mqtt/message/publish/MqttPubRec.java | 12 ++-- .../message/publish/MqttPubRecBuilder.java | 20 +++--- .../message/publish/MqttPubRecProperty.java | 4 +- .../mqtt/message/publish/MqttPubRel.java | 12 ++-- .../message/publish/MqttPubRelBuilder.java | 18 ++--- .../message/publish/MqttPubRelProperty.java | 4 +- .../mqtt/message/publish/MqttPublish.java | 38 +++++----- .../message/publish/MqttPublishBuilder.java | 28 ++++---- .../message/publish/MqttPublishProperty.java | 4 +- .../message/publish/MqttPublishResult.java | 4 +- .../message/publish/MqttStatefulPublish.java | 8 +-- .../mqtt/message/publish/MqttWillPublish.java | 18 ++--- .../publish/MqttWillPublishProperty.java | 4 +- .../publish/mqtt3/Mqtt3PubAckView.java | 12 ++-- .../publish/mqtt3/Mqtt3PubCompView.java | 12 ++-- .../publish/mqtt3/Mqtt3PubRecView.java | 12 ++-- .../publish/mqtt3/Mqtt3PubRelView.java | 12 ++-- .../publish/mqtt3/Mqtt3PublishResultView.java | 12 ++-- .../publish/mqtt3/Mqtt3PublishView.java | 24 +++---- .../mqtt3/Mqtt3PublishViewBuilder.java | 26 +++---- .../subscribe/MqttStatefulSubscribe.java | 4 +- .../mqtt/message/subscribe/MqttSubAck.java | 16 ++--- .../message/subscribe/MqttSubAckProperty.java | 4 +- .../mqtt/message/subscribe/MqttSubscribe.java | 12 ++-- .../subscribe/MqttSubscribeBuilder.java | 28 ++++---- .../subscribe/MqttSubscribeProperty.java | 4 +- .../message/subscribe/MqttSubscription.java | 10 +-- .../subscribe/MqttSubscriptionBuilder.java | 22 +++--- .../subscribe/mqtt3/Mqtt3SubAckView.java | 18 ++--- .../subscribe/mqtt3/Mqtt3SubscribeView.java | 12 ++-- .../mqtt3/Mqtt3SubscribeViewBuilder.java | 20 +++--- .../mqtt3/Mqtt3SubscriptionView.java | 16 ++--- .../mqtt3/Mqtt3SubscriptionViewBuilder.java | 22 +++--- .../unsubscribe/MqttStatefulUnsubscribe.java | 4 +- .../message/unsubscribe/MqttUnsubAck.java | 16 ++--- .../unsubscribe/MqttUnsubAckProperty.java | 4 +- .../message/unsubscribe/MqttUnsubscribe.java | 14 ++-- .../unsubscribe/MqttUnsubscribeBuilder.java | 28 ++++---- .../unsubscribe/MqttUnsubscribeProperty.java | 4 +- .../unsubscribe/mqtt3/Mqtt3UnsubAckView.java | 18 ++--- .../mqtt3/Mqtt3UnsubscribeView.java | 12 ++-- .../mqtt3/Mqtt3UnsubscribeViewBuilder.java | 22 +++--- .../mqtt/mqtt3/Mqtt3AsyncClientView.java | 72 +++++++++---------- .../mqtt/mqtt3/Mqtt3BlockingClientView.java | 72 +++++++++---------- .../mqtt/mqtt3/Mqtt3ClientConfigView.java | 40 +++++------ .../mqtt/mqtt3/Mqtt3RxClientView.java | 72 +++++++++---------- .../mqtt/mqtt3/Mqtt3RxClientViewBuilder.java | 30 ++++---- .../internal/mqtt/util/MqttChecks.java | 58 +++++++-------- .../internal/netty/ContextFuture.java | 2 +- .../netty/DefaultChannelOutboundHandler.java | 2 +- .../internal/netty/DefaultContextPromise.java | 2 +- .../netty/NettyEventLoopProvider.java | 14 ++-- .../internal/rx/CompletableFlow.java | 2 +- .../rx/WithSingleConditionalSubscriber.java | 4 +- .../rx/WithSingleStrictSubscriber.java | 6 +- .../operators/FlowableWithSingleCombine.java | 10 +-- .../rx/operators/FlowableWithSingleMap.java | 12 ++-- .../operators/FlowableWithSingleMapError.java | 12 ++-- .../FlowableWithSingleObserveOn.java | 6 +- .../operators/FlowableWithSingleOperator.java | 4 +- .../internal/util/AsyncRuntimeException.java | 2 +- .../internal/util/ByteArray.java | 2 +- .../internal/util/ByteArrayUtil.java | 2 +- .../internal/util/ByteBufferUtil.java | 2 +- .../internal/util/Checks.java | 4 +- .../internal/util/ClassUtil.java | 2 +- .../internal/util/ExecutorUtil.java | 2 +- .../internal/util/InetSocketAddressUtil.java | 2 +- .../internal/util/Pow2Util.java | 2 +- .../internal/util/Ranges.java | 4 +- .../internal/util/StringUtil.java | 2 +- .../internal/util/UnsignedDataTypes.java | 2 +- .../internal/util/Utf8Util.java | 2 +- .../util/collections/ChunkedArrayQueue.java | 4 +- .../internal/util/collections/HandleList.java | 4 +- .../util/collections/ImmutableArray.java | 4 +- .../util/collections/ImmutableElement.java | 4 +- .../collections/ImmutableEmptyIntList.java | 2 +- .../util/collections/ImmutableEmptyList.java | 4 +- .../util/collections/ImmutableIntArray.java | 4 +- .../util/collections/ImmutableIntElement.java | 4 +- .../util/collections/ImmutableIntList.java | 4 +- .../util/collections/ImmutableList.java | 4 +- .../internal/util/collections/Index.java | 6 +- .../internal/util/collections/IntIndex.java | 6 +- .../internal/util/collections/NodeList.java | 4 +- .../{client => client2}/mqtt/MqttClient.java | 4 +- .../mqtt/MqttClientBuilder.java | 12 ++-- .../mqtt/MqttClientBuilderBase.java | 14 ++-- .../mqtt/MqttClientConfig.java | 10 +-- .../mqtt/MqttClientConnectionConfig.java | 4 +- .../mqtt/MqttClientState.java | 2 +- .../mqtt/MqttExecutorConfig.java | 4 +- .../mqtt/MqttExecutorConfigBuilder.java | 4 +- .../mqtt/MqttExecutorConfigBuilderBase.java | 4 +- .../mqtt/MqttGlobalPublishFilter.java | 2 +- .../mqtt/MqttProxyConfig.java | 4 +- .../mqtt/MqttProxyConfigBuilder.java | 4 +- .../mqtt/MqttProxyConfigBuilderBase.java | 4 +- .../mqtt/MqttProxyProtocol.java | 2 +- .../mqtt/MqttTlsConfig.java | 4 +- .../mqtt/MqttTlsConfigBuilder.java | 4 +- .../mqtt/MqttTlsConfigBuilderBase.java | 4 +- .../mqtt/MqttTransportConfig.java | 4 +- .../mqtt/MqttTransportConfigBuilder.java | 4 +- .../mqtt/MqttTransportConfigBuilderBase.java | 6 +- .../{client => client2}/mqtt/MqttVersion.java | 2 +- .../mqtt/MqttWebSocketConfig.java | 4 +- .../mqtt/MqttWebSocketConfigBuilder.java | 4 +- .../mqtt/MqttWebSocketConfigBuilderBase.java | 4 +- .../mqtt/datatypes/MqttClientIdentifier.java | 4 +- .../mqtt/datatypes/MqttQos.java | 2 +- .../mqtt/datatypes/MqttSharedTopicFilter.java | 6 +- .../MqttSharedTopicFilterBuilder.java | 4 +- .../mqtt/datatypes/MqttTopic.java | 6 +- .../mqtt/datatypes/MqttTopicBuilder.java | 4 +- .../mqtt/datatypes/MqttTopicBuilderBase.java | 4 +- .../mqtt/datatypes/MqttTopicFilter.java | 6 +- .../datatypes/MqttTopicFilterBuilder.java | 4 +- .../datatypes/MqttTopicFilterBuilderBase.java | 4 +- .../mqtt/datatypes/MqttUtf8String.java | 4 +- .../exceptions/ConnectionClosedException.java | 4 +- .../exceptions/ConnectionFailedException.java | 4 +- .../exceptions/MqttClientStateException.java | 6 +- .../mqtt/exceptions/MqttDecodeException.java | 4 +- .../mqtt/exceptions/MqttEncodeException.java | 4 +- .../MqttSessionExpiredException.java | 4 +- .../mqtt/lifecycle/MqttAutoReconnect.java | 4 +- .../lifecycle/MqttAutoReconnectBuilder.java | 4 +- .../MqttAutoReconnectBuilderBase.java | 4 +- .../mqtt/lifecycle/MqttConnectedContext.java | 4 +- .../mqtt/lifecycle/MqttConnectedListener.java | 2 +- .../mqtt/lifecycle/MqttDisconnectSource.java | 2 +- .../lifecycle/MqttDisconnectedContext.java | 16 ++--- .../lifecycle/MqttDisconnectedListener.java | 14 ++-- .../mqtt/lifecycle/MqttReconnector.java | 10 +-- .../mqtt/mqtt3/Mqtt3AsyncClient.java | 36 +++++----- .../mqtt/mqtt3/Mqtt3BlockingClient.java | 38 +++++----- .../mqtt/mqtt3/Mqtt3Client.java | 8 +-- .../mqtt/mqtt3/Mqtt3ClientBuilder.java | 14 ++-- .../mqtt/mqtt3/Mqtt3ClientConfig.java | 16 ++--- .../mqtt3/Mqtt3ClientConnectionConfig.java | 6 +- .../mqtt/mqtt3/Mqtt3RxClient.java | 46 ++++++------ .../exceptions/Mqtt3ConnAckException.java | 4 +- .../exceptions/Mqtt3DisconnectException.java | 4 +- .../exceptions/Mqtt3MessageException.java | 6 +- .../exceptions/Mqtt3PubAckException.java | 4 +- .../exceptions/Mqtt3PubRecException.java | 4 +- .../exceptions/Mqtt3SubAckException.java | 4 +- .../exceptions/Mqtt3UnsubAckException.java | 4 +- .../lifecycle/Mqtt3ConnectedContext.java | 12 ++-- .../lifecycle/Mqtt3DisconnectedContext.java | 8 +-- .../mqtt3/lifecycle/Mqtt3Reconnector.java | 20 +++--- .../mqtt/mqtt3/message/Mqtt3Message.java | 2 +- .../mqtt/mqtt3/message/Mqtt3MessageType.java | 2 +- .../mqtt/mqtt3/message/Mqtt3ReturnCode.java | 4 +- .../mqtt3/message/auth/Mqtt3SimpleAuth.java | 8 +-- .../message/auth/Mqtt3SimpleAuthBuilder.java | 4 +- .../auth/Mqtt3SimpleAuthBuilderBase.java | 6 +- .../mqtt3/message/connect/Mqtt3ConnAck.java | 6 +- .../connect/Mqtt3ConnAckReturnCode.java | 4 +- .../mqtt3/message/connect/Mqtt3Connect.java | 14 ++-- .../message/connect/Mqtt3ConnectBuilder.java | 6 +- .../connect/Mqtt3ConnectBuilderBase.java | 14 ++-- .../message/disconnect/Mqtt3Disconnect.java | 6 +- .../mqtt/mqtt3/message/ping/Mqtt3PingReq.java | 6 +- .../mqtt3/message/ping/Mqtt3PingResp.java | 6 +- .../mqtt3/message/publish/Mqtt3PubAck.java | 6 +- .../mqtt3/message/publish/Mqtt3PubComp.java | 6 +- .../mqtt3/message/publish/Mqtt3PubRec.java | 6 +- .../mqtt3/message/publish/Mqtt3PubRel.java | 6 +- .../mqtt3/message/publish/Mqtt3Publish.java | 12 ++-- .../message/publish/Mqtt3PublishBuilder.java | 6 +- .../publish/Mqtt3PublishBuilderBase.java | 10 +-- .../message/publish/Mqtt3PublishResult.java | 4 +- .../publish/Mqtt3WillPublishBuilder.java | 4 +- .../mqtt3/message/subscribe/Mqtt3SubAck.java | 10 +-- .../subscribe/Mqtt3SubAckReturnCode.java | 4 +- .../message/subscribe/Mqtt3Subscribe.java | 8 +-- .../subscribe/Mqtt3SubscribeBuilder.java | 10 +-- .../subscribe/Mqtt3SubscribeBuilderBase.java | 4 +- .../message/subscribe/Mqtt3Subscription.java | 8 +-- .../subscribe/Mqtt3SubscriptionBuilder.java | 4 +- .../Mqtt3SubscriptionBuilderBase.java | 10 +-- .../message/unsubscribe/Mqtt3UnsubAck.java | 6 +- .../message/unsubscribe/Mqtt3Unsubscribe.java | 10 +-- .../unsubscribe/Mqtt3UnsubscribeBuilder.java | 6 +- .../Mqtt3UnsubscribeBuilderBase.java | 10 +-- .../mqtt/mqtt5/Mqtt5AsyncClient.java | 48 ++++++------- .../mqtt/mqtt5/Mqtt5BlockingClient.java | 48 ++++++------- .../mqtt/mqtt5/Mqtt5Client.java | 8 +-- .../mqtt/mqtt5/Mqtt5ClientBuilder.java | 20 +++--- .../mqtt/mqtt5/Mqtt5ClientConfig.java | 24 +++---- .../mqtt5/Mqtt5ClientConnectionConfig.java | 44 ++++++------ .../mqtt/mqtt5/Mqtt5RxClient.java | 54 +++++++------- .../mqtt5/advanced/Mqtt5AdvancedConfig.java | 10 +-- .../advanced/Mqtt5AdvancedConfigBuilder.java | 4 +- .../Mqtt5AdvancedConfigBuilderBase.java | 8 +-- .../interceptor/Mqtt5ClientInterceptors.java | 14 ++-- .../Mqtt5ClientInterceptorsBuilder.java | 4 +- .../Mqtt5ClientInterceptorsBuilderBase.java | 12 ++-- .../qos1/Mqtt5InboundQos1Interceptor.java | 8 +-- .../qos1/Mqtt5OutboundQos1Interceptor.java | 8 +-- .../qos2/Mqtt5InboundQos2Interceptor.java | 12 ++-- .../qos2/Mqtt5OutboundQos2Interceptor.java | 6 +- .../auth/Mqtt5EnhancedAuthMechanism.java | 20 +++--- .../mqtt5/datatypes/Mqtt5UserProperties.java | 8 +-- .../datatypes/Mqtt5UserPropertiesBuilder.java | 4 +- .../Mqtt5UserPropertiesBuilderBase.java | 6 +- .../mqtt5/datatypes/Mqtt5UserProperty.java | 8 +-- .../mqtt5/exceptions/Mqtt5AuthException.java | 4 +- .../exceptions/Mqtt5ConnAckException.java | 4 +- .../exceptions/Mqtt5DisconnectException.java | 4 +- .../exceptions/Mqtt5MessageException.java | 6 +- .../exceptions/Mqtt5PubAckException.java | 4 +- .../exceptions/Mqtt5PubRecException.java | 4 +- .../exceptions/Mqtt5SubAckException.java | 4 +- .../exceptions/Mqtt5UnsubAckException.java | 4 +- .../lifecycle/Mqtt5ConnectedContext.java | 12 ++-- .../lifecycle/Mqtt5DisconnectedContext.java | 8 +-- .../mqtt5/lifecycle/Mqtt5Reconnector.java | 20 +++--- .../mqtt/mqtt5/message/Mqtt5Message.java | 2 +- .../mqtt/mqtt5/message/Mqtt5MessageType.java | 2 +- .../mqtt/mqtt5/message/Mqtt5ReasonCode.java | 4 +- .../mqtt/mqtt5/message/auth/Mqtt5Auth.java | 10 +-- .../mqtt5/message/auth/Mqtt5AuthBuilder.java | 10 +-- .../message/auth/Mqtt5AuthReasonCode.java | 6 +- .../mqtt5/message/auth/Mqtt5EnhancedAuth.java | 4 +- .../auth/Mqtt5EnhancedAuthBuilder.java | 2 +- .../mqtt5/message/auth/Mqtt5SimpleAuth.java | 8 +-- .../message/auth/Mqtt5SimpleAuthBuilder.java | 4 +- .../auth/Mqtt5SimpleAuthBuilderBase.java | 6 +- .../mqtt5/message/connect/Mqtt5ConnAck.java | 18 ++--- .../connect/Mqtt5ConnAckReasonCode.java | 6 +- .../connect/Mqtt5ConnAckRestrictions.java | 12 ++-- .../mqtt5/message/connect/Mqtt5Connect.java | 20 +++--- .../message/connect/Mqtt5ConnectBuilder.java | 6 +- .../connect/Mqtt5ConnectBuilderBase.java | 22 +++--- .../connect/Mqtt5ConnectRestrictions.java | 12 ++-- .../Mqtt5ConnectRestrictionsBuilder.java | 4 +- .../Mqtt5ConnectRestrictionsBuilderBase.java | 8 +-- .../message/disconnect/Mqtt5Disconnect.java | 14 ++-- .../disconnect/Mqtt5DisconnectBuilder.java | 8 +-- .../Mqtt5DisconnectBuilderBase.java | 14 ++-- .../disconnect/Mqtt5DisconnectReasonCode.java | 6 +- .../mqtt/mqtt5/message/ping/Mqtt5PingReq.java | 6 +- .../mqtt5/message/ping/Mqtt5PingResp.java | 6 +- .../publish/Mqtt5PayloadFormatIndicator.java | 2 +- .../mqtt5/message/publish/Mqtt5PubAck.java | 10 +-- .../message/publish/Mqtt5PubAckBuilder.java | 10 +-- .../publish/Mqtt5PubAckReasonCode.java | 6 +- .../mqtt5/message/publish/Mqtt5PubComp.java | 10 +-- .../message/publish/Mqtt5PubCompBuilder.java | 10 +-- .../publish/Mqtt5PubCompReasonCode.java | 6 +- .../mqtt5/message/publish/Mqtt5PubRec.java | 10 +-- .../message/publish/Mqtt5PubRecBuilder.java | 10 +-- .../publish/Mqtt5PubRecReasonCode.java | 6 +- .../mqtt5/message/publish/Mqtt5PubRel.java | 10 +-- .../message/publish/Mqtt5PubRelBuilder.java | 10 +-- .../publish/Mqtt5PubRelReasonCode.java | 6 +- .../mqtt5/message/publish/Mqtt5Publish.java | 20 +++--- .../message/publish/Mqtt5PublishBuilder.java | 8 +-- .../publish/Mqtt5PublishBuilderBase.java | 18 ++--- .../message/publish/Mqtt5PublishResult.java | 10 +-- .../message/publish/Mqtt5WillPublish.java | 10 +-- .../publish/Mqtt5WillPublishBuilder.java | 4 +- .../subscribe/Mqtt5RetainHandling.java | 2 +- .../mqtt5/message/subscribe/Mqtt5SubAck.java | 14 ++-- .../subscribe/Mqtt5SubAckReasonCode.java | 6 +- .../message/subscribe/Mqtt5Subscribe.java | 10 +-- .../subscribe/Mqtt5SubscribeBuilder.java | 10 +-- .../subscribe/Mqtt5SubscribeBuilderBase.java | 8 +-- .../message/subscribe/Mqtt5Subscription.java | 8 +-- .../subscribe/Mqtt5SubscriptionBuilder.java | 4 +- .../Mqtt5SubscriptionBuilderBase.java | 10 +-- .../message/unsubscribe/Mqtt5UnsubAck.java | 12 ++-- .../unsubscribe/Mqtt5UnsubAckReasonCode.java | 6 +- .../message/unsubscribe/Mqtt5Unsubscribe.java | 12 ++-- .../unsubscribe/Mqtt5UnsubscribeBuilder.java | 6 +- .../Mqtt5UnsubscribeBuilderBase.java | 16 ++--- .../rx/FlowableWithSingle.java | 20 +++--- .../rx/FlowableWithSingleSubscriber.java | 4 +- .../reactivestreams/PublisherWithSingle.java | 2 +- .../reactivestreams/WithSingleSubscriber.java | 2 +- .../util/KeyStoreUtil.java | 4 +- .../{client => client2}/util/TypeSwitch.java | 2 +- .../example/Mqtt3ClientExample.java | 30 ++++---- .../example/Mqtt3SmokeTest.java | 6 +- .../mqtt/MqttExecutorConfigImplTest.java | 2 +- .../mqtt/MqttProxyConfigImplTest.java | 2 +- .../internal/mqtt/MqttTlsConfigImplTest.java | 2 +- .../mqtt/MqttTransportConfigImplTest.java | 2 +- .../mqtt/MqttWebSocketConfigImplTest.java | 2 +- .../mqtt/advanced/MqttAdvancedConfigTest.java | 2 +- .../MqttClientInterceptorsTest.java | 2 +- .../decoder/AbstractMqttDecoderTest.java | 30 ++++---- .../mqtt3/AbstractMqtt3DecoderTest.java | 10 +-- .../mqtt3/Mqtt3ClientMessageDecodersTest.java | 6 +- .../mqtt3/Mqtt3ConnAckDecoderTest.java | 10 +-- .../decoder/mqtt3/Mqtt3PubAckDecoderTest.java | 8 +-- .../mqtt3/Mqtt3PubCompDecoderTest.java | 8 +-- .../decoder/mqtt3/Mqtt3PubRecDecoderTest.java | 8 +-- .../decoder/mqtt3/Mqtt3PubRelDecoderTest.java | 8 +-- .../mqtt3/Mqtt3PublishDecoderTest.java | 8 +-- .../decoder/mqtt3/Mqtt3SubAckDecoderTest.java | 10 +-- .../mqtt3/Mqtt3UnsubAckDecoderTest.java | 8 +-- .../mqtt5/AbstractMqtt5DecoderTest.java | 14 ++-- .../decoder/mqtt5/Mqtt5AuthDecoderTest.java | 22 +++--- .../mqtt5/Mqtt5ClientMessageDecodersTest.java | 6 +- .../mqtt5/Mqtt5ConnAckDecoderTest.java | 30 ++++---- .../mqtt5/Mqtt5DisconnectDecoderTest.java | 18 ++--- .../mqtt5/Mqtt5MessageDecoderUtilTest.java | 8 +-- .../mqtt5/Mqtt5PingRespDecoderTest.java | 12 ++-- .../decoder/mqtt5/Mqtt5PubAckDecoderTest.java | 20 +++--- .../mqtt5/Mqtt5PubCompDecoderTest.java | 20 +++--- .../decoder/mqtt5/Mqtt5PubRecDecoderTest.java | 24 +++---- .../decoder/mqtt5/Mqtt5PubRelDecoderTest.java | 22 +++--- .../mqtt5/Mqtt5PublishDecoderTest.java | 28 ++++---- .../decoder/mqtt5/Mqtt5SubAckDecoderTest.java | 22 +++--- .../mqtt5/Mqtt5UnsubAckDecoderTest.java | 30 ++++---- .../encoder/AbstractMqttEncoderTest.java | 10 +-- .../mqtt3/AbstractMqtt3EncoderTest.java | 6 +- .../mqtt3/Mqtt3ConnectEncoderTest.java | 16 ++--- .../mqtt3/Mqtt3PingReqEncoderTest.java | 8 +-- .../encoder/mqtt3/Mqtt3PubAckEncoderTest.java | 10 +-- .../mqtt3/Mqtt3PubCompEncoderTest.java | 10 +-- .../encoder/mqtt3/Mqtt3PubRecEncoderTest.java | 10 +-- .../encoder/mqtt3/Mqtt3PubRelEncoderTest.java | 10 +-- .../mqtt5/AbstractMqtt5EncoderTest.java | 6 +- ...actMqtt5EncoderWithUserPropertiesTest.java | 12 ++-- .../encoder/mqtt5/Mqtt5AuthEncoderTest.java | 22 +++--- .../mqtt5/Mqtt5ConnectEncoderTest.java | 52 +++++++------- .../mqtt5/Mqtt5DisconnectEncoderTest.java | 26 +++---- .../mqtt5/Mqtt5PingReqEncoderTest.java | 8 +-- .../encoder/mqtt5/Mqtt5PubAckEncoderTest.java | 24 +++---- .../mqtt5/Mqtt5PubCompEncoderTest.java | 26 +++---- .../encoder/mqtt5/Mqtt5PubRecEncoderTest.java | 20 +++--- .../encoder/mqtt5/Mqtt5PubRelEncoderTest.java | 22 +++--- .../mqtt5/Mqtt5PublishEncoderTest.java | 32 ++++----- .../mqtt5/Mqtt5SubscribeEncoderTest.java | 34 ++++----- .../mqtt5/Mqtt5UnsubscribeEncoderTest.java | 18 ++--- .../mqtt/datatypes/MqttBinaryDataTest.java | 2 +- .../MqttClientIdentifierImplTest.java | 2 +- .../MqttSharedTopicFilterImplTest.java | 4 +- .../datatypes/MqttTopicFilterImplTest.java | 4 +- .../mqtt/datatypes/MqttTopicImplTest.java | 4 +- .../mqtt/datatypes/MqttTopicIteratorTest.java | 2 +- .../mqtt/datatypes/MqttTopicLevelTest.java | 2 +- .../mqtt/datatypes/MqttTopicLevelsTest.java | 2 +- .../MqttUserPropertiesImplBuilderTest.java | 10 +-- .../datatypes/MqttUserPropertiesImplTest.java | 6 +- .../datatypes/MqttUserPropertyImplTest.java | 2 +- .../datatypes/MqttUtf8StringImplTest.java | 2 +- .../MqttVariableByteIntegerTest.java | 2 +- .../MqttSubscribedPublishFlowTreeTest.java | 8 +-- .../MqttSubscribedPublishFlowsTest.java | 16 ++--- .../handler/tls/MqttTlsInitializerTest.java | 8 +-- .../mqtt/message/MqttPropertyTest.java | 2 +- .../mqtt/message/MqttReasonCodesTest.java | 2 +- .../mqtt/message/auth/MqttAuthTest.java | 2 +- .../message/auth/MqttEnhancedAuthTest.java | 2 +- .../mqtt/message/auth/MqttSimpleAuthTest.java | 2 +- .../auth/mqtt3/Mqtt3SimpleAuthViewTest.java | 2 +- .../connect/MqttConnAckRestrictionsTest.java | 2 +- .../mqtt/message/connect/MqttConnAckTest.java | 2 +- .../connect/MqttConnectRestrictionsTest.java | 2 +- .../mqtt/message/connect/MqttConnectTest.java | 2 +- .../connect/mqtt3/Mqtt3ConnAckViewTest.java | 2 +- .../connect/mqtt3/Mqtt3ConnectViewTest.java | 2 +- .../disconnect/MqttDisconnectTest.java | 2 +- .../mqtt/message/publish/MqttPubAckTest.java | 2 +- .../mqtt/message/publish/MqttPubCompTest.java | 2 +- .../mqtt/message/publish/MqttPubRecTest.java | 2 +- .../mqtt/message/publish/MqttPubRelTest.java | 2 +- .../publish/MqttPublishResultTest.java | 2 +- .../mqtt/message/publish/MqttPublishTest.java | 2 +- .../message/publish/MqttWillPublishTest.java | 2 +- .../mqtt3/Mqtt3PublishResultViewTest.java | 2 +- .../publish/mqtt3/Mqtt3PublishViewTest.java | 6 +- .../message/subscribe/MqttSubAckTest.java | 2 +- .../subscribe/MqttSubscribeBuilderTest.java | 16 ++--- .../message/subscribe/MqttSubscribeTest.java | 2 +- .../subscribe/MqttSubscriptionTest.java | 2 +- .../subscribe/mqtt3/Mqtt3SubAckViewTest.java | 2 +- .../mqtt3/Mqtt3SubscribeViewBuilderTest.java | 12 ++-- .../mqtt3/Mqtt3SubscribeViewTest.java | 2 +- .../mqtt3/Mqtt3SubscriptionViewTest.java | 2 +- .../message/unsubscribe/MqttUnsubAckTest.java | 16 ++--- .../MqttUnsubscribeBuilderTest.java | 8 +-- .../unsubscribe/MqttUnsubscribeTest.java | 2 +- .../Mqtt3UnsubscribeViewBuilderTest.java | 8 +-- .../mqtt3/Mqtt3UnsubscribeViewTest.java | 2 +- .../Mqtt3RxClientViewExceptionsTest.java | 36 +++++----- .../util/AsyncRuntimeExceptionTest.java | 2 +- .../internal/util/ByteArrayTest.java | 2 +- .../internal/util/ByteArrayUtilTest.java | 2 +- .../internal/util/ByteBufferUtilTest.java | 2 +- .../internal/util/ChecksTest.java | 10 +-- .../internal/util/ClassUtilTest.java | 6 +- .../internal/util/ExecutorUtilTest.java | 2 +- .../internal/util/Pow2UtilTest.java | 2 +- .../internal/util/RangesTest.java | 2 +- .../internal/util/StringUtilTest.java | 2 +- .../internal/util/UnsignedDataTypesTest.java | 2 +- .../internal/util/Utf8UtilTest.java | 2 +- .../collections/ChunkedArrayQueueTest.java | 2 +- .../util/collections/HandleListTest.java | 4 +- .../collections/ImmutableIntListTest.java | 2 +- .../util/collections/ImmutableListTest.java | 2 +- .../util/collections/IntIndexTest.java | 2 +- .../util/collections/NodeListTest.java | 2 +- .../mqtt/MqttClientStateTest.java | 2 +- .../mqtt/MqttTlsConfigBuilderTest.java | 2 +- .../mqtt/datatypes/MqttQosTest.java | 2 +- .../ConnectionClosedExceptionTest.java | 4 +- .../ConnectionFailedExceptionTest.java | 4 +- .../MqttClientStateExceptionTest.java | 4 +- .../exceptions/MqttDecodeExceptionTest.java | 4 +- .../exceptions/MqttEncodeExceptionTest.java | 4 +- .../MqttSessionExpiredExceptionTest.java | 4 +- .../exceptions/Mqtt3ConnAckExceptionTest.java | 6 +- .../Mqtt3DisconnectExceptionTest.java | 6 +- .../exceptions/Mqtt3PubAckExceptionTest.java | 6 +- .../exceptions/Mqtt3PubRecExceptionTest.java | 6 +- .../exceptions/Mqtt3SubAckExceptionTest.java | 6 +- .../Mqtt3UnsubAckExceptionTest.java | 6 +- .../mqtt3/message/Mqtt3MessageTypeTest.java | 2 +- .../connect/Mqtt3ConnAckReturnCodeTest.java | 2 +- .../subscribe/Mqtt3SubAckReturnCodeTest.java | 2 +- .../exceptions/Mqtt5AuthExceptionTest.java | 6 +- .../exceptions/Mqtt5ConnAckExceptionTest.java | 6 +- .../Mqtt5DisconnectExceptionTest.java | 6 +- .../exceptions/Mqtt5PubAckExceptionTest.java | 6 +- .../exceptions/Mqtt5PubRecExceptionTest.java | 6 +- .../exceptions/Mqtt5SubAckExceptionTest.java | 6 +- .../Mqtt5UnsubAckExceptionTest.java | 6 +- .../mqtt5/message/Mqtt5MessageTypeTest.java | 2 +- .../message/auth/Mqtt5AuthReasonCodeTest.java | 2 +- .../connect/Mqtt5ConnAckReasonCodeTest.java | 2 +- .../Mqtt5DisconnectReasonCodeTest.java | 2 +- .../Mqtt5PayloadFormatIndicatorTest.java | 2 +- .../publish/Mqtt5PubAckReasonCodeTest.java | 2 +- .../publish/Mqtt5PubCompReasonCodeTest.java | 2 +- .../publish/Mqtt5PubRecReasonCodeTest.java | 2 +- .../publish/Mqtt5PubRelReasonCodeTest.java | 2 +- .../subscribe/Mqtt5RetainHandlingTest.java | 2 +- .../subscribe/Mqtt5SubAckReasonCodeTest.java | 2 +- .../Mqtt5UnsubAckReasonCodeTest.java | 2 +- .../rx/FlowableWithSingleItem.java | 4 +- .../rx/FlowableWithSingleSplit.java | 4 +- .../rx/FlowableWithSingleTest.java | 4 +- .../util/KeyStoreUtilTest.java | 2 +- .../util/TestKeyStoreGenerator.java | 2 +- .../util/TypeSwitchTest.java | 2 +- websocket/build.gradle.kts | 2 +- 705 files changed, 3857 insertions(+), 3857 deletions(-) rename examples/src/main/java/com/hivemq/{client => client2}/mqtt/examples/AsyncDemo.java (89%) rename examples/src/main/java/com/hivemq/{client => client2}/mqtt/examples/Mqtt5Features.java (90%) rename examples/src/main/java/com/hivemq/{client => client2}/mqtt/examples/ReconnectStrategy.java (95%) rename examples/src/main/java/com/hivemq/{client => client2}/mqtt/examples/RequestResponse.java (92%) rename reactor/src/main/java/com/hivemq/{client => client2}/internal/mqtt/mqtt3/reactor/Mqtt3ReactorClientView.java (77%) rename reactor/src/main/java/com/hivemq/{client => client2}/internal/mqtt/reactor/MqttReactorClient.java (76%) rename reactor/src/main/java/com/hivemq/{client => client2}/internal/rx/reactor/CoreWithSingleConditionalSubscriber.java (88%) rename reactor/src/main/java/com/hivemq/{client => client2}/internal/rx/reactor/CoreWithSingleStrictSubscriber.java (80%) rename reactor/src/main/java/com/hivemq/{client => client2}/internal/rx/reactor/operators/FluxWithSingleCombine.java (97%) rename reactor/src/main/java/com/hivemq/{client => client2}/internal/rx/reactor/operators/FluxWithSingleFrom.java (84%) rename reactor/src/main/java/com/hivemq/{client => client2}/internal/rx/reactor/operators/FluxWithSingleMap.java (96%) rename reactor/src/main/java/com/hivemq/{client => client2}/internal/rx/reactor/operators/FluxWithSingleOperator.java (89%) rename reactor/src/main/java/com/hivemq/{client => client2}/internal/rx/reactor/operators/FluxWithSinglePublishOn.java (91%) rename reactor/src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/reactor/Mqtt3ReactorClient.java (89%) rename reactor/src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/reactor/Mqtt5ReactorClient.java (88%) rename reactor/src/main/java/com/hivemq/{client => client2}/rx/reactor/CorePublisherWithSingle.java (91%) rename reactor/src/main/java/com/hivemq/{client => client2}/rx/reactor/CoreWithSingleSubscriber.java (91%) rename reactor/src/main/java/com/hivemq/{client => client2}/rx/reactor/FluxWithSingle.java (97%) rename reactor/src/test/java/com/hivemq/{client => client2}/rx/reactor/FluxWithSingleItem.java (98%) rename reactor/src/test/java/com/hivemq/{client => client2}/rx/reactor/FluxWithSingleSplit.java (97%) rename reactor/src/test/java/com/hivemq/{client => client2}/rx/reactor/FluxWithSingleTest.java (99%) rename src/main/java/com/hivemq/{client => client2}/annotations/CheckReturnValue.java (95%) rename src/main/java/com/hivemq/{client => client2}/internal/annotations/CallByThread.java (95%) rename src/main/java/com/hivemq/{client => client2}/internal/annotations/NotThreadSafe.java (94%) rename src/main/java/com/hivemq/{client => client2}/internal/annotations/ThreadSafe.java (94%) rename src/main/java/com/hivemq/{client => client2}/internal/checkpoint/Confirmable.java (93%) rename src/main/java/com/hivemq/{client => client2}/internal/logging/InternalLogger.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/logging/InternalLoggerFactory.java (92%) rename src/main/java/com/hivemq/{client => client2}/internal/logging/InternalNoopLogger.java (97%) rename src/main/java/com/hivemq/{client => client2}/internal/logging/InternalSlf4jLogger.java (97%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/MqttAsyncClient.java (88%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/MqttBlockingClient.java (86%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/MqttClientConfig.java (89%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/MqttClientConnectionConfig.java (94%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/MqttExecutorConfigImpl.java (97%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/MqttExecutorConfigImplBuilder.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/MqttProxyConfigImpl.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/MqttProxyConfigImplBuilder.java (95%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/MqttRxClient.java (79%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/MqttRxClientBuilder.java (78%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/MqttRxClientBuilderBase.java (91%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/MqttTlsConfigImpl.java (97%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/MqttTlsConfigImplBuilder.java (95%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/MqttTransportConfigImpl.java (94%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/MqttTransportConfigImplBuilder.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/MqttWebSocketConfigImpl.java (97%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/MqttWebSocketConfigImplBuilder.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/advanced/MqttAdvancedConfig.java (91%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/advanced/MqttAdvancedConfigBuilder.java (87%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/advanced/interceptor/MqttClientInterceptors.java (87%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/advanced/interceptor/MqttClientInterceptorsBuilder.java (88%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/MqttCodecModule.java (75%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/MqttDecoder.java (86%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/MqttDecoderContext.java (95%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/MqttDecoderException.java (93%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/MqttMessageDecoder.java (92%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/MqttMessageDecoderUtil.java (90%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/MqttMessageDecoders.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/MqttPingRespDecoder.java (76%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt3/Mqtt3ClientMessageDecoders.java (88%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt3/Mqtt3ConnAckDecoder.java (71%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt3/Mqtt3MessageDecoderUtil.java (87%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubAckDecoder.java (69%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubCompDecoder.java (69%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRecDecoder.java (69%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRelDecoder.java (69%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt3/Mqtt3PublishDecoder.java (74%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt3/Mqtt3SubAckDecoder.java (69%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt3/Mqtt3UnsubAckDecoder.java (69%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5AuthDecoder.java (72%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5ClientMessageDecoders.java (89%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5ConnAckDecoder.java (88%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5DisconnectDecoder.java (71%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5MessageDecoderUtil.java (90%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubAckDecoder.java (68%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubCompDecoder.java (68%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRecDecoder.java (68%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRelDecoder.java (68%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5PublishDecoder.java (86%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5SubAckDecoder.java (73%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoder.java (73%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/MqttEncoder.java (92%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/MqttEncoderContext.java (90%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/MqttMessageEncoder.java (93%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/MqttMessageEncoderUtil.java (89%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/MqttMessageEncoders.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/MqttPingReqEncoder.java (88%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt3/Mqtt3ClientMessageEncoders.java (89%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt3/Mqtt3ConnectEncoder.java (87%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt3/Mqtt3DisconnectEncoder.java (80%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt3/Mqtt3MessageEncoder.java (87%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubAckEncoder.java (77%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubCompEncoder.java (77%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRecEncoder.java (77%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRelEncoder.java (77%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt3/Mqtt3PublishEncoder.java (89%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt3/Mqtt3SubscribeEncoder.java (86%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt3/Mqtt3UnsubscribeEncoder.java (86%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5AuthEncoder.java (84%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5ClientMessageEncoders.java (89%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoder.java (90%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5DisconnectEncoder.java (70%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5MessageEncoderUtil.java (93%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5MessageWithUserPropertiesEncoder.java (93%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubAckEncoder.java (77%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubCompEncoder.java (77%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRecEncoder.java (77%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRelEncoder.java (77%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5PublishEncoder.java (88%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5SubscribeEncoder.java (81%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5UnsubscribeEncoder.java (89%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttBinaryData.java (98%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttClientIdentifierImpl.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttSharedTopicFilterImpl.java (98%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttTopicFilterImpl.java (97%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttTopicFilterImplBuilder.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttTopicImpl.java (97%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttTopicImplBuilder.java (95%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttTopicIterator.java (98%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttTopicLevel.java (97%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttTopicLevels.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttUserPropertiesImpl.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttUserPropertiesImplBuilder.java (90%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttUserPropertyImpl.java (95%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttUtf8StringImpl.java (98%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttVariableByteInteger.java (98%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/exceptions/MqttClientStateExceptions.java (90%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java (78%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/MqttChannelInitializer.java (80%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/MqttConnectionAwareHandler.java (92%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/MqttSession.java (83%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/MqttSessionAwareHandler.java (87%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/auth/AbstractMqttAuthHandler.java (88%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/auth/MqttAuthHandler.java (93%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/auth/MqttConnectAuthHandler.java (86%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/auth/MqttDisconnectOnAuthHandler.java (83%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/auth/MqttReAuthCompletable.java (88%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/auth/MqttReAuthHandler.java (87%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/connect/MqttConnAckFlow.java (95%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/connect/MqttConnAckSingle.java (88%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/connect/MqttConnectHandler.java (86%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/disconnect/MqttDisconnectCompletable.java (84%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/disconnect/MqttDisconnectEvent.java (86%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/disconnect/MqttDisconnectHandler.java (87%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/disconnect/MqttDisconnectUtil.java (88%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/ping/MqttPingHandler.java (89%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/proxy/MqttProxyAdapterHandler.java (97%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/proxy/MqttProxyInitializer.java (89%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlow.java (85%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlowable.java (84%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/incoming/MqttIncomingPublishConfirmable.java (94%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlow.java (95%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlows.java (85%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/incoming/MqttIncomingPublishService.java (91%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/incoming/MqttIncomingQosHandler.java (92%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/incoming/MqttStatefulPublishWithFlows.java (83%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlow.java (75%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTree.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowable.java (78%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlows.java (84%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/outgoing/MqttAckFlow.java (76%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/outgoing/MqttAckFlowable.java (83%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/outgoing/MqttAckFlowableFlow.java (94%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/outgoing/MqttAckSingle.java (87%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/outgoing/MqttAckSingleFlowable.java (90%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java (89%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/outgoing/MqttPubOrRelWithFlow.java (88%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/outgoing/MqttPubRelWithFlow.java (88%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/outgoing/MqttPublishFlowableAckLink.java (95%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/outgoing/MqttPublishFlowables.java (90%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/outgoing/MqttPublishWithFlow.java (88%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/outgoing/MqttTopicAliasAutoMapping.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/outgoing/MqttTopicAliasMapping.java (86%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/subscribe/MqttSubAckSingle.java (81%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/subscribe/MqttSubOrUnsubAckFlow.java (88%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/subscribe/MqttSubOrUnsubWithFlow.java (87%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/subscribe/MqttSubscribeWithFlow.java (87%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/subscribe/MqttSubscriptionFlow.java (94%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/subscribe/MqttSubscriptionHandler.java (86%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/subscribe/MqttUnsubAckSingle.java (80%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/subscribe/MqttUnsubscribeWithFlow.java (85%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/tls/MqttTlsAdapterHandler.java (98%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/tls/MqttTlsInitializer.java (93%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/util/FlowWithEventLoop.java (95%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/util/MqttTimeoutInboundHandler.java (90%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/websocket/MqttWebSocketCodec.java (95%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java (89%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/handler/websocket/MqttWebsocketHandshakeHandler.java (98%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/ioc/ClientComponent.java (79%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/ioc/ClientScope.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/ioc/ConnectionComponent.java (84%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/ioc/ConnectionModule.java (76%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/ioc/ConnectionScope.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/ioc/SingletonComponent.java (95%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/lifecycle/MqttAutoReconnectImpl.java (90%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/lifecycle/MqttAutoReconnectImplBuilder.java (95%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/lifecycle/MqttConnectedContextImpl.java (79%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/lifecycle/MqttDisconnectedContextImpl.java (84%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/lifecycle/MqttReconnector.java (90%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/lifecycle/mqtt3/Mqtt3ConnectedContextView.java (76%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/lifecycle/mqtt3/Mqtt3DisconnectedContextView.java (81%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/lifecycle/mqtt3/Mqtt3ReconnectorView.java (84%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/MqttMessage.java (84%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/MqttMessageWithUserProperties.java (94%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/MqttProperty.java (97%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/MqttReasonCodes.java (95%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/MqttStatefulMessage.java (93%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/auth/MqttAuth.java (84%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/auth/MqttAuthBuilder.java (81%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/auth/MqttAuthProperty.java (90%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/auth/MqttEnhancedAuth.java (90%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/auth/MqttEnhancedAuthBuilder.java (83%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/auth/MqttSimpleAuth.java (89%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/auth/MqttSimpleAuthBuilder.java (88%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthView.java (87%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthViewBuilder.java (88%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/connect/MqttConnAck.java (90%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/connect/MqttConnAckProperty.java (95%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/connect/MqttConnAckRestrictions.java (95%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/connect/MqttConnect.java (88%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/connect/MqttConnectBuilder.java (85%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/connect/MqttConnectProperty.java (93%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/connect/MqttConnectRestrictions.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/connect/MqttConnectRestrictionsBuilder.java (93%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/connect/MqttStatefulConnect.java (87%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckView.java (87%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java (83%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewBuilder.java (83%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/disconnect/MqttDisconnect.java (87%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/disconnect/MqttDisconnectBuilder.java (87%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/disconnect/MqttDisconnectProperty.java (90%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/disconnect/mqtt3/Mqtt3DisconnectView.java (78%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/ping/MqttPingReq.java (83%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/ping/MqttPingResp.java (83%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/ping/mqtt3/Mqtt3PingReqView.java (87%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/ping/mqtt3/Mqtt3PingRespView.java (87%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttPubAck.java (81%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttPubAckBuilder.java (79%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttPubAckProperty.java (89%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttPubComp.java (81%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttPubCompBuilder.java (80%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttPubCompProperty.java (89%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttPubRec.java (81%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttPubRecBuilder.java (79%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttPubRecProperty.java (89%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttPubRel.java (81%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttPubRelBuilder.java (80%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttPubRelProperty.java (89%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttPublish.java (87%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttPublishBuilder.java (93%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttPublishProperty.java (92%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttPublishResult.java (98%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttStatefulPublish.java (90%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttWillPublish.java (86%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttWillPublishProperty.java (92%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/mqtt3/Mqtt3PubAckView.java (78%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/mqtt3/Mqtt3PubCompView.java (78%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/mqtt3/Mqtt3PubRecView.java (78%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/mqtt3/Mqtt3PubRelView.java (78%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/mqtt3/Mqtt3PublishResultView.java (84%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java (86%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewBuilder.java (89%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/subscribe/MqttStatefulSubscribe.java (92%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/subscribe/MqttSubAck.java (78%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/subscribe/MqttSubAckProperty.java (88%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/subscribe/MqttSubscribe.java (85%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/subscribe/MqttSubscribeBuilder.java (89%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/subscribe/MqttSubscribeProperty.java (88%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/subscribe/MqttSubscription.java (93%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/subscribe/MqttSubscriptionBuilder.java (86%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckView.java (89%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeView.java (87%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java (92%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionView.java (85%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewBuilder.java (82%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/unsubscribe/MqttStatefulUnsubscribe.java (89%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/unsubscribe/MqttUnsubAck.java (78%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/unsubscribe/MqttUnsubAckProperty.java (88%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/unsubscribe/MqttUnsubscribe.java (83%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilder.java (87%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/unsubscribe/MqttUnsubscribeProperty.java (86%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubAckView.java (75%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeView.java (85%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilder.java (89%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java (81%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java (71%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java (71%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/mqtt3/Mqtt3RxClientView.java (73%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/mqtt3/Mqtt3RxClientViewBuilder.java (78%) rename src/main/java/com/hivemq/{client => client2}/internal/mqtt/util/MqttChecks.java (82%) rename src/main/java/com/hivemq/{client => client2}/internal/netty/ContextFuture.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/netty/DefaultChannelOutboundHandler.java (98%) rename src/main/java/com/hivemq/{client => client2}/internal/netty/DefaultContextPromise.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/netty/NettyEventLoopProvider.java (93%) rename src/main/java/com/hivemq/{client => client2}/internal/rx/CompletableFlow.java (97%) rename src/main/java/com/hivemq/{client => client2}/internal/rx/WithSingleConditionalSubscriber.java (89%) rename src/main/java/com/hivemq/{client => client2}/internal/rx/WithSingleStrictSubscriber.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/rx/operators/FlowableWithSingleCombine.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/rx/operators/FlowableWithSingleMap.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/rx/operators/FlowableWithSingleMapError.java (94%) rename src/main/java/com/hivemq/{client => client2}/internal/rx/operators/FlowableWithSingleObserveOn.java (91%) rename src/main/java/com/hivemq/{client => client2}/internal/rx/operators/FlowableWithSingleOperator.java (90%) rename src/main/java/com/hivemq/{client => client2}/internal/util/AsyncRuntimeException.java (98%) rename src/main/java/com/hivemq/{client => client2}/internal/util/ByteArray.java (97%) rename src/main/java/com/hivemq/{client => client2}/internal/util/ByteArrayUtil.java (97%) rename src/main/java/com/hivemq/{client => client2}/internal/util/ByteBufferUtil.java (98%) rename src/main/java/com/hivemq/{client => client2}/internal/util/Checks.java (98%) rename src/main/java/com/hivemq/{client => client2}/internal/util/ClassUtil.java (95%) rename src/main/java/com/hivemq/{client => client2}/internal/util/ExecutorUtil.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/util/InetSocketAddressUtil.java (97%) rename src/main/java/com/hivemq/{client => client2}/internal/util/Pow2Util.java (95%) rename src/main/java/com/hivemq/{client => client2}/internal/util/Ranges.java (97%) rename src/main/java/com/hivemq/{client => client2}/internal/util/StringUtil.java (95%) rename src/main/java/com/hivemq/{client => client2}/internal/util/UnsignedDataTypes.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/util/Utf8Util.java (98%) rename src/main/java/com/hivemq/{client => client2}/internal/util/collections/ChunkedArrayQueue.java (98%) rename src/main/java/com/hivemq/{client => client2}/internal/util/collections/HandleList.java (91%) rename src/main/java/com/hivemq/{client => client2}/internal/util/collections/ImmutableArray.java (98%) rename src/main/java/com/hivemq/{client => client2}/internal/util/collections/ImmutableElement.java (98%) rename src/main/java/com/hivemq/{client => client2}/internal/util/collections/ImmutableEmptyIntList.java (96%) rename src/main/java/com/hivemq/{client => client2}/internal/util/collections/ImmutableEmptyList.java (98%) rename src/main/java/com/hivemq/{client => client2}/internal/util/collections/ImmutableIntArray.java (95%) rename src/main/java/com/hivemq/{client => client2}/internal/util/collections/ImmutableIntElement.java (94%) rename src/main/java/com/hivemq/{client => client2}/internal/util/collections/ImmutableIntList.java (97%) rename src/main/java/com/hivemq/{client => client2}/internal/util/collections/ImmutableList.java (99%) rename src/main/java/com/hivemq/{client => client2}/internal/util/collections/Index.java (98%) rename src/main/java/com/hivemq/{client => client2}/internal/util/collections/IntIndex.java (98%) rename src/main/java/com/hivemq/{client => client2}/internal/util/collections/NodeList.java (96%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttClient.java (93%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttClientBuilder.java (75%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttClientBuilderBase.java (92%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttClientConfig.java (91%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttClientConnectionConfig.java (94%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttClientState.java (98%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttExecutorConfig.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttExecutorConfigBuilder.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttExecutorConfigBuilderBase.java (96%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttGlobalPublishFilter.java (98%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttProxyConfig.java (96%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttProxyConfigBuilder.java (94%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttProxyConfigBuilderBase.java (97%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttProxyProtocol.java (96%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttTlsConfig.java (96%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttTlsConfigBuilder.java (94%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttTlsConfigBuilderBase.java (97%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttTransportConfig.java (97%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttTransportConfigBuilder.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttTransportConfigBuilderBase.java (98%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttVersion.java (97%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttWebSocketConfig.java (96%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttWebSocketConfigBuilder.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/MqttWebSocketConfigBuilderBase.java (96%) rename src/main/java/com/hivemq/{client => client2}/mqtt/datatypes/MqttClientIdentifier.java (94%) rename src/main/java/com/hivemq/{client => client2}/mqtt/datatypes/MqttQos.java (97%) rename src/main/java/com/hivemq/{client => client2}/mqtt/datatypes/MqttSharedTopicFilter.java (94%) rename src/main/java/com/hivemq/{client => client2}/mqtt/datatypes/MqttSharedTopicFilterBuilder.java (97%) rename src/main/java/com/hivemq/{client => client2}/mqtt/datatypes/MqttTopic.java (93%) rename src/main/java/com/hivemq/{client => client2}/mqtt/datatypes/MqttTopicBuilder.java (96%) rename src/main/java/com/hivemq/{client => client2}/mqtt/datatypes/MqttTopicBuilderBase.java (93%) rename src/main/java/com/hivemq/{client => client2}/mqtt/datatypes/MqttTopicFilter.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/datatypes/MqttTopicFilterBuilder.java (97%) rename src/main/java/com/hivemq/{client => client2}/mqtt/datatypes/MqttTopicFilterBuilderBase.java (98%) rename src/main/java/com/hivemq/{client => client2}/mqtt/datatypes/MqttUtf8String.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/exceptions/ConnectionClosedException.java (92%) rename src/main/java/com/hivemq/{client => client2}/mqtt/exceptions/ConnectionFailedException.java (92%) rename src/main/java/com/hivemq/{client => client2}/mqtt/exceptions/MqttClientStateException.java (88%) rename src/main/java/com/hivemq/{client => client2}/mqtt/exceptions/MqttDecodeException.java (91%) rename src/main/java/com/hivemq/{client => client2}/mqtt/exceptions/MqttEncodeException.java (91%) rename src/main/java/com/hivemq/{client => client2}/mqtt/exceptions/MqttSessionExpiredException.java (92%) rename src/main/java/com/hivemq/{client => client2}/mqtt/lifecycle/MqttAutoReconnect.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/lifecycle/MqttAutoReconnectBuilder.java (94%) rename src/main/java/com/hivemq/{client => client2}/mqtt/lifecycle/MqttAutoReconnectBuilderBase.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/lifecycle/MqttConnectedContext.java (91%) rename src/main/java/com/hivemq/{client => client2}/mqtt/lifecycle/MqttConnectedListener.java (96%) rename src/main/java/com/hivemq/{client => client2}/mqtt/lifecycle/MqttDisconnectSource.java (97%) rename src/main/java/com/hivemq/{client => client2}/mqtt/lifecycle/MqttDisconnectedContext.java (75%) rename src/main/java/com/hivemq/{client => client2}/mqtt/lifecycle/MqttDisconnectedListener.java (76%) rename src/main/java/com/hivemq/{client => client2}/mqtt/lifecycle/MqttReconnector.java (96%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/Mqtt3AsyncClient.java (94%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/Mqtt3BlockingClient.java (86%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/Mqtt3Client.java (90%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/Mqtt3ClientBuilder.java (89%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/Mqtt3ClientConfig.java (76%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/Mqtt3ClientConnectionConfig.java (91%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/Mqtt3RxClient.java (89%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/exceptions/Mqtt3ConnAckException.java (92%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/exceptions/Mqtt3DisconnectException.java (92%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/exceptions/Mqtt3MessageException.java (86%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/exceptions/Mqtt3PubAckException.java (92%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/exceptions/Mqtt3PubRecException.java (92%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/exceptions/Mqtt3SubAckException.java (92%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/exceptions/Mqtt3UnsubAckException.java (92%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/lifecycle/Mqtt3ConnectedContext.java (78%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/lifecycle/Mqtt3DisconnectedContext.java (82%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/lifecycle/Mqtt3Reconnector.java (83%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/Mqtt3Message.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/Mqtt3MessageType.java (97%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/Mqtt3ReturnCode.java (91%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/auth/Mqtt3SimpleAuth.java (84%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilder.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilderBase.java (93%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/connect/Mqtt3ConnAck.java (88%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/connect/Mqtt3ConnAckReturnCode.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/connect/Mqtt3Connect.java (84%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilder.java (93%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java (89%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/disconnect/Mqtt3Disconnect.java (85%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/ping/Mqtt3PingReq.java (85%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/ping/Mqtt3PingResp.java (85%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/publish/Mqtt3PubAck.java (85%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/publish/Mqtt3PubComp.java (85%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/publish/Mqtt3PubRec.java (85%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/publish/Mqtt3PubRel.java (85%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/publish/Mqtt3Publish.java (88%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/publish/Mqtt3PublishBuilder.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/publish/Mqtt3PublishBuilderBase.java (92%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/publish/Mqtt3PublishResult.java (91%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/publish/Mqtt3WillPublishBuilder.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/subscribe/Mqtt3SubAck.java (81%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/subscribe/Mqtt3SubAckReturnCode.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/subscribe/Mqtt3Subscribe.java (86%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java (97%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/subscribe/Mqtt3Subscription.java (87%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilder.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilderBase.java (90%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubAck.java (85%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/unsubscribe/Mqtt3Unsubscribe.java (84%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilder.java (96%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/Mqtt5AsyncClient.java (92%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/Mqtt5BlockingClient.java (83%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/Mqtt5Client.java (91%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/Mqtt5ClientBuilder.java (88%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/Mqtt5ClientConfig.java (72%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/Mqtt5ClientConnectionConfig.java (75%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/Mqtt5RxClient.java (89%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/advanced/Mqtt5AdvancedConfig.java (81%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilder.java (94%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java (89%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptors.java (75%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilder.java (93%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilderBase.java (75%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5InboundQos1Interceptor.java (85%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5OutboundQos1Interceptor.java (84%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5InboundQos2Interceptor.java (84%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutboundQos2Interceptor.java (93%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java (92%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/datatypes/Mqtt5UserProperties.java (90%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilder.java (94%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilderBase.java (94%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/datatypes/Mqtt5UserProperty.java (89%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/exceptions/Mqtt5AuthException.java (92%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/exceptions/Mqtt5ConnAckException.java (92%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/exceptions/Mqtt5DisconnectException.java (92%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/exceptions/Mqtt5MessageException.java (86%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/exceptions/Mqtt5PubAckException.java (91%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/exceptions/Mqtt5PubRecException.java (91%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/exceptions/Mqtt5SubAckException.java (91%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/exceptions/Mqtt5UnsubAckException.java (91%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/lifecycle/Mqtt5ConnectedContext.java (78%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/lifecycle/Mqtt5DisconnectedContext.java (82%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/lifecycle/Mqtt5Reconnector.java (83%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/Mqtt5Message.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/Mqtt5MessageType.java (97%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/Mqtt5ReasonCode.java (94%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/auth/Mqtt5Auth.java (83%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/auth/Mqtt5AuthBuilder.java (89%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/auth/Mqtt5AuthReasonCode.java (92%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuth.java (91%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuthBuilder.java (96%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/auth/Mqtt5SimpleAuth.java (85%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilder.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilderBase.java (94%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/connect/Mqtt5ConnAck.java (86%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCode.java (96%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/connect/Mqtt5ConnAckRestrictions.java (92%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/connect/Mqtt5Connect.java (85%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilder.java (93%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilderBase.java (90%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictions.java (93%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilder.java (94%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilderBase.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/disconnect/Mqtt5Disconnect.java (85%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilder.java (92%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilderBase.java (88%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectReasonCode.java (97%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/ping/Mqtt5PingReq.java (85%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/ping/Mqtt5PingResp.java (85%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5PayloadFormatIndicator.java (96%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5PubAck.java (82%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5PubAckBuilder.java (89%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5PubAckReasonCode.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5PubComp.java (83%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5PubCompBuilder.java (88%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5PubCompReasonCode.java (92%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5PubRec.java (82%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5PubRecBuilder.java (89%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5PubRecReasonCode.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5PubRel.java (82%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5PubRelBuilder.java (88%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5PubRelReasonCode.java (91%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5Publish.java (87%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5PublishBuilder.java (94%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5PublishBuilderBase.java (94%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5PublishResult.java (90%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5WillPublish.java (85%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5WillPublishBuilder.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandling.java (97%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/subscribe/Mqtt5SubAck.java (79%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCode.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/subscribe/Mqtt5Subscribe.java (85%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilder.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilderBase.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/subscribe/Mqtt5Subscription.java (91%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilder.java (95%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilderBase.java (93%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAck.java (79%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCode.java (93%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/unsubscribe/Mqtt5Unsubscribe.java (82%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilder.java (96%) rename src/main/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilderBase.java (94%) rename src/main/java/com/hivemq/{client => client2}/rx/FlowableWithSingle.java (97%) rename src/main/java/com/hivemq/{client => client2}/rx/FlowableWithSingleSubscriber.java (92%) rename src/main/java/com/hivemq/{client => client2}/rx/reactivestreams/PublisherWithSingle.java (97%) rename src/main/java/com/hivemq/{client => client2}/rx/reactivestreams/WithSingleSubscriber.java (96%) rename src/main/java/com/hivemq/{client => client2}/util/KeyStoreUtil.java (97%) rename src/main/java/com/hivemq/{client => client2}/util/TypeSwitch.java (99%) rename src/test/java/com/hivemq/{client => client2}/example/Mqtt3ClientExample.java (90%) rename src/test/java/com/hivemq/{client => client2}/example/Mqtt3SmokeTest.java (97%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/MqttExecutorConfigImplTest.java (96%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/MqttProxyConfigImplTest.java (96%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/MqttTlsConfigImplTest.java (97%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/MqttTransportConfigImplTest.java (97%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/MqttWebSocketConfigImplTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/advanced/MqttAdvancedConfigTest.java (94%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/advanced/interceptor/MqttClientInterceptorsTest.java (93%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/AbstractMqttDecoderTest.java (81%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt3/AbstractMqtt3DecoderTest.java (73%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt3/Mqtt3ClientMessageDecodersTest.java (92%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt3/Mqtt3ConnAckDecoderTest.java (96%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubAckDecoderTest.java (92%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubCompDecoderTest.java (92%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRecDecoderTest.java (92%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRelDecoderTest.java (92%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt3/Mqtt3PublishDecoderTest.java (96%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt3/Mqtt3SubAckDecoderTest.java (93%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt3/Mqtt3UnsubAckDecoderTest.java (92%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/AbstractMqtt5DecoderTest.java (75%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5AuthDecoderTest.java (97%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5ClientMessageDecodersTest.java (93%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5ConnAckDecoderTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5DisconnectDecoderTest.java (97%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5MessageDecoderUtilTest.java (93%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5PingRespDecoderTest.java (87%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubAckDecoderTest.java (97%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubCompDecoderTest.java (97%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRecDecoderTest.java (93%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRelDecoderTest.java (93%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5PublishDecoderTest.java (97%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5SubAckDecoderTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoderTest.java (94%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/AbstractMqttEncoderTest.java (90%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt3/AbstractMqtt3EncoderTest.java (85%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt3/Mqtt3ConnectEncoderTest.java (88%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt3/Mqtt3PingReqEncoderTest.java (82%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubAckEncoderTest.java (79%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubCompEncoderTest.java (79%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRecEncoderTest.java (82%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRelEncoderTest.java (82%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/AbstractMqtt5EncoderTest.java (81%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/AbstractMqtt5EncoderWithUserPropertiesTest.java (90%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5AuthEncoderTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoderTest.java (94%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5DisconnectEncoderTest.java (93%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5PingReqEncoderTest.java (85%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubAckEncoderTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubCompEncoderTest.java (91%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRecEncoderTest.java (93%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRelEncoderTest.java (92%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5PublishEncoderTest.java (96%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5SubscribeEncoderTest.java (93%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/codec/encoder/mqtt5/Mqtt5UnsubscribeEncoderTest.java (94%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttBinaryDataTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttClientIdentifierImplTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttSharedTopicFilterImplTest.java (99%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttTopicFilterImplTest.java (99%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttTopicImplTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttTopicIteratorTest.java (99%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttTopicLevelTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttTopicLevelsTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttUserPropertiesImplBuilderTest.java (96%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttUserPropertiesImplTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttUserPropertyImplTest.java (97%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttUtf8StringImplTest.java (99%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/datatypes/MqttVariableByteIntegerTest.java (99%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTreeTest.java (97%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowsTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/handler/tls/MqttTlsInitializerTest.java (96%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/MqttPropertyTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/MqttReasonCodesTest.java (99%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/auth/MqttAuthTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/auth/MqttEnhancedAuthTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/auth/MqttSimpleAuthTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthViewTest.java (93%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/connect/MqttConnAckRestrictionsTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/connect/MqttConnAckTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/connect/MqttConnectRestrictionsTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/connect/MqttConnectTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckViewTest.java (93%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewTest.java (93%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/disconnect/MqttDisconnectTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttPubAckTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttPubCompTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttPubRecTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttPubRelTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttPublishResultTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttPublishTest.java (97%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/MqttWillPublishTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/mqtt3/Mqtt3PublishResultViewTest.java (93%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewTest.java (90%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/subscribe/MqttSubAckTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/subscribe/MqttSubscribeBuilderTest.java (97%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/subscribe/MqttSubscribeTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/subscribe/MqttSubscriptionTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckViewTest.java (93%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilderTest.java (97%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewTest.java (93%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewTest.java (93%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/unsubscribe/MqttUnsubAckTest.java (88%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilderTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/unsubscribe/MqttUnsubscribeTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilderTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewTest.java (93%) rename src/test/java/com/hivemq/{client => client2}/internal/mqtt/mqtt3/Mqtt3RxClientViewExceptionsTest.java (84%) rename src/test/java/com/hivemq/{client => client2}/internal/util/AsyncRuntimeExceptionTest.java (99%) rename src/test/java/com/hivemq/{client => client2}/internal/util/ByteArrayTest.java (96%) rename src/test/java/com/hivemq/{client => client2}/internal/util/ByteArrayUtilTest.java (99%) rename src/test/java/com/hivemq/{client => client2}/internal/util/ByteBufferUtilTest.java (99%) rename src/test/java/com/hivemq/{client => client2}/internal/util/ChecksTest.java (97%) rename src/test/java/com/hivemq/{client => client2}/internal/util/ClassUtilTest.java (82%) rename src/test/java/com/hivemq/{client => client2}/internal/util/ExecutorUtilTest.java (97%) rename src/test/java/com/hivemq/{client => client2}/internal/util/Pow2UtilTest.java (96%) rename src/test/java/com/hivemq/{client => client2}/internal/util/RangesTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/internal/util/StringUtilTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/util/UnsignedDataTypesTest.java (97%) rename src/test/java/com/hivemq/{client => client2}/internal/util/Utf8UtilTest.java (97%) rename src/test/java/com/hivemq/{client => client2}/internal/util/collections/ChunkedArrayQueueTest.java (97%) rename src/test/java/com/hivemq/{client => client2}/internal/util/collections/HandleListTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/internal/util/collections/ImmutableIntListTest.java (99%) rename src/test/java/com/hivemq/{client => client2}/internal/util/collections/ImmutableListTest.java (99%) rename src/test/java/com/hivemq/{client => client2}/internal/util/collections/IntIndexTest.java (99%) rename src/test/java/com/hivemq/{client => client2}/internal/util/collections/NodeListTest.java (99%) rename src/test/java/com/hivemq/{client => client2}/mqtt/MqttClientStateTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/mqtt/MqttTlsConfigBuilderTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/mqtt/datatypes/MqttQosTest.java (97%) rename src/test/java/com/hivemq/{client => client2}/mqtt/exceptions/ConnectionClosedExceptionTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/mqtt/exceptions/ConnectionFailedExceptionTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/mqtt/exceptions/MqttClientStateExceptionTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/mqtt/exceptions/MqttDecodeExceptionTest.java (94%) rename src/test/java/com/hivemq/{client => client2}/mqtt/exceptions/MqttEncodeExceptionTest.java (94%) rename src/test/java/com/hivemq/{client => client2}/mqtt/exceptions/MqttSessionExpiredExceptionTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt3/exceptions/Mqtt3ConnAckExceptionTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt3/exceptions/Mqtt3DisconnectExceptionTest.java (94%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt3/exceptions/Mqtt3PubAckExceptionTest.java (94%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt3/exceptions/Mqtt3PubRecExceptionTest.java (94%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt3/exceptions/Mqtt3SubAckExceptionTest.java (95%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt3/exceptions/Mqtt3UnsubAckExceptionTest.java (94%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/Mqtt3MessageTypeTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/connect/Mqtt3ConnAckReturnCodeTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt3/message/subscribe/Mqtt3SubAckReturnCodeTest.java (97%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt5/exceptions/Mqtt5AuthExceptionTest.java (92%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt5/exceptions/Mqtt5ConnAckExceptionTest.java (92%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt5/exceptions/Mqtt5DisconnectExceptionTest.java (94%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt5/exceptions/Mqtt5PubAckExceptionTest.java (92%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt5/exceptions/Mqtt5PubRecExceptionTest.java (92%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt5/exceptions/Mqtt5SubAckExceptionTest.java (92%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt5/exceptions/Mqtt5UnsubAckExceptionTest.java (92%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/Mqtt5MessageTypeTest.java (99%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/auth/Mqtt5AuthReasonCodeTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCodeTest.java (99%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectReasonCodeTest.java (99%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5PayloadFormatIndicatorTest.java (96%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5PubAckReasonCodeTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5PubCompReasonCodeTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5PubRecReasonCodeTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/publish/Mqtt5PubRelReasonCodeTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandlingTest.java (97%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCodeTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCodeTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/rx/FlowableWithSingleItem.java (97%) rename src/test/java/com/hivemq/{client => client2}/rx/FlowableWithSingleSplit.java (97%) rename src/test/java/com/hivemq/{client => client2}/rx/FlowableWithSingleTest.java (99%) rename src/test/java/com/hivemq/{client => client2}/util/KeyStoreUtilTest.java (98%) rename src/test/java/com/hivemq/{client => client2}/util/TestKeyStoreGenerator.java (99%) rename src/test/java/com/hivemq/{client => client2}/util/TypeSwitchTest.java (98%) diff --git a/README.md b/README.md index 4618d067e..f7754be89 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ If you use Gradle, just include the following inside your `build.gradle` file. ```groovy dependencies { - implementation group: 'com.hivemq', name: 'hivemq-mqtt-client', version: '1.2.1' + implementation group: 'com.hivemq', name: 'hivemq-mqtt-client2', version: '2.0.0' } ``` @@ -110,10 +110,10 @@ For optional features you can choose to include additional modules: ```groovy dependencies { - implementation group: 'com.hivemq', name: 'hivemq-mqtt-client-websocket', version: '1.2.1' - implementation group: 'com.hivemq', name: 'hivemq-mqtt-client-proxy', version: '1.2.1' - implementation group: 'com.hivemq', name: 'hivemq-mqtt-client-epoll', version: '1.2.1' - implementation group: 'com.hivemq', name: 'hivemq-mqtt-client-reactor', version: '1.2.1' + implementation group: 'com.hivemq', name: 'hivemq-mqtt-client2-websocket', version: '2.0.0' + implementation group: 'com.hivemq', name: 'hivemq-mqtt-client2-proxy', version: '2.0.0' + implementation group: 'com.hivemq', name: 'hivemq-mqtt-client2-epoll', version: '2.0.0' + implementation group: 'com.hivemq', name: 'hivemq-mqtt-client2-reactor', version: '2.0.0' } ``` @@ -127,8 +127,8 @@ If you use Maven, just include the following inside your `pom.xml` file. com.hivemq - hivemq-mqtt-client - 1.2.1 + hivemq-mqtt-client2 + 2.0.0 ... @@ -156,32 +156,32 @@ For optional features you can choose to include additional modules: com.hivemq - hivemq-mqtt-client-websocket - 1.2.1 + hivemq-mqtt-client2-websocket + 2.0.0 pom com.hivemq - hivemq-mqtt-client-proxy - 1.2.1 + hivemq-mqtt-client2-proxy + 2.0.0 pom com.hivemq - hivemq-mqtt-client-epoll - 1.2.1 + hivemq-mqtt-client2-epoll + 2.0.0 pom com.hivemq - hivemq-mqtt-client-reactor - 1.2.1 + hivemq-mqtt-client2-reactor + 2.0.0 ... @@ -199,7 +199,7 @@ To use the shaded version just append `-shaded` to the artifact name. ```groovy dependencies { - implementation group: 'com.hivemq', name: 'hivemq-mqtt-client-shaded', version: '1.2.1' + implementation group: 'com.hivemq', name: 'hivemq-mqtt-client2-shaded', version: '2.0.0' } ``` @@ -211,8 +211,8 @@ dependencies { com.hivemq - hivemq-mqtt-client-shaded - 1.2.1 + hivemq-mqtt-client2-shaded + 2.0.0 ... @@ -232,13 +232,13 @@ repositories { } dependencies { - implementation 'com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client:develop-SNAPSHOT' + implementation 'com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client2:develop-SNAPSHOT' // snapshots for optional modules - implementation 'com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client-websocket:develop-SNAPSHOT' - implementation 'com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client-proxy:develop-SNAPSHOT' - implementation 'com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client-epoll:develop-SNAPSHOT' - implementation 'com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client-reactor:develop-SNAPSHOT' + implementation 'com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client2-websocket:develop-SNAPSHOT' + implementation 'com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client2-proxy:develop-SNAPSHOT' + implementation 'com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client2-epoll:develop-SNAPSHOT' + implementation 'com.github.hivemq.hivemq-mqtt-client:hivemq-mqtt-client2-reactor:develop-SNAPSHOT' } ``` @@ -257,7 +257,7 @@ dependencies { com.github.hivemq.hivemq-mqtt-client - hivemq-mqtt-client + hivemq-mqtt-client2 develop-SNAPSHOT @@ -266,7 +266,7 @@ dependencies { com.github.hivemq.hivemq-mqtt-client - hivemq-mqtt-client-websocket + hivemq-mqtt-client2-websocket develop-SNAPSHOT pom @@ -274,7 +274,7 @@ dependencies { com.github.hivemq.hivemq-mqtt-client - hivemq-mqtt-client-proxy + hivemq-mqtt-client2-proxy develop-SNAPSHOT pom @@ -282,7 +282,7 @@ dependencies { com.github.hivemq.hivemq-mqtt-client - hivemq-mqtt-client-epoll + hivemq-mqtt-client2-epoll develop-SNAPSHOT pom @@ -290,7 +290,7 @@ dependencies { com.github.hivemq.hivemq-mqtt-client - hivemq-mqtt-client-reactor + hivemq-mqtt-client2-reactor develop-SNAPSHOT @@ -298,7 +298,7 @@ dependencies { ``` -Change the artifact name to `hivemq-mqtt-client-shaded` to get snapshots of the shaded version. +Change the artifact name to `hivemq-mqtt-client2-shaded` to get snapshots of the shaded version. JitPack works for all branches and also specific commits. Just specify `-SNAPSHOT` or the first 10 digits of the commit id in the version. @@ -735,7 +735,7 @@ API but return `Completable`. [Semantic Versioning](https://semver.org/) is used. -All code inside `com.hivemq.client.internal` packages must not be used directly. It can change at any time and is not +All code inside `com.hivemq.client2.internal` packages must not be used directly. It can change at any time and is not part of the public API. Interfaces annotated with `DoNotImplement` must not be implemented. The implementation is provided by the library. diff --git a/build.gradle.kts b/build.gradle.kts index ef3a104ce..17b3968d5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,7 +25,7 @@ allprojects { plugins.apply("com.github.sgtsilvio.gradle.metadata") metadata { - moduleName.set("com.hivemq.client.mqtt") + moduleName.set("com.hivemq.client2.mqtt") readableName.set("HiveMQ MQTT Client") organization { name.set("HiveMQ and the HiveMQ Community") @@ -166,10 +166,10 @@ allprojects { tasks.jar { withConvention(aQute.bnd.gradle.BundleTaskConvention::class) { bnd("Export-Package: " + - "com.hivemq.client.annotations.*," + - "com.hivemq.client.mqtt.*," + - "com.hivemq.client.rx.*," + - "com.hivemq.client.util.*") + "com.hivemq.client2.annotations.*," + + "com.hivemq.client2.mqtt.*," + + "com.hivemq.client2.rx.*," + + "com.hivemq.client2.util.*") } } @@ -186,7 +186,7 @@ tasks.shadowJar { } }) - val shadePrefix = "com.hivemq.client.internal.shaded." + val shadePrefix = "com.hivemq.client2.internal.shaded." val shadeFilePrefix = shadePrefix.replace(".", "_") relocate("io.netty", "${shadePrefix}io.netty") relocate("META-INF/native/libnetty", "META-INF/native/lib${shadeFilePrefix}netty") diff --git a/epoll/build.gradle.kts b/epoll/build.gradle.kts index a5e027963..69a9cb617 100644 --- a/epoll/build.gradle.kts +++ b/epoll/build.gradle.kts @@ -8,7 +8,7 @@ plugins { description = "Adds dependencies for the HiveMQ MQTT Client epoll module" metadata { - moduleName.set("com.hivemq.client.mqtt.epoll") + moduleName.set("com.hivemq.client2.mqtt.epoll") readableName.set("HiveMQ MQTT Client epoll module") } diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts index 1805aa5e1..b51360ecf 100644 --- a/examples/build.gradle.kts +++ b/examples/build.gradle.kts @@ -8,7 +8,7 @@ plugins { description = "Examples using the HiveMQ MQTT Client" metadata { - moduleName.set("com.hivemq.client.mqtt.examples") + moduleName.set("com.hivemq.client2.mqtt.examples") readableName.set("HiveMQ MQTT Client examples") } diff --git a/examples/src/main/java/com/hivemq/client/mqtt/examples/AsyncDemo.java b/examples/src/main/java/com/hivemq/client2/mqtt/examples/AsyncDemo.java similarity index 89% rename from examples/src/main/java/com/hivemq/client/mqtt/examples/AsyncDemo.java rename to examples/src/main/java/com/hivemq/client2/mqtt/examples/AsyncDemo.java index 10ce0ce1f..64c4dfb22 100644 --- a/examples/src/main/java/com/hivemq/client/mqtt/examples/AsyncDemo.java +++ b/examples/src/main/java/com/hivemq/client2/mqtt/examples/AsyncDemo.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.examples; +package com.hivemq.client2.mqtt.examples; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient; -import com.hivemq.client.mqtt.mqtt5.Mqtt5Client; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5AsyncClient; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5Client; import java.util.concurrent.TimeUnit; diff --git a/examples/src/main/java/com/hivemq/client/mqtt/examples/Mqtt5Features.java b/examples/src/main/java/com/hivemq/client2/mqtt/examples/Mqtt5Features.java similarity index 90% rename from examples/src/main/java/com/hivemq/client/mqtt/examples/Mqtt5Features.java rename to examples/src/main/java/com/hivemq/client2/mqtt/examples/Mqtt5Features.java index 1aaeeddc1..fda9698b3 100644 --- a/examples/src/main/java/com/hivemq/client/mqtt/examples/Mqtt5Features.java +++ b/examples/src/main/java/com/hivemq/client2/mqtt/examples/Mqtt5Features.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.examples; - -import com.hivemq.client.mqtt.MqttGlobalPublishFilter; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient; -import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient; -import com.hivemq.client.mqtt.mqtt5.Mqtt5Client; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5RetainHandling; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; +package com.hivemq.client2.mqtt.examples; + +import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5AsyncClient; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5BlockingClient; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5Client; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5RetainHandling; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import java.util.concurrent.CountDownLatch; diff --git a/examples/src/main/java/com/hivemq/client/mqtt/examples/ReconnectStrategy.java b/examples/src/main/java/com/hivemq/client2/mqtt/examples/ReconnectStrategy.java similarity index 95% rename from examples/src/main/java/com/hivemq/client/mqtt/examples/ReconnectStrategy.java rename to examples/src/main/java/com/hivemq/client2/mqtt/examples/ReconnectStrategy.java index 2dd44f828..257225dba 100644 --- a/examples/src/main/java/com/hivemq/client/mqtt/examples/ReconnectStrategy.java +++ b/examples/src/main/java/com/hivemq/client2/mqtt/examples/ReconnectStrategy.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.examples; +package com.hivemq.client2.mqtt.examples; -import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient; -import com.hivemq.client.mqtt.mqtt5.Mqtt5Client; -import com.hivemq.client.mqtt.mqtt5.lifecycle.Mqtt5DisconnectedContext; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5BlockingClient; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5Client; +import com.hivemq.client2.mqtt.mqtt5.lifecycle.Mqtt5DisconnectedContext; import java.time.LocalTime; import java.util.concurrent.CompletableFuture; diff --git a/examples/src/main/java/com/hivemq/client/mqtt/examples/RequestResponse.java b/examples/src/main/java/com/hivemq/client2/mqtt/examples/RequestResponse.java similarity index 92% rename from examples/src/main/java/com/hivemq/client/mqtt/examples/RequestResponse.java rename to examples/src/main/java/com/hivemq/client2/mqtt/examples/RequestResponse.java index 7982d68fd..0493d6d86 100644 --- a/examples/src/main/java/com/hivemq/client/mqtt/examples/RequestResponse.java +++ b/examples/src/main/java/com/hivemq/client2/mqtt/examples/RequestResponse.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.examples; +package com.hivemq.client2.mqtt.examples; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt5.Mqtt5Client; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5Client; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; /** * Shows how to implement a request/response pattern using response topic and correlation data. diff --git a/gradle/japicc.gradle.kts b/gradle/japicc.gradle.kts index f3b404321..9f60a4068 100644 --- a/gradle/japicc.gradle.kts +++ b/gradle/japicc.gradle.kts @@ -189,7 +189,7 @@ allprojects { val command = listOf( "perl", bin.resolve("japi-compliance-checker.pl").path, "-lib", artifactId, - "-skip-internal-packages", "com.hivemq.client.internal", + "-skip-internal-packages", "com.hivemq.client2.internal", "-non-impl", nonImplFile.path, "-check-annotations", "-s", prevJar.path, jar.path) diff --git a/proxy/build.gradle.kts b/proxy/build.gradle.kts index 320c1565f..a7f1a160f 100644 --- a/proxy/build.gradle.kts +++ b/proxy/build.gradle.kts @@ -8,7 +8,7 @@ plugins { description = "Adds dependencies for the HiveMQ MQTT Client proxy module" metadata { - moduleName.set("com.hivemq.client.mqtt.proxy") + moduleName.set("com.hivemq.client2.mqtt.proxy") readableName.set("HiveMQ MQTT Client proxy module") } diff --git a/reactor/build.gradle.kts b/reactor/build.gradle.kts index c75f58085..dd4aef70a 100644 --- a/reactor/build.gradle.kts +++ b/reactor/build.gradle.kts @@ -8,7 +8,7 @@ plugins { description = "Reactor API for the HiveMQ MQTT Client" metadata { - moduleName.set("com.hivemq.client.mqtt.reactor") + moduleName.set("com.hivemq.client2.mqtt.reactor") readableName.set("HiveMQ MQTT Client reactor module") } @@ -37,8 +37,8 @@ dependencies { tasks.jar { withConvention(aQute.bnd.gradle.BundleTaskConvention::class) { bnd("Export-Package: " + - "com.hivemq.client.mqtt.mqtt3.reactor," + - "com.hivemq.client.mqtt.mqtt5.reactor," + - "com.hivemq.client.rx.reactor") + "com.hivemq.client2.mqtt.mqtt3.reactor," + + "com.hivemq.client2.mqtt.mqtt5.reactor," + + "com.hivemq.client2.rx.reactor") } } diff --git a/reactor/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/reactor/Mqtt3ReactorClientView.java b/reactor/src/main/java/com/hivemq/client2/internal/mqtt/mqtt3/reactor/Mqtt3ReactorClientView.java similarity index 77% rename from reactor/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/reactor/Mqtt3ReactorClientView.java rename to reactor/src/main/java/com/hivemq/client2/internal/mqtt/mqtt3/reactor/Mqtt3ReactorClientView.java index 15c333d9a..6b829bd7d 100644 --- a/reactor/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/reactor/Mqtt3ReactorClientView.java +++ b/reactor/src/main/java/com/hivemq/client2/internal/mqtt/mqtt3/reactor/Mqtt3ReactorClientView.java @@ -14,27 +14,27 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.mqtt3.reactor; - -import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectView; -import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectViewBuilder; -import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubscribeViewBuilder; -import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubscribeViewBuilder; -import com.hivemq.client.mqtt.MqttGlobalPublishFilter; -import com.hivemq.client.mqtt.mqtt3.Mqtt3AsyncClient; -import com.hivemq.client.mqtt.mqtt3.Mqtt3BlockingClient; -import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientConfig; -import com.hivemq.client.mqtt.mqtt3.Mqtt3RxClient; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; -import com.hivemq.client.mqtt.mqtt3.reactor.Mqtt3ReactorClient; -import com.hivemq.client.rx.reactor.FluxWithSingle; +package com.hivemq.client2.internal.mqtt.mqtt3.reactor; + +import com.hivemq.client2.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectView; +import com.hivemq.client2.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectViewBuilder; +import com.hivemq.client2.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubscribeViewBuilder; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubscribeViewBuilder; +import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; +import com.hivemq.client2.mqtt.mqtt3.Mqtt3AsyncClient; +import com.hivemq.client2.mqtt.mqtt3.Mqtt3BlockingClient; +import com.hivemq.client2.mqtt.mqtt3.Mqtt3ClientConfig; +import com.hivemq.client2.mqtt.mqtt3.Mqtt3RxClient; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3ConnAck; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3Connect; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3Publish; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3PublishResult; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; +import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; +import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; +import com.hivemq.client2.mqtt.mqtt3.reactor.Mqtt3ReactorClient; +import com.hivemq.client2.rx.reactor.FluxWithSingle; import io.reactivex.rxjava3.core.Flowable; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Publisher; diff --git a/reactor/src/main/java/com/hivemq/client/internal/mqtt/reactor/MqttReactorClient.java b/reactor/src/main/java/com/hivemq/client2/internal/mqtt/reactor/MqttReactorClient.java similarity index 76% rename from reactor/src/main/java/com/hivemq/client/internal/mqtt/reactor/MqttReactorClient.java rename to reactor/src/main/java/com/hivemq/client2/internal/mqtt/reactor/MqttReactorClient.java index 426160c44..c9089b8a6 100644 --- a/reactor/src/main/java/com/hivemq/client/internal/mqtt/reactor/MqttReactorClient.java +++ b/reactor/src/main/java/com/hivemq/client2/internal/mqtt/reactor/MqttReactorClient.java @@ -14,30 +14,30 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.reactor; - -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnectBuilder; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnectBuilder; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribeBuilder; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribeBuilder; -import com.hivemq.client.mqtt.MqttGlobalPublishFilter; -import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient; -import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient; -import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; -import com.hivemq.client.mqtt.mqtt5.Mqtt5RxClient; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; -import com.hivemq.client.mqtt.mqtt5.reactor.Mqtt5ReactorClient; -import com.hivemq.client.rx.reactor.FluxWithSingle; +package com.hivemq.client2.internal.mqtt.reactor; + +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnectBuilder; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnectBuilder; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscribeBuilder; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubscribeBuilder; +import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5AsyncClient; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5BlockingClient; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5ClientConfig; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5RxClient; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PublishResult; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; +import com.hivemq.client2.mqtt.mqtt5.reactor.Mqtt5ReactorClient; +import com.hivemq.client2.rx.reactor.FluxWithSingle; import io.reactivex.rxjava3.core.Flowable; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Publisher; diff --git a/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/CoreWithSingleConditionalSubscriber.java b/reactor/src/main/java/com/hivemq/client2/internal/rx/reactor/CoreWithSingleConditionalSubscriber.java similarity index 88% rename from reactor/src/main/java/com/hivemq/client/internal/rx/reactor/CoreWithSingleConditionalSubscriber.java rename to reactor/src/main/java/com/hivemq/client2/internal/rx/reactor/CoreWithSingleConditionalSubscriber.java index 11f16d2f0..91be44e2f 100644 --- a/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/CoreWithSingleConditionalSubscriber.java +++ b/reactor/src/main/java/com/hivemq/client2/internal/rx/reactor/CoreWithSingleConditionalSubscriber.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.rx.reactor; +package com.hivemq.client2.internal.rx.reactor; -import com.hivemq.client.rx.reactor.CoreWithSingleSubscriber; +import com.hivemq.client2.rx.reactor.CoreWithSingleSubscriber; import reactor.core.Fuseable; /** diff --git a/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/CoreWithSingleStrictSubscriber.java b/reactor/src/main/java/com/hivemq/client2/internal/rx/reactor/CoreWithSingleStrictSubscriber.java similarity index 80% rename from reactor/src/main/java/com/hivemq/client/internal/rx/reactor/CoreWithSingleStrictSubscriber.java rename to reactor/src/main/java/com/hivemq/client2/internal/rx/reactor/CoreWithSingleStrictSubscriber.java index 334ea086f..9bcce5074 100644 --- a/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/CoreWithSingleStrictSubscriber.java +++ b/reactor/src/main/java/com/hivemq/client2/internal/rx/reactor/CoreWithSingleStrictSubscriber.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.rx.reactor; +package com.hivemq.client2.internal.rx.reactor; -import com.hivemq.client.internal.rx.WithSingleStrictSubscriber; -import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; -import com.hivemq.client.rx.reactor.CoreWithSingleSubscriber; +import com.hivemq.client2.internal.rx.WithSingleStrictSubscriber; +import com.hivemq.client2.rx.reactivestreams.WithSingleSubscriber; +import com.hivemq.client2.rx.reactor.CoreWithSingleSubscriber; import org.jetbrains.annotations.NotNull; /** diff --git a/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSingleCombine.java b/reactor/src/main/java/com/hivemq/client2/internal/rx/reactor/operators/FluxWithSingleCombine.java similarity index 97% rename from reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSingleCombine.java rename to reactor/src/main/java/com/hivemq/client2/internal/rx/reactor/operators/FluxWithSingleCombine.java index cbcfe4962..3f6ec1b93 100644 --- a/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSingleCombine.java +++ b/reactor/src/main/java/com/hivemq/client2/internal/rx/reactor/operators/FluxWithSingleCombine.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.rx.reactor.operators; +package com.hivemq.client2.internal.rx.reactor.operators; -import com.hivemq.client.internal.rx.reactor.CoreWithSingleConditionalSubscriber; -import com.hivemq.client.rx.reactor.CoreWithSingleSubscriber; -import com.hivemq.client.rx.reactor.FluxWithSingle; +import com.hivemq.client2.internal.rx.reactor.CoreWithSingleConditionalSubscriber; +import com.hivemq.client2.rx.reactor.CoreWithSingleSubscriber; +import com.hivemq.client2.rx.reactor.FluxWithSingle; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reactivestreams.Subscription; diff --git a/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSingleFrom.java b/reactor/src/main/java/com/hivemq/client2/internal/rx/reactor/operators/FluxWithSingleFrom.java similarity index 84% rename from reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSingleFrom.java rename to reactor/src/main/java/com/hivemq/client2/internal/rx/reactor/operators/FluxWithSingleFrom.java index 172e5d413..dbb2a7454 100644 --- a/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSingleFrom.java +++ b/reactor/src/main/java/com/hivemq/client2/internal/rx/reactor/operators/FluxWithSingleFrom.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.rx.reactor.operators; +package com.hivemq.client2.internal.rx.reactor.operators; -import com.hivemq.client.rx.reactivestreams.PublisherWithSingle; -import com.hivemq.client.rx.reactor.CoreWithSingleSubscriber; -import com.hivemq.client.rx.reactor.FluxWithSingle; +import com.hivemq.client2.rx.reactivestreams.PublisherWithSingle; +import com.hivemq.client2.rx.reactor.CoreWithSingleSubscriber; +import com.hivemq.client2.rx.reactor.FluxWithSingle; import org.jetbrains.annotations.NotNull; import reactor.core.CoreSubscriber; diff --git a/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSingleMap.java b/reactor/src/main/java/com/hivemq/client2/internal/rx/reactor/operators/FluxWithSingleMap.java similarity index 96% rename from reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSingleMap.java rename to reactor/src/main/java/com/hivemq/client2/internal/rx/reactor/operators/FluxWithSingleMap.java index 897fa6569..7ff3e5d22 100644 --- a/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSingleMap.java +++ b/reactor/src/main/java/com/hivemq/client2/internal/rx/reactor/operators/FluxWithSingleMap.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.rx.reactor.operators; +package com.hivemq.client2.internal.rx.reactor.operators; -import com.hivemq.client.internal.rx.reactor.CoreWithSingleConditionalSubscriber; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.rx.reactor.CoreWithSingleSubscriber; -import com.hivemq.client.rx.reactor.FluxWithSingle; +import com.hivemq.client2.internal.rx.reactor.CoreWithSingleConditionalSubscriber; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.rx.reactor.CoreWithSingleSubscriber; +import com.hivemq.client2.rx.reactor.FluxWithSingle; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reactivestreams.Subscription; diff --git a/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSingleOperator.java b/reactor/src/main/java/com/hivemq/client2/internal/rx/reactor/operators/FluxWithSingleOperator.java similarity index 89% rename from reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSingleOperator.java rename to reactor/src/main/java/com/hivemq/client2/internal/rx/reactor/operators/FluxWithSingleOperator.java index c62be9886..cffcf6b4c 100644 --- a/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSingleOperator.java +++ b/reactor/src/main/java/com/hivemq/client2/internal/rx/reactor/operators/FluxWithSingleOperator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.rx.reactor.operators; +package com.hivemq.client2.internal.rx.reactor.operators; -import com.hivemq.client.rx.reactor.FluxWithSingle; +import com.hivemq.client2.rx.reactor.FluxWithSingle; import org.jetbrains.annotations.NotNull; /** diff --git a/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSinglePublishOn.java b/reactor/src/main/java/com/hivemq/client2/internal/rx/reactor/operators/FluxWithSinglePublishOn.java similarity index 91% rename from reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSinglePublishOn.java rename to reactor/src/main/java/com/hivemq/client2/internal/rx/reactor/operators/FluxWithSinglePublishOn.java index e4d45f2a6..9581ba1bf 100644 --- a/reactor/src/main/java/com/hivemq/client/internal/rx/reactor/operators/FluxWithSinglePublishOn.java +++ b/reactor/src/main/java/com/hivemq/client2/internal/rx/reactor/operators/FluxWithSinglePublishOn.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.rx.reactor.operators; +package com.hivemq.client2.internal.rx.reactor.operators; -import com.hivemq.client.rx.reactor.CoreWithSingleSubscriber; -import com.hivemq.client.rx.reactor.FluxWithSingle; +import com.hivemq.client2.rx.reactor.CoreWithSingleSubscriber; +import com.hivemq.client2.rx.reactor.FluxWithSingle; import org.jetbrains.annotations.NotNull; import reactor.core.CoreSubscriber; import reactor.core.scheduler.Scheduler; diff --git a/reactor/src/main/java/com/hivemq/client/mqtt/mqtt3/reactor/Mqtt3ReactorClient.java b/reactor/src/main/java/com/hivemq/client2/mqtt/mqtt3/reactor/Mqtt3ReactorClient.java similarity index 89% rename from reactor/src/main/java/com/hivemq/client/mqtt/mqtt3/reactor/Mqtt3ReactorClient.java rename to reactor/src/main/java/com/hivemq/client2/mqtt/mqtt3/reactor/Mqtt3ReactorClient.java index c511508cb..e26467802 100644 --- a/reactor/src/main/java/com/hivemq/client/mqtt/mqtt3/reactor/Mqtt3ReactorClient.java +++ b/reactor/src/main/java/com/hivemq/client2/mqtt/mqtt3/reactor/Mqtt3ReactorClient.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.reactor; +package com.hivemq.client2.mqtt.mqtt3.reactor; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.internal.mqtt.mqtt3.reactor.Mqtt3ReactorClientView; -import com.hivemq.client.mqtt.MqttGlobalPublishFilter; -import com.hivemq.client.mqtt.mqtt3.Mqtt3Client; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnectBuilder; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilder; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; -import com.hivemq.client.rx.reactor.FluxWithSingle; +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; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3ConnAck; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3Connect; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3ConnectBuilder; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3Publish; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3PublishResult; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilder; +import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; +import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; +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.NotNull; import org.reactivestreams.Publisher; @@ -83,7 +83,7 @@ public interface Mqtt3ReactorClient extends Mqtt3Client { * @return the {@link Mono} which *

          *
        • succeeds with the ConnAck message if it does not contain an Error Code (connected successfully), - *
        • errors with a {@link com.hivemq.client.mqtt.mqtt3.exceptions.Mqtt3ConnAckException + *
        • errors with a {@link com.hivemq.client2.mqtt.mqtt3.exceptions.Mqtt3ConnAckException * Mqtt3ConnAckException} wrapping the ConnAck message if it contains an Error Code or *
        • errors with a different exception if an error occurred before the Connect message was sent or * before the ConnAck message was received. @@ -120,7 +120,7 @@ public interface Mqtt3ReactorClient extends Mqtt3Client { *
            *
          • succeeds with the SubAck message if at least one subscription of the Subscribe message was * successful (the SubAck message contains at least one Return Code that is not an Error Code), - *
          • errors with a {@link com.hivemq.client.mqtt.mqtt3.exceptions.Mqtt3SubAckException + *
          • errors with a {@link com.hivemq.client2.mqtt.mqtt3.exceptions.Mqtt3SubAckException * Mqtt3SubAckException} wrapping the SubAck message if it only contains Error Codes or *
          • errors with a different exception if an error occurred before the Subscribe message was sent or * before a SubAck message was received. @@ -158,11 +158,11 @@ public interface Mqtt3ReactorClient extends Mqtt3Client { * Error Code) and then emits the Publish messages matching the successful subscriptions of the * Subscribe message, *
          • completes when all subscriptions of the Subscribe message were unsubscribed, - *
          • errors with a {@link com.hivemq.client.mqtt.mqtt3.exceptions.Mqtt3SubAckException + *
          • errors with a {@link com.hivemq.client2.mqtt.mqtt3.exceptions.Mqtt3SubAckException * Mqtt3SubAckException} wrapping the SubAck message if it only contains Error Codes or *
          • errors with a different exception if an error occurred before the Subscribe message was sent, * before a SubAck message was received or when a error occurs before all subscriptions of the Subscribe - * message were unsubscribed (e.g. {@link com.hivemq.client.mqtt.exceptions.MqttSessionExpiredException + * message were unsubscribed (e.g. {@link com.hivemq.client2.mqtt.exceptions.MqttSessionExpiredException * MqttSessionExpiredException}). *
          * @see #subscribePublishes(Mqtt3Subscribe, boolean) @@ -187,11 +187,11 @@ public interface Mqtt3ReactorClient extends Mqtt3Client { * Error Code) and then emits the Publish messages matching the successful subscriptions of the * Subscribe message, *
        • completes when all subscriptions of the Subscribe message were unsubscribed, - *
        • errors with a {@link com.hivemq.client.mqtt.mqtt3.exceptions.Mqtt3SubAckException + *
        • errors with a {@link com.hivemq.client2.mqtt.mqtt3.exceptions.Mqtt3SubAckException * Mqtt3SubAckException} wrapping the SubAck message if it only contains Error Codes or *
        • errors with a different exception if an error occurred before the Subscribe message was sent, * before a SubAck message was received or when a error occurs before all subscriptions of the Subscribe - * message were unsubscribed (e.g. {@link com.hivemq.client.mqtt.exceptions.MqttSessionExpiredException + * message were unsubscribed (e.g. {@link com.hivemq.client2.mqtt.exceptions.MqttSessionExpiredException * MqttSessionExpiredException}). *
        * @see #subscribePublishes(Mqtt3Subscribe) @@ -225,7 +225,7 @@ public interface Mqtt3ReactorClient extends Mqtt3Client { *
          *
        • emits the incoming Publish messages matching the given filter, *
        • never completes but - *
        • errors with a {@link com.hivemq.client.mqtt.exceptions.MqttSessionExpiredException + *
        • errors with a {@link com.hivemq.client2.mqtt.exceptions.MqttSessionExpiredException * MqttSessionExpiredException} when the MQTT session expires. *
        * @see #publishes(MqttGlobalPublishFilter, boolean) @@ -246,7 +246,7 @@ public interface Mqtt3ReactorClient extends Mqtt3Client { *
          *
        • emits the incoming Publish messages matching the given filter, *
        • never completes but - *
        • errors with a {@link com.hivemq.client.mqtt.exceptions.MqttSessionExpiredException + *
        • errors with a {@link com.hivemq.client2.mqtt.exceptions.MqttSessionExpiredException * MqttSessionExpiredException} when the MQTT session expires. *
        * @see #publishes(MqttGlobalPublishFilter) diff --git a/reactor/src/main/java/com/hivemq/client/mqtt/mqtt5/reactor/Mqtt5ReactorClient.java b/reactor/src/main/java/com/hivemq/client2/mqtt/mqtt5/reactor/Mqtt5ReactorClient.java similarity index 88% rename from reactor/src/main/java/com/hivemq/client/mqtt/mqtt5/reactor/Mqtt5ReactorClient.java rename to reactor/src/main/java/com/hivemq/client2/mqtt/mqtt5/reactor/Mqtt5ReactorClient.java index ce45fe115..038e61fd2 100644 --- a/reactor/src/main/java/com/hivemq/client/mqtt/mqtt5/reactor/Mqtt5ReactorClient.java +++ b/reactor/src/main/java/com/hivemq/client2/mqtt/mqtt5/reactor/Mqtt5ReactorClient.java @@ -14,26 +14,26 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.reactor; +package com.hivemq.client2.mqtt.mqtt5.reactor; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.internal.mqtt.reactor.MqttReactorClient; -import com.hivemq.client.mqtt.MqttGlobalPublishFilter; -import com.hivemq.client.mqtt.mqtt5.Mqtt5Client; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectBuilder; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectBuilder; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubscribeBuilder; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubscribeBuilder; -import com.hivemq.client.rx.reactor.FluxWithSingle; +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; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnectBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PublishResult; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubscribeBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; +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.NotNull; import org.reactivestreams.Publisher; @@ -85,7 +85,7 @@ public interface Mqtt5ReactorClient extends Mqtt5Client { * @return the {@link Mono} which *
          *
        • succeeds with the ConnAck message if it does not contain an Error Code (connected successfully), - *
        • errors with a {@link com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5ConnAckException + *
        • errors with a {@link com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5ConnAckException * Mqtt5ConnAckException} wrapping the ConnAck message if it contains an Error Code or *
        • errors with a different exception if an error occurred before the Connect message was sent or * before the ConnAck message was received. @@ -122,7 +122,7 @@ public interface Mqtt5ReactorClient extends Mqtt5Client { *
            *
          • succeeds with the SubAck message if at least one subscription of the Subscribe message was * successful (the SubAck message contains at least one Reason Code that is not an Error Code), - *
          • errors with a {@link com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5SubAckException + *
          • errors with a {@link com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5SubAckException * Mqtt5SubAckException} wrapping the SubAck message if it only contains Error Codes or *
          • errors with a different exception if an error occurred before the Subscribe message was sent or * before a SubAck message was received. @@ -160,11 +160,11 @@ public interface Mqtt5ReactorClient extends Mqtt5Client { * Error Code) and then emits the Publish messages matching the successful subscriptions of the * Subscribe message, *
          • completes when all subscriptions of the Subscribe message were unsubscribed, - *
          • errors with a {@link com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5SubAckException + *
          • errors with a {@link com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5SubAckException * Mqtt5SubAckException} wrapping the SubAck message if it only contains Error Codes or *
          • errors with a different exception if an error occurred before the Subscribe message was sent, * before a SubAck message was received or when a error occurs before all subscriptions of the Subscribe - * message were unsubscribed (e.g. {@link com.hivemq.client.mqtt.exceptions.MqttSessionExpiredException + * message were unsubscribed (e.g. {@link com.hivemq.client2.mqtt.exceptions.MqttSessionExpiredException * MqttSessionExpiredException}). *
          * @see #subscribePublishes(Mqtt5Subscribe, boolean) @@ -189,11 +189,11 @@ public interface Mqtt5ReactorClient extends Mqtt5Client { * Error Code) and then emits the Publish messages matching the successful subscriptions of the * Subscribe message, *
        • completes when all subscriptions of the Subscribe message were unsubscribed, - *
        • errors with a {@link com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5SubAckException + *
        • errors with a {@link com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5SubAckException * Mqtt5SubAckException} wrapping the SubAck message if it only contains Error Codes or *
        • errors with a different exception if an error occurred before the Subscribe message was sent, * before a SubAck message was received or when a error occurs before all subscriptions of the Subscribe - * message were unsubscribed (e.g. {@link com.hivemq.client.mqtt.exceptions.MqttSessionExpiredException + * message were unsubscribed (e.g. {@link com.hivemq.client2.mqtt.exceptions.MqttSessionExpiredException * MqttSessionExpiredException}). *
        * @see #subscribePublishes(Mqtt5Subscribe) @@ -227,7 +227,7 @@ public interface Mqtt5ReactorClient extends Mqtt5Client { *
          *
        • emits the incoming Publish messages matching the given filter, *
        • never completes but - *
        • errors with a {@link com.hivemq.client.mqtt.exceptions.MqttSessionExpiredException + *
        • errors with a {@link com.hivemq.client2.mqtt.exceptions.MqttSessionExpiredException * MqttSessionExpiredException} when the MQTT session expires. *
        * @see #publishes(MqttGlobalPublishFilter, boolean) @@ -248,7 +248,7 @@ public interface Mqtt5ReactorClient extends Mqtt5Client { *
          *
        • emits the incoming Publish messages matching the given filter, *
        • never completes but - *
        • errors with a {@link com.hivemq.client.mqtt.exceptions.MqttSessionExpiredException + *
        • errors with a {@link com.hivemq.client2.mqtt.exceptions.MqttSessionExpiredException * MqttSessionExpiredException} when the MQTT session expires. *
        * @see #publishes(MqttGlobalPublishFilter) @@ -269,7 +269,7 @@ public interface Mqtt5ReactorClient extends Mqtt5Client { *
      • succeeds with the UnsubAck message if at least one Topic Filter of the Unsubscribe message was * successfully unsubscribed (the UnsubAck message contains at least one Reason Code that is not an * Error Code), - *
      • errors with a {@link com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5UnsubAckException + *
      • errors with a {@link com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5UnsubAckException * Mqtt5UnsubAckException} wrapping the UnsubAck message if it only contains Error Codes or *
      • errors with a different exception if an error occurred before the Unsubscribe message was sent or * before a UnsubAck message was received. @@ -321,7 +321,7 @@ public interface Mqtt5ReactorClient extends Mqtt5Client { * @return the {@link Mono} which *
          *
        • completes when the client was successfully re-authenticated, - *
        • errors with a {@link com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5AuthException Mqtt5AuthException} + *
        • errors with a {@link com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5AuthException Mqtt5AuthException} * wrapping the Auth message with the Error Code if not re-authenticated successfully or *
        • errors with a different exception if an error occurred before the first Auth message was sent or * before the last Auth message was received. diff --git a/reactor/src/main/java/com/hivemq/client/rx/reactor/CorePublisherWithSingle.java b/reactor/src/main/java/com/hivemq/client2/rx/reactor/CorePublisherWithSingle.java similarity index 91% rename from reactor/src/main/java/com/hivemq/client/rx/reactor/CorePublisherWithSingle.java rename to reactor/src/main/java/com/hivemq/client2/rx/reactor/CorePublisherWithSingle.java index 770586fc0..9cc7191f1 100644 --- a/reactor/src/main/java/com/hivemq/client/rx/reactor/CorePublisherWithSingle.java +++ b/reactor/src/main/java/com/hivemq/client2/rx/reactor/CorePublisherWithSingle.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.rx.reactor; +package com.hivemq.client2.rx.reactor; -import com.hivemq.client.rx.reactivestreams.PublisherWithSingle; -import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; +import com.hivemq.client2.rx.reactivestreams.PublisherWithSingle; +import com.hivemq.client2.rx.reactivestreams.WithSingleSubscriber; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; diff --git a/reactor/src/main/java/com/hivemq/client/rx/reactor/CoreWithSingleSubscriber.java b/reactor/src/main/java/com/hivemq/client2/rx/reactor/CoreWithSingleSubscriber.java similarity index 91% rename from reactor/src/main/java/com/hivemq/client/rx/reactor/CoreWithSingleSubscriber.java rename to reactor/src/main/java/com/hivemq/client2/rx/reactor/CoreWithSingleSubscriber.java index bd495af0d..1a9be33d8 100644 --- a/reactor/src/main/java/com/hivemq/client/rx/reactor/CoreWithSingleSubscriber.java +++ b/reactor/src/main/java/com/hivemq/client2/rx/reactor/CoreWithSingleSubscriber.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.rx.reactor; +package com.hivemq.client2.rx.reactor; -import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; +import com.hivemq.client2.rx.reactivestreams.WithSingleSubscriber; import reactor.core.CoreSubscriber; /** diff --git a/reactor/src/main/java/com/hivemq/client/rx/reactor/FluxWithSingle.java b/reactor/src/main/java/com/hivemq/client2/rx/reactor/FluxWithSingle.java similarity index 97% rename from reactor/src/main/java/com/hivemq/client/rx/reactor/FluxWithSingle.java rename to reactor/src/main/java/com/hivemq/client2/rx/reactor/FluxWithSingle.java index 3a598770b..4808c1153 100644 --- a/reactor/src/main/java/com/hivemq/client/rx/reactor/FluxWithSingle.java +++ b/reactor/src/main/java/com/hivemq/client2/rx/reactor/FluxWithSingle.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.hivemq.client.rx.reactor; - -import com.hivemq.client.internal.rx.reactor.CoreWithSingleStrictSubscriber; -import com.hivemq.client.internal.rx.reactor.operators.FluxWithSingleFrom; -import com.hivemq.client.internal.rx.reactor.operators.FluxWithSingleMap; -import com.hivemq.client.internal.rx.reactor.operators.FluxWithSinglePublishOn; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.rx.reactivestreams.PublisherWithSingle; -import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; +package com.hivemq.client2.rx.reactor; + +import com.hivemq.client2.internal.rx.reactor.CoreWithSingleStrictSubscriber; +import com.hivemq.client2.internal.rx.reactor.operators.FluxWithSingleFrom; +import com.hivemq.client2.internal.rx.reactor.operators.FluxWithSingleMap; +import com.hivemq.client2.internal.rx.reactor.operators.FluxWithSinglePublishOn; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.rx.reactivestreams.PublisherWithSingle; +import com.hivemq.client2.rx.reactivestreams.WithSingleSubscriber; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reactivestreams.Subscriber; diff --git a/reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleItem.java b/reactor/src/test/java/com/hivemq/client2/rx/reactor/FluxWithSingleItem.java similarity index 98% rename from reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleItem.java rename to reactor/src/test/java/com/hivemq/client2/rx/reactor/FluxWithSingleItem.java index c6c6d1a16..d6b7b393f 100644 --- a/reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleItem.java +++ b/reactor/src/test/java/com/hivemq/client2/rx/reactor/FluxWithSingleItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.rx.reactor; +package com.hivemq.client2.rx.reactor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleSplit.java b/reactor/src/test/java/com/hivemq/client2/rx/reactor/FluxWithSingleSplit.java similarity index 97% rename from reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleSplit.java rename to reactor/src/test/java/com/hivemq/client2/rx/reactor/FluxWithSingleSplit.java index d84d2bd87..218d5f419 100644 --- a/reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleSplit.java +++ b/reactor/src/test/java/com/hivemq/client2/rx/reactor/FluxWithSingleSplit.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.rx.reactor; +package com.hivemq.client2.rx.reactor; -import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; +import com.hivemq.client2.rx.reactivestreams.WithSingleSubscriber; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reactivestreams.Subscriber; diff --git a/reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleTest.java b/reactor/src/test/java/com/hivemq/client2/rx/reactor/FluxWithSingleTest.java similarity index 99% rename from reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleTest.java rename to reactor/src/test/java/com/hivemq/client2/rx/reactor/FluxWithSingleTest.java index 0872ecae9..e4af4c602 100644 --- a/reactor/src/test/java/com/hivemq/client/rx/reactor/FluxWithSingleTest.java +++ b/reactor/src/test/java/com/hivemq/client2/rx/reactor/FluxWithSingleTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.rx.reactor; +package com.hivemq.client2.rx.reactor; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; +import com.hivemq.client2.rx.reactivestreams.WithSingleSubscriber; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.function.ThrowingSupplier; diff --git a/settings.gradle.kts b/settings.gradle.kts index 6658e9120..c71c3ac7c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,7 +15,7 @@ pluginManagement { } } -rootProject.name = "hivemq-mqtt-client" +rootProject.name = "hivemq-mqtt-client2" listOf("websocket", "proxy", "epoll", "reactor", "examples").forEach { module -> include("${rootProject.name}-$module") diff --git a/src/main/java/com/hivemq/client/annotations/CheckReturnValue.java b/src/main/java/com/hivemq/client2/annotations/CheckReturnValue.java similarity index 95% rename from src/main/java/com/hivemq/client/annotations/CheckReturnValue.java rename to src/main/java/com/hivemq/client2/annotations/CheckReturnValue.java index 10cfbf60d..70e697dfe 100644 --- a/src/main/java/com/hivemq/client/annotations/CheckReturnValue.java +++ b/src/main/java/com/hivemq/client2/annotations/CheckReturnValue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.annotations; +package com.hivemq.client2.annotations; import java.lang.annotation.*; diff --git a/src/main/java/com/hivemq/client/internal/annotations/CallByThread.java b/src/main/java/com/hivemq/client2/internal/annotations/CallByThread.java similarity index 95% rename from src/main/java/com/hivemq/client/internal/annotations/CallByThread.java rename to src/main/java/com/hivemq/client2/internal/annotations/CallByThread.java index 680e06f01..bd7894d25 100644 --- a/src/main/java/com/hivemq/client/internal/annotations/CallByThread.java +++ b/src/main/java/com/hivemq/client2/internal/annotations/CallByThread.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.annotations; +package com.hivemq.client2.internal.annotations; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/annotations/NotThreadSafe.java b/src/main/java/com/hivemq/client2/internal/annotations/NotThreadSafe.java similarity index 94% rename from src/main/java/com/hivemq/client/internal/annotations/NotThreadSafe.java rename to src/main/java/com/hivemq/client2/internal/annotations/NotThreadSafe.java index b61792038..3ffd00d25 100644 --- a/src/main/java/com/hivemq/client/internal/annotations/NotThreadSafe.java +++ b/src/main/java/com/hivemq/client2/internal/annotations/NotThreadSafe.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.annotations; +package com.hivemq.client2.internal.annotations; import java.lang.annotation.*; diff --git a/src/main/java/com/hivemq/client/internal/annotations/ThreadSafe.java b/src/main/java/com/hivemq/client2/internal/annotations/ThreadSafe.java similarity index 94% rename from src/main/java/com/hivemq/client/internal/annotations/ThreadSafe.java rename to src/main/java/com/hivemq/client2/internal/annotations/ThreadSafe.java index ea5653dac..161af114e 100644 --- a/src/main/java/com/hivemq/client/internal/annotations/ThreadSafe.java +++ b/src/main/java/com/hivemq/client2/internal/annotations/ThreadSafe.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.annotations; +package com.hivemq.client2.internal.annotations; import java.lang.annotation.*; diff --git a/src/main/java/com/hivemq/client/internal/checkpoint/Confirmable.java b/src/main/java/com/hivemq/client2/internal/checkpoint/Confirmable.java similarity index 93% rename from src/main/java/com/hivemq/client/internal/checkpoint/Confirmable.java rename to src/main/java/com/hivemq/client2/internal/checkpoint/Confirmable.java index 4c5f346ac..eeefa3515 100644 --- a/src/main/java/com/hivemq/client/internal/checkpoint/Confirmable.java +++ b/src/main/java/com/hivemq/client2/internal/checkpoint/Confirmable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.checkpoint; +package com.hivemq.client2.internal.checkpoint; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/logging/InternalLogger.java b/src/main/java/com/hivemq/client2/internal/logging/InternalLogger.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/logging/InternalLogger.java rename to src/main/java/com/hivemq/client2/internal/logging/InternalLogger.java index 3326953d0..07fff16a5 100644 --- a/src/main/java/com/hivemq/client/internal/logging/InternalLogger.java +++ b/src/main/java/com/hivemq/client2/internal/logging/InternalLogger.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.logging; +package com.hivemq.client2.internal.logging; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/logging/InternalLoggerFactory.java b/src/main/java/com/hivemq/client2/internal/logging/InternalLoggerFactory.java similarity index 92% rename from src/main/java/com/hivemq/client/internal/logging/InternalLoggerFactory.java rename to src/main/java/com/hivemq/client2/internal/logging/InternalLoggerFactory.java index e171be152..c5f6594df 100644 --- a/src/main/java/com/hivemq/client/internal/logging/InternalLoggerFactory.java +++ b/src/main/java/com/hivemq/client2/internal/logging/InternalLoggerFactory.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.logging; +package com.hivemq.client2.internal.logging; -import com.hivemq.client.internal.util.ClassUtil; +import com.hivemq.client2.internal.util.ClassUtil; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/logging/InternalNoopLogger.java b/src/main/java/com/hivemq/client2/internal/logging/InternalNoopLogger.java similarity index 97% rename from src/main/java/com/hivemq/client/internal/logging/InternalNoopLogger.java rename to src/main/java/com/hivemq/client2/internal/logging/InternalNoopLogger.java index ceecb2479..163e3c2b2 100644 --- a/src/main/java/com/hivemq/client/internal/logging/InternalNoopLogger.java +++ b/src/main/java/com/hivemq/client2/internal/logging/InternalNoopLogger.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.logging; +package com.hivemq.client2.internal.logging; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/logging/InternalSlf4jLogger.java b/src/main/java/com/hivemq/client2/internal/logging/InternalSlf4jLogger.java similarity index 97% rename from src/main/java/com/hivemq/client/internal/logging/InternalSlf4jLogger.java rename to src/main/java/com/hivemq/client2/internal/logging/InternalSlf4jLogger.java index a95831987..de81da102 100644 --- a/src/main/java/com/hivemq/client/internal/logging/InternalSlf4jLogger.java +++ b/src/main/java/com/hivemq/client2/internal/logging/InternalSlf4jLogger.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.logging; +package com.hivemq.client2.internal.logging; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java b/src/main/java/com/hivemq/client2/internal/mqtt/MqttAsyncClient.java similarity index 88% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java rename to src/main/java/com/hivemq/client2/internal/mqtt/MqttAsyncClient.java index 19747f5bd..365b41714 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/MqttAsyncClient.java @@ -14,31 +14,31 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt; - -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnectBuilder; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnectBuilder; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublishBuilder; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribeBuilder; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribeBuilder; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.MqttGlobalPublishFilter; -import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; +package com.hivemq.client2.internal.mqtt; + +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnectBuilder; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnectBuilder; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublishBuilder; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscribe; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscribeBuilder; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubscribe; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubscribeBuilder; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5AsyncClient; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PublishResult; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; import io.reactivex.rxjava3.core.FlowableSubscriber; import io.reactivex.rxjava3.schedulers.Schedulers; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java b/src/main/java/com/hivemq/client2/internal/mqtt/MqttBlockingClient.java similarity index 86% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java rename to src/main/java/com/hivemq/client2/internal/mqtt/MqttBlockingClient.java index 87955aa72..6b2b57310 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/MqttBlockingClient.java @@ -14,36 +14,36 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt; - -import com.hivemq.client.internal.mqtt.exceptions.MqttClientStateExceptions; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnectBuilder; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnectBuilder; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublishBuilder; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribeBuilder; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribeBuilder; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.AsyncRuntimeException; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.MqttGlobalPublishFilter; -import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient; -import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5SubAckException; -import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5UnsubAckException; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; +package com.hivemq.client2.internal.mqtt; + +import com.hivemq.client2.internal.mqtt.exceptions.MqttClientStateExceptions; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnectBuilder; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnectBuilder; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublishBuilder; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscribe; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscribeBuilder; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubscribe; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubscribeBuilder; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.AsyncRuntimeException; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5BlockingClient; +import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5SubAckException; +import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5UnsubAckException; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5ReasonCode; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PublishResult; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.core.FlowableSubscriber; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java b/src/main/java/com/hivemq/client2/internal/mqtt/MqttClientConfig.java similarity index 89% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java rename to src/main/java/com/hivemq/client2/internal/mqtt/MqttClientConfig.java index 47ecc3c51..67f7aa708 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConfig.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/MqttClientConfig.java @@ -14,28 +14,28 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt; - -import com.hivemq.client.internal.mqtt.advanced.MqttAdvancedConfig; -import com.hivemq.client.internal.mqtt.datatypes.MqttClientIdentifierImpl; -import com.hivemq.client.internal.mqtt.ioc.ClientComponent; -import com.hivemq.client.internal.mqtt.ioc.SingletonComponent; -import com.hivemq.client.internal.mqtt.message.auth.MqttSimpleAuth; -import com.hivemq.client.internal.mqtt.message.publish.MqttWillPublish; -import com.hivemq.client.internal.netty.NettyEventLoopProvider; -import com.hivemq.client.internal.util.ExecutorUtil; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.MqttClientState; -import com.hivemq.client.mqtt.MqttVersion; -import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; -import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnect; -import com.hivemq.client.mqtt.lifecycle.MqttConnectedListener; -import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedListener; -import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; -import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConnectionConfig; -import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublish; +package com.hivemq.client2.internal.mqtt; + +import com.hivemq.client2.internal.mqtt.advanced.MqttAdvancedConfig; +import com.hivemq.client2.internal.mqtt.datatypes.MqttClientIdentifierImpl; +import com.hivemq.client2.internal.mqtt.ioc.ClientComponent; +import com.hivemq.client2.internal.mqtt.ioc.SingletonComponent; +import com.hivemq.client2.internal.mqtt.message.auth.MqttSimpleAuth; +import com.hivemq.client2.internal.mqtt.message.publish.MqttWillPublish; +import com.hivemq.client2.internal.netty.NettyEventLoopProvider; +import com.hivemq.client2.internal.util.ExecutorUtil; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.MqttClientState; +import com.hivemq.client2.mqtt.MqttVersion; +import com.hivemq.client2.mqtt.datatypes.MqttClientIdentifier; +import com.hivemq.client2.mqtt.lifecycle.MqttAutoReconnect; +import com.hivemq.client2.mqtt.lifecycle.MqttConnectedListener; +import com.hivemq.client2.mqtt.lifecycle.MqttDisconnectedListener; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5ClientConfig; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5ClientConnectionConfig; +import com.hivemq.client2.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5WillPublish; import io.netty.channel.EventLoop; import io.netty.handler.ssl.SslContext; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConnectionConfig.java b/src/main/java/com/hivemq/client2/internal/mqtt/MqttClientConnectionConfig.java similarity index 94% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttClientConnectionConfig.java rename to src/main/java/com/hivemq/client2/internal/mqtt/MqttClientConnectionConfig.java index cc96f74d7..80a2d144e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttClientConnectionConfig.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/MqttClientConnectionConfig.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt; - -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.mqtt.handler.publish.outgoing.MqttTopicAliasAutoMapping; -import com.hivemq.client.internal.mqtt.handler.publish.outgoing.MqttTopicAliasMapping; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientConnectionConfig; -import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConnectionConfig; -import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; +package com.hivemq.client2.internal.mqtt; + +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.mqtt.handler.publish.outgoing.MqttTopicAliasAutoMapping; +import com.hivemq.client2.internal.mqtt.handler.publish.outgoing.MqttTopicAliasMapping; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.mqtt3.Mqtt3ClientConnectionConfig; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5ClientConnectionConfig; +import com.hivemq.client2.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; import io.netty.channel.Channel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImpl.java b/src/main/java/com/hivemq/client2/internal/mqtt/MqttExecutorConfigImpl.java similarity index 97% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImpl.java rename to src/main/java/com/hivemq/client2/internal/mqtt/MqttExecutorConfigImpl.java index 7bb5af7a5..91b5986b2 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImpl.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/MqttExecutorConfigImpl.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt; +package com.hivemq.client2.internal.mqtt; -import com.hivemq.client.mqtt.MqttExecutorConfig; +import com.hivemq.client2.mqtt.MqttExecutorConfig; import io.reactivex.rxjava3.core.Scheduler; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImplBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/MqttExecutorConfigImplBuilder.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImplBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/MqttExecutorConfigImplBuilder.java index 86f5ad687..0053293a7 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImplBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/MqttExecutorConfigImplBuilder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt; +package com.hivemq.client2.internal.mqtt; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.MqttExecutorConfigBuilder; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.MqttExecutorConfigBuilder; import io.reactivex.rxjava3.core.Scheduler; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImpl.java b/src/main/java/com/hivemq/client2/internal/mqtt/MqttProxyConfigImpl.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImpl.java rename to src/main/java/com/hivemq/client2/internal/mqtt/MqttProxyConfigImpl.java index b1f510cdf..017619572 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImpl.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/MqttProxyConfigImpl.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt; +package com.hivemq.client2.internal.mqtt; -import com.hivemq.client.mqtt.MqttProxyConfig; -import com.hivemq.client.mqtt.MqttProxyProtocol; +import com.hivemq.client2.mqtt.MqttProxyConfig; +import com.hivemq.client2.mqtt.MqttProxyProtocol; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImplBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/MqttProxyConfigImplBuilder.java similarity index 95% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImplBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/MqttProxyConfigImplBuilder.java index a6966a7af..b9bf2cde5 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImplBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/MqttProxyConfigImplBuilder.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt; +package com.hivemq.client2.internal.mqtt; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.internal.util.InetSocketAddressUtil; -import com.hivemq.client.mqtt.MqttProxyConfigBuilder; -import com.hivemq.client.mqtt.MqttProxyProtocol; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.internal.util.InetSocketAddressUtil; +import com.hivemq.client2.mqtt.MqttProxyConfigBuilder; +import com.hivemq.client2.mqtt.MqttProxyProtocol; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java b/src/main/java/com/hivemq/client2/internal/mqtt/MqttRxClient.java similarity index 79% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java rename to src/main/java/com/hivemq/client2/internal/mqtt/MqttRxClient.java index 08047f767..30ce1f783 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/MqttRxClient.java @@ -14,41 +14,41 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt; - -import com.hivemq.client.internal.mqtt.handler.auth.MqttReAuthCompletable; -import com.hivemq.client.internal.mqtt.handler.connect.MqttConnAckSingle; -import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectCompletable; -import com.hivemq.client.internal.mqtt.handler.publish.incoming.MqttGlobalIncomingPublishFlowable; -import com.hivemq.client.internal.mqtt.handler.publish.incoming.MqttSubscribedPublishFlowable; -import com.hivemq.client.internal.mqtt.handler.publish.outgoing.MqttAckFlowable; -import com.hivemq.client.internal.mqtt.handler.publish.outgoing.MqttAckSingle; -import com.hivemq.client.internal.mqtt.handler.publish.outgoing.MqttAckSingleFlowable; -import com.hivemq.client.internal.mqtt.handler.subscribe.MqttSubAckSingle; -import com.hivemq.client.internal.mqtt.handler.subscribe.MqttUnsubAckSingle; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnectBuilder; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnectBuilder; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribeBuilder; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribeBuilder; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.MqttGlobalPublishFilter; -import com.hivemq.client.mqtt.mqtt5.Mqtt5RxClient; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; -import com.hivemq.client.rx.FlowableWithSingle; +package com.hivemq.client2.internal.mqtt; + +import com.hivemq.client2.internal.mqtt.handler.auth.MqttReAuthCompletable; +import com.hivemq.client2.internal.mqtt.handler.connect.MqttConnAckSingle; +import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectCompletable; +import com.hivemq.client2.internal.mqtt.handler.publish.incoming.MqttGlobalIncomingPublishFlowable; +import com.hivemq.client2.internal.mqtt.handler.publish.incoming.MqttSubscribedPublishFlowable; +import com.hivemq.client2.internal.mqtt.handler.publish.outgoing.MqttAckFlowable; +import com.hivemq.client2.internal.mqtt.handler.publish.outgoing.MqttAckSingle; +import com.hivemq.client2.internal.mqtt.handler.publish.outgoing.MqttAckSingleFlowable; +import com.hivemq.client2.internal.mqtt.handler.subscribe.MqttSubAckSingle; +import com.hivemq.client2.internal.mqtt.handler.subscribe.MqttUnsubAckSingle; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnectBuilder; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnectBuilder; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscribe; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscribeBuilder; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubscribe; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubscribeBuilder; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5RxClient; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PublishResult; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; +import com.hivemq.client2.rx.FlowableWithSingle; import io.reactivex.rxjava3.core.Completable; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.core.Scheduler; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/MqttRxClientBuilder.java similarity index 78% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/MqttRxClientBuilder.java index 6d98185bd..4f3961ba8 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/MqttRxClientBuilder.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt; - -import com.hivemq.client.internal.mqtt.advanced.MqttAdvancedConfig; -import com.hivemq.client.internal.mqtt.advanced.MqttAdvancedConfigBuilder; -import com.hivemq.client.internal.mqtt.message.auth.MqttSimpleAuth; -import com.hivemq.client.internal.mqtt.message.auth.MqttSimpleAuthBuilder; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublishBuilder; -import com.hivemq.client.internal.mqtt.message.publish.MqttWillPublish; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.MqttVersion; -import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientBuilder; -import com.hivemq.client.mqtt.mqtt5.advanced.Mqtt5AdvancedConfig; -import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; +package com.hivemq.client2.internal.mqtt; + +import com.hivemq.client2.internal.mqtt.advanced.MqttAdvancedConfig; +import com.hivemq.client2.internal.mqtt.advanced.MqttAdvancedConfigBuilder; +import com.hivemq.client2.internal.mqtt.message.auth.MqttSimpleAuth; +import com.hivemq.client2.internal.mqtt.message.auth.MqttSimpleAuthBuilder; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublishBuilder; +import com.hivemq.client2.internal.mqtt.message.publish.MqttWillPublish; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.MqttVersion; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5ClientBuilder; +import com.hivemq.client2.mqtt.mqtt5.advanced.Mqtt5AdvancedConfig; +import com.hivemq.client2.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java b/src/main/java/com/hivemq/client2/internal/mqtt/MqttRxClientBuilderBase.java similarity index 91% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java rename to src/main/java/com/hivemq/client2/internal/mqtt/MqttRxClientBuilderBase.java index 83273cb3a..1d766c880 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttRxClientBuilderBase.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/MqttRxClientBuilderBase.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt; - -import com.hivemq.client.internal.mqtt.advanced.MqttAdvancedConfig; -import com.hivemq.client.internal.mqtt.datatypes.MqttClientIdentifierImpl; -import com.hivemq.client.internal.mqtt.lifecycle.MqttAutoReconnectImpl; -import com.hivemq.client.internal.mqtt.lifecycle.MqttAutoReconnectImplBuilder; -import com.hivemq.client.internal.mqtt.mqtt3.Mqtt3RxClientViewBuilder; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.*; -import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; -import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnect; -import com.hivemq.client.mqtt.lifecycle.MqttConnectedListener; -import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedListener; +package com.hivemq.client2.internal.mqtt; + +import com.hivemq.client2.internal.mqtt.advanced.MqttAdvancedConfig; +import com.hivemq.client2.internal.mqtt.datatypes.MqttClientIdentifierImpl; +import com.hivemq.client2.internal.mqtt.lifecycle.MqttAutoReconnectImpl; +import com.hivemq.client2.internal.mqtt.lifecycle.MqttAutoReconnectImplBuilder; +import com.hivemq.client2.internal.mqtt.mqtt3.Mqtt3RxClientViewBuilder; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.*; +import com.hivemq.client2.mqtt.datatypes.MqttClientIdentifier; +import com.hivemq.client2.mqtt.lifecycle.MqttAutoReconnect; +import com.hivemq.client2.mqtt.lifecycle.MqttConnectedListener; +import com.hivemq.client2.mqtt.lifecycle.MqttDisconnectedListener; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImpl.java b/src/main/java/com/hivemq/client2/internal/mqtt/MqttTlsConfigImpl.java similarity index 97% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImpl.java rename to src/main/java/com/hivemq/client2/internal/mqtt/MqttTlsConfigImpl.java index 235cd77ca..717fe636e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImpl.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/MqttTlsConfigImpl.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt; +package com.hivemq.client2.internal.mqtt; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.MqttTlsConfig; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.MqttTlsConfig; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImplBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/MqttTlsConfigImplBuilder.java similarity index 95% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImplBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/MqttTlsConfigImplBuilder.java index c143c47e4..6b8b8a2f7 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImplBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/MqttTlsConfigImplBuilder.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt; +package com.hivemq.client2.internal.mqtt; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.MqttTlsConfigBuilder; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.MqttTlsConfigBuilder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImpl.java b/src/main/java/com/hivemq/client2/internal/mqtt/MqttTransportConfigImpl.java similarity index 94% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImpl.java rename to src/main/java/com/hivemq/client2/internal/mqtt/MqttTransportConfigImpl.java index b5bb50eb7..3fca7e302 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImpl.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/MqttTransportConfigImpl.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt; +package com.hivemq.client2.internal.mqtt; -import com.hivemq.client.internal.util.InetSocketAddressUtil; -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 com.hivemq.client2.internal.util.InetSocketAddressUtil; +import com.hivemq.client2.mqtt.MqttProxyConfig; +import com.hivemq.client2.mqtt.MqttTlsConfig; +import com.hivemq.client2.mqtt.MqttTransportConfig; +import com.hivemq.client2.mqtt.MqttWebSocketConfig; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImplBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/MqttTransportConfigImplBuilder.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImplBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/MqttTransportConfigImplBuilder.java index 5fc660394..a121d501e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImplBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/MqttTransportConfigImplBuilder.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt; - -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.internal.util.InetSocketAddressUtil; -import com.hivemq.client.mqtt.MqttProxyConfig; -import com.hivemq.client.mqtt.MqttTlsConfig; -import com.hivemq.client.mqtt.MqttTransportConfigBuilder; -import com.hivemq.client.mqtt.MqttWebSocketConfig; +package com.hivemq.client2.internal.mqtt; + +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.internal.util.InetSocketAddressUtil; +import com.hivemq.client2.mqtt.MqttProxyConfig; +import com.hivemq.client2.mqtt.MqttTlsConfig; +import com.hivemq.client2.mqtt.MqttTransportConfigBuilder; +import com.hivemq.client2.mqtt.MqttWebSocketConfig; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImpl.java b/src/main/java/com/hivemq/client2/internal/mqtt/MqttWebSocketConfigImpl.java similarity index 97% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImpl.java rename to src/main/java/com/hivemq/client2/internal/mqtt/MqttWebSocketConfigImpl.java index 944ca3b22..a658978a2 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImpl.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/MqttWebSocketConfigImpl.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt; +package com.hivemq.client2.internal.mqtt; -import com.hivemq.client.mqtt.MqttWebSocketConfig; +import com.hivemq.client2.mqtt.MqttWebSocketConfig; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImplBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/MqttWebSocketConfigImplBuilder.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImplBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/MqttWebSocketConfigImplBuilder.java index 43e11ac3e..35a3b2010 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImplBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/MqttWebSocketConfigImplBuilder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt; +package com.hivemq.client2.internal.mqtt; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.MqttWebSocketConfigBuilder; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.MqttWebSocketConfigBuilder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfig.java b/src/main/java/com/hivemq/client2/internal/mqtt/advanced/MqttAdvancedConfig.java similarity index 91% rename from src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfig.java rename to src/main/java/com/hivemq/client2/internal/mqtt/advanced/MqttAdvancedConfig.java index d01fe8ea3..037255479 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfig.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/advanced/MqttAdvancedConfig.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.advanced; +package com.hivemq.client2.internal.mqtt.advanced; -import com.hivemq.client.internal.mqtt.advanced.interceptor.MqttClientInterceptors; -import com.hivemq.client.mqtt.mqtt5.advanced.Mqtt5AdvancedConfig; +import com.hivemq.client2.internal.mqtt.advanced.interceptor.MqttClientInterceptors; +import com.hivemq.client2.mqtt.mqtt5.advanced.Mqtt5AdvancedConfig; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfigBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/advanced/MqttAdvancedConfigBuilder.java similarity index 87% rename from src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfigBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/advanced/MqttAdvancedConfigBuilder.java index 221e47992..ffdd7217d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfigBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/advanced/MqttAdvancedConfigBuilder.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.advanced; +package com.hivemq.client2.internal.mqtt.advanced; -import com.hivemq.client.internal.mqtt.advanced.interceptor.MqttClientInterceptors; -import com.hivemq.client.internal.mqtt.advanced.interceptor.MqttClientInterceptorsBuilder; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.mqtt5.advanced.Mqtt5AdvancedConfigBuilder; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.Mqtt5ClientInterceptors; +import com.hivemq.client2.internal.mqtt.advanced.interceptor.MqttClientInterceptors; +import com.hivemq.client2.internal.mqtt.advanced.interceptor.MqttClientInterceptorsBuilder; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.mqtt5.advanced.Mqtt5AdvancedConfigBuilder; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.Mqtt5ClientInterceptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptors.java b/src/main/java/com/hivemq/client2/internal/mqtt/advanced/interceptor/MqttClientInterceptors.java similarity index 87% rename from src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptors.java rename to src/main/java/com/hivemq/client2/internal/mqtt/advanced/interceptor/MqttClientInterceptors.java index 7214fcd4c..c9efb602d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptors.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/advanced/interceptor/MqttClientInterceptors.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.advanced.interceptor; +package com.hivemq.client2.internal.mqtt.advanced.interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.Mqtt5ClientInterceptors; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5InboundQos1Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5OutboundQos1Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5InboundQos2Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutboundQos2Interceptor; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.Mqtt5ClientInterceptors; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5InboundQos1Interceptor; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5OutboundQos1Interceptor; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5InboundQos2Interceptor; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutboundQos2Interceptor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptorsBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/advanced/interceptor/MqttClientInterceptorsBuilder.java similarity index 88% rename from src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptorsBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/advanced/interceptor/MqttClientInterceptorsBuilder.java index 30b7c3c04..316cc5be8 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptorsBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/advanced/interceptor/MqttClientInterceptorsBuilder.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.advanced.interceptor; +package com.hivemq.client2.internal.mqtt.advanced.interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.Mqtt5ClientInterceptorsBuilder; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5InboundQos1Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5OutboundQos1Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5InboundQos2Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutboundQos2Interceptor; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.Mqtt5ClientInterceptorsBuilder; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5InboundQos1Interceptor; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5OutboundQos1Interceptor; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5InboundQos2Interceptor; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutboundQos2Interceptor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/MqttCodecModule.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/MqttCodecModule.java similarity index 75% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/MqttCodecModule.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/MqttCodecModule.java index 5aaff1947..f75d45d0c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/MqttCodecModule.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/MqttCodecModule.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec; +package com.hivemq.client2.internal.mqtt.codec; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.codec.decoder.mqtt3.Mqtt3ClientMessageDecoders; -import com.hivemq.client.internal.mqtt.codec.decoder.mqtt5.Mqtt5ClientMessageDecoders; -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.codec.encoder.mqtt3.Mqtt3ClientMessageEncoders; -import com.hivemq.client.internal.mqtt.codec.encoder.mqtt5.Mqtt5ClientMessageEncoders; -import com.hivemq.client.internal.mqtt.ioc.ConnectionScope; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.internal.mqtt.codec.decoder.mqtt3.Mqtt3ClientMessageDecoders; +import com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5.Mqtt5ClientMessageDecoders; +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoders; +import com.hivemq.client2.internal.mqtt.codec.encoder.mqtt3.Mqtt3ClientMessageEncoders; +import com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5.Mqtt5ClientMessageEncoders; +import com.hivemq.client2.internal.mqtt.ioc.ConnectionScope; import dagger.Lazy; import dagger.Module; import dagger.Provides; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttDecoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttDecoder.java similarity index 86% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttDecoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttDecoder.java index 8abec3f1b..56ebeddb1 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttDecoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttDecoder.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder; - -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectUtil; -import com.hivemq.client.internal.mqtt.ioc.ConnectionScope; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnectRestrictions; -import com.hivemq.client.mqtt.exceptions.MqttDecodeException; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +package com.hivemq.client2.internal.mqtt.codec.decoder; + +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectUtil; +import com.hivemq.client2.internal.mqtt.ioc.ConnectionScope; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnectRestrictions; +import com.hivemq.client2.mqtt.exceptions.MqttDecodeException; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ByteToMessageDecoder; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttDecoderContext.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttDecoderContext.java similarity index 95% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttDecoderContext.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttDecoderContext.java index cce067581..005cd1daa 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttDecoderContext.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttDecoderContext.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder; +package com.hivemq.client2.internal.mqtt.codec.decoder; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicImpl; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttDecoderException.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttDecoderException.java similarity index 93% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttDecoderException.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttDecoderException.java index d4ac754a9..d95fd71d4 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttDecoderException.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttDecoderException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder; +package com.hivemq.client2.internal.mqtt.codec.decoder; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttMessageDecoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttMessageDecoder.java similarity index 92% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttMessageDecoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttMessageDecoder.java index 47560d3f6..145e32937 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttMessageDecoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttMessageDecoder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder; +package com.hivemq.client2.internal.mqtt.codec.decoder; -import com.hivemq.client.internal.mqtt.message.MqttMessage; +import com.hivemq.client2.internal.mqtt.message.MqttMessage; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttMessageDecoderUtil.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttMessageDecoderUtil.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttMessageDecoderUtil.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttMessageDecoderUtil.java index 32c33d9d7..312594e43 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttMessageDecoderUtil.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttMessageDecoderUtil.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder; +package com.hivemq.client2.internal.mqtt.codec.decoder; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; -import static com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish.NO_PACKET_IDENTIFIER_QOS_0; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttStatefulPublish.NO_PACKET_IDENTIFIER_QOS_0; /** * Util for decoders for MQTT messages of different versions. diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttMessageDecoders.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttMessageDecoders.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttMessageDecoders.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttMessageDecoders.java index 0403bbe1e..a92d4ec5a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttMessageDecoders.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttMessageDecoders.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder; +package com.hivemq.client2.internal.mqtt.codec.decoder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttPingRespDecoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttPingRespDecoder.java similarity index 76% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttPingRespDecoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttPingRespDecoder.java index 3660628a8..13fddfdc0 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/MqttPingRespDecoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttPingRespDecoder.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder; +package com.hivemq.client2.internal.mqtt.codec.decoder; -import com.hivemq.client.internal.mqtt.message.ping.MqttPingResp; +import com.hivemq.client2.internal.mqtt.message.ping.MqttPingResp; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkRemainingLength; -import static com.hivemq.client.internal.mqtt.message.ping.MqttPingResp.INSTANCE; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkRemainingLength; +import static com.hivemq.client2.internal.mqtt.message.ping.MqttPingResp.INSTANCE; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ClientMessageDecoders.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3ClientMessageDecoders.java similarity index 88% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ClientMessageDecoders.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3ClientMessageDecoders.java index b70a8df4c..65e852323 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ClientMessageDecoders.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3ClientMessageDecoders.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttPingRespDecoder; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttPingRespDecoder; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ConnAckDecoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3ConnAckDecoder.java similarity index 71% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ConnAckDecoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3ConnAckDecoder.java index 89ac60eb4..d5ed22f16 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ConnAckDecoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3ConnAckDecoder.java @@ -14,23 +14,23 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; -import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnAckView; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAckReturnCode; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderContext; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderException; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoder; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnAck; +import com.hivemq.client2.internal.mqtt.message.connect.mqtt3.Mqtt3ConnAckView; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3ConnAckReturnCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkRemainingLength; -import static com.hivemq.client.internal.mqtt.codec.decoder.mqtt3.Mqtt3MessageDecoderUtil.wrongReturnCode; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkRemainingLength; +import static com.hivemq.client2.internal.mqtt.codec.decoder.mqtt3.Mqtt3MessageDecoderUtil.wrongReturnCode; /** * @author Daniel Krüger diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3MessageDecoderUtil.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3MessageDecoderUtil.java similarity index 87% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3MessageDecoderUtil.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3MessageDecoderUtil.java index 89313143f..637a04992 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3MessageDecoderUtil.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3MessageDecoderUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderException; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubAckDecoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubAckDecoder.java similarity index 69% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubAckDecoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubAckDecoder.java index 46c4900be..2716774db 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubAckDecoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubAckDecoder.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubAck; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubAckView; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderContext; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderException; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoder; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubAck; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PubAckView; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkRemainingLength; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkRemainingLength; /** * @author Daniel Krüger diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubCompDecoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubCompDecoder.java similarity index 69% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubCompDecoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubCompDecoder.java index 8099754c5..874f193e7 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubCompDecoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubCompDecoder.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubComp; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubCompView; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderContext; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderException; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoder; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubComp; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PubCompView; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkRemainingLength; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkRemainingLength; /** * @author Daniel Krüger diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRecDecoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRecDecoder.java similarity index 69% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRecDecoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRecDecoder.java index 142feb8ae..fdda8fb14 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRecDecoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRecDecoder.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubRec; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubRecView; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderContext; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderException; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoder; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubRec; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PubRecView; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkRemainingLength; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkRemainingLength; /** * @author Daniel Krüger diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRelDecoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRelDecoder.java similarity index 69% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRelDecoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRelDecoder.java index 552ae56f7..0ee455a23 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRelDecoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRelDecoder.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubRel; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubRelView; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderContext; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderException; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoder; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubRel; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PubRelView; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkRemainingLength; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkRemainingLength; /** * @author Daniel Krüger diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PublishDecoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PublishDecoder.java similarity index 74% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PublishDecoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PublishDecoder.java index 612a14be8..d1cf26f46 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PublishDecoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PublishDecoder.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicImpl; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; -import com.hivemq.client.internal.util.ByteBufferUtil; -import com.hivemq.client.mqtt.datatypes.MqttQos; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderContext; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderException; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicImpl; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.mqtt.message.publish.MqttStatefulPublish; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; +import com.hivemq.client2.internal.util.ByteBufferUtil; +import com.hivemq.client2.mqtt.datatypes.MqttQos; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; @@ -32,7 +32,7 @@ import javax.inject.Singleton; import java.nio.ByteBuffer; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.*; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.*; /** * @author Daniel Krüger diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3SubAckDecoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3SubAckDecoder.java similarity index 69% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3SubAckDecoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3SubAckDecoder.java index 32a137795..99f6a2abb 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3SubAckDecoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3SubAckDecoder.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; -import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubAckView; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAckReturnCode; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderContext; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderException; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoder; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubAck; +import com.hivemq.client2.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubAckView; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3SubAckReturnCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; -import static com.hivemq.client.internal.mqtt.codec.decoder.mqtt3.Mqtt3MessageDecoderUtil.wrongReturnCode; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; +import static com.hivemq.client2.internal.mqtt.codec.decoder.mqtt3.Mqtt3MessageDecoderUtil.wrongReturnCode; /** * @author Daniel Krüger diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3UnsubAckDecoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3UnsubAckDecoder.java similarity index 69% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3UnsubAckDecoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3UnsubAckDecoder.java index ec01fb5be..7bf19f7c0 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3UnsubAckDecoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3UnsubAckDecoder.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubAck; -import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderContext; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderException; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoder; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubAck; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkRemainingLength; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkRemainingLength; /** * @author Daniel Krüger diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5AuthDecoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5AuthDecoder.java similarity index 72% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5AuthDecoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5AuthDecoder.java index a6109c0f6..1d70e4888 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5AuthDecoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5AuthDecoder.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.auth.MqttAuth; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5AuthReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderContext; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderException; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.message.auth.MqttAuth; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5AuthReasonCode; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; @@ -33,10 +33,10 @@ import javax.inject.Singleton; import java.nio.ByteBuffer; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; -import static com.hivemq.client.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; -import static com.hivemq.client.internal.mqtt.message.auth.MqttAuthProperty.*; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; +import static com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; +import static com.hivemq.client2.internal.mqtt.message.auth.MqttAuthProperty.*; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ClientMessageDecoders.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5ClientMessageDecoders.java similarity index 89% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ClientMessageDecoders.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5ClientMessageDecoders.java index 00c7af4be..52aed2207 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ClientMessageDecoders.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5ClientMessageDecoders.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttPingRespDecoder; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttPingRespDecoder; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ConnAckDecoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5ConnAckDecoder.java similarity index 88% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ConnAckDecoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5ConnAckDecoder.java index 8224d5f25..6b90fb735 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ConnAckDecoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5ConnAckDecoder.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.datatypes.*; -import com.hivemq.client.internal.mqtt.message.auth.MqttEnhancedAuth; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnAckRestrictions; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAckReturnCode; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderContext; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderException; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoder; +import com.hivemq.client2.internal.mqtt.datatypes.*; +import com.hivemq.client2.internal.mqtt.message.auth.MqttEnhancedAuth; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnAck; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnAckRestrictions; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3ConnAckReturnCode; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAckReasonCode; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; @@ -35,12 +35,12 @@ import javax.inject.Singleton; import java.nio.ByteBuffer; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.*; -import static com.hivemq.client.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; -import static com.hivemq.client.internal.mqtt.message.connect.MqttConnAck.KEEP_ALIVE_FROM_CONNECT; -import static com.hivemq.client.internal.mqtt.message.connect.MqttConnAck.SESSION_EXPIRY_INTERVAL_FROM_CONNECT; -import static com.hivemq.client.internal.mqtt.message.connect.MqttConnAckProperty.*; -import static com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions.*; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.*; +import static com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; +import static com.hivemq.client2.internal.mqtt.message.connect.MqttConnAck.KEEP_ALIVE_FROM_CONNECT; +import static com.hivemq.client2.internal.mqtt.message.connect.MqttConnAck.SESSION_EXPIRY_INTERVAL_FROM_CONNECT; +import static com.hivemq.client2.internal.mqtt.message.connect.MqttConnAckProperty.*; +import static com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions.*; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5DisconnectDecoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5DisconnectDecoder.java similarity index 71% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5DisconnectDecoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5DisconnectDecoder.java index 35b8319b0..a8d3bf814 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5DisconnectDecoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5DisconnectDecoder.java @@ -14,28 +14,28 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderContext; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderException; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; -import static com.hivemq.client.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; -import static com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect.DEFAULT_REASON_CODE; -import static com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect.SESSION_EXPIRY_INTERVAL_FROM_CONNECT; -import static com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnectProperty.*; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; +import static com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; +import static com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect.DEFAULT_REASON_CODE; +import static com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect.SESSION_EXPIRY_INTERVAL_FROM_CONNECT; +import static com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnectProperty.*; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5MessageDecoderUtil.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5MessageDecoderUtil.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5MessageDecoderUtil.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5MessageDecoderUtil.java index ac0f592f5..26f4f3e1d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5MessageDecoderUtil.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5MessageDecoderUtil.java @@ -14,25 +14,25 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; -import com.hivemq.client.internal.mqtt.datatypes.MqttBinaryData; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderContext; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderException; +import com.hivemq.client2.internal.mqtt.datatypes.MqttBinaryData; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.nio.ByteBuffer; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.malformedUTF8String; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; -import static com.hivemq.client.internal.mqtt.message.connect.MqttConnAck.SESSION_EXPIRY_INTERVAL_FROM_CONNECT; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.malformedUTF8String; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; +import static com.hivemq.client2.internal.mqtt.message.connect.MqttConnAck.SESSION_EXPIRY_INTERVAL_FROM_CONNECT; /** * Util for decoders for MQTT 5 messages. diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubAckDecoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubAckDecoder.java similarity index 68% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubAckDecoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubAckDecoder.java index 59f3b22b6..47a284a52 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubAckDecoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubAckDecoder.java @@ -14,29 +14,29 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubAck; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAckReasonCode; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderContext; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderException; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubAck; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubAckReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; -import static com.hivemq.client.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; -import static com.hivemq.client.internal.mqtt.message.publish.MqttPubAck.DEFAULT_REASON_CODE; -import static com.hivemq.client.internal.mqtt.message.publish.MqttPubAckProperty.REASON_STRING; -import static com.hivemq.client.internal.mqtt.message.publish.MqttPubAckProperty.USER_PROPERTY; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; +import static com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttPubAck.DEFAULT_REASON_CODE; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttPubAckProperty.REASON_STRING; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttPubAckProperty.USER_PROPERTY; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubCompDecoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubCompDecoder.java similarity index 68% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubCompDecoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubCompDecoder.java index 1fca4208a..6f1ce2acc 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubCompDecoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubCompDecoder.java @@ -14,29 +14,29 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubComp; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderContext; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderException; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubComp; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; -import static com.hivemq.client.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; -import static com.hivemq.client.internal.mqtt.message.publish.MqttPubComp.DEFAULT_REASON_CODE; -import static com.hivemq.client.internal.mqtt.message.publish.MqttPubCompProperty.REASON_STRING; -import static com.hivemq.client.internal.mqtt.message.publish.MqttPubCompProperty.USER_PROPERTY; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; +import static com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttPubComp.DEFAULT_REASON_CODE; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttPubCompProperty.REASON_STRING; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttPubCompProperty.USER_PROPERTY; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRecDecoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRecDecoder.java similarity index 68% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRecDecoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRecDecoder.java index 564230d65..6397257d0 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRecDecoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRecDecoder.java @@ -14,29 +14,29 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubRec; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderContext; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderException; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubRec; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; -import static com.hivemq.client.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; -import static com.hivemq.client.internal.mqtt.message.publish.MqttPubRec.DEFAULT_REASON_CODE; -import static com.hivemq.client.internal.mqtt.message.publish.MqttPubRecProperty.REASON_STRING; -import static com.hivemq.client.internal.mqtt.message.publish.MqttPubRecProperty.USER_PROPERTY; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; +import static com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttPubRec.DEFAULT_REASON_CODE; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttPubRecProperty.REASON_STRING; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttPubRecProperty.USER_PROPERTY; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRelDecoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRelDecoder.java similarity index 68% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRelDecoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRelDecoder.java index 352eabbef..aa28d08a8 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRelDecoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRelDecoder.java @@ -14,29 +14,29 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubRel; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderContext; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderException; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubRel; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; -import static com.hivemq.client.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; -import static com.hivemq.client.internal.mqtt.message.publish.MqttPubRel.DEFAULT_REASON_CODE; -import static com.hivemq.client.internal.mqtt.message.publish.MqttPubRelProperty.REASON_STRING; -import static com.hivemq.client.internal.mqtt.message.publish.MqttPubRelProperty.USER_PROPERTY; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; +import static com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttPubRel.DEFAULT_REASON_CODE; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttPubRelProperty.REASON_STRING; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttPubRelProperty.USER_PROPERTY; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PublishDecoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PublishDecoder.java similarity index 86% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PublishDecoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PublishDecoder.java index 8d31a2785..441a76f2f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PublishDecoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PublishDecoder.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.datatypes.*; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish; -import com.hivemq.client.internal.util.ByteBufferUtil; -import com.hivemq.client.internal.util.Utf8Util; -import com.hivemq.client.internal.util.collections.ImmutableIntList; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PayloadFormatIndicator; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderContext; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderException; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoder; +import com.hivemq.client2.internal.mqtt.datatypes.*; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.mqtt.message.publish.MqttStatefulPublish; +import com.hivemq.client2.internal.util.ByteBufferUtil; +import com.hivemq.client2.internal.util.Utf8Util; +import com.hivemq.client2.internal.util.collections.ImmutableIntList; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PayloadFormatIndicator; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; @@ -36,11 +36,11 @@ import javax.inject.Singleton; import java.nio.ByteBuffer; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.*; -import static com.hivemq.client.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; -import static com.hivemq.client.internal.mqtt.message.publish.MqttPublish.NO_MESSAGE_EXPIRY; -import static com.hivemq.client.internal.mqtt.message.publish.MqttPublishProperty.*; -import static com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish.*; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.*; +import static com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttPublish.NO_MESSAGE_EXPIRY; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttPublishProperty.*; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttStatefulPublish.*; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5SubAckDecoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5SubAckDecoder.java similarity index 73% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5SubAckDecoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5SubAckDecoder.java index 466a84c52..f7df5c0b2 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5SubAckDecoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5SubAckDecoder.java @@ -14,28 +14,28 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAckReasonCode; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderContext; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderException; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubAck; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAckReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; -import static com.hivemq.client.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; -import static com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAckProperty.REASON_STRING; -import static com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAckProperty.USER_PROPERTY; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; +import static com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; +import static com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubAckProperty.REASON_STRING; +import static com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubAckProperty.USER_PROPERTY; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoder.java similarity index 73% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoder.java index 423597ae0..bf128d50e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoder.java @@ -14,28 +14,28 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderContext; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoder; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubAck; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderContext; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderException; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubAck; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; -import static com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; -import static com.hivemq.client.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; -import static com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubAckProperty.REASON_STRING; -import static com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubAckProperty.USER_PROPERTY; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.checkFixedHeaderFlags; +import static com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoderUtil.remainingLengthTooShort; +import static com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5.Mqtt5MessageDecoderUtil.*; +import static com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubAckProperty.REASON_STRING; +import static com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubAckProperty.USER_PROPERTY; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/MqttEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttEncoder.java similarity index 92% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/MqttEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttEncoder.java index 3b99bb907..74d9c525c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/MqttEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttEncoder.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder; +package com.hivemq.client2.internal.mqtt.codec.encoder; -import com.hivemq.client.internal.mqtt.MqttClientConnectionConfig; -import com.hivemq.client.internal.mqtt.ioc.ConnectionScope; -import com.hivemq.client.internal.mqtt.message.MqttMessage; +import com.hivemq.client2.internal.mqtt.MqttClientConnectionConfig; +import com.hivemq.client2.internal.mqtt.ioc.ConnectionScope; +import com.hivemq.client2.internal.mqtt.message.MqttMessage; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import io.netty.channel.ChannelDuplexHandler; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/MqttEncoderContext.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttEncoderContext.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/MqttEncoderContext.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttEncoderContext.java index ce903a0d5..b6fad855d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/MqttEncoderContext.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttEncoderContext.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder; +package com.hivemq.client2.internal.mqtt.codec.encoder; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; import io.netty.buffer.ByteBufAllocator; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/MqttMessageEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttMessageEncoder.java similarity index 93% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/MqttMessageEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttMessageEncoder.java index 1131417f7..88a16e030 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/MqttMessageEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttMessageEncoder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder; +package com.hivemq.client2.internal.mqtt.codec.encoder; -import com.hivemq.client.internal.mqtt.message.MqttMessage; +import com.hivemq.client2.internal.mqtt.message.MqttMessage; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/MqttMessageEncoderUtil.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttMessageEncoderUtil.java similarity index 89% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/MqttMessageEncoderUtil.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttMessageEncoderUtil.java index c6102b65a..aae4d7d7f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/MqttMessageEncoderUtil.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttMessageEncoderUtil.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder; +package com.hivemq.client2.internal.mqtt.codec.encoder; -import com.hivemq.client.internal.mqtt.datatypes.MqttBinaryData; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.mqtt.message.MqttMessage; -import com.hivemq.client.mqtt.exceptions.MqttEncodeException; +import com.hivemq.client2.internal.mqtt.datatypes.MqttBinaryData; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.mqtt.message.MqttMessage; +import com.hivemq.client2.mqtt.exceptions.MqttEncodeException; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/MqttMessageEncoders.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttMessageEncoders.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/MqttMessageEncoders.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttMessageEncoders.java index b0592ed8c..e54a29373 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/MqttMessageEncoders.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttMessageEncoders.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder; +package com.hivemq.client2.internal.mqtt.codec.encoder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/MqttPingReqEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttPingReqEncoder.java similarity index 88% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/MqttPingReqEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttPingReqEncoder.java index 411711187..18662388c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/MqttPingReqEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttPingReqEncoder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder; +package com.hivemq.client2.internal.mqtt.codec.encoder; -import com.hivemq.client.internal.mqtt.message.ping.MqttPingReq; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.internal.mqtt.message.ping.MqttPingReq; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; import io.netty.buffer.ByteBuf; import io.netty.buffer.UnpooledByteBufAllocator; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3ClientMessageEncoders.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3ClientMessageEncoders.java similarity index 89% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3ClientMessageEncoders.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3ClientMessageEncoders.java index 3e978f027..57a77d012 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3ClientMessageEncoders.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3ClientMessageEncoders.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.codec.encoder.MqttPingReqEncoder; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoders; +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttPingReqEncoder; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3ConnectEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3ConnectEncoder.java similarity index 87% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3ConnectEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3ConnectEncoder.java index 4358591a4..4419f6bc3 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3ConnectEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3ConnectEncoder.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; - -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.mqtt.message.auth.MqttSimpleAuth; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.MqttStatefulConnect; -import com.hivemq.client.internal.mqtt.message.publish.MqttWillPublish; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt3; + +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.mqtt.message.auth.MqttSimpleAuth; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.message.connect.MqttStatefulConnect; +import com.hivemq.client2.internal.mqtt.message.publish.MqttWillPublish; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoderUtil.*; +import static com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoderUtil.*; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3DisconnectEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3DisconnectEncoder.java similarity index 80% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3DisconnectEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3DisconnectEncoder.java index 0f473f019..c7f224508 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3DisconnectEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3DisconnectEncoder.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.encoder.MqttEncoderContext; -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoder; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttEncoderContext; +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoder; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import io.netty.buffer.ByteBuf; import io.netty.buffer.UnpooledByteBufAllocator; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3MessageEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3MessageEncoder.java similarity index 87% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3MessageEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3MessageEncoder.java index c0c2c5b93..94bf7c688 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3MessageEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3MessageEncoder.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.encoder.MqttEncoderContext; -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoder; -import com.hivemq.client.internal.mqtt.message.MqttMessage; +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttEncoderContext; +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoder; +import com.hivemq.client2.internal.mqtt.message.MqttMessage; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; -import static com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoderUtil.encodedPacketLength; -import static com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoderUtil.maximumPacketSizeExceeded; +import static com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoderUtil.encodedPacketLength; +import static com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoderUtil.maximumPacketSizeExceeded; /** * Base class of encoders for MQTT 3 messages. diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubAckEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubAckEncoder.java similarity index 77% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubAckEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubAckEncoder.java index f93e0b8db..a515c478c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubAckEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubAckEncoder.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.encoder.mqtt3.Mqtt3MessageEncoder.Mqtt3MessageWithIdEncoder; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubAck; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.codec.encoder.mqtt3.Mqtt3MessageEncoder.Mqtt3MessageWithIdEncoder; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubAck; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubCompEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubCompEncoder.java similarity index 77% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubCompEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubCompEncoder.java index 3f40349e6..44e202ac1 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubCompEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubCompEncoder.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.encoder.mqtt3.Mqtt3MessageEncoder.Mqtt3MessageWithIdEncoder; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubComp; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.codec.encoder.mqtt3.Mqtt3MessageEncoder.Mqtt3MessageWithIdEncoder; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubComp; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRecEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRecEncoder.java similarity index 77% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRecEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRecEncoder.java index 501b35d3c..69e078a94 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRecEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRecEncoder.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.encoder.mqtt3.Mqtt3MessageEncoder.Mqtt3MessageWithIdEncoder; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubRec; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.codec.encoder.mqtt3.Mqtt3MessageEncoder.Mqtt3MessageWithIdEncoder; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubRec; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRelEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRelEncoder.java similarity index 77% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRelEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRelEncoder.java index f4ba10b50..3b53ac831 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRelEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRelEncoder.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.encoder.mqtt3.Mqtt3MessageEncoder.Mqtt3MessageWithIdEncoder; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubRel; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.codec.encoder.mqtt3.Mqtt3MessageEncoder.Mqtt3MessageWithIdEncoder; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubRel; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PublishEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PublishEncoder.java similarity index 89% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PublishEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PublishEncoder.java index 1deec43a0..d299d8d73 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PublishEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PublishEncoder.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; - -import com.hivemq.client.internal.mqtt.codec.encoder.MqttEncoderContext; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt3; + +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttEncoderContext; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.mqtt.message.publish.MqttStatefulPublish; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3SubscribeEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3SubscribeEncoder.java similarity index 86% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3SubscribeEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3SubscribeEncoder.java index 6a974aa9f..0322eea85 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3SubscribeEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3SubscribeEncoder.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt3; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttStatefulSubscribe; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscription; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttStatefulSubscribe; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscription; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3UnsubscribeEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3UnsubscribeEncoder.java similarity index 86% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3UnsubscribeEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3UnsubscribeEncoder.java index 9e5c70de1..6f99c0c05 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3UnsubscribeEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3UnsubscribeEncoder.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt3; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttStatefulUnsubscribe; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicFilterImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttStatefulUnsubscribe; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5AuthEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5AuthEncoder.java similarity index 84% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5AuthEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5AuthEncoder.java index 19c8c13e9..263e10303 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5AuthEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5AuthEncoder.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.mqtt.message.auth.MqttAuth; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.mqtt.message.auth.MqttAuth; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.codec.encoder.mqtt5.Mqtt5MessageEncoderUtil.*; -import static com.hivemq.client.internal.mqtt.message.auth.MqttAuthProperty.AUTHENTICATION_DATA; -import static com.hivemq.client.internal.mqtt.message.auth.MqttAuthProperty.AUTHENTICATION_METHOD; +import static com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5.Mqtt5MessageEncoderUtil.*; +import static com.hivemq.client2.internal.mqtt.message.auth.MqttAuthProperty.AUTHENTICATION_DATA; +import static com.hivemq.client2.internal.mqtt.message.auth.MqttAuthProperty.AUTHENTICATION_METHOD; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ClientMessageEncoders.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5ClientMessageEncoders.java similarity index 89% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ClientMessageEncoders.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5ClientMessageEncoders.java index ef3cf01ad..afecd53aa 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ClientMessageEncoders.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5ClientMessageEncoders.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.codec.encoder.MqttPingReqEncoder; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoders; +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttPingReqEncoder; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoder.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoder.java index d2917c25a..8fb819854 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoder.java @@ -14,31 +14,31 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.encoder.MqttEncoderContext; -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoder; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.mqtt.message.auth.MqttEnhancedAuth; -import com.hivemq.client.internal.mqtt.message.auth.MqttSimpleAuth; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnectRestrictions; -import com.hivemq.client.internal.mqtt.message.connect.MqttStatefulConnect; -import com.hivemq.client.internal.mqtt.message.publish.MqttWillPublish; -import com.hivemq.client.internal.mqtt.message.publish.MqttWillPublishProperty; -import com.hivemq.client.mqtt.exceptions.MqttEncodeException; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttEncoderContext; +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.mqtt.message.auth.MqttEnhancedAuth; +import com.hivemq.client2.internal.mqtt.message.auth.MqttSimpleAuth; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnectRestrictions; +import com.hivemq.client2.internal.mqtt.message.connect.MqttStatefulConnect; +import com.hivemq.client2.internal.mqtt.message.publish.MqttWillPublish; +import com.hivemq.client2.internal.mqtt.message.publish.MqttWillPublishProperty; +import com.hivemq.client2.mqtt.exceptions.MqttEncodeException; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoderUtil.*; -import static com.hivemq.client.internal.mqtt.codec.encoder.mqtt5.Mqtt5MessageEncoderUtil.*; -import static com.hivemq.client.internal.mqtt.message.connect.MqttConnect.DEFAULT_SESSION_EXPIRY_INTERVAL; -import static com.hivemq.client.internal.mqtt.message.connect.MqttConnectProperty.*; +import static com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoderUtil.*; +import static com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5.Mqtt5MessageEncoderUtil.*; +import static com.hivemq.client2.internal.mqtt.message.connect.MqttConnect.DEFAULT_SESSION_EXPIRY_INTERVAL; +import static com.hivemq.client2.internal.mqtt.message.connect.MqttConnectProperty.*; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5DisconnectEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5DisconnectEncoder.java similarity index 70% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5DisconnectEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5DisconnectEncoder.java index 83d25be1e..991c2c180 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5DisconnectEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5DisconnectEncoder.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.codec.encoder.mqtt5.Mqtt5MessageEncoderUtil.*; -import static com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect.DEFAULT_REASON_CODE; -import static com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect.SESSION_EXPIRY_INTERVAL_FROM_CONNECT; -import static com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnectProperty.SERVER_REFERENCE; -import static com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnectProperty.SESSION_EXPIRY_INTERVAL; +import static com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5.Mqtt5MessageEncoderUtil.*; +import static com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect.DEFAULT_REASON_CODE; +import static com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect.SESSION_EXPIRY_INTERVAL_FROM_CONNECT; +import static com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnectProperty.SERVER_REFERENCE; +import static com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnectProperty.SESSION_EXPIRY_INTERVAL; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5MessageEncoderUtil.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5MessageEncoderUtil.java similarity index 93% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5MessageEncoderUtil.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5MessageEncoderUtil.java index 95f928939..9aac4db3e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5MessageEncoderUtil.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5MessageEncoderUtil.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; -import com.hivemq.client.internal.mqtt.datatypes.MqttBinaryData; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PayloadFormatIndicator; +import com.hivemq.client2.internal.mqtt.datatypes.MqttBinaryData; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PayloadFormatIndicator; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5MessageWithUserPropertiesEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5MessageWithUserPropertiesEncoder.java similarity index 93% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5MessageWithUserPropertiesEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5MessageWithUserPropertiesEncoder.java index 565cf88a9..f4e104e96 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5MessageWithUserPropertiesEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5MessageWithUserPropertiesEncoder.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.encoder.MqttEncoderContext; -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoder; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.mqtt.message.MqttMessage; -import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttEncoderContext; +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.mqtt.message.MqttMessage; +import com.hivemq.client2.internal.mqtt.message.MqttMessageWithUserProperties; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5ReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; -import static com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoderUtil.*; -import static com.hivemq.client.internal.mqtt.codec.encoder.mqtt5.Mqtt5MessageEncoderUtil.encodeNullableProperty; -import static com.hivemq.client.internal.mqtt.codec.encoder.mqtt5.Mqtt5MessageEncoderUtil.nullablePropertyEncodedLength; -import static com.hivemq.client.internal.mqtt.message.MqttProperty.REASON_STRING; +import static com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoderUtil.*; +import static com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5.Mqtt5MessageEncoderUtil.encodeNullableProperty; +import static com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5.Mqtt5MessageEncoderUtil.nullablePropertyEncodedLength; +import static com.hivemq.client2.internal.mqtt.message.MqttProperty.REASON_STRING; /** * Base class of encoders for MQTT messages with omissible User Properties. diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubAckEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubAckEncoder.java similarity index 77% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubAckEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubAckEncoder.java index d5d0df2f0..03a694ea5 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubAckEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubAckEncoder.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubAck; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAckReasonCode; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubAck; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubAckReasonCode; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.message.publish.MqttPubAck.DEFAULT_REASON_CODE; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttPubAck.DEFAULT_REASON_CODE; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubCompEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubCompEncoder.java similarity index 77% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubCompEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubCompEncoder.java index 09eb840d3..cacde6f90 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubCompEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubCompEncoder.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubComp; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubComp; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.message.publish.MqttPubComp.DEFAULT_REASON_CODE; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttPubComp.DEFAULT_REASON_CODE; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRecEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRecEncoder.java similarity index 77% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRecEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRecEncoder.java index 20f314676..f936c39c7 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRecEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRecEncoder.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubRec; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubRec; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.message.publish.MqttPubRec.DEFAULT_REASON_CODE; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttPubRec.DEFAULT_REASON_CODE; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRelEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRelEncoder.java similarity index 77% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRelEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRelEncoder.java index 5c7845ecb..d21d1688a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRelEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRelEncoder.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubRel; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubRel; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.message.publish.MqttPubRel.DEFAULT_REASON_CODE; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttPubRel.DEFAULT_REASON_CODE; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PublishEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PublishEncoder.java similarity index 88% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PublishEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PublishEncoder.java index 0ee94dcda..a50c7ae5d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PublishEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PublishEncoder.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.encoder.MqttEncoderContext; -import com.hivemq.client.internal.mqtt.datatypes.MqttBinaryData; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish; -import com.hivemq.client.internal.util.collections.ImmutableIntList; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttEncoderContext; +import com.hivemq.client2.internal.mqtt.datatypes.MqttBinaryData; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.mqtt.message.publish.MqttStatefulPublish; +import com.hivemq.client2.internal.util.collections.ImmutableIntList; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.jetbrains.annotations.NotNull; @@ -32,10 +32,10 @@ import javax.inject.Singleton; import java.nio.ByteBuffer; -import static com.hivemq.client.internal.mqtt.codec.encoder.mqtt5.Mqtt5MessageEncoderUtil.*; -import static com.hivemq.client.internal.mqtt.message.publish.MqttPublish.NO_MESSAGE_EXPIRY; -import static com.hivemq.client.internal.mqtt.message.publish.MqttPublishProperty.*; -import static com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish.DEFAULT_NO_TOPIC_ALIAS; +import static com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5.Mqtt5MessageEncoderUtil.*; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttPublish.NO_MESSAGE_EXPIRY; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttPublishProperty.*; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttStatefulPublish.DEFAULT_NO_TOPIC_ALIAS; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5SubscribeEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5SubscribeEncoder.java similarity index 81% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5SubscribeEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5SubscribeEncoder.java index 5060fe17c..54a5ab106 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5SubscribeEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5SubscribeEncoder.java @@ -14,23 +14,23 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttStatefulSubscribe; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscription; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttStatefulSubscribe; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscription; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import javax.inject.Inject; import javax.inject.Singleton; -import static com.hivemq.client.internal.mqtt.codec.encoder.mqtt5.Mqtt5MessageEncoderUtil.encodeVariableByteIntegerProperty; -import static com.hivemq.client.internal.mqtt.codec.encoder.mqtt5.Mqtt5MessageEncoderUtil.variableByteIntegerPropertyEncodedLength; -import static com.hivemq.client.internal.mqtt.message.subscribe.MqttStatefulSubscribe.DEFAULT_NO_SUBSCRIPTION_IDENTIFIER; -import static com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribeProperty.SUBSCRIPTION_IDENTIFIER; +import static com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5.Mqtt5MessageEncoderUtil.encodeVariableByteIntegerProperty; +import static com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5.Mqtt5MessageEncoderUtil.variableByteIntegerPropertyEncodedLength; +import static com.hivemq.client2.internal.mqtt.message.subscribe.MqttStatefulSubscribe.DEFAULT_NO_SUBSCRIPTION_IDENTIFIER; +import static com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscribeProperty.SUBSCRIPTION_IDENTIFIER; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5UnsubscribeEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5UnsubscribeEncoder.java similarity index 89% rename from src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5UnsubscribeEncoder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5UnsubscribeEncoder.java index f5b1fd2cd..a2157c20b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5UnsubscribeEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5UnsubscribeEncoder.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttStatefulUnsubscribe; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicFilterImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttStatefulUnsubscribe; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttBinaryData.java b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttBinaryData.java similarity index 98% rename from src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttBinaryData.java rename to src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttBinaryData.java index 367909753..c4416e624 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttBinaryData.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttBinaryData.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; -import com.hivemq.client.internal.util.ByteBufferUtil; +import com.hivemq.client2.internal.util.ByteBufferUtil; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttClientIdentifierImpl.java b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttClientIdentifierImpl.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttClientIdentifierImpl.java rename to src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttClientIdentifierImpl.java index 32101efef..9dbe3d12b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttClientIdentifierImpl.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttClientIdentifierImpl.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.datatypes.MqttClientIdentifier; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttSharedTopicFilterImpl.java b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttSharedTopicFilterImpl.java similarity index 98% rename from src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttSharedTopicFilterImpl.java rename to src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttSharedTopicFilterImpl.java index 134e47c45..eb647b781 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttSharedTopicFilterImpl.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttSharedTopicFilterImpl.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; -import com.hivemq.client.internal.util.ByteArrayUtil; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.datatypes.MqttSharedTopicFilter; +import com.hivemq.client2.internal.util.ByteArrayUtil; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.datatypes.MqttSharedTopicFilter; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImpl.java b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicFilterImpl.java similarity index 97% rename from src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImpl.java rename to src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicFilterImpl.java index 966b647db..a4cc3e85b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImpl.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicFilterImpl.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.datatypes.MqttTopic; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.datatypes.MqttTopic; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilter; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImplBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicFilterImplBuilder.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImplBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicFilterImplBuilder.java index c28b618c4..2048e7af3 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImplBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicFilterImplBuilder.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.datatypes.MqttSharedTopicFilterBuilder; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilterBuilder; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.datatypes.MqttSharedTopicFilterBuilder; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilterBuilder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicImpl.java b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicImpl.java similarity index 97% rename from src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicImpl.java rename to src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicImpl.java index 9b7d4dcc2..e30b2c4f5 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicImpl.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicImpl.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.datatypes.MqttTopic; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.datatypes.MqttTopic; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicImplBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicImplBuilder.java similarity index 95% rename from src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicImplBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicImplBuilder.java index 2a1c3238d..f2a0eec58 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicImplBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicImplBuilder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.datatypes.MqttTopicBuilder; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.datatypes.MqttTopicBuilder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicIterator.java b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicIterator.java similarity index 98% rename from src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicIterator.java rename to src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicIterator.java index 9635d226e..de037b86d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicIterator.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicIterator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; -import com.hivemq.client.internal.util.ByteArrayUtil; +import com.hivemq.client2.internal.util.ByteArrayUtil; import org.jetbrains.annotations.NotNull; import java.util.Arrays; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicLevel.java b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicLevel.java similarity index 97% rename from src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicLevel.java rename to src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicLevel.java index 90b89ef3e..9cf179f5b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicLevel.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicLevel.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; -import com.hivemq.client.internal.util.ByteArray; +import com.hivemq.client2.internal.util.ByteArray; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicLevels.java b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicLevels.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicLevels.java rename to src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicLevels.java index 325ce7100..ae5c530a6 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicLevels.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicLevels.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; -import com.hivemq.client.internal.util.ByteArrayUtil; +import com.hivemq.client2.internal.util.ByteArrayUtil; import org.jetbrains.annotations.NotNull; import java.util.Arrays; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImpl.java b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUserPropertiesImpl.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImpl.java rename to src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUserPropertiesImpl.java index 45a5ffe27..8e996f51f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImpl.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUserPropertiesImpl.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImplBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUserPropertiesImplBuilder.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImplBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUserPropertiesImplBuilder.java index 2c5cb44cc..9841b8b9a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImplBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUserPropertiesImplBuilder.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; - -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperty; +package com.hivemq.client2.internal.mqtt.datatypes; + +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperty; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertyImpl.java b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUserPropertyImpl.java similarity index 95% rename from src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertyImpl.java rename to src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUserPropertyImpl.java index 4a4521160..65fff4324 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertyImpl.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUserPropertyImpl.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; -import com.hivemq.client.internal.mqtt.message.MqttProperty; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperty; +import com.hivemq.client2.internal.mqtt.message.MqttProperty; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperty; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUtf8StringImpl.java b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUtf8StringImpl.java similarity index 98% rename from src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUtf8StringImpl.java rename to src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUtf8StringImpl.java index 29a64ad15..7ef029762 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttUtf8StringImpl.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUtf8StringImpl.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.internal.util.Utf8Util; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.internal.util.Utf8Util; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttVariableByteInteger.java b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttVariableByteInteger.java similarity index 98% rename from src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttVariableByteInteger.java rename to src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttVariableByteInteger.java index 3ca9da933..055bd0056 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/datatypes/MqttVariableByteInteger.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/datatypes/MqttVariableByteInteger.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/exceptions/MqttClientStateExceptions.java b/src/main/java/com/hivemq/client2/internal/mqtt/exceptions/MqttClientStateExceptions.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/exceptions/MqttClientStateExceptions.java rename to src/main/java/com/hivemq/client2/internal/mqtt/exceptions/MqttClientStateExceptions.java index a09585696..56e61f496 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/exceptions/MqttClientStateExceptions.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/exceptions/MqttClientStateExceptions.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.exceptions; +package com.hivemq.client2.internal.mqtt.exceptions; -import com.hivemq.client.mqtt.exceptions.MqttClientStateException; +import com.hivemq.client2.mqtt.exceptions.MqttClientStateException; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java b/src/main/java/com/hivemq/client2/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java similarity index 78% rename from src/main/java/com/hivemq/client/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java rename to src/main/java/com/hivemq/client2/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java index 253b745d5..4e5a77596 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.exceptions.mqtt3; +package com.hivemq.client2.internal.mqtt.exceptions.mqtt3; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; -import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnAckView; -import com.hivemq.client.internal.mqtt.message.disconnect.mqtt3.Mqtt3DisconnectView; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubAckView; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubRecView; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; -import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubAckView; -import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; -import com.hivemq.client.mqtt.exceptions.MqttSessionExpiredException; -import com.hivemq.client.mqtt.mqtt3.exceptions.*; -import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5MessageException; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnAck; +import com.hivemq.client2.internal.mqtt.message.connect.mqtt3.Mqtt3ConnAckView; +import com.hivemq.client2.internal.mqtt.message.disconnect.mqtt3.Mqtt3DisconnectView; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PubAckView; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PubRecView; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubAck; +import com.hivemq.client2.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubAckView; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; +import com.hivemq.client2.mqtt.exceptions.MqttSessionExpiredException; +import com.hivemq.client2.mqtt.mqtt3.exceptions.*; +import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5MessageException; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5Message; import io.reactivex.rxjava3.functions.Function; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttChannelInitializer.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/MqttChannelInitializer.java similarity index 80% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/MqttChannelInitializer.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/MqttChannelInitializer.java index 8ec2de071..cdae2a492 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttChannelInitializer.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/MqttChannelInitializer.java @@ -14,25 +14,25 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler; - -import com.hivemq.client.internal.mqtt.MqttClientConfig; -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; -import com.hivemq.client.internal.mqtt.handler.connect.MqttConnAckFlow; -import com.hivemq.client.internal.mqtt.handler.connect.MqttConnAckSingle; -import com.hivemq.client.internal.mqtt.handler.connect.MqttConnectHandler; -import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectHandler; -import com.hivemq.client.internal.mqtt.handler.proxy.MqttProxyInitializer; -import com.hivemq.client.internal.mqtt.handler.tls.MqttTlsInitializer; -import com.hivemq.client.internal.mqtt.handler.websocket.MqttWebSocketInitializer; -import com.hivemq.client.internal.mqtt.ioc.ConnectionScope; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.mqtt.exceptions.ConnectionFailedException; -import com.hivemq.client.mqtt.lifecycle.MqttDisconnectSource; +package com.hivemq.client2.internal.mqtt.handler; + +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.MqttProxyConfigImpl; +import com.hivemq.client2.internal.mqtt.MqttTlsConfigImpl; +import com.hivemq.client2.internal.mqtt.MqttWebSocketConfigImpl; +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttEncoder; +import com.hivemq.client2.internal.mqtt.handler.auth.MqttAuthHandler; +import com.hivemq.client2.internal.mqtt.handler.connect.MqttConnAckFlow; +import com.hivemq.client2.internal.mqtt.handler.connect.MqttConnAckSingle; +import com.hivemq.client2.internal.mqtt.handler.connect.MqttConnectHandler; +import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectHandler; +import com.hivemq.client2.internal.mqtt.handler.proxy.MqttProxyInitializer; +import com.hivemq.client2.internal.mqtt.handler.tls.MqttTlsInitializer; +import com.hivemq.client2.internal.mqtt.handler.websocket.MqttWebSocketInitializer; +import com.hivemq.client2.internal.mqtt.ioc.ConnectionScope; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.mqtt.exceptions.ConnectionFailedException; +import com.hivemq.client2.mqtt.lifecycle.MqttDisconnectSource; import dagger.Lazy; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttConnectionAwareHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/MqttConnectionAwareHandler.java similarity index 92% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/MqttConnectionAwareHandler.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/MqttConnectionAwareHandler.java index 76d21539c..c800054fe 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttConnectionAwareHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/MqttConnectionAwareHandler.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler; +package com.hivemq.client2.internal.mqtt.handler; -import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectEvent; +import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectEvent; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttSession.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/MqttSession.java similarity index 83% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/MqttSession.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/MqttSession.java index e93b899c5..63fdb3847 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttSession.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/MqttSession.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler; +package com.hivemq.client2.internal.mqtt.handler; -import com.hivemq.client.internal.annotations.CallByThread; -import com.hivemq.client.internal.mqtt.MqttClientConnectionConfig; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoder; -import com.hivemq.client.internal.mqtt.handler.publish.incoming.MqttIncomingQosHandler; -import com.hivemq.client.internal.mqtt.handler.publish.outgoing.MqttOutgoingQosHandler; -import com.hivemq.client.internal.mqtt.handler.subscribe.MqttSubscriptionHandler; -import com.hivemq.client.internal.mqtt.ioc.ClientScope; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.mqtt.exceptions.MqttSessionExpiredException; -import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5ConnAckException; +import com.hivemq.client2.internal.annotations.CallByThread; +import com.hivemq.client2.internal.mqtt.MqttClientConnectionConfig; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoder; +import com.hivemq.client2.internal.mqtt.handler.publish.incoming.MqttIncomingQosHandler; +import com.hivemq.client2.internal.mqtt.handler.publish.outgoing.MqttOutgoingQosHandler; +import com.hivemq.client2.internal.mqtt.handler.subscribe.MqttSubscriptionHandler; +import com.hivemq.client2.internal.mqtt.ioc.ClientScope; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnAck; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.mqtt.exceptions.MqttSessionExpiredException; +import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5ConnAckException; import io.netty.channel.ChannelPipeline; import io.netty.channel.EventLoop; import io.netty.util.concurrent.ScheduledFuture; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttSessionAwareHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/MqttSessionAwareHandler.java similarity index 87% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/MqttSessionAwareHandler.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/MqttSessionAwareHandler.java index 4da38e553..caa68ae65 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/MqttSessionAwareHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/MqttSessionAwareHandler.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler; +package com.hivemq.client2.internal.mqtt.handler; -import com.hivemq.client.internal.mqtt.MqttClientConnectionConfig; -import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectEvent; +import com.hivemq.client2.internal.mqtt.MqttClientConnectionConfig; +import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectEvent; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.EventLoop; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/AbstractMqttAuthHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/AbstractMqttAuthHandler.java similarity index 88% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/auth/AbstractMqttAuthHandler.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/AbstractMqttAuthHandler.java index 7712de545..0b92bea73 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/AbstractMqttAuthHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/AbstractMqttAuthHandler.java @@ -14,23 +14,23 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.auth; - -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.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectUtil; -import com.hivemq.client.internal.mqtt.handler.util.MqttTimeoutInboundHandler; -import com.hivemq.client.internal.mqtt.message.auth.MqttAuth; -import com.hivemq.client.internal.mqtt.message.auth.MqttAuthBuilder; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; -import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; -import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5AuthException; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5Auth; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5AuthBuilder; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +package com.hivemq.client2.internal.mqtt.handler.auth; + +import com.hivemq.client2.internal.logging.InternalLogger; +import com.hivemq.client2.internal.logging.InternalLoggerFactory; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectUtil; +import com.hivemq.client2.internal.mqtt.handler.util.MqttTimeoutInboundHandler; +import com.hivemq.client2.internal.mqtt.message.auth.MqttAuth; +import com.hivemq.client2.internal.mqtt.message.auth.MqttAuthBuilder; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5ClientConfig; +import com.hivemq.client2.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; +import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5AuthException; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5Auth; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5AuthBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.channel.ChannelHandlerContext; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -41,7 +41,7 @@ import java.util.function.Consumer; import java.util.function.Supplier; -import static com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5AuthReasonCode.CONTINUE_AUTHENTICATION; +import static com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5AuthReasonCode.CONTINUE_AUTHENTICATION; /** * Base for enhanced auth handling according to the MQTT 5 specification. diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttAuthHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttAuthHandler.java similarity index 93% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttAuthHandler.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttAuthHandler.java index db2038ebb..6805568d8 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttAuthHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttAuthHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.auth; +package com.hivemq.client2.internal.mqtt.handler.auth; import io.netty.channel.ChannelHandler; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttConnectAuthHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttConnectAuthHandler.java similarity index 86% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttConnectAuthHandler.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttConnectAuthHandler.java index a8c561731..51d997d4d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttConnectAuthHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttConnectAuthHandler.java @@ -14,30 +14,30 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.auth; - -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectEvent; -import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectUtil; -import com.hivemq.client.internal.mqtt.ioc.ConnectionScope; -import com.hivemq.client.internal.mqtt.message.auth.MqttAuth; -import com.hivemq.client.internal.mqtt.message.auth.MqttEnhancedAuthBuilder; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.MqttStatefulConnect; -import com.hivemq.client.internal.netty.DefaultChannelOutboundHandler; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.exceptions.ConnectionFailedException; -import com.hivemq.client.mqtt.lifecycle.MqttDisconnectSource; -import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; -import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; -import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5AuthException; -import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5ConnAckException; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuth; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuthBuilder; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +package com.hivemq.client2.internal.mqtt.handler.auth; + +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectEvent; +import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectUtil; +import com.hivemq.client2.internal.mqtt.ioc.ConnectionScope; +import com.hivemq.client2.internal.mqtt.message.auth.MqttAuth; +import com.hivemq.client2.internal.mqtt.message.auth.MqttEnhancedAuthBuilder; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnAck; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.message.connect.MqttStatefulConnect; +import com.hivemq.client2.internal.netty.DefaultChannelOutboundHandler; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.exceptions.ConnectionFailedException; +import com.hivemq.client2.mqtt.lifecycle.MqttDisconnectSource; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5ClientConfig; +import com.hivemq.client2.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; +import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5AuthException; +import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5ConnAckException; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuth; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuthBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPromise; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttDisconnectOnAuthHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttDisconnectOnAuthHandler.java similarity index 83% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttDisconnectOnAuthHandler.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttDisconnectOnAuthHandler.java index d58da8588..5384fb085 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttDisconnectOnAuthHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttDisconnectOnAuthHandler.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.auth; +package com.hivemq.client2.internal.mqtt.handler.auth; -import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectUtil; -import com.hivemq.client.internal.mqtt.message.auth.MqttAuth; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; -import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5AuthException; -import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5ConnAckException; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectUtil; +import com.hivemq.client2.internal.mqtt.message.auth.MqttAuth; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnAck; +import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5AuthException; +import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5ConnAckException; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttReAuthCompletable.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttReAuthCompletable.java similarity index 88% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttReAuthCompletable.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttReAuthCompletable.java index 5d2ac3008..ee84aec60 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttReAuthCompletable.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttReAuthCompletable.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.auth; +package com.hivemq.client2.internal.mqtt.handler.auth; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.MqttClientConnectionConfig; -import com.hivemq.client.internal.mqtt.exceptions.MqttClientStateExceptions; -import com.hivemq.client.internal.rx.CompletableFlow; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.MqttClientConnectionConfig; +import com.hivemq.client2.internal.mqtt.exceptions.MqttClientStateExceptions; +import com.hivemq.client2.internal.rx.CompletableFlow; import io.netty.channel.Channel; import io.netty.channel.ChannelHandler; import io.reactivex.rxjava3.core.Completable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttReAuthHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttReAuthHandler.java similarity index 87% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttReAuthHandler.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttReAuthHandler.java index f5f1e132d..bdb7dc4d7 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttReAuthHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttReAuthHandler.java @@ -14,29 +14,29 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.auth; - -import com.hivemq.client.internal.mqtt.exceptions.MqttClientStateExceptions; -import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectEvent; -import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectUtil; -import com.hivemq.client.internal.mqtt.ioc.ConnectionScope; -import com.hivemq.client.internal.mqtt.message.auth.MqttAuth; -import com.hivemq.client.internal.mqtt.message.auth.MqttAuthBuilder; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect; -import com.hivemq.client.internal.rx.CompletableFlow; -import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; -import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; -import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5AuthException; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5Auth; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5AuthBuilder; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +package com.hivemq.client2.internal.mqtt.handler.auth; + +import com.hivemq.client2.internal.mqtt.exceptions.MqttClientStateExceptions; +import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectEvent; +import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectUtil; +import com.hivemq.client2.internal.mqtt.ioc.ConnectionScope; +import com.hivemq.client2.internal.mqtt.message.auth.MqttAuth; +import com.hivemq.client2.internal.mqtt.message.auth.MqttAuthBuilder; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect; +import com.hivemq.client2.internal.rx.CompletableFlow; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5ClientConfig; +import com.hivemq.client2.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; +import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5AuthException; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5Auth; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5AuthBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.channel.ChannelHandlerContext; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5AuthReasonCode.CONTINUE_AUTHENTICATION; -import static com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5AuthReasonCode.REAUTHENTICATE; +import static com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5AuthReasonCode.CONTINUE_AUTHENTICATION; +import static com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5AuthReasonCode.REAUTHENTICATE; /** * Enhanced reauth handling according to the MQTT 5 specification. diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckFlow.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/connect/MqttConnAckFlow.java similarity index 95% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckFlow.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/connect/MqttConnAckFlow.java index 863a9cdce..11b736260 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckFlow.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/connect/MqttConnAckFlow.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.connect; +package com.hivemq.client2.internal.mqtt.handler.connect; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import io.reactivex.rxjava3.core.SingleObserver; import io.reactivex.rxjava3.disposables.Disposable; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/connect/MqttConnAckSingle.java similarity index 88% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/connect/MqttConnAckSingle.java index cc4ece51b..f17985585 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/connect/MqttConnAckSingle.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.connect; - -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.MqttTransportConfigImpl; -import com.hivemq.client.internal.mqtt.exceptions.MqttClientStateExceptions; -import com.hivemq.client.internal.mqtt.lifecycle.MqttDisconnectedContextImpl; -import com.hivemq.client.internal.mqtt.lifecycle.MqttReconnector; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.mqtt.exceptions.ConnectionFailedException; -import com.hivemq.client.mqtt.lifecycle.MqttDisconnectSource; -import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedContext; -import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedListener; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +package com.hivemq.client2.internal.mqtt.handler.connect; + +import com.hivemq.client2.internal.logging.InternalLogger; +import com.hivemq.client2.internal.logging.InternalLoggerFactory; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.MqttTransportConfigImpl; +import com.hivemq.client2.internal.mqtt.exceptions.MqttClientStateExceptions; +import com.hivemq.client2.internal.mqtt.lifecycle.MqttDisconnectedContextImpl; +import com.hivemq.client2.internal.mqtt.lifecycle.MqttReconnector; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.mqtt.exceptions.ConnectionFailedException; +import com.hivemq.client2.mqtt.lifecycle.MqttDisconnectSource; +import com.hivemq.client2.mqtt.lifecycle.MqttDisconnectedContext; +import com.hivemq.client2.mqtt.lifecycle.MqttDisconnectedListener; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import io.netty.bootstrap.Bootstrap; import io.netty.channel.EventLoop; import io.reactivex.rxjava3.core.Single; @@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit; -import static com.hivemq.client.mqtt.MqttClientState.*; +import static com.hivemq.client2.mqtt.MqttClientState.*; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnectHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/connect/MqttConnectHandler.java similarity index 86% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnectHandler.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/connect/MqttConnectHandler.java index 512d2453f..6de6be8e0 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnectHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/connect/MqttConnectHandler.java @@ -14,35 +14,35 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.connect; - -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.MqttClientConnectionConfig; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoder; -import com.hivemq.client.internal.mqtt.codec.encoder.MqttEncoder; -import com.hivemq.client.internal.mqtt.datatypes.MqttClientIdentifierImpl; -import com.hivemq.client.internal.mqtt.handler.MqttSession; -import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectEvent; -import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectUtil; -import com.hivemq.client.internal.mqtt.handler.ping.MqttPingHandler; -import com.hivemq.client.internal.mqtt.handler.util.MqttTimeoutInboundHandler; -import com.hivemq.client.internal.mqtt.ioc.ConnectionScope; -import com.hivemq.client.internal.mqtt.lifecycle.MqttConnectedContextImpl; -import com.hivemq.client.internal.mqtt.message.MqttMessage; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnAckRestrictions; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnectRestrictions; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.MqttClientState; -import com.hivemq.client.mqtt.MqttVersion; -import com.hivemq.client.mqtt.lifecycle.MqttConnectedContext; -import com.hivemq.client.mqtt.lifecycle.MqttConnectedListener; -import com.hivemq.client.mqtt.lifecycle.MqttDisconnectSource; -import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5ConnAckException; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +package com.hivemq.client2.internal.mqtt.handler.connect; + +import com.hivemq.client2.internal.logging.InternalLogger; +import com.hivemq.client2.internal.logging.InternalLoggerFactory; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.MqttClientConnectionConfig; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoder; +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttEncoder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttClientIdentifierImpl; +import com.hivemq.client2.internal.mqtt.handler.MqttSession; +import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectEvent; +import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectUtil; +import com.hivemq.client2.internal.mqtt.handler.ping.MqttPingHandler; +import com.hivemq.client2.internal.mqtt.handler.util.MqttTimeoutInboundHandler; +import com.hivemq.client2.internal.mqtt.ioc.ConnectionScope; +import com.hivemq.client2.internal.mqtt.lifecycle.MqttConnectedContextImpl; +import com.hivemq.client2.internal.mqtt.message.MqttMessage; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnAck; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnAckRestrictions; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnectRestrictions; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.MqttClientState; +import com.hivemq.client2.mqtt.MqttVersion; +import com.hivemq.client2.mqtt.lifecycle.MqttConnectedContext; +import com.hivemq.client2.mqtt.lifecycle.MqttConnectedListener; +import com.hivemq.client2.mqtt.lifecycle.MqttDisconnectSource; +import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5ConnAckException; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectCompletable.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/disconnect/MqttDisconnectCompletable.java similarity index 84% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectCompletable.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/disconnect/MqttDisconnectCompletable.java index 5dbdd048d..14cb7e09a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectCompletable.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/disconnect/MqttDisconnectCompletable.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.disconnect; +package com.hivemq.client2.internal.mqtt.handler.disconnect; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.MqttClientConnectionConfig; -import com.hivemq.client.internal.mqtt.exceptions.MqttClientStateExceptions; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect; -import com.hivemq.client.internal.rx.CompletableFlow; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.MqttClientConnectionConfig; +import com.hivemq.client2.internal.mqtt.exceptions.MqttClientStateExceptions; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect; +import com.hivemq.client2.internal.rx.CompletableFlow; import io.netty.channel.Channel; import io.reactivex.rxjava3.core.Completable; import io.reactivex.rxjava3.core.CompletableObserver; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectEvent.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/disconnect/MqttDisconnectEvent.java similarity index 86% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectEvent.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/disconnect/MqttDisconnectEvent.java index 69a31479b..829dad17e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectEvent.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/disconnect/MqttDisconnectEvent.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.disconnect; +package com.hivemq.client2.internal.mqtt.handler.disconnect; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect; -import com.hivemq.client.internal.rx.CompletableFlow; -import com.hivemq.client.mqtt.lifecycle.MqttDisconnectSource; -import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5DisconnectException; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect; +import com.hivemq.client2.internal.rx.CompletableFlow; +import com.hivemq.client2.mqtt.lifecycle.MqttDisconnectSource; +import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5DisconnectException; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/disconnect/MqttDisconnectHandler.java similarity index 87% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectHandler.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/disconnect/MqttDisconnectHandler.java index 5755679e0..116257a59 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/disconnect/MqttDisconnectHandler.java @@ -14,30 +14,30 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.disconnect; - -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.MqttClientConnectionConfig; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.exceptions.MqttClientStateExceptions; -import com.hivemq.client.internal.mqtt.handler.MqttConnectionAwareHandler; -import com.hivemq.client.internal.mqtt.handler.MqttSession; -import com.hivemq.client.internal.mqtt.handler.connect.MqttConnAckSingle; -import com.hivemq.client.internal.mqtt.ioc.ConnectionScope; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnectRestrictions; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect; -import com.hivemq.client.internal.rx.CompletableFlow; -import com.hivemq.client.mqtt.MqttVersion; -import com.hivemq.client.mqtt.exceptions.ConnectionClosedException; -import com.hivemq.client.mqtt.lifecycle.MqttDisconnectSource; -import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; -import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5ConnAckException; -import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5DisconnectException; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +package com.hivemq.client2.internal.mqtt.handler.disconnect; + +import com.hivemq.client2.internal.logging.InternalLogger; +import com.hivemq.client2.internal.logging.InternalLoggerFactory; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.MqttClientConnectionConfig; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.exceptions.MqttClientStateExceptions; +import com.hivemq.client2.internal.mqtt.handler.MqttConnectionAwareHandler; +import com.hivemq.client2.internal.mqtt.handler.MqttSession; +import com.hivemq.client2.internal.mqtt.handler.connect.MqttConnAckSingle; +import com.hivemq.client2.internal.mqtt.ioc.ConnectionScope; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnAck; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnectRestrictions; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect; +import com.hivemq.client2.internal.rx.CompletableFlow; +import com.hivemq.client2.mqtt.MqttVersion; +import com.hivemq.client2.mqtt.exceptions.ConnectionClosedException; +import com.hivemq.client2.mqtt.lifecycle.MqttDisconnectSource; +import com.hivemq.client2.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; +import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5ConnAckException; +import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5DisconnectException; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.EventLoop; @@ -50,7 +50,7 @@ import java.io.IOException; import java.util.concurrent.TimeUnit; -import static com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectUtil.fireDisconnectEvent; +import static com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectUtil.fireDisconnectEvent; /** * If the server initiated the closing of the channel (a Disconnect message is received or the channel is closed without diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectUtil.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/disconnect/MqttDisconnectUtil.java similarity index 88% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectUtil.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/disconnect/MqttDisconnectUtil.java index ebacaab11..b3b19dcaf 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectUtil.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/disconnect/MqttDisconnectUtil.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.disconnect; +package com.hivemq.client2.internal.mqtt.handler.disconnect; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnectBuilder; -import com.hivemq.client.mqtt.exceptions.ConnectionClosedException; -import com.hivemq.client.mqtt.lifecycle.MqttDisconnectSource; -import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5DisconnectException; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnectBuilder; +import com.hivemq.client2.mqtt.exceptions.ConnectionClosedException; +import com.hivemq.client2.mqtt.lifecycle.MqttDisconnectSource; +import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5DisconnectException; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.channel.Channel; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/ping/MqttPingHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/ping/MqttPingHandler.java similarity index 89% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/ping/MqttPingHandler.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/ping/MqttPingHandler.java index 3f11d6f72..3335d8f09 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/ping/MqttPingHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/ping/MqttPingHandler.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.ping; - -import com.hivemq.client.internal.mqtt.handler.MqttConnectionAwareHandler; -import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectEvent; -import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectUtil; -import com.hivemq.client.internal.mqtt.ioc.ConnectionScope; -import com.hivemq.client.internal.mqtt.message.ping.MqttPingReq; -import com.hivemq.client.internal.mqtt.message.ping.MqttPingResp; -import com.hivemq.client.internal.netty.DefaultChannelOutboundHandler; +package com.hivemq.client2.internal.mqtt.handler.ping; + +import com.hivemq.client2.internal.mqtt.handler.MqttConnectionAwareHandler; +import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectEvent; +import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectUtil; +import com.hivemq.client2.internal.mqtt.ioc.ConnectionScope; +import com.hivemq.client2.internal.mqtt.message.ping.MqttPingReq; +import com.hivemq.client2.internal.mqtt.message.ping.MqttPingResp; +import com.hivemq.client2.internal.netty.DefaultChannelOutboundHandler; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/proxy/MqttProxyAdapterHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/proxy/MqttProxyAdapterHandler.java similarity index 97% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/proxy/MqttProxyAdapterHandler.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/proxy/MqttProxyAdapterHandler.java index b58b0ccd1..00163e4da 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/proxy/MqttProxyAdapterHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/proxy/MqttProxyAdapterHandler.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.proxy; +package com.hivemq.client2.internal.mqtt.handler.proxy; -import com.hivemq.client.internal.mqtt.MqttProxyConfigImpl; +import com.hivemq.client2.internal.mqtt.MqttProxyConfigImpl; import io.netty.channel.*; import io.netty.handler.proxy.HttpProxyHandler; import io.netty.handler.proxy.ProxyHandler; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/proxy/MqttProxyInitializer.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/proxy/MqttProxyInitializer.java similarity index 89% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/proxy/MqttProxyInitializer.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/proxy/MqttProxyInitializer.java index 83be60cfc..8f4866d79 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/proxy/MqttProxyInitializer.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/proxy/MqttProxyInitializer.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.proxy; +package com.hivemq.client2.internal.mqtt.handler.proxy; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.MqttProxyConfigImpl; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.MqttProxyConfigImpl; import io.netty.channel.Channel; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlow.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlow.java similarity index 85% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlow.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlow.java index a534b615e..7b5d7ea6a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlow.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlow.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.incoming; +package com.hivemq.client2.internal.mqtt.handler.publish.incoming; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.util.collections.HandleList.Handle; -import com.hivemq.client.mqtt.MqttGlobalPublishFilter; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.util.collections.HandleList.Handle; +import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reactivestreams.Subscriber; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlowable.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlowable.java similarity index 84% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlowable.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlowable.java index e57ceaa61..4164fcff8 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlowable.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlowable.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.incoming; +package com.hivemq.client2.internal.mqtt.handler.publish.incoming; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.handler.subscribe.MqttSubscriptionHandler; -import com.hivemq.client.internal.mqtt.ioc.ClientComponent; -import com.hivemq.client.mqtt.MqttGlobalPublishFilter; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.handler.subscribe.MqttSubscriptionHandler; +import com.hivemq.client2.internal.mqtt.ioc.ClientComponent; +import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; import io.reactivex.rxjava3.core.Flowable; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Subscriber; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishConfirmable.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingPublishConfirmable.java similarity index 94% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishConfirmable.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingPublishConfirmable.java index de5b296b1..b41d24146 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishConfirmable.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingPublishConfirmable.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.incoming; +package com.hivemq.client2.internal.mqtt.handler.publish.incoming; -import com.hivemq.client.internal.checkpoint.Confirmable; +import com.hivemq.client2.internal.checkpoint.Confirmable; import org.jetbrains.annotations.NotNull; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlow.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlow.java similarity index 95% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlow.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlow.java index a181ee32f..5bbf6e841 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlow.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlow.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.incoming; +package com.hivemq.client2.internal.mqtt.handler.publish.incoming; -import com.hivemq.client.internal.annotations.CallByThread; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.handler.util.FlowWithEventLoop; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.internal.annotations.CallByThread; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.handler.util.FlowWithEventLoop; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; import io.reactivex.rxjava3.core.Emitter; import io.reactivex.rxjava3.internal.util.BackpressureHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlows.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlows.java similarity index 85% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlows.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlows.java index 084860a9e..749012830 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlows.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlows.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.incoming; - -import com.hivemq.client.internal.annotations.NotThreadSafe; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImpl; -import com.hivemq.client.internal.mqtt.ioc.ClientScope; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscription; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; -import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; -import com.hivemq.client.internal.util.collections.HandleList; -import com.hivemq.client.internal.util.collections.HandleList.Handle; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.MqttGlobalPublishFilter; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAckReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; +package com.hivemq.client2.internal.mqtt.handler.publish.incoming; + +import com.hivemq.client2.internal.annotations.NotThreadSafe; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicFilterImpl; +import com.hivemq.client2.internal.mqtt.ioc.ClientScope; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscribe; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscription; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubscribe; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; +import com.hivemq.client2.internal.util.collections.HandleList; +import com.hivemq.client2.internal.util.collections.HandleList.Handle; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAckReasonCode; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishService.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingPublishService.java similarity index 91% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishService.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingPublishService.java index 7dd36fca5..cdeb3adf5 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishService.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingPublishService.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.incoming; - -import com.hivemq.client.internal.annotations.CallByThread; -import com.hivemq.client.internal.checkpoint.Confirmable; -import com.hivemq.client.internal.logging.InternalLogger; -import com.hivemq.client.internal.logging.InternalLoggerFactory; -import com.hivemq.client.internal.mqtt.ioc.ClientScope; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.internal.util.collections.ChunkedArrayQueue; -import com.hivemq.client.internal.util.collections.HandleList.Handle; -import com.hivemq.client.mqtt.datatypes.MqttQos; +package com.hivemq.client2.internal.mqtt.handler.publish.incoming; + +import com.hivemq.client2.internal.annotations.CallByThread; +import com.hivemq.client2.internal.checkpoint.Confirmable; +import com.hivemq.client2.internal.logging.InternalLogger; +import com.hivemq.client2.internal.logging.InternalLoggerFactory; +import com.hivemq.client2.internal.mqtt.ioc.ClientScope; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.util.collections.ChunkedArrayQueue; +import com.hivemq.client2.internal.util.collections.HandleList.Handle; +import com.hivemq.client2.mqtt.datatypes.MqttQos; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingQosHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingQosHandler.java similarity index 92% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingQosHandler.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingQosHandler.java index 8f967da31..e64c7e7c8 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingQosHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingQosHandler.java @@ -14,25 +14,25 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.incoming; - -import com.hivemq.client.internal.annotations.CallByThread; -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.MqttClientConnectionConfig; -import com.hivemq.client.internal.mqtt.advanced.interceptor.MqttClientInterceptors; -import com.hivemq.client.internal.mqtt.handler.MqttSessionAwareHandler; -import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectUtil; -import com.hivemq.client.internal.mqtt.ioc.ClientScope; -import com.hivemq.client.internal.mqtt.message.publish.*; -import com.hivemq.client.internal.util.collections.IntIndex; -import com.hivemq.client.mqtt.MqttVersion; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5InboundQos1Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5InboundQos2Interceptor; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; +package com.hivemq.client2.internal.mqtt.handler.publish.incoming; + +import com.hivemq.client2.internal.annotations.CallByThread; +import com.hivemq.client2.internal.logging.InternalLogger; +import com.hivemq.client2.internal.logging.InternalLoggerFactory; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.MqttClientConnectionConfig; +import com.hivemq.client2.internal.mqtt.advanced.interceptor.MqttClientInterceptors; +import com.hivemq.client2.internal.mqtt.handler.MqttSessionAwareHandler; +import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectUtil; +import com.hivemq.client2.internal.mqtt.ioc.ClientScope; +import com.hivemq.client2.internal.mqtt.message.publish.*; +import com.hivemq.client2.internal.util.collections.IntIndex; +import com.hivemq.client2.mqtt.MqttVersion; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5InboundQos1Interceptor; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5InboundQos2Interceptor; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.EventLoop; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttStatefulPublishWithFlows.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttStatefulPublishWithFlows.java similarity index 83% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttStatefulPublishWithFlows.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttStatefulPublishWithFlows.java index ec8e4c216..3a39a9570 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttStatefulPublishWithFlows.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttStatefulPublishWithFlows.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.incoming; +package com.hivemq.client2.internal.mqtt.handler.publish.incoming; -import com.hivemq.client.internal.annotations.NotThreadSafe; -import com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish; -import com.hivemq.client.internal.util.collections.HandleList; -import com.hivemq.client.mqtt.datatypes.MqttQos; +import com.hivemq.client2.internal.annotations.NotThreadSafe; +import com.hivemq.client2.internal.mqtt.message.publish.MqttStatefulPublish; +import com.hivemq.client2.internal.util.collections.HandleList; +import com.hivemq.client2.mqtt.datatypes.MqttQos; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlow.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlow.java similarity index 75% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlow.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlow.java index 272a2cd1e..33b8c453d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlow.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlow.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.incoming; +package com.hivemq.client2.internal.mqtt.handler.publish.incoming; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImpl; -import com.hivemq.client.internal.mqtt.handler.subscribe.MqttSubscriptionFlow; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; -import com.hivemq.client.internal.util.collections.HandleList; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; -import com.hivemq.client.rx.FlowableWithSingleSubscriber; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicFilterImpl; +import com.hivemq.client2.internal.mqtt.handler.subscribe.MqttSubscriptionFlow; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubAck; +import com.hivemq.client2.internal.util.collections.HandleList; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; +import com.hivemq.client2.rx.FlowableWithSingleSubscriber; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Subscriber; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTree.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTree.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTree.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTree.java index f12a5f8a2..724760aee 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTree.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTree.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.incoming; - -import com.hivemq.client.internal.annotations.NotThreadSafe; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicIterator; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicLevel; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicLevels; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscription; -import com.hivemq.client.internal.util.collections.HandleList.Handle; -import com.hivemq.client.internal.util.collections.Index; -import com.hivemq.client.internal.util.collections.NodeList; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5RetainHandling; +package com.hivemq.client2.internal.mqtt.handler.publish.incoming; + +import com.hivemq.client2.internal.annotations.NotThreadSafe; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicFilterImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicIterator; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicLevel; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicLevels; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscription; +import com.hivemq.client2.internal.util.collections.HandleList.Handle; +import com.hivemq.client2.internal.util.collections.Index; +import com.hivemq.client2.internal.util.collections.NodeList; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5RetainHandling; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowable.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowable.java similarity index 78% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowable.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowable.java index d07857df9..f430a99e7 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowable.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowable.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.incoming; +package com.hivemq.client2.internal.mqtt.handler.publish.incoming; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.handler.subscribe.MqttSubscriptionHandler; -import com.hivemq.client.internal.mqtt.ioc.ClientComponent; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; -import com.hivemq.client.rx.FlowableWithSingle; -import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.handler.subscribe.MqttSubscriptionHandler; +import com.hivemq.client2.internal.mqtt.ioc.ClientComponent; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscribe; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; +import com.hivemq.client2.rx.FlowableWithSingle; +import com.hivemq.client2.rx.reactivestreams.WithSingleSubscriber; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Subscriber; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlows.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlows.java similarity index 84% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlows.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlows.java index d4f3ad00f..d286c5659 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlows.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlows.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.incoming; +package com.hivemq.client2.internal.mqtt.handler.publish.incoming; -import com.hivemq.client.internal.annotations.NotThreadSafe; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImpl; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscription; +import com.hivemq.client2.internal.annotations.NotThreadSafe; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicFilterImpl; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscription; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckFlow.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttAckFlow.java similarity index 76% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckFlow.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttAckFlow.java index 85b875bed..5ac0c538e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckFlow.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttAckFlow.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.outgoing; +package com.hivemq.client2.internal.mqtt.handler.publish.outgoing; -import com.hivemq.client.internal.annotations.CallByThread; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.handler.util.FlowWithEventLoop; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublishResult; +import com.hivemq.client2.internal.annotations.CallByThread; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.handler.util.FlowWithEventLoop; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublishResult; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckFlowable.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttAckFlowable.java similarity index 83% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckFlowable.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttAckFlowable.java index fda8cfea2..cfa6890f4 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckFlowable.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttAckFlowable.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.outgoing; +package com.hivemq.client2.internal.mqtt.handler.publish.outgoing; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.exceptions.MqttClientStateExceptions; -import com.hivemq.client.internal.mqtt.ioc.ClientComponent; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.exceptions.MqttClientStateExceptions; +import com.hivemq.client2.internal.mqtt.ioc.ClientComponent; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PublishResult; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckFlowableFlow.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttAckFlowableFlow.java similarity index 94% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckFlowableFlow.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttAckFlowableFlow.java index 40c843fa5..8d34192d7 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckFlowableFlow.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttAckFlowableFlow.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.outgoing; +package com.hivemq.client2.internal.mqtt.handler.publish.outgoing; -import com.hivemq.client.internal.annotations.CallByThread; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.handler.publish.outgoing.MqttPublishFlowableAckLink.LinkedFlow; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublishResult; -import com.hivemq.client.internal.util.collections.ChunkedArrayQueue; +import com.hivemq.client2.internal.annotations.CallByThread; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.handler.publish.outgoing.MqttPublishFlowableAckLink.LinkedFlow; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublishResult; +import com.hivemq.client2.internal.util.collections.ChunkedArrayQueue; import io.reactivex.rxjava3.internal.util.BackpressureHelper; import io.reactivex.rxjava3.plugins.RxJavaPlugins; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckSingle.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttAckSingle.java similarity index 87% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckSingle.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttAckSingle.java index 98c7db0a4..a80cf6854 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckSingle.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttAckSingle.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.outgoing; +package com.hivemq.client2.internal.mqtt.handler.publish.outgoing; -import com.hivemq.client.internal.annotations.CallByThread; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.exceptions.MqttClientStateExceptions; -import com.hivemq.client.internal.mqtt.ioc.ClientComponent; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublishResult; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; +import com.hivemq.client2.internal.annotations.CallByThread; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.exceptions.MqttClientStateExceptions; +import com.hivemq.client2.internal.mqtt.ioc.ClientComponent; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublishResult; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PublishResult; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.core.Single; import io.reactivex.rxjava3.core.SingleObserver; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckSingleFlowable.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttAckSingleFlowable.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckSingleFlowable.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttAckSingleFlowable.java index 7e3432a84..00bcec441 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckSingleFlowable.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttAckSingleFlowable.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.outgoing; - -import com.hivemq.client.internal.annotations.CallByThread; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.exceptions.MqttClientStateExceptions; -import com.hivemq.client.internal.mqtt.ioc.ClientComponent; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublishResult; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; +package com.hivemq.client2.internal.mqtt.handler.publish.outgoing; + +import com.hivemq.client2.internal.annotations.CallByThread; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.exceptions.MqttClientStateExceptions; +import com.hivemq.client2.internal.mqtt.ioc.ClientComponent; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublishResult; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PublishResult; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java similarity index 89% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java index a9aa9a98a..68e8e2b0d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java @@ -14,40 +14,40 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.outgoing; - -import com.hivemq.client.internal.annotations.CallByThread; -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.MqttClientConnectionConfig; -import com.hivemq.client.internal.mqtt.advanced.interceptor.MqttClientInterceptors; -import com.hivemq.client.internal.mqtt.exceptions.MqttClientStateExceptions; -import com.hivemq.client.internal.mqtt.handler.MqttSessionAwareHandler; -import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectUtil; -import com.hivemq.client.internal.mqtt.handler.publish.outgoing.MqttPubRelWithFlow.MqttQos2CompleteWithFlow; -import com.hivemq.client.internal.mqtt.handler.publish.outgoing.MqttPubRelWithFlow.MqttQos2IntermediateWithFlow; -import com.hivemq.client.internal.mqtt.handler.subscribe.MqttSubscriptionHandler; -import com.hivemq.client.internal.mqtt.ioc.ClientScope; -import com.hivemq.client.internal.mqtt.message.publish.*; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublishResult.MqttQos1Result; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublishResult.MqttQos2CompleteResult; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublishResult.MqttQos2IntermediateResult; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublishResult.MqttQos2Result; -import com.hivemq.client.internal.netty.ContextFuture; -import com.hivemq.client.internal.netty.DefaultContextPromise; -import com.hivemq.client.internal.util.Ranges; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.internal.util.collections.IntIndex; -import com.hivemq.client.internal.util.collections.NodeList; -import com.hivemq.client.mqtt.MqttClientState; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.exceptions.ConnectionClosedException; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5OutboundQos1Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutboundQos2Interceptor; -import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5PubAckException; -import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5PubRecException; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +package com.hivemq.client2.internal.mqtt.handler.publish.outgoing; + +import com.hivemq.client2.internal.annotations.CallByThread; +import com.hivemq.client2.internal.logging.InternalLogger; +import com.hivemq.client2.internal.logging.InternalLoggerFactory; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.MqttClientConnectionConfig; +import com.hivemq.client2.internal.mqtt.advanced.interceptor.MqttClientInterceptors; +import com.hivemq.client2.internal.mqtt.exceptions.MqttClientStateExceptions; +import com.hivemq.client2.internal.mqtt.handler.MqttSessionAwareHandler; +import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectUtil; +import com.hivemq.client2.internal.mqtt.handler.publish.outgoing.MqttPubRelWithFlow.MqttQos2CompleteWithFlow; +import com.hivemq.client2.internal.mqtt.handler.publish.outgoing.MqttPubRelWithFlow.MqttQos2IntermediateWithFlow; +import com.hivemq.client2.internal.mqtt.handler.subscribe.MqttSubscriptionHandler; +import com.hivemq.client2.internal.mqtt.ioc.ClientScope; +import com.hivemq.client2.internal.mqtt.message.publish.*; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublishResult.MqttQos1Result; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublishResult.MqttQos2CompleteResult; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublishResult.MqttQos2IntermediateResult; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublishResult.MqttQos2Result; +import com.hivemq.client2.internal.netty.ContextFuture; +import com.hivemq.client2.internal.netty.DefaultContextPromise; +import com.hivemq.client2.internal.util.Ranges; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.internal.util.collections.IntIndex; +import com.hivemq.client2.internal.util.collections.NodeList; +import com.hivemq.client2.mqtt.MqttClientState; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.exceptions.ConnectionClosedException; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5OutboundQos1Interceptor; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutboundQos2Interceptor; +import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5PubAckException; +import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5PubRecException; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.EventLoop; @@ -62,7 +62,7 @@ import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; -import static com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish.NO_PACKET_IDENTIFIER_QOS_0; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttStatefulPublish.NO_PACKET_IDENTIFIER_QOS_0; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPubOrRelWithFlow.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttPubOrRelWithFlow.java similarity index 88% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPubOrRelWithFlow.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttPubOrRelWithFlow.java index edff5b74a..f43c1638a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPubOrRelWithFlow.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttPubOrRelWithFlow.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.outgoing; +package com.hivemq.client2.internal.mqtt.handler.publish.outgoing; -import com.hivemq.client.internal.util.collections.NodeList; +import com.hivemq.client2.internal.util.collections.NodeList; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPubRelWithFlow.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttPubRelWithFlow.java similarity index 88% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPubRelWithFlow.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttPubRelWithFlow.java index c39bf2867..c7465139a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPubRelWithFlow.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttPubRelWithFlow.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.outgoing; +package com.hivemq.client2.internal.mqtt.handler.publish.outgoing; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubRec; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubRel; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubRec; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubRel; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; import org.jetbrains.annotations.NotNull; import java.util.function.BooleanSupplier; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPublishFlowableAckLink.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttPublishFlowableAckLink.java similarity index 95% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPublishFlowableAckLink.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttPublishFlowableAckLink.java index 4eccc672e..ce3e5dd69 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPublishFlowableAckLink.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttPublishFlowableAckLink.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.outgoing; +package com.hivemq.client2.internal.mqtt.handler.publish.outgoing; -import com.hivemq.client.internal.logging.InternalLogger; -import com.hivemq.client.internal.logging.InternalLoggerFactory; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.logging.InternalLogger; +import com.hivemq.client2.internal.logging.InternalLoggerFactory; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.core.FlowableSubscriber; import io.reactivex.rxjava3.plugins.RxJavaPlugins; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPublishFlowables.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttPublishFlowables.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPublishFlowables.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttPublishFlowables.java index da0d1e11e..9727369e7 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPublishFlowables.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttPublishFlowables.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.outgoing; +package com.hivemq.client2.internal.mqtt.handler.publish.outgoing; -import com.hivemq.client.internal.logging.InternalLogger; -import com.hivemq.client.internal.logging.InternalLoggerFactory; -import com.hivemq.client.internal.mqtt.ioc.ClientScope; +import com.hivemq.client2.internal.logging.InternalLogger; +import com.hivemq.client2.internal.logging.InternalLoggerFactory; +import com.hivemq.client2.internal.mqtt.ioc.ClientScope; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.internal.util.BackpressureHelper; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPublishWithFlow.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttPublishWithFlow.java similarity index 88% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPublishWithFlow.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttPublishWithFlow.java index d5f573327..ad361d3a2 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPublishWithFlow.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttPublishWithFlow.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.outgoing; +package com.hivemq.client2.internal.mqtt.handler.publish.outgoing; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttTopicAliasAutoMapping.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttTopicAliasAutoMapping.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttTopicAliasAutoMapping.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttTopicAliasAutoMapping.java index e3f22c4d3..c080f5653 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttTopicAliasAutoMapping.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttTopicAliasAutoMapping.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.outgoing; +package com.hivemq.client2.internal.mqtt.handler.publish.outgoing; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicImpl; -import com.hivemq.client.internal.util.collections.Index; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicImpl; +import com.hivemq.client2.internal.util.collections.Index; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish.*; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttStatefulPublish.*; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttTopicAliasMapping.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttTopicAliasMapping.java similarity index 86% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttTopicAliasMapping.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttTopicAliasMapping.java index 75b42e79f..8a4e57151 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttTopicAliasMapping.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttTopicAliasMapping.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.outgoing; +package com.hivemq.client2.internal.mqtt.handler.publish.outgoing; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicImpl; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubAckSingle.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttSubAckSingle.java similarity index 81% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubAckSingle.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttSubAckSingle.java index a168ceb27..fc4dda01b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubAckSingle.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttSubAckSingle.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.subscribe; +package com.hivemq.client2.internal.mqtt.handler.subscribe; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.ioc.ClientComponent; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.ioc.ClientComponent; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubAck; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscribe; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import io.reactivex.rxjava3.core.Single; import io.reactivex.rxjava3.core.SingleObserver; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubOrUnsubAckFlow.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttSubOrUnsubAckFlow.java similarity index 88% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubOrUnsubAckFlow.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttSubOrUnsubAckFlow.java index 61e716b2b..a4e95c693 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubOrUnsubAckFlow.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttSubOrUnsubAckFlow.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.subscribe; +package com.hivemq.client2.internal.mqtt.handler.subscribe; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.handler.util.FlowWithEventLoop; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.handler.util.FlowWithEventLoop; import io.reactivex.rxjava3.core.SingleObserver; import io.reactivex.rxjava3.disposables.Disposable; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubOrUnsubWithFlow.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttSubOrUnsubWithFlow.java similarity index 87% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubOrUnsubWithFlow.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttSubOrUnsubWithFlow.java index a8ae37a8e..1be0be063 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubOrUnsubWithFlow.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttSubOrUnsubWithFlow.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.subscribe; +package com.hivemq.client2.internal.mqtt.handler.subscribe; -import com.hivemq.client.internal.util.collections.NodeList; +import com.hivemq.client2.internal.util.collections.NodeList; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscribeWithFlow.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttSubscribeWithFlow.java similarity index 87% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscribeWithFlow.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttSubscribeWithFlow.java index 7467c8607..524a32dbd 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscribeWithFlow.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttSubscribeWithFlow.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.subscribe; +package com.hivemq.client2.internal.mqtt.handler.subscribe; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubAck; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscribe; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscriptionFlow.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttSubscriptionFlow.java similarity index 94% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscriptionFlow.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttSubscriptionFlow.java index 0b1be90dd..62e4b5f5e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscriptionFlow.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttSubscriptionFlow.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.subscribe; +package com.hivemq.client2.internal.mqtt.handler.subscribe; import io.netty.channel.EventLoop; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscriptionHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttSubscriptionHandler.java similarity index 86% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscriptionHandler.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttSubscriptionHandler.java index 7efc22084..57a04588e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubscriptionHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttSubscriptionHandler.java @@ -14,39 +14,39 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.subscribe; - -import com.hivemq.client.internal.annotations.CallByThread; -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.MqttClientConnectionConfig; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.handler.MqttSessionAwareHandler; -import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectUtil; -import com.hivemq.client.internal.mqtt.handler.publish.incoming.MqttGlobalIncomingPublishFlow; -import com.hivemq.client.internal.mqtt.handler.publish.incoming.MqttIncomingPublishFlows; -import com.hivemq.client.internal.mqtt.handler.publish.incoming.MqttSubscribedPublishFlow; -import com.hivemq.client.internal.mqtt.ioc.ClientScope; -import com.hivemq.client.internal.mqtt.message.MqttReasonCodes; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttStatefulSubscribe; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttStatefulUnsubscribe; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubAck; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; -import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; -import com.hivemq.client.internal.util.Ranges; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.internal.util.collections.IntIndex; -import com.hivemq.client.internal.util.collections.NodeList; -import com.hivemq.client.mqtt.MqttClientState; -import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5SubAckException; -import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5UnsubAckException; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAckReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; +package com.hivemq.client2.internal.mqtt.handler.subscribe; + +import com.hivemq.client2.internal.annotations.CallByThread; +import com.hivemq.client2.internal.logging.InternalLogger; +import com.hivemq.client2.internal.logging.InternalLoggerFactory; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.MqttClientConnectionConfig; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.handler.MqttSessionAwareHandler; +import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectUtil; +import com.hivemq.client2.internal.mqtt.handler.publish.incoming.MqttGlobalIncomingPublishFlow; +import com.hivemq.client2.internal.mqtt.handler.publish.incoming.MqttIncomingPublishFlows; +import com.hivemq.client2.internal.mqtt.handler.publish.incoming.MqttSubscribedPublishFlow; +import com.hivemq.client2.internal.mqtt.ioc.ClientScope; +import com.hivemq.client2.internal.mqtt.message.MqttReasonCodes; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttStatefulSubscribe; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubAck; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscribe; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttStatefulUnsubscribe; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubAck; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubscribe; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; +import com.hivemq.client2.internal.util.Ranges; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.internal.util.collections.IntIndex; +import com.hivemq.client2.internal.util.collections.NodeList; +import com.hivemq.client2.mqtt.MqttClientState; +import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5SubAckException; +import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5UnsubAckException; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAckReasonCode; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.EventLoop; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttUnsubAckSingle.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttUnsubAckSingle.java similarity index 80% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttUnsubAckSingle.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttUnsubAckSingle.java index 770e70e19..06004222c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttUnsubAckSingle.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttUnsubAckSingle.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.subscribe; +package com.hivemq.client2.internal.mqtt.handler.subscribe; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.ioc.ClientComponent; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubAck; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.ioc.ClientComponent; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubAck; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubscribe; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; import io.reactivex.rxjava3.core.Single; import io.reactivex.rxjava3.core.SingleObserver; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttUnsubscribeWithFlow.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttUnsubscribeWithFlow.java similarity index 85% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttUnsubscribeWithFlow.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttUnsubscribeWithFlow.java index 9154319e9..dedf217da 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttUnsubscribeWithFlow.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttUnsubscribeWithFlow.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.subscribe; +package com.hivemq.client2.internal.mqtt.handler.subscribe; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubAck; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubAck; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubscribe; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsAdapterHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/tls/MqttTlsAdapterHandler.java similarity index 98% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsAdapterHandler.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/tls/MqttTlsAdapterHandler.java index 77b990581..05efe4e2a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsAdapterHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/tls/MqttTlsAdapterHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.tls; +package com.hivemq.client2.internal.mqtt.handler.tls; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsInitializer.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/tls/MqttTlsInitializer.java similarity index 93% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsInitializer.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/tls/MqttTlsInitializer.java index fb7a3041a..61590bc21 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsInitializer.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/tls/MqttTlsInitializer.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.tls; +package com.hivemq.client2.internal.mqtt.handler.tls; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.MqttTlsConfigImpl; -import com.hivemq.client.internal.util.collections.ImmutableList; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.MqttTlsConfigImpl; +import com.hivemq.client2.internal.util.collections.ImmutableList; import io.netty.channel.Channel; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContextBuilder; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/util/FlowWithEventLoop.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/util/FlowWithEventLoop.java similarity index 95% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/util/FlowWithEventLoop.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/util/FlowWithEventLoop.java index 4c116c9e4..75ac38584 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/util/FlowWithEventLoop.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/util/FlowWithEventLoop.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.util; +package com.hivemq.client2.internal.mqtt.handler.util; -import com.hivemq.client.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; import io.netty.channel.EventLoop; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/util/MqttTimeoutInboundHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/util/MqttTimeoutInboundHandler.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/util/MqttTimeoutInboundHandler.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/util/MqttTimeoutInboundHandler.java index 06857674f..7d2276d62 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/util/MqttTimeoutInboundHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/util/MqttTimeoutInboundHandler.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.util; +package com.hivemq.client2.internal.mqtt.handler.util; -import com.hivemq.client.internal.annotations.CallByThread; -import com.hivemq.client.internal.mqtt.handler.MqttConnectionAwareHandler; -import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectEvent; -import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectUtil; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +import com.hivemq.client2.internal.annotations.CallByThread; +import com.hivemq.client2.internal.mqtt.handler.MqttConnectionAwareHandler; +import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectEvent; +import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectUtil; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketCodec.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/websocket/MqttWebSocketCodec.java similarity index 95% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketCodec.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/websocket/MqttWebSocketCodec.java index ede95cc2b..c0653a182 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketCodec.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/websocket/MqttWebSocketCodec.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.websocket; +package com.hivemq.client2.internal.mqtt.handler.websocket; -import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectUtil; +import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectUtil; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelHandler; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java similarity index 89% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java index 38cf4333f..62910da7b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.websocket; +package com.hivemq.client2.internal.mqtt.handler.websocket; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -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; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.MqttTransportConfigImpl; +import com.hivemq.client2.internal.mqtt.MqttWebSocketConfigImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.mqtt.ioc.ConnectionScope; import io.netty.channel.Channel; import io.netty.handler.codec.http.HttpClientCodec; import io.netty.handler.codec.http.HttpObjectAggregator; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebsocketHandshakeHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/websocket/MqttWebsocketHandshakeHandler.java similarity index 98% rename from src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebsocketHandshakeHandler.java rename to src/main/java/com/hivemq/client2/internal/mqtt/handler/websocket/MqttWebsocketHandshakeHandler.java index dcde3a0ad..4572acbb0 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/handler/websocket/MqttWebsocketHandshakeHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/websocket/MqttWebsocketHandshakeHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.websocket; +package com.hivemq.client2.internal.mqtt.handler.websocket; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/ioc/ClientComponent.java b/src/main/java/com/hivemq/client2/internal/mqtt/ioc/ClientComponent.java similarity index 79% rename from src/main/java/com/hivemq/client/internal/mqtt/ioc/ClientComponent.java rename to src/main/java/com/hivemq/client2/internal/mqtt/ioc/ClientComponent.java index e9bee22dd..6ccd41f6d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/ioc/ClientComponent.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/ioc/ClientComponent.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.ioc; +package com.hivemq.client2.internal.mqtt.ioc; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.handler.publish.incoming.MqttIncomingQosHandler; -import com.hivemq.client.internal.mqtt.handler.publish.outgoing.MqttOutgoingQosHandler; -import com.hivemq.client.internal.mqtt.handler.subscribe.MqttSubscriptionHandler; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.handler.publish.incoming.MqttIncomingQosHandler; +import com.hivemq.client2.internal.mqtt.handler.publish.outgoing.MqttOutgoingQosHandler; +import com.hivemq.client2.internal.mqtt.handler.subscribe.MqttSubscriptionHandler; import dagger.BindsInstance; import dagger.Subcomponent; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/ioc/ClientScope.java b/src/main/java/com/hivemq/client2/internal/mqtt/ioc/ClientScope.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/mqtt/ioc/ClientScope.java rename to src/main/java/com/hivemq/client2/internal/mqtt/ioc/ClientScope.java index 34ede4af2..e9449a4f5 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/ioc/ClientScope.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/ioc/ClientScope.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.ioc; +package com.hivemq.client2.internal.mqtt.ioc; import javax.inject.Scope; import java.lang.annotation.Documented; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/ioc/ConnectionComponent.java b/src/main/java/com/hivemq/client2/internal/mqtt/ioc/ConnectionComponent.java similarity index 84% rename from src/main/java/com/hivemq/client/internal/mqtt/ioc/ConnectionComponent.java rename to src/main/java/com/hivemq/client2/internal/mqtt/ioc/ConnectionComponent.java index 60fbb2e66..dd469dc9e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/ioc/ConnectionComponent.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/ioc/ConnectionComponent.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.ioc; +package com.hivemq.client2.internal.mqtt.ioc; -import com.hivemq.client.internal.mqtt.codec.MqttCodecModule; -import com.hivemq.client.internal.mqtt.handler.connect.MqttConnAckFlow; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.codec.MqttCodecModule; +import com.hivemq.client2.internal.mqtt.handler.connect.MqttConnAckFlow; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; import dagger.BindsInstance; import dagger.Subcomponent; import io.netty.bootstrap.Bootstrap; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/ioc/ConnectionModule.java b/src/main/java/com/hivemq/client2/internal/mqtt/ioc/ConnectionModule.java similarity index 76% rename from src/main/java/com/hivemq/client/internal/mqtt/ioc/ConnectionModule.java rename to src/main/java/com/hivemq/client2/internal/mqtt/ioc/ConnectionModule.java index 34d516c4c..8be9ee528 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/ioc/ConnectionModule.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/ioc/ConnectionModule.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.ioc; +package com.hivemq.client2.internal.mqtt.ioc; -import com.hivemq.client.internal.mqtt.handler.MqttChannelInitializer; -import com.hivemq.client.internal.mqtt.handler.auth.MqttAuthHandler; -import com.hivemq.client.internal.mqtt.handler.auth.MqttConnectAuthHandler; -import com.hivemq.client.internal.mqtt.handler.auth.MqttDisconnectOnAuthHandler; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.netty.NettyEventLoopProvider; +import com.hivemq.client2.internal.mqtt.handler.MqttChannelInitializer; +import com.hivemq.client2.internal.mqtt.handler.auth.MqttAuthHandler; +import com.hivemq.client2.internal.mqtt.handler.auth.MqttConnectAuthHandler; +import com.hivemq.client2.internal.mqtt.handler.auth.MqttDisconnectOnAuthHandler; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.netty.NettyEventLoopProvider; import dagger.Lazy; import dagger.Module; import dagger.Provides; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/ioc/ConnectionScope.java b/src/main/java/com/hivemq/client2/internal/mqtt/ioc/ConnectionScope.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/mqtt/ioc/ConnectionScope.java rename to src/main/java/com/hivemq/client2/internal/mqtt/ioc/ConnectionScope.java index 56363f8fe..89b17371c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/ioc/ConnectionScope.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/ioc/ConnectionScope.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.ioc; +package com.hivemq.client2.internal.mqtt.ioc; import javax.inject.Scope; import java.lang.annotation.Documented; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/ioc/SingletonComponent.java b/src/main/java/com/hivemq/client2/internal/mqtt/ioc/SingletonComponent.java similarity index 95% rename from src/main/java/com/hivemq/client/internal/mqtt/ioc/SingletonComponent.java rename to src/main/java/com/hivemq/client2/internal/mqtt/ioc/SingletonComponent.java index 7129a5407..3534076b6 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/ioc/SingletonComponent.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/ioc/SingletonComponent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.ioc; +package com.hivemq.client2.internal.mqtt.ioc; import dagger.Component; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttAutoReconnectImpl.java b/src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/MqttAutoReconnectImpl.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttAutoReconnectImpl.java rename to src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/MqttAutoReconnectImpl.java index d560084fc..906bd3880 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttAutoReconnectImpl.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/MqttAutoReconnectImpl.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.lifecycle; +package com.hivemq.client2.internal.mqtt.lifecycle; -import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnect; -import com.hivemq.client.mqtt.lifecycle.MqttDisconnectSource; -import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedContext; -import com.hivemq.client.mqtt.lifecycle.MqttReconnector; +import com.hivemq.client2.mqtt.lifecycle.MqttAutoReconnect; +import com.hivemq.client2.mqtt.lifecycle.MqttDisconnectSource; +import com.hivemq.client2.mqtt.lifecycle.MqttDisconnectedContext; +import com.hivemq.client2.mqtt.lifecycle.MqttReconnector; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttAutoReconnectImplBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/MqttAutoReconnectImplBuilder.java similarity index 95% rename from src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttAutoReconnectImplBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/MqttAutoReconnectImplBuilder.java index e31572954..1fbcf76be 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttAutoReconnectImplBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/MqttAutoReconnectImplBuilder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.lifecycle; +package com.hivemq.client2.internal.mqtt.lifecycle; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnectBuilder; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.lifecycle.MqttAutoReconnectBuilder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttConnectedContextImpl.java b/src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/MqttConnectedContextImpl.java similarity index 79% rename from src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttConnectedContextImpl.java rename to src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/MqttConnectedContextImpl.java index e1828856d..3181f617f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttConnectedContextImpl.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/MqttConnectedContextImpl.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.lifecycle; +package com.hivemq.client2.internal.mqtt.lifecycle; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.lifecycle.mqtt3.Mqtt3ConnectedContextView; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.mqtt.MqttVersion; -import com.hivemq.client.mqtt.lifecycle.MqttConnectedContext; -import com.hivemq.client.mqtt.mqtt5.lifecycle.Mqtt5ConnectedContext; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.lifecycle.mqtt3.Mqtt3ConnectedContextView; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnAck; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.mqtt.MqttVersion; +import com.hivemq.client2.mqtt.lifecycle.MqttConnectedContext; +import com.hivemq.client2.mqtt.mqtt5.lifecycle.Mqtt5ConnectedContext; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttDisconnectedContextImpl.java b/src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/MqttDisconnectedContextImpl.java similarity index 84% rename from src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttDisconnectedContextImpl.java rename to src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/MqttDisconnectedContextImpl.java index f88ae0296..8ba674f2d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttDisconnectedContextImpl.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/MqttDisconnectedContextImpl.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.lifecycle; +package com.hivemq.client2.internal.mqtt.lifecycle; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.lifecycle.mqtt3.Mqtt3DisconnectedContextView; -import com.hivemq.client.mqtt.MqttVersion; -import com.hivemq.client.mqtt.lifecycle.MqttDisconnectSource; -import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedContext; -import com.hivemq.client.mqtt.mqtt5.lifecycle.Mqtt5DisconnectedContext; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.lifecycle.mqtt3.Mqtt3DisconnectedContextView; +import com.hivemq.client2.mqtt.MqttVersion; +import com.hivemq.client2.mqtt.lifecycle.MqttDisconnectSource; +import com.hivemq.client2.mqtt.lifecycle.MqttDisconnectedContext; +import com.hivemq.client2.mqtt.mqtt5.lifecycle.Mqtt5DisconnectedContext; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttReconnector.java b/src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/MqttReconnector.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttReconnector.java rename to src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/MqttReconnector.java index 4a4cda741..7d4af210c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/MqttReconnector.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/MqttReconnector.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.lifecycle; - -import com.hivemq.client.internal.mqtt.MqttTransportConfigImpl; -import com.hivemq.client.internal.mqtt.MqttTransportConfigImplBuilder; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnectBuilder; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.MqttTransportConfig; -import com.hivemq.client.mqtt.mqtt5.lifecycle.Mqtt5Reconnector; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; +package com.hivemq.client2.internal.mqtt.lifecycle; + +import com.hivemq.client2.internal.mqtt.MqttTransportConfigImpl; +import com.hivemq.client2.internal.mqtt.MqttTransportConfigImplBuilder; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnectBuilder; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.MqttTransportConfig; +import com.hivemq.client2.mqtt.mqtt5.lifecycle.Mqtt5Reconnector; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect; import io.netty.channel.EventLoop; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ConnectedContextView.java b/src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/mqtt3/Mqtt3ConnectedContextView.java similarity index 76% rename from src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ConnectedContextView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/mqtt3/Mqtt3ConnectedContextView.java index 442d6a34b..8f6158647 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ConnectedContextView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/mqtt3/Mqtt3ConnectedContextView.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.lifecycle.mqtt3; +package com.hivemq.client2.internal.mqtt.lifecycle.mqtt3; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnAckView; -import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectView; -import com.hivemq.client.internal.mqtt.mqtt3.Mqtt3ClientConfigView; -import com.hivemq.client.mqtt.lifecycle.MqttConnectedContext; -import com.hivemq.client.mqtt.mqtt3.lifecycle.Mqtt3ConnectedContext; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnAck; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.message.connect.mqtt3.Mqtt3ConnAckView; +import com.hivemq.client2.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectView; +import com.hivemq.client2.internal.mqtt.mqtt3.Mqtt3ClientConfigView; +import com.hivemq.client2.mqtt.lifecycle.MqttConnectedContext; +import com.hivemq.client2.mqtt.mqtt3.lifecycle.Mqtt3ConnectedContext; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3DisconnectedContextView.java b/src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/mqtt3/Mqtt3DisconnectedContextView.java similarity index 81% rename from src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3DisconnectedContextView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/mqtt3/Mqtt3DisconnectedContextView.java index 6921200e1..a34c3a412 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3DisconnectedContextView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/mqtt3/Mqtt3DisconnectedContextView.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.lifecycle.mqtt3; +package com.hivemq.client2.internal.mqtt.lifecycle.mqtt3; -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.exceptions.mqtt3.Mqtt3ExceptionFactory; -import com.hivemq.client.internal.mqtt.lifecycle.MqttReconnector; -import com.hivemq.client.internal.mqtt.mqtt3.Mqtt3ClientConfigView; -import com.hivemq.client.mqtt.lifecycle.MqttDisconnectSource; -import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedContext; -import com.hivemq.client.mqtt.mqtt3.lifecycle.Mqtt3DisconnectedContext; +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.exceptions.mqtt3.Mqtt3ExceptionFactory; +import com.hivemq.client2.internal.mqtt.lifecycle.MqttReconnector; +import com.hivemq.client2.internal.mqtt.mqtt3.Mqtt3ClientConfigView; +import com.hivemq.client2.mqtt.lifecycle.MqttDisconnectSource; +import com.hivemq.client2.mqtt.lifecycle.MqttDisconnectedContext; +import com.hivemq.client2.mqtt.mqtt3.lifecycle.Mqtt3DisconnectedContext; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ReconnectorView.java b/src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/mqtt3/Mqtt3ReconnectorView.java similarity index 84% rename from src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ReconnectorView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/mqtt3/Mqtt3ReconnectorView.java index 69d18603e..510970ffb 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/lifecycle/mqtt3/Mqtt3ReconnectorView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/lifecycle/mqtt3/Mqtt3ReconnectorView.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.lifecycle.mqtt3; - -import com.hivemq.client.internal.mqtt.MqttTransportConfigImpl; -import com.hivemq.client.internal.mqtt.MqttTransportConfigImplBuilder; -import com.hivemq.client.internal.mqtt.lifecycle.MqttReconnector; -import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectView; -import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectViewBuilder; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.mqtt.MqttTransportConfig; -import com.hivemq.client.mqtt.mqtt3.lifecycle.Mqtt3Reconnector; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; +package com.hivemq.client2.internal.mqtt.lifecycle.mqtt3; + +import com.hivemq.client2.internal.mqtt.MqttTransportConfigImpl; +import com.hivemq.client2.internal.mqtt.MqttTransportConfigImplBuilder; +import com.hivemq.client2.internal.mqtt.lifecycle.MqttReconnector; +import com.hivemq.client2.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectView; +import com.hivemq.client2.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectViewBuilder; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.mqtt.MqttTransportConfig; +import com.hivemq.client2.mqtt.mqtt3.lifecycle.Mqtt3Reconnector; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3Connect; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/MqttMessage.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/MqttMessage.java similarity index 84% rename from src/main/java/com/hivemq/client/internal/mqtt/message/MqttMessage.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/MqttMessage.java index 373e7acc5..7b498242c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/MqttMessage.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/MqttMessage.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message; +package com.hivemq.client2.internal.mqtt.message; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5Message; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/MqttMessageWithUserProperties.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/MqttMessageWithUserProperties.java similarity index 94% rename from src/main/java/com/hivemq/client/internal/mqtt/message/MqttMessageWithUserProperties.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/MqttMessageWithUserProperties.java index a79a6d07f..4a2150619 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/MqttMessageWithUserProperties.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/MqttMessageWithUserProperties.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message; - -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.util.StringUtil; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; +package com.hivemq.client2.internal.mqtt.message; + +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.util.StringUtil; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5ReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/MqttProperty.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/MqttProperty.java similarity index 97% rename from src/main/java/com/hivemq/client/internal/mqtt/message/MqttProperty.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/MqttProperty.java index dc8cbf3ba..21656b89a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/MqttProperty.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/MqttProperty.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message; +package com.hivemq.client2.internal.mqtt.message; /** * All possible MQTT properties and its byte code according to the MQTT 5 specification. diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/MqttReasonCodes.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/MqttReasonCodes.java similarity index 95% rename from src/main/java/com/hivemq/client/internal/mqtt/message/MqttReasonCodes.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/MqttReasonCodes.java index 9901f1479..958915e8f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/MqttReasonCodes.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/MqttReasonCodes.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message; +package com.hivemq.client2.internal.mqtt.message; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5ReasonCode; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/MqttStatefulMessage.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/MqttStatefulMessage.java similarity index 93% rename from src/main/java/com/hivemq/client/internal/mqtt/message/MqttStatefulMessage.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/MqttStatefulMessage.java index 2c50ff506..a52332453 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/MqttStatefulMessage.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/MqttStatefulMessage.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message; +package com.hivemq.client2.internal.mqtt.message; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuth.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/auth/MqttAuth.java similarity index 84% rename from src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuth.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/auth/MqttAuth.java index 1ad618a16..8983d708a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuth.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/auth/MqttAuth.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.auth; +package com.hivemq.client2.internal.mqtt.message.auth; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; -import com.hivemq.client.internal.util.ByteBufferUtil; -import com.hivemq.client.internal.util.StringUtil; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5Auth; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5AuthReasonCode; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.message.MqttMessageWithUserProperties; +import com.hivemq.client2.internal.util.ByteBufferUtil; +import com.hivemq.client2.internal.util.StringUtil; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5Auth; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5AuthReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuthBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/auth/MqttAuthBuilder.java similarity index 81% rename from src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuthBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/auth/MqttAuthBuilder.java index ef5738f6d..8d5061c1c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuthBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/auth/MqttAuthBuilder.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.auth; +package com.hivemq.client2.internal.mqtt.message.auth; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5AuthBuilder; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5AuthReasonCode; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5AuthBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5AuthReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuthProperty.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/auth/MqttAuthProperty.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuthProperty.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/auth/MqttAuthProperty.java index 8e7243954..e8c74354d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuthProperty.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/auth/MqttAuthProperty.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.auth; +package com.hivemq.client2.internal.mqtt.message.auth; -import com.hivemq.client.internal.mqtt.message.MqttProperty; +import com.hivemq.client2.internal.mqtt.message.MqttProperty; /** * All possible MQTT AUTH properties and its byte code according to the MQTT 5 specification. diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttEnhancedAuth.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/auth/MqttEnhancedAuth.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttEnhancedAuth.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/auth/MqttEnhancedAuth.java index 996f19627..21f94aa47 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttEnhancedAuth.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/auth/MqttEnhancedAuth.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.auth; +package com.hivemq.client2.internal.mqtt.message.auth; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.util.ByteBufferUtil; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuth; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.util.ByteBufferUtil; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuth; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttEnhancedAuthBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/auth/MqttEnhancedAuthBuilder.java similarity index 83% rename from src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttEnhancedAuthBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/auth/MqttEnhancedAuthBuilder.java index f842235e0..b1b4701d9 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttEnhancedAuthBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/auth/MqttEnhancedAuthBuilder.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.auth; +package com.hivemq.client2.internal.mqtt.message.auth; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuthBuilder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuthBuilder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttSimpleAuth.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/auth/MqttSimpleAuth.java similarity index 89% rename from src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttSimpleAuth.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/auth/MqttSimpleAuth.java index 14d550c5d..d9e955728 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttSimpleAuth.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/auth/MqttSimpleAuth.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.auth; +package com.hivemq.client2.internal.mqtt.message.auth; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.util.ByteBufferUtil; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.util.ByteBufferUtil; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttSimpleAuthBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/auth/MqttSimpleAuthBuilder.java similarity index 88% rename from src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttSimpleAuthBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/auth/MqttSimpleAuthBuilder.java index f75f3984a..aa2e8346d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/MqttSimpleAuthBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/auth/MqttSimpleAuthBuilder.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.auth; +package com.hivemq.client2.internal.mqtt.message.auth; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuthBuilder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5SimpleAuthBuilder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthView.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthView.java similarity index 87% rename from src/main/java/com/hivemq/client/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthView.java index dc1d219e9..1a14806df 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthView.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.auth.mqtt3; +package com.hivemq.client2.internal.mqtt.message.auth.mqtt3; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.auth.MqttSimpleAuth; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.message.auth.MqttSimpleAuth; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthViewBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthViewBuilder.java similarity index 88% rename from src/main/java/com/hivemq/client/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthViewBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthViewBuilder.java index 208858663..921cb43b8 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthViewBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthViewBuilder.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.auth.mqtt3; +package com.hivemq.client2.internal.mqtt.message.auth.mqtt3; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuthBuilder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt3.message.auth.Mqtt3SimpleAuthBuilder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAck.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnAck.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAck.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnAck.java index 6a7121e80..1caf8c551 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAck.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnAck.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect; - -import com.hivemq.client.internal.mqtt.datatypes.MqttClientIdentifierImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; -import com.hivemq.client.internal.util.StringUtil; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuth; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckReasonCode; +package com.hivemq.client2.internal.mqtt.message.connect; + +import com.hivemq.client2.internal.mqtt.datatypes.MqttClientIdentifierImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.message.MqttMessageWithUserProperties; +import com.hivemq.client2.internal.util.StringUtil; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.mqtt.datatypes.MqttClientIdentifier; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuth; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAckReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckProperty.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnAckProperty.java similarity index 95% rename from src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckProperty.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnAckProperty.java index 4e4edd141..05e58a1d1 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckProperty.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnAckProperty.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect; +package com.hivemq.client2.internal.mqtt.message.connect; -import com.hivemq.client.internal.mqtt.message.MqttProperty; +import com.hivemq.client2.internal.mqtt.message.MqttProperty; /** * All possible MQTT CONNACK properties and its byte code according to the MQTT 5 specification. diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckRestrictions.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnAckRestrictions.java similarity index 95% rename from src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckRestrictions.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnAckRestrictions.java index dade827a2..963269d56 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckRestrictions.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnAckRestrictions.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect; +package com.hivemq.client2.internal.mqtt.message.connect; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnect.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnect.java similarity index 88% rename from src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnect.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnect.java index 970c96e66..72fb031c2 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnect.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnect.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect; - -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.datatypes.MqttClientIdentifierImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; -import com.hivemq.client.internal.mqtt.message.auth.MqttEnhancedAuth; -import com.hivemq.client.internal.mqtt.message.auth.MqttSimpleAuth; -import com.hivemq.client.internal.mqtt.message.publish.MqttWillPublish; -import com.hivemq.client.internal.util.StringUtil; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublish; +package com.hivemq.client2.internal.mqtt.message.connect; + +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.datatypes.MqttClientIdentifierImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.message.MqttMessageWithUserProperties; +import com.hivemq.client2.internal.mqtt.message.auth.MqttEnhancedAuth; +import com.hivemq.client2.internal.mqtt.message.auth.MqttSimpleAuth; +import com.hivemq.client2.internal.mqtt.message.publish.MqttWillPublish; +import com.hivemq.client2.internal.util.StringUtil; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5WillPublish; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnectBuilder.java similarity index 85% rename from src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnectBuilder.java index 26f0e118e..080dcc6a8 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnectBuilder.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect; - -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; -import com.hivemq.client.internal.mqtt.message.auth.MqttSimpleAuth; -import com.hivemq.client.internal.mqtt.message.auth.MqttSimpleAuthBuilder; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublishBuilder; -import com.hivemq.client.internal.mqtt.message.publish.MqttWillPublish; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectBuilder; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; +package com.hivemq.client2.internal.mqtt.message.connect; + +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; +import com.hivemq.client2.internal.mqtt.message.auth.MqttSimpleAuth; +import com.hivemq.client2.internal.mqtt.message.auth.MqttSimpleAuthBuilder; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublishBuilder; +import com.hivemq.client2.internal.mqtt.message.publish.MqttWillPublish; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnectBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectProperty.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnectProperty.java similarity index 93% rename from src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectProperty.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnectProperty.java index ab7af390a..37a221c2c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectProperty.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnectProperty.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect; +package com.hivemq.client2.internal.mqtt.message.connect; -import com.hivemq.client.internal.mqtt.message.MqttProperty; +import com.hivemq.client2.internal.mqtt.message.MqttProperty; /** * All possible MQTT CONNECT properties and its byte code according to the MQTT 5 specification. diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictions.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnectRestrictions.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictions.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnectRestrictions.java index a0bbfafd4..9db802f7b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictions.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnectRestrictions.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect; +package com.hivemq.client2.internal.mqtt.message.connect; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictionsBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnectRestrictionsBuilder.java similarity index 93% rename from src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictionsBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnectRestrictionsBuilder.java index c4df74c66..0b67f84ed 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictionsBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnectRestrictionsBuilder.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect; +package com.hivemq.client2.internal.mqtt.message.connect; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictionsBuilder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictionsBuilder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttStatefulConnect.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttStatefulConnect.java similarity index 87% rename from src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttStatefulConnect.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttStatefulConnect.java index a65d7a34b..dd83617e2 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/MqttStatefulConnect.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/MqttStatefulConnect.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect; +package com.hivemq.client2.internal.mqtt.message.connect; -import com.hivemq.client.internal.mqtt.datatypes.MqttClientIdentifierImpl; -import com.hivemq.client.internal.mqtt.message.MqttStatefulMessage; -import com.hivemq.client.internal.mqtt.message.auth.MqttEnhancedAuth; +import com.hivemq.client2.internal.mqtt.datatypes.MqttClientIdentifierImpl; +import com.hivemq.client2.internal.mqtt.message.MqttStatefulMessage; +import com.hivemq.client2.internal.mqtt.message.auth.MqttEnhancedAuth; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckView.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckView.java similarity index 87% rename from src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckView.java index f665dc51d..123bb7df0 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckView.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect.mqtt3; - -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnAckRestrictions; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAckReturnCode; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckReasonCode; +package com.hivemq.client2.internal.mqtt.message.connect.mqtt3; + +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnAck; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnAckRestrictions; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3ConnAck; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3ConnAckReturnCode; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAckReasonCode; import io.reactivex.rxjava3.functions.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; -import static com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAckReturnCode.*; +import static com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3ConnAckReturnCode.*; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java similarity index 83% rename from src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java index b8c492703..eb2348a2b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectView.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect.mqtt3; - -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.message.auth.MqttSimpleAuth; -import com.hivemq.client.internal.mqtt.message.auth.mqtt3.Mqtt3SimpleAuthView; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnectRestrictions; -import com.hivemq.client.internal.mqtt.message.publish.MqttWillPublish; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; +package com.hivemq.client2.internal.mqtt.message.connect.mqtt3; + +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.message.auth.MqttSimpleAuth; +import com.hivemq.client2.internal.mqtt.message.auth.mqtt3.Mqtt3SimpleAuthView; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnectRestrictions; +import com.hivemq.client2.internal.mqtt.message.publish.MqttWillPublish; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3Connect; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3Publish; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewBuilder.java similarity index 83% rename from src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewBuilder.java index 5953d9118..715c23474 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewBuilder.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect.mqtt3; - -import com.hivemq.client.internal.mqtt.message.auth.MqttSimpleAuth; -import com.hivemq.client.internal.mqtt.message.auth.mqtt3.Mqtt3SimpleAuthView; -import com.hivemq.client.internal.mqtt.message.auth.mqtt3.Mqtt3SimpleAuthViewBuilder; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.publish.MqttWillPublish; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishViewBuilder; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnectBuilder; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; +package com.hivemq.client2.internal.mqtt.message.connect.mqtt3; + +import com.hivemq.client2.internal.mqtt.message.auth.MqttSimpleAuth; +import com.hivemq.client2.internal.mqtt.message.auth.mqtt3.Mqtt3SimpleAuthView; +import com.hivemq.client2.internal.mqtt.message.auth.mqtt3.Mqtt3SimpleAuthViewBuilder; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.message.publish.MqttWillPublish; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PublishViewBuilder; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3ConnectBuilder; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3Publish; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnect.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/disconnect/MqttDisconnect.java similarity index 87% rename from src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnect.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/disconnect/MqttDisconnect.java index 75def00c3..977094ab2 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnect.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/disconnect/MqttDisconnect.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.disconnect; - -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; -import com.hivemq.client.internal.util.StringUtil; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +package com.hivemq.client2.internal.mqtt.message.disconnect; + +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.message.MqttMessageWithUserProperties; +import com.hivemq.client2.internal.util.StringUtil; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnectBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/disconnect/MqttDisconnectBuilder.java similarity index 87% rename from src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnectBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/disconnect/MqttDisconnectBuilder.java index b3a039138..fe4c9cf64 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnectBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/disconnect/MqttDisconnectBuilder.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.disconnect; - -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectBuilder; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +package com.hivemq.client2.internal.mqtt.message.disconnect; + +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnectProperty.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/disconnect/MqttDisconnectProperty.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnectProperty.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/disconnect/MqttDisconnectProperty.java index 1f262e462..a06ab7629 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnectProperty.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/disconnect/MqttDisconnectProperty.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.disconnect; +package com.hivemq.client2.internal.mqtt.message.disconnect; -import com.hivemq.client.internal.mqtt.message.MqttProperty; +import com.hivemq.client2.internal.mqtt.message.MqttProperty; /** * All possible MQTT DISCONNECT properties and its byte code according to the MQTT 5 specification. diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/mqtt3/Mqtt3DisconnectView.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/disconnect/mqtt3/Mqtt3DisconnectView.java similarity index 78% rename from src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/mqtt3/Mqtt3DisconnectView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/disconnect/mqtt3/Mqtt3DisconnectView.java index 18328d07d..7f19b9c43 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/disconnect/mqtt3/Mqtt3DisconnectView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/disconnect/mqtt3/Mqtt3DisconnectView.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.disconnect.mqtt3; +package com.hivemq.client2.internal.mqtt.message.disconnect.mqtt3; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; -import com.hivemq.client.mqtt.mqtt3.message.disconnect.Mqtt3Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.mqtt.mqtt3.message.disconnect.Mqtt3Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/ping/MqttPingReq.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/ping/MqttPingReq.java similarity index 83% rename from src/main/java/com/hivemq/client/internal/mqtt/message/ping/MqttPingReq.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/ping/MqttPingReq.java index 5f0e806cb..bda63bc49 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/ping/MqttPingReq.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/ping/MqttPingReq.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.ping; +package com.hivemq.client2.internal.mqtt.message.ping; -import com.hivemq.client.internal.mqtt.message.MqttMessage; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.ping.Mqtt5PingReq; +import com.hivemq.client2.internal.mqtt.message.MqttMessage; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.ping.Mqtt5PingReq; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/ping/MqttPingResp.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/ping/MqttPingResp.java similarity index 83% rename from src/main/java/com/hivemq/client/internal/mqtt/message/ping/MqttPingResp.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/ping/MqttPingResp.java index aadc17795..1cc78956a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/ping/MqttPingResp.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/ping/MqttPingResp.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.ping; +package com.hivemq.client2.internal.mqtt.message.ping; -import com.hivemq.client.internal.mqtt.message.MqttMessage; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.ping.Mqtt5PingResp; +import com.hivemq.client2.internal.mqtt.message.MqttMessage; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.ping.Mqtt5PingResp; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/ping/mqtt3/Mqtt3PingReqView.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/ping/mqtt3/Mqtt3PingReqView.java similarity index 87% rename from src/main/java/com/hivemq/client/internal/mqtt/message/ping/mqtt3/Mqtt3PingReqView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/ping/mqtt3/Mqtt3PingReqView.java index 36ec07183..3446c897e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/ping/mqtt3/Mqtt3PingReqView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/ping/mqtt3/Mqtt3PingReqView.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.ping.mqtt3; +package com.hivemq.client2.internal.mqtt.message.ping.mqtt3; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; -import com.hivemq.client.mqtt.mqtt3.message.ping.Mqtt3PingReq; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.mqtt.mqtt3.message.ping.Mqtt3PingReq; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/ping/mqtt3/Mqtt3PingRespView.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/ping/mqtt3/Mqtt3PingRespView.java similarity index 87% rename from src/main/java/com/hivemq/client/internal/mqtt/message/ping/mqtt3/Mqtt3PingRespView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/ping/mqtt3/Mqtt3PingRespView.java index 11ae4cf85..0e5b4e557 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/ping/mqtt3/Mqtt3PingRespView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/ping/mqtt3/Mqtt3PingRespView.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.ping.mqtt3; +package com.hivemq.client2.internal.mqtt.message.ping.mqtt3; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; -import com.hivemq.client.mqtt.mqtt3.message.ping.Mqtt3PingResp; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.mqtt.mqtt3.message.ping.Mqtt3PingResp; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAck.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubAck.java similarity index 81% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAck.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubAck.java index 016dc6099..998c60b76 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAck.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubAck.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; +package com.hivemq.client2.internal.mqtt.message.publish; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAck; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAckReasonCode; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.message.MqttMessageWithUserProperties; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubAck; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubAckReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAckBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubAckBuilder.java similarity index 79% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAckBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubAckBuilder.java index c4408e969..ef50835b5 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAckBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubAckBuilder.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; +package com.hivemq.client2.internal.mqtt.message.publish; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAckBuilder; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAckReasonCode; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubAckBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubAckReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAckProperty.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubAckProperty.java similarity index 89% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAckProperty.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubAckProperty.java index cf715fe75..12441536b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAckProperty.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubAckProperty.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; +package com.hivemq.client2.internal.mqtt.message.publish; -import com.hivemq.client.internal.mqtt.message.MqttProperty; +import com.hivemq.client2.internal.mqtt.message.MqttProperty; /** * All possible MQTT PUBACK properties and its byte code according to the MQTT 5 specification. diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubComp.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubComp.java similarity index 81% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubComp.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubComp.java index 1262a7ea4..e7662933b 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubComp.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubComp.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; +package com.hivemq.client2.internal.mqtt.message.publish; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubComp; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.message.MqttMessageWithUserProperties; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubComp; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubCompBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubCompBuilder.java similarity index 80% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubCompBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubCompBuilder.java index f797ed606..2a25d90fa 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubCompBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubCompBuilder.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; +package com.hivemq.client2.internal.mqtt.message.publish; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompBuilder; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubCompBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubCompProperty.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubCompProperty.java similarity index 89% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubCompProperty.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubCompProperty.java index 6e37476bf..cdc1f6dc0 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubCompProperty.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubCompProperty.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; +package com.hivemq.client2.internal.mqtt.message.publish; -import com.hivemq.client.internal.mqtt.message.MqttProperty; +import com.hivemq.client2.internal.mqtt.message.MqttProperty; /** * All possible MQTT PUBCOMP properties and its byte code according to the MQTT 5 specification. diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRec.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRec.java similarity index 81% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRec.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRec.java index bf365f83a..3d1788adf 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRec.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRec.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; +package com.hivemq.client2.internal.mqtt.message.publish; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRec; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.message.MqttMessageWithUserProperties; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRec; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRecBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRecBuilder.java similarity index 79% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRecBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRecBuilder.java index 239571369..bb678ff18 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRecBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRecBuilder.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; +package com.hivemq.client2.internal.mqtt.message.publish; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecBuilder; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRecBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRecProperty.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRecProperty.java similarity index 89% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRecProperty.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRecProperty.java index 7aa23b0c9..97234fa5a 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRecProperty.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRecProperty.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; +package com.hivemq.client2.internal.mqtt.message.publish; -import com.hivemq.client.internal.mqtt.message.MqttProperty; +import com.hivemq.client2.internal.mqtt.message.MqttProperty; /** * All possible MQTT PUBREC properties and its byte code according to the MQTT 5 specification. diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRel.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRel.java similarity index 81% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRel.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRel.java index f7437a147..d9907fd31 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRel.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRel.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; +package com.hivemq.client2.internal.mqtt.message.publish; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRel; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.message.MqttMessageWithUserProperties; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRel; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRelBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRelBuilder.java similarity index 80% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRelBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRelBuilder.java index 70dfc3df3..3656cbc5c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRelBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRelBuilder.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; +package com.hivemq.client2.internal.mqtt.message.publish; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRelBuilder; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRelBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRelProperty.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRelProperty.java similarity index 89% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRelProperty.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRelProperty.java index 85855b6ac..86a789b3d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRelProperty.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRelProperty.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; +package com.hivemq.client2.internal.mqtt.message.publish; -import com.hivemq.client.internal.mqtt.message.MqttProperty; +import com.hivemq.client2.internal.mqtt.message.MqttProperty; /** * All possible MQTT PUBREL properties and its byte code according to the MQTT 5 specification. diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublish.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPublish.java similarity index 87% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublish.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPublish.java index 5fe0db3d9..005cbcda6 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublish.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPublish.java @@ -14,23 +14,23 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; - -import com.hivemq.client.internal.checkpoint.Confirmable; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.handler.publish.outgoing.MqttTopicAliasMapping; -import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; -import com.hivemq.client.internal.util.ByteBufferUtil; -import com.hivemq.client.internal.util.StringUtil; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.internal.util.collections.ImmutableIntList; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.datatypes.MqttTopic; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PayloadFormatIndicator; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; +package com.hivemq.client2.internal.mqtt.message.publish; + +import com.hivemq.client2.internal.checkpoint.Confirmable; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.handler.publish.outgoing.MqttTopicAliasMapping; +import com.hivemq.client2.internal.mqtt.message.MqttMessageWithUserProperties; +import com.hivemq.client2.internal.util.ByteBufferUtil; +import com.hivemq.client2.internal.util.StringUtil; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.internal.util.collections.ImmutableIntList; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.datatypes.MqttTopic; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PayloadFormatIndicator; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; @@ -41,8 +41,8 @@ import java.util.Optional; import java.util.OptionalLong; -import static com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish.DEFAULT_NO_SUBSCRIPTION_IDENTIFIERS; -import static com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish.DEFAULT_NO_TOPIC_ALIAS; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttStatefulPublish.DEFAULT_NO_SUBSCRIPTION_IDENTIFIERS; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttStatefulPublish.DEFAULT_NO_TOPIC_ALIAS; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPublishBuilder.java similarity index 93% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPublishBuilder.java index 2475421b1..23e041bea 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPublishBuilder.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; - -import com.hivemq.client.internal.mqtt.datatypes.*; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.ByteBufferUtil; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.datatypes.MqttTopic; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PayloadFormatIndicator; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishBuilder; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublishBuilder; +package com.hivemq.client2.internal.mqtt.message.publish; + +import com.hivemq.client2.internal.mqtt.datatypes.*; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.ByteBufferUtil; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.datatypes.MqttTopic; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PayloadFormatIndicator; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PublishBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5WillPublishBuilder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishProperty.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPublishProperty.java similarity index 92% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishProperty.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPublishProperty.java index 3181f7ef7..6a583580c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishProperty.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPublishProperty.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; +package com.hivemq.client2.internal.mqtt.message.publish; -import com.hivemq.client.internal.mqtt.message.MqttProperty; +import com.hivemq.client2.internal.mqtt.message.MqttProperty; /** * All possible MQTT PUBLISH properties and its byte code according to the MQTT 5 specification. diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishResult.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPublishResult.java similarity index 98% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishResult.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPublishResult.java index d2d88243d..a8f6e0eba 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishResult.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPublishResult.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; +package com.hivemq.client2.internal.mqtt.message.publish; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PublishResult; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttStatefulPublish.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttStatefulPublish.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttStatefulPublish.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttStatefulPublish.java index e3481dbc3..fa17a4cb6 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttStatefulPublish.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttStatefulPublish.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; +package com.hivemq.client2.internal.mqtt.message.publish; -import com.hivemq.client.internal.mqtt.message.MqttStatefulMessage; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.internal.util.collections.ImmutableIntList; +import com.hivemq.client2.internal.mqtt.message.MqttStatefulMessage; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.internal.util.collections.ImmutableIntList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublish.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttWillPublish.java similarity index 86% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublish.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttWillPublish.java index f2fc5b995..dcf878f2c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublish.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttWillPublish.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; - -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PayloadFormatIndicator; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublish; +package com.hivemq.client2.internal.mqtt.message.publish; + +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PayloadFormatIndicator; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5WillPublish; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublishProperty.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttWillPublishProperty.java similarity index 92% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublishProperty.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttWillPublishProperty.java index 5b0a4047d..dcba584bb 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublishProperty.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/MqttWillPublishProperty.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; +package com.hivemq.client2.internal.mqtt.message.publish; -import com.hivemq.client.internal.mqtt.message.MqttProperty; +import com.hivemq.client2.internal.mqtt.message.MqttProperty; /** * All possible MQTT Will Publish properties and its byte code according to the MQTT 5 specification. diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubAckView.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PubAckView.java similarity index 78% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubAckView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PubAckView.java index 8575d1381..deb66fd38 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubAckView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PubAckView.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.mqtt3; +package com.hivemq.client2.internal.mqtt.message.publish.mqtt3; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubAck; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PubAck; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAckReasonCode; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubAck; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3PubAck; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubAckReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubCompView.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PubCompView.java similarity index 78% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubCompView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PubCompView.java index 052cc1972..2a4d311b6 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubCompView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PubCompView.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.mqtt3; +package com.hivemq.client2.internal.mqtt.message.publish.mqtt3; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubComp; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PubComp; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubComp; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3PubComp; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubRecView.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PubRecView.java similarity index 78% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubRecView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PubRecView.java index 3bf24fe69..603a98fee 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubRecView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PubRecView.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.mqtt3; +package com.hivemq.client2.internal.mqtt.message.publish.mqtt3; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubRec; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PubRec; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubRec; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3PubRec; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubRelView.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PubRelView.java similarity index 78% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubRelView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PubRelView.java index a23d4b386..b3912d638 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PubRelView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PubRelView.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.mqtt3; +package com.hivemq.client2.internal.mqtt.message.publish.mqtt3; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubRel; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PubRel; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubRel; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3PubRel; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishResultView.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PublishResultView.java similarity index 84% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishResultView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PublishResultView.java index e17ffe627..e3cfdc76d 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishResultView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PublishResultView.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.mqtt3; +package com.hivemq.client2.internal.mqtt.message.publish.mqtt3; -import com.hivemq.client.internal.mqtt.exceptions.mqtt3.Mqtt3ExceptionFactory; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublishResult; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; +import com.hivemq.client2.internal.mqtt.exceptions.mqtt3.Mqtt3ExceptionFactory; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublishResult; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3Publish; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3PublishResult; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PublishResult; import io.reactivex.rxjava3.functions.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java similarity index 86% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java index 86c67e0d0..b0f28b12f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.mqtt3; - -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish; -import com.hivemq.client.internal.mqtt.message.publish.MqttWillPublish; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.datatypes.MqttTopic; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublish; +package com.hivemq.client2.internal.mqtt.message.publish.mqtt3; + +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.mqtt.message.publish.MqttStatefulPublish; +import com.hivemq.client2.internal.mqtt.message.publish.MqttWillPublish; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.datatypes.MqttTopic; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3Publish; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5WillPublish; import io.reactivex.rxjava3.functions.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewBuilder.java similarity index 89% rename from src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewBuilder.java index a94457ca5..ccc02c4d3 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewBuilder.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.mqtt3; - -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicImplBuilder; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.internal.mqtt.message.publish.MqttWillPublish; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.ByteBufferUtil; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.datatypes.MqttTopic; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishBuilder; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3WillPublishBuilder; +package com.hivemq.client2.internal.mqtt.message.publish.mqtt3; + +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicImplBuilder; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.mqtt.message.publish.MqttWillPublish; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.ByteBufferUtil; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.datatypes.MqttTopic; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3PublishBuilder; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3WillPublishBuilder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttStatefulSubscribe.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttStatefulSubscribe.java similarity index 92% rename from src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttStatefulSubscribe.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttStatefulSubscribe.java index dc2ed5747..5e8c1f9fd 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttStatefulSubscribe.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttStatefulSubscribe.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe; +package com.hivemq.client2.internal.mqtt.message.subscribe; -import com.hivemq.client.internal.mqtt.message.MqttStatefulMessage; +import com.hivemq.client2.internal.mqtt.message.MqttStatefulMessage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubAck.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubAck.java similarity index 78% rename from src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubAck.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubAck.java index d9f023daf..ea2ca9b82 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubAck.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubAck.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe; +package com.hivemq.client2.internal.mqtt.message.subscribe; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; -import com.hivemq.client.internal.util.StringUtil; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAckReasonCode; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.message.MqttMessageWithUserProperties; +import com.hivemq.client2.internal.util.StringUtil; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAckReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubAckProperty.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubAckProperty.java similarity index 88% rename from src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubAckProperty.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubAckProperty.java index 44334a56d..86c2e1086 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubAckProperty.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubAckProperty.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe; +package com.hivemq.client2.internal.mqtt.message.subscribe; -import com.hivemq.client.internal.mqtt.message.MqttProperty; +import com.hivemq.client2.internal.mqtt.message.MqttProperty; /** * All possible MQTT SUBACK properties and its byte code according to the MQTT 5 specification. diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribe.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscribe.java similarity index 85% rename from src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribe.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscribe.java index 8e26e02aa..8fd09c793 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribe.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscribe.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe; +package com.hivemq.client2.internal.mqtt.message.subscribe; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; -import com.hivemq.client.internal.util.StringUtil; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.message.MqttMessageWithUserProperties; +import com.hivemq.client2.internal.util.StringUtil; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscribeBuilder.java similarity index 89% rename from src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscribeBuilder.java index 3d1c4bd19..bc4716648 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscribeBuilder.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe; - -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImplBuilder; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5RetainHandling; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubscribeBuilder; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscription; +package com.hivemq.client2.internal.mqtt.message.subscribe; + +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicFilterImplBuilder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilter; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5RetainHandling; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubscribeBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5Subscription; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeProperty.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscribeProperty.java similarity index 88% rename from src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeProperty.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscribeProperty.java index dcf1fd3ef..36860aa10 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeProperty.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscribeProperty.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe; +package com.hivemq.client2.internal.mqtt.message.subscribe; -import com.hivemq.client.internal.mqtt.message.MqttProperty; +import com.hivemq.client2.internal.mqtt.message.MqttProperty; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscription.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscription.java similarity index 93% rename from src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscription.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscription.java index c29203de3..cfe8abcb2 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscription.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscription.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe; +package com.hivemq.client2.internal.mqtt.message.subscribe; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImpl; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5RetainHandling; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscription; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicFilterImpl; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5RetainHandling; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5Subscription; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscriptionBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscriptionBuilder.java similarity index 86% rename from src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscriptionBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscriptionBuilder.java index 3a1078931..6ce79b3aa 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscriptionBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscriptionBuilder.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe; - -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImplBuilder; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5RetainHandling; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscription; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubscriptionBuilder; +package com.hivemq.client2.internal.mqtt.message.subscribe; + +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicFilterImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicFilterImplBuilder; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilter; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5RetainHandling; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5Subscription; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubscriptionBuilder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckView.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckView.java similarity index 89% rename from src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckView.java index 687b6078f..c857839a1 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckView.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe.mqtt3; - -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAckReturnCode; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAckReasonCode; +package com.hivemq.client2.internal.mqtt.message.subscribe.mqtt3; + +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubAck; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3SubAckReturnCode; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAckReasonCode; import io.reactivex.rxjava3.functions.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeView.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeView.java similarity index 87% rename from src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeView.java index 08ac0371c..5ffe1b8a9 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeView.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe.mqtt3; +package com.hivemq.client2.internal.mqtt.message.subscribe.mqtt3; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscription; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscribe; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscription; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java similarity index 92% rename from src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java index 8fb163a97..33d03ab9c 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilder.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe.mqtt3; - -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImplBuilder; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscription; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilder; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscription; +package com.hivemq.client2.internal.mqtt.message.subscribe.mqtt3; + +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicFilterImplBuilder; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscription; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilter; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilder; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscription; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionView.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionView.java similarity index 85% rename from src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionView.java index a235b8605..be0e6e699 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionView.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe.mqtt3; - -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImpl; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscription; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscription; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5RetainHandling; +package com.hivemq.client2.internal.mqtt.message.subscribe.mqtt3; + +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicFilterImpl; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscription; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilter; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscription; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5RetainHandling; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewBuilder.java similarity index 82% rename from src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewBuilder.java index 1f5156f1b..af42c4dee 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewBuilder.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe.mqtt3; - -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImplBuilder; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscription; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscription; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubscriptionBuilder; +package com.hivemq.client2.internal.mqtt.message.subscribe.mqtt3; + +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicFilterImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicFilterImplBuilder; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscription; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilter; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscription; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3SubscriptionBuilder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttStatefulUnsubscribe.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttStatefulUnsubscribe.java similarity index 89% rename from src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttStatefulUnsubscribe.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttStatefulUnsubscribe.java index 995407365..b15c04858 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttStatefulUnsubscribe.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttStatefulUnsubscribe.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.unsubscribe; +package com.hivemq.client2.internal.mqtt.message.unsubscribe; -import com.hivemq.client.internal.mqtt.message.MqttStatefulMessage; +import com.hivemq.client2.internal.mqtt.message.MqttStatefulMessage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubAck.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubAck.java similarity index 78% rename from src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubAck.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubAck.java index 1175687f8..162e21608 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubAck.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubAck.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.unsubscribe; +package com.hivemq.client2.internal.mqtt.message.unsubscribe; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; -import com.hivemq.client.internal.util.StringUtil; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.message.MqttMessageWithUserProperties; +import com.hivemq.client2.internal.util.StringUtil; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubAckProperty.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubAckProperty.java similarity index 88% rename from src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubAckProperty.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubAckProperty.java index 8eb1bcdfe..65756d976 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubAckProperty.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubAckProperty.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.unsubscribe; +package com.hivemq.client2.internal.mqtt.message.unsubscribe; -import com.hivemq.client.internal.mqtt.message.MqttProperty; +import com.hivemq.client2.internal.mqtt.message.MqttProperty; /** * All possible MQTT UNSUBACK properties and its byte code according to the MQTT 5 specification. diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribe.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubscribe.java similarity index 83% rename from src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribe.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubscribe.java index 2d86714ef..c1a26ee9e 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribe.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubscribe.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.unsubscribe; +package com.hivemq.client2.internal.mqtt.message.unsubscribe; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.message.MqttMessageWithUserProperties; -import com.hivemq.client.internal.util.StringUtil; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicFilterImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.message.MqttMessageWithUserProperties; +import com.hivemq.client2.internal.util.StringUtil; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilder.java similarity index 87% rename from src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilder.java index 26654208f..f6ad88aa0 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilder.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.unsubscribe; - -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImplBuilder; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscription; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubscribeBuilder; +package com.hivemq.client2.internal.mqtt.message.unsubscribe; + +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicFilterImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicFilterImplBuilder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscription; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilter; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubscribeBuilder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeProperty.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubscribeProperty.java similarity index 86% rename from src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeProperty.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubscribeProperty.java index 1ec39727d..a710dadf1 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeProperty.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubscribeProperty.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.unsubscribe; +package com.hivemq.client2.internal.mqtt.message.unsubscribe; -import com.hivemq.client.internal.mqtt.message.MqttProperty; +import com.hivemq.client2.internal.mqtt.message.MqttProperty; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubAckView.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubAckView.java similarity index 75% rename from src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubAckView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubAckView.java index d98e4b437..d3d83c7f2 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubAckView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubAckView.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3; - -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubAck; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; +package com.hivemq.client2.internal.mqtt.message.unsubscribe.mqtt3; + +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubAck; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; import io.reactivex.rxjava3.functions.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeView.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeView.java similarity index 85% rename from src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeView.java index c9e4a1c30..d0d2a79be 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeView.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3; +package com.hivemq.client2.internal.mqtt.message.unsubscribe.mqtt3; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicFilterImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubscribe; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilder.java similarity index 89% rename from src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilder.java index 0877b876c..17b6909f7 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilder.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3; - -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImplBuilder; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscription; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; +package com.hivemq.client2.internal.mqtt.message.unsubscribe.mqtt3; + +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicFilterImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicFilterImplBuilder; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscription; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilter; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; +import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java b/src/main/java/com/hivemq/client2/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java similarity index 81% rename from src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java index eb49cba6a..74fa35e03 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/mqtt3/Mqtt3AsyncClientView.java @@ -14,42 +14,42 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.mqtt3; - -import com.hivemq.client.internal.mqtt.MqttAsyncClient; -import com.hivemq.client.internal.mqtt.exceptions.mqtt3.Mqtt3ExceptionFactory; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnAckView; -import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectView; -import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectViewBuilder; -import com.hivemq.client.internal.mqtt.message.disconnect.mqtt3.Mqtt3DisconnectView; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishResultView; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishViewBuilder; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; -import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubAckView; -import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubscribeViewBuilder; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; -import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; -import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubscribeViewBuilder; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.MqttGlobalPublishFilter; -import com.hivemq.client.mqtt.mqtt3.Mqtt3AsyncClient; -import com.hivemq.client.mqtt.mqtt3.Mqtt3BlockingClient; -import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientConfig; -import com.hivemq.client.mqtt.mqtt3.Mqtt3RxClient; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; +package com.hivemq.client2.internal.mqtt.mqtt3; + +import com.hivemq.client2.internal.mqtt.MqttAsyncClient; +import com.hivemq.client2.internal.mqtt.exceptions.mqtt3.Mqtt3ExceptionFactory; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.message.connect.mqtt3.Mqtt3ConnAckView; +import com.hivemq.client2.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectView; +import com.hivemq.client2.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectViewBuilder; +import com.hivemq.client2.internal.mqtt.message.disconnect.mqtt3.Mqtt3DisconnectView; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PublishResultView; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PublishViewBuilder; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscribe; +import com.hivemq.client2.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubAckView; +import com.hivemq.client2.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubscribeViewBuilder; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubscribe; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubscribeViewBuilder; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; +import com.hivemq.client2.mqtt.mqtt3.Mqtt3AsyncClient; +import com.hivemq.client2.mqtt.mqtt3.Mqtt3BlockingClient; +import com.hivemq.client2.mqtt.mqtt3.Mqtt3ClientConfig; +import com.hivemq.client2.mqtt.mqtt3.Mqtt3RxClient; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3ConnAck; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3Connect; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3Publish; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3PublishResult; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; +import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; +import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java b/src/main/java/com/hivemq/client2/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java similarity index 71% rename from src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java index 29262029c..fb1cf3975 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/mqtt3/Mqtt3BlockingClientView.java @@ -14,42 +14,42 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.mqtt3; - -import com.hivemq.client.internal.mqtt.MqttBlockingClient; -import com.hivemq.client.internal.mqtt.exceptions.mqtt3.Mqtt3ExceptionFactory; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnAckView; -import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectView; -import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectViewBuilder; -import com.hivemq.client.internal.mqtt.message.disconnect.mqtt3.Mqtt3DisconnectView; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishResultView; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishViewBuilder; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; -import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubAckView; -import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubscribeViewBuilder; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; -import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; -import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubscribeViewBuilder; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.MqttGlobalPublishFilter; -import com.hivemq.client.mqtt.mqtt3.Mqtt3AsyncClient; -import com.hivemq.client.mqtt.mqtt3.Mqtt3BlockingClient; -import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientConfig; -import com.hivemq.client.mqtt.mqtt3.Mqtt3RxClient; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; -import com.hivemq.client.mqtt.mqtt5.Mqtt5BlockingClient; -import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5MessageException; +package com.hivemq.client2.internal.mqtt.mqtt3; + +import com.hivemq.client2.internal.mqtt.MqttBlockingClient; +import com.hivemq.client2.internal.mqtt.exceptions.mqtt3.Mqtt3ExceptionFactory; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.message.connect.mqtt3.Mqtt3ConnAckView; +import com.hivemq.client2.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectView; +import com.hivemq.client2.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectViewBuilder; +import com.hivemq.client2.internal.mqtt.message.disconnect.mqtt3.Mqtt3DisconnectView; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PublishResultView; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PublishViewBuilder; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscribe; +import com.hivemq.client2.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubAckView; +import com.hivemq.client2.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubscribeViewBuilder; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubscribe; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubscribeViewBuilder; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; +import com.hivemq.client2.mqtt.mqtt3.Mqtt3AsyncClient; +import com.hivemq.client2.mqtt.mqtt3.Mqtt3BlockingClient; +import com.hivemq.client2.mqtt.mqtt3.Mqtt3ClientConfig; +import com.hivemq.client2.mqtt.mqtt3.Mqtt3RxClient; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3ConnAck; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3Connect; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3Publish; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3PublishResult; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; +import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; +import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5BlockingClient; +import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5MessageException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java b/src/main/java/com/hivemq/client2/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java similarity index 71% rename from src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java index 66c1b934d..28700ecd7 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/mqtt3/Mqtt3ClientConfigView.java @@ -14,26 +14,26 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.mqtt3; - -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.message.auth.MqttSimpleAuth; -import com.hivemq.client.internal.mqtt.message.auth.mqtt3.Mqtt3SimpleAuthView; -import com.hivemq.client.internal.mqtt.message.publish.MqttWillPublish; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.MqttClientState; -import com.hivemq.client.mqtt.MqttExecutorConfig; -import com.hivemq.client.mqtt.MqttTransportConfig; -import com.hivemq.client.mqtt.MqttVersion; -import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; -import com.hivemq.client.mqtt.lifecycle.MqttAutoReconnect; -import com.hivemq.client.mqtt.lifecycle.MqttConnectedListener; -import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedListener; -import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientConfig; -import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientConnectionConfig; -import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; +package com.hivemq.client2.internal.mqtt.mqtt3; + +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.message.auth.MqttSimpleAuth; +import com.hivemq.client2.internal.mqtt.message.auth.mqtt3.Mqtt3SimpleAuthView; +import com.hivemq.client2.internal.mqtt.message.publish.MqttWillPublish; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.MqttClientState; +import com.hivemq.client2.mqtt.MqttExecutorConfig; +import com.hivemq.client2.mqtt.MqttTransportConfig; +import com.hivemq.client2.mqtt.MqttVersion; +import com.hivemq.client2.mqtt.datatypes.MqttClientIdentifier; +import com.hivemq.client2.mqtt.lifecycle.MqttAutoReconnect; +import com.hivemq.client2.mqtt.lifecycle.MqttConnectedListener; +import com.hivemq.client2.mqtt.lifecycle.MqttDisconnectedListener; +import com.hivemq.client2.mqtt.mqtt3.Mqtt3ClientConfig; +import com.hivemq.client2.mqtt.mqtt3.Mqtt3ClientConnectionConfig; +import com.hivemq.client2.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3Publish; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java b/src/main/java/com/hivemq/client2/internal/mqtt/mqtt3/Mqtt3RxClientView.java similarity index 73% rename from src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java rename to src/main/java/com/hivemq/client2/internal/mqtt/mqtt3/Mqtt3RxClientView.java index 2a3d8c485..cb04de18f 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/mqtt3/Mqtt3RxClientView.java @@ -14,42 +14,42 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.mqtt3; - -import com.hivemq.client.internal.mqtt.MqttRxClient; -import com.hivemq.client.internal.mqtt.exceptions.mqtt3.Mqtt3ExceptionFactory; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnAckView; -import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectView; -import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectViewBuilder; -import com.hivemq.client.internal.mqtt.message.disconnect.mqtt3.Mqtt3DisconnectView; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishResultView; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; -import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubAckView; -import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubscribeViewBuilder; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; -import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; -import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubscribeViewBuilder; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.MqttGlobalPublishFilter; -import com.hivemq.client.mqtt.mqtt3.Mqtt3RxClient; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; -import com.hivemq.client.rx.FlowableWithSingle; +package com.hivemq.client2.internal.mqtt.mqtt3; + +import com.hivemq.client2.internal.mqtt.MqttRxClient; +import com.hivemq.client2.internal.mqtt.exceptions.mqtt3.Mqtt3ExceptionFactory; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.message.connect.mqtt3.Mqtt3ConnAckView; +import com.hivemq.client2.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectView; +import com.hivemq.client2.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectViewBuilder; +import com.hivemq.client2.internal.mqtt.message.disconnect.mqtt3.Mqtt3DisconnectView; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PublishResultView; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscribe; +import com.hivemq.client2.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubAckView; +import com.hivemq.client2.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubscribeViewBuilder; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubscribe; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubscribeViewBuilder; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; +import com.hivemq.client2.mqtt.mqtt3.Mqtt3RxClient; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3ConnAck; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3Connect; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3Publish; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3PublishResult; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; +import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; +import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PublishResult; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; +import com.hivemq.client2.rx.FlowableWithSingle; import io.reactivex.rxjava3.core.Completable; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.core.Single; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/mqtt3/Mqtt3RxClientViewBuilder.java similarity index 78% rename from src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewBuilder.java rename to src/main/java/com/hivemq/client2/internal/mqtt/mqtt3/Mqtt3RxClientViewBuilder.java index e0b08d57a..0c00c0d97 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/mqtt3/Mqtt3RxClientViewBuilder.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.mqtt3; - -import com.hivemq.client.internal.mqtt.*; -import com.hivemq.client.internal.mqtt.advanced.MqttAdvancedConfig; -import com.hivemq.client.internal.mqtt.message.auth.MqttSimpleAuth; -import com.hivemq.client.internal.mqtt.message.auth.mqtt3.Mqtt3SimpleAuthView; -import com.hivemq.client.internal.mqtt.message.auth.mqtt3.Mqtt3SimpleAuthViewBuilder; -import com.hivemq.client.internal.mqtt.message.publish.MqttWillPublish; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishViewBuilder; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.mqtt.MqttVersion; -import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientBuilder; -import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; +package com.hivemq.client2.internal.mqtt.mqtt3; + +import com.hivemq.client2.internal.mqtt.*; +import com.hivemq.client2.internal.mqtt.advanced.MqttAdvancedConfig; +import com.hivemq.client2.internal.mqtt.message.auth.MqttSimpleAuth; +import com.hivemq.client2.internal.mqtt.message.auth.mqtt3.Mqtt3SimpleAuthView; +import com.hivemq.client2.internal.mqtt.message.auth.mqtt3.Mqtt3SimpleAuthViewBuilder; +import com.hivemq.client2.internal.mqtt.message.publish.MqttWillPublish; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PublishViewBuilder; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.mqtt.MqttVersion; +import com.hivemq.client2.mqtt.mqtt3.Mqtt3ClientBuilder; +import com.hivemq.client2.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3Publish; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/mqtt/util/MqttChecks.java b/src/main/java/com/hivemq/client2/internal/mqtt/util/MqttChecks.java similarity index 82% rename from src/main/java/com/hivemq/client/internal/mqtt/util/MqttChecks.java rename to src/main/java/com/hivemq/client2/internal/mqtt/util/MqttChecks.java index f71cfad7a..200b24944 100644 --- a/src/main/java/com/hivemq/client/internal/mqtt/util/MqttChecks.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/util/MqttChecks.java @@ -14,35 +14,35 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.util; - -import com.hivemq.client.internal.mqtt.datatypes.*; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectView; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; -import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubscribeView; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; -import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubscribeView; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; -import com.hivemq.client.mqtt.datatypes.MqttTopic; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperty; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; +package com.hivemq.client2.internal.mqtt.util; + +import com.hivemq.client2.internal.mqtt.datatypes.*; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectView; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PublishView; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscribe; +import com.hivemq.client2.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubscribeView; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubscribe; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubscribeView; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.datatypes.MqttClientIdentifier; +import com.hivemq.client2.mqtt.datatypes.MqttTopic; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilter; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3Connect; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3Publish; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; +import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperty; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/netty/ContextFuture.java b/src/main/java/com/hivemq/client2/internal/netty/ContextFuture.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/netty/ContextFuture.java rename to src/main/java/com/hivemq/client2/internal/netty/ContextFuture.java index 63b4df478..3e7188ade 100644 --- a/src/main/java/com/hivemq/client/internal/netty/ContextFuture.java +++ b/src/main/java/com/hivemq/client2/internal/netty/ContextFuture.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.netty; +package com.hivemq.client2.internal.netty; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelPromise; diff --git a/src/main/java/com/hivemq/client/internal/netty/DefaultChannelOutboundHandler.java b/src/main/java/com/hivemq/client2/internal/netty/DefaultChannelOutboundHandler.java similarity index 98% rename from src/main/java/com/hivemq/client/internal/netty/DefaultChannelOutboundHandler.java rename to src/main/java/com/hivemq/client2/internal/netty/DefaultChannelOutboundHandler.java index 159fb6e63..6560e4416 100644 --- a/src/main/java/com/hivemq/client/internal/netty/DefaultChannelOutboundHandler.java +++ b/src/main/java/com/hivemq/client2/internal/netty/DefaultChannelOutboundHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.netty; +package com.hivemq.client2.internal.netty; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelOutboundHandler; diff --git a/src/main/java/com/hivemq/client/internal/netty/DefaultContextPromise.java b/src/main/java/com/hivemq/client2/internal/netty/DefaultContextPromise.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/netty/DefaultContextPromise.java rename to src/main/java/com/hivemq/client2/internal/netty/DefaultContextPromise.java index f77890c7b..d05c1b907 100644 --- a/src/main/java/com/hivemq/client/internal/netty/DefaultContextPromise.java +++ b/src/main/java/com/hivemq/client2/internal/netty/DefaultContextPromise.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.netty; +package com.hivemq.client2.internal.netty; import io.netty.channel.Channel; import io.netty.channel.DefaultChannelPromise; diff --git a/src/main/java/com/hivemq/client/internal/netty/NettyEventLoopProvider.java b/src/main/java/com/hivemq/client2/internal/netty/NettyEventLoopProvider.java similarity index 93% rename from src/main/java/com/hivemq/client/internal/netty/NettyEventLoopProvider.java rename to src/main/java/com/hivemq/client2/internal/netty/NettyEventLoopProvider.java index 377155782..623cb28c6 100644 --- a/src/main/java/com/hivemq/client/internal/netty/NettyEventLoopProvider.java +++ b/src/main/java/com/hivemq/client2/internal/netty/NettyEventLoopProvider.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.netty; +package com.hivemq.client2.internal.netty; -import com.hivemq.client.internal.annotations.ThreadSafe; -import com.hivemq.client.internal.logging.InternalLogger; -import com.hivemq.client.internal.logging.InternalLoggerFactory; -import com.hivemq.client.internal.mqtt.MqttExecutorConfigImpl; -import com.hivemq.client.internal.util.ClassUtil; +import com.hivemq.client2.internal.annotations.ThreadSafe; +import com.hivemq.client2.internal.logging.InternalLogger; +import com.hivemq.client2.internal.logging.InternalLoggerFactory; +import com.hivemq.client2.internal.mqtt.MqttExecutorConfigImpl; +import com.hivemq.client2.internal.util.ClassUtil; import io.netty.channel.ChannelFactory; import io.netty.channel.EventLoop; import io.netty.channel.MultithreadEventLoopGroup; @@ -92,7 +92,7 @@ private NettyEventLoopProvider( if (executor == null) { eventLoopGroup = eventLoopGroupFactory.apply( threadCount, new ThreadPerTaskExecutor( - new DefaultThreadFactory("com.hivemq.client.mqtt", Thread.MAX_PRIORITY))); + new DefaultThreadFactory("com.hivemq.client2.mqtt", Thread.MAX_PRIORITY))); } else if (executor instanceof MultithreadEventLoopGroup) { eventLoopGroup = (MultithreadEventLoopGroup) executor; diff --git a/src/main/java/com/hivemq/client/internal/rx/CompletableFlow.java b/src/main/java/com/hivemq/client2/internal/rx/CompletableFlow.java similarity index 97% rename from src/main/java/com/hivemq/client/internal/rx/CompletableFlow.java rename to src/main/java/com/hivemq/client2/internal/rx/CompletableFlow.java index d9d3b1a34..573853d59 100644 --- a/src/main/java/com/hivemq/client/internal/rx/CompletableFlow.java +++ b/src/main/java/com/hivemq/client2/internal/rx/CompletableFlow.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.rx; +package com.hivemq.client2.internal.rx; import io.reactivex.rxjava3.core.CompletableObserver; import io.reactivex.rxjava3.disposables.Disposable; diff --git a/src/main/java/com/hivemq/client/internal/rx/WithSingleConditionalSubscriber.java b/src/main/java/com/hivemq/client2/internal/rx/WithSingleConditionalSubscriber.java similarity index 89% rename from src/main/java/com/hivemq/client/internal/rx/WithSingleConditionalSubscriber.java rename to src/main/java/com/hivemq/client2/internal/rx/WithSingleConditionalSubscriber.java index d108c7d84..e34d6cd07 100644 --- a/src/main/java/com/hivemq/client/internal/rx/WithSingleConditionalSubscriber.java +++ b/src/main/java/com/hivemq/client2/internal/rx/WithSingleConditionalSubscriber.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.rx; +package com.hivemq.client2.internal.rx; -import com.hivemq.client.rx.FlowableWithSingleSubscriber; +import com.hivemq.client2.rx.FlowableWithSingleSubscriber; import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; /** diff --git a/src/main/java/com/hivemq/client/internal/rx/WithSingleStrictSubscriber.java b/src/main/java/com/hivemq/client2/internal/rx/WithSingleStrictSubscriber.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/rx/WithSingleStrictSubscriber.java rename to src/main/java/com/hivemq/client2/internal/rx/WithSingleStrictSubscriber.java index 31aa2b257..13ad3c06b 100644 --- a/src/main/java/com/hivemq/client/internal/rx/WithSingleStrictSubscriber.java +++ b/src/main/java/com/hivemq/client2/internal/rx/WithSingleStrictSubscriber.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.rx; +package com.hivemq.client2.internal.rx; -import com.hivemq.client.rx.FlowableWithSingleSubscriber; -import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; +import com.hivemq.client2.rx.FlowableWithSingleSubscriber; +import com.hivemq.client2.rx.reactivestreams.WithSingleSubscriber; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; import io.reactivex.rxjava3.internal.util.BackpressureHelper; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleCombine.java b/src/main/java/com/hivemq/client2/internal/rx/operators/FlowableWithSingleCombine.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleCombine.java rename to src/main/java/com/hivemq/client2/internal/rx/operators/FlowableWithSingleCombine.java index 5ad5d6438..29f57a8a1 100644 --- a/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleCombine.java +++ b/src/main/java/com/hivemq/client2/internal/rx/operators/FlowableWithSingleCombine.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.rx.operators; +package com.hivemq.client2.internal.rx.operators; -import com.hivemq.client.internal.rx.WithSingleConditionalSubscriber; -import com.hivemq.client.rx.FlowableWithSingle; -import com.hivemq.client.rx.FlowableWithSingleSubscriber; -import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; +import com.hivemq.client2.internal.rx.WithSingleConditionalSubscriber; +import com.hivemq.client2.rx.FlowableWithSingle; +import com.hivemq.client2.rx.FlowableWithSingleSubscriber; +import com.hivemq.client2.rx.reactivestreams.WithSingleSubscriber; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; import io.reactivex.rxjava3.internal.util.BackpressureHelper; diff --git a/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleMap.java b/src/main/java/com/hivemq/client2/internal/rx/operators/FlowableWithSingleMap.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleMap.java rename to src/main/java/com/hivemq/client2/internal/rx/operators/FlowableWithSingleMap.java index ffd923a5f..e32317038 100644 --- a/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleMap.java +++ b/src/main/java/com/hivemq/client2/internal/rx/operators/FlowableWithSingleMap.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.rx.operators; +package com.hivemq.client2.internal.rx.operators; -import com.hivemq.client.internal.rx.WithSingleConditionalSubscriber; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.rx.FlowableWithSingle; -import com.hivemq.client.rx.FlowableWithSingleSubscriber; -import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; +import com.hivemq.client2.internal.rx.WithSingleConditionalSubscriber; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.rx.FlowableWithSingle; +import com.hivemq.client2.rx.FlowableWithSingleSubscriber; +import com.hivemq.client2.rx.reactivestreams.WithSingleSubscriber; import io.reactivex.rxjava3.exceptions.Exceptions; import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber; diff --git a/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleMapError.java b/src/main/java/com/hivemq/client2/internal/rx/operators/FlowableWithSingleMapError.java similarity index 94% rename from src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleMapError.java rename to src/main/java/com/hivemq/client2/internal/rx/operators/FlowableWithSingleMapError.java index 3f1ed32eb..4e62d2a64 100644 --- a/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleMapError.java +++ b/src/main/java/com/hivemq/client2/internal/rx/operators/FlowableWithSingleMapError.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.rx.operators; +package com.hivemq.client2.internal.rx.operators; -import com.hivemq.client.internal.rx.WithSingleConditionalSubscriber; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.rx.FlowableWithSingle; -import com.hivemq.client.rx.FlowableWithSingleSubscriber; -import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; +import com.hivemq.client2.internal.rx.WithSingleConditionalSubscriber; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.rx.FlowableWithSingle; +import com.hivemq.client2.rx.FlowableWithSingleSubscriber; +import com.hivemq.client2.rx.reactivestreams.WithSingleSubscriber; import io.reactivex.rxjava3.core.FlowableSubscriber; import io.reactivex.rxjava3.exceptions.CompositeException; import io.reactivex.rxjava3.exceptions.Exceptions; diff --git a/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleObserveOn.java b/src/main/java/com/hivemq/client2/internal/rx/operators/FlowableWithSingleObserveOn.java similarity index 91% rename from src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleObserveOn.java rename to src/main/java/com/hivemq/client2/internal/rx/operators/FlowableWithSingleObserveOn.java index 3fcec3107..f9fd17942 100644 --- a/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleObserveOn.java +++ b/src/main/java/com/hivemq/client2/internal/rx/operators/FlowableWithSingleObserveOn.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.rx.operators; +package com.hivemq.client2.internal.rx.operators; -import com.hivemq.client.rx.FlowableWithSingle; -import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; +import com.hivemq.client2.rx.FlowableWithSingle; +import com.hivemq.client2.rx.reactivestreams.WithSingleSubscriber; import io.reactivex.rxjava3.core.Scheduler; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Subscriber; diff --git a/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleOperator.java b/src/main/java/com/hivemq/client2/internal/rx/operators/FlowableWithSingleOperator.java similarity index 90% rename from src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleOperator.java rename to src/main/java/com/hivemq/client2/internal/rx/operators/FlowableWithSingleOperator.java index af8738bb0..dbf362372 100644 --- a/src/main/java/com/hivemq/client/internal/rx/operators/FlowableWithSingleOperator.java +++ b/src/main/java/com/hivemq/client2/internal/rx/operators/FlowableWithSingleOperator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.rx.operators; +package com.hivemq.client2.internal.rx.operators; -import com.hivemq.client.rx.FlowableWithSingle; +import com.hivemq.client2.rx.FlowableWithSingle; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/util/AsyncRuntimeException.java b/src/main/java/com/hivemq/client2/internal/util/AsyncRuntimeException.java similarity index 98% rename from src/main/java/com/hivemq/client/internal/util/AsyncRuntimeException.java rename to src/main/java/com/hivemq/client2/internal/util/AsyncRuntimeException.java index f124a699d..86342be04 100644 --- a/src/main/java/com/hivemq/client/internal/util/AsyncRuntimeException.java +++ b/src/main/java/com/hivemq/client2/internal/util/AsyncRuntimeException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/util/ByteArray.java b/src/main/java/com/hivemq/client2/internal/util/ByteArray.java similarity index 97% rename from src/main/java/com/hivemq/client/internal/util/ByteArray.java rename to src/main/java/com/hivemq/client2/internal/util/ByteArray.java index 8d8586ebf..498971f77 100644 --- a/src/main/java/com/hivemq/client/internal/util/ByteArray.java +++ b/src/main/java/com/hivemq/client2/internal/util/ByteArray.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/util/ByteArrayUtil.java b/src/main/java/com/hivemq/client2/internal/util/ByteArrayUtil.java similarity index 97% rename from src/main/java/com/hivemq/client/internal/util/ByteArrayUtil.java rename to src/main/java/com/hivemq/client2/internal/util/ByteArrayUtil.java index f70f44c33..b12d6d4ac 100644 --- a/src/main/java/com/hivemq/client/internal/util/ByteArrayUtil.java +++ b/src/main/java/com/hivemq/client2/internal/util/ByteArrayUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/util/ByteBufferUtil.java b/src/main/java/com/hivemq/client2/internal/util/ByteBufferUtil.java similarity index 98% rename from src/main/java/com/hivemq/client/internal/util/ByteBufferUtil.java rename to src/main/java/com/hivemq/client2/internal/util/ByteBufferUtil.java index e3832e276..9b04c8ecd 100644 --- a/src/main/java/com/hivemq/client/internal/util/ByteBufferUtil.java +++ b/src/main/java/com/hivemq/client2/internal/util/ByteBufferUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/util/Checks.java b/src/main/java/com/hivemq/client2/internal/util/Checks.java similarity index 98% rename from src/main/java/com/hivemq/client/internal/util/Checks.java rename to src/main/java/com/hivemq/client2/internal/util/Checks.java index 18924785d..8cd4a0c7f 100644 --- a/src/main/java/com/hivemq/client/internal/util/Checks.java +++ b/src/main/java/com/hivemq/client2/internal/util/Checks.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; -import com.hivemq.client.internal.util.collections.ImmutableList; +import com.hivemq.client2.internal.util.collections.ImmutableList; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/util/ClassUtil.java b/src/main/java/com/hivemq/client2/internal/util/ClassUtil.java similarity index 95% rename from src/main/java/com/hivemq/client/internal/util/ClassUtil.java rename to src/main/java/com/hivemq/client2/internal/util/ClassUtil.java index 6bf513719..e40313367 100644 --- a/src/main/java/com/hivemq/client/internal/util/ClassUtil.java +++ b/src/main/java/com/hivemq/client2/internal/util/ClassUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/util/ExecutorUtil.java b/src/main/java/com/hivemq/client2/internal/util/ExecutorUtil.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/util/ExecutorUtil.java rename to src/main/java/com/hivemq/client2/internal/util/ExecutorUtil.java index 53211b263..3de35d923 100644 --- a/src/main/java/com/hivemq/client/internal/util/ExecutorUtil.java +++ b/src/main/java/com/hivemq/client2/internal/util/ExecutorUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/util/InetSocketAddressUtil.java b/src/main/java/com/hivemq/client2/internal/util/InetSocketAddressUtil.java similarity index 97% rename from src/main/java/com/hivemq/client/internal/util/InetSocketAddressUtil.java rename to src/main/java/com/hivemq/client2/internal/util/InetSocketAddressUtil.java index fac25bf5b..a32e3419d 100644 --- a/src/main/java/com/hivemq/client/internal/util/InetSocketAddressUtil.java +++ b/src/main/java/com/hivemq/client2/internal/util/InetSocketAddressUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; import io.netty.util.NetUtil; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/util/Pow2Util.java b/src/main/java/com/hivemq/client2/internal/util/Pow2Util.java similarity index 95% rename from src/main/java/com/hivemq/client/internal/util/Pow2Util.java rename to src/main/java/com/hivemq/client2/internal/util/Pow2Util.java index be17d92ca..cac9b709d 100644 --- a/src/main/java/com/hivemq/client/internal/util/Pow2Util.java +++ b/src/main/java/com/hivemq/client2/internal/util/Pow2Util.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/util/Ranges.java b/src/main/java/com/hivemq/client2/internal/util/Ranges.java similarity index 97% rename from src/main/java/com/hivemq/client/internal/util/Ranges.java rename to src/main/java/com/hivemq/client2/internal/util/Ranges.java index 4c1a868b8..c395f2533 100644 --- a/src/main/java/com/hivemq/client/internal/util/Ranges.java +++ b/src/main/java/com/hivemq/client2/internal/util/Ranges.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; -import com.hivemq.client.internal.annotations.NotThreadSafe; +import com.hivemq.client2.internal.annotations.NotThreadSafe; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/util/StringUtil.java b/src/main/java/com/hivemq/client2/internal/util/StringUtil.java similarity index 95% rename from src/main/java/com/hivemq/client/internal/util/StringUtil.java rename to src/main/java/com/hivemq/client2/internal/util/StringUtil.java index af7149032..6e13aaeac 100644 --- a/src/main/java/com/hivemq/client/internal/util/StringUtil.java +++ b/src/main/java/com/hivemq/client2/internal/util/StringUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/util/UnsignedDataTypes.java b/src/main/java/com/hivemq/client2/internal/util/UnsignedDataTypes.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/util/UnsignedDataTypes.java rename to src/main/java/com/hivemq/client2/internal/util/UnsignedDataTypes.java index 1b5d1a0ca..cf8ec6f32 100644 --- a/src/main/java/com/hivemq/client/internal/util/UnsignedDataTypes.java +++ b/src/main/java/com/hivemq/client2/internal/util/UnsignedDataTypes.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; /** * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/internal/util/Utf8Util.java b/src/main/java/com/hivemq/client2/internal/util/Utf8Util.java similarity index 98% rename from src/main/java/com/hivemq/client/internal/util/Utf8Util.java rename to src/main/java/com/hivemq/client2/internal/util/Utf8Util.java index 600e35ccf..0f631c837 100644 --- a/src/main/java/com/hivemq/client/internal/util/Utf8Util.java +++ b/src/main/java/com/hivemq/client2/internal/util/Utf8Util.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/internal/util/collections/ChunkedArrayQueue.java b/src/main/java/com/hivemq/client2/internal/util/collections/ChunkedArrayQueue.java similarity index 98% rename from src/main/java/com/hivemq/client/internal/util/collections/ChunkedArrayQueue.java rename to src/main/java/com/hivemq/client2/internal/util/collections/ChunkedArrayQueue.java index c567ca5bb..53f8f78ac 100644 --- a/src/main/java/com/hivemq/client/internal/util/collections/ChunkedArrayQueue.java +++ b/src/main/java/com/hivemq/client2/internal/util/collections/ChunkedArrayQueue.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.util.collections; +package com.hivemq.client2.internal.util.collections; -import com.hivemq.client.internal.annotations.NotThreadSafe; +import com.hivemq.client2.internal.annotations.NotThreadSafe; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/util/collections/HandleList.java b/src/main/java/com/hivemq/client2/internal/util/collections/HandleList.java similarity index 91% rename from src/main/java/com/hivemq/client/internal/util/collections/HandleList.java rename to src/main/java/com/hivemq/client2/internal/util/collections/HandleList.java index 74d740859..1260afbfb 100644 --- a/src/main/java/com/hivemq/client/internal/util/collections/HandleList.java +++ b/src/main/java/com/hivemq/client2/internal/util/collections/HandleList.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.util.collections; +package com.hivemq.client2.internal.util.collections; -import com.hivemq.client.internal.annotations.NotThreadSafe; +import com.hivemq.client2.internal.annotations.NotThreadSafe; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableArray.java b/src/main/java/com/hivemq/client2/internal/util/collections/ImmutableArray.java similarity index 98% rename from src/main/java/com/hivemq/client/internal/util/collections/ImmutableArray.java rename to src/main/java/com/hivemq/client2/internal/util/collections/ImmutableArray.java index 79547f847..9f9e0d0b2 100644 --- a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableArray.java +++ b/src/main/java/com/hivemq/client2/internal/util/collections/ImmutableArray.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.util.collections; +package com.hivemq.client2.internal.util.collections; -import com.hivemq.client.internal.util.Checks; +import com.hivemq.client2.internal.util.Checks; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableElement.java b/src/main/java/com/hivemq/client2/internal/util/collections/ImmutableElement.java similarity index 98% rename from src/main/java/com/hivemq/client/internal/util/collections/ImmutableElement.java rename to src/main/java/com/hivemq/client2/internal/util/collections/ImmutableElement.java index 4715e4602..89f2747ba 100644 --- a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableElement.java +++ b/src/main/java/com/hivemq/client2/internal/util/collections/ImmutableElement.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.util.collections; +package com.hivemq.client2.internal.util.collections; -import com.hivemq.client.internal.util.Checks; +import com.hivemq.client2.internal.util.Checks; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableEmptyIntList.java b/src/main/java/com/hivemq/client2/internal/util/collections/ImmutableEmptyIntList.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/util/collections/ImmutableEmptyIntList.java rename to src/main/java/com/hivemq/client2/internal/util/collections/ImmutableEmptyIntList.java index fc80b49fd..8cdd147e5 100644 --- a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableEmptyIntList.java +++ b/src/main/java/com/hivemq/client2/internal/util/collections/ImmutableEmptyIntList.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util.collections; +package com.hivemq.client2.internal.util.collections; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableEmptyList.java b/src/main/java/com/hivemq/client2/internal/util/collections/ImmutableEmptyList.java similarity index 98% rename from src/main/java/com/hivemq/client/internal/util/collections/ImmutableEmptyList.java rename to src/main/java/com/hivemq/client2/internal/util/collections/ImmutableEmptyList.java index d9c917557..f48808111 100644 --- a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableEmptyList.java +++ b/src/main/java/com/hivemq/client2/internal/util/collections/ImmutableEmptyList.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.util.collections; +package com.hivemq.client2.internal.util.collections; -import com.hivemq.client.internal.util.Checks; +import com.hivemq.client2.internal.util.Checks; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableIntArray.java b/src/main/java/com/hivemq/client2/internal/util/collections/ImmutableIntArray.java similarity index 95% rename from src/main/java/com/hivemq/client/internal/util/collections/ImmutableIntArray.java rename to src/main/java/com/hivemq/client2/internal/util/collections/ImmutableIntArray.java index 574a3494d..40017516a 100644 --- a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableIntArray.java +++ b/src/main/java/com/hivemq/client2/internal/util/collections/ImmutableIntArray.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.util.collections; +package com.hivemq.client2.internal.util.collections; -import com.hivemq.client.internal.util.Checks; +import com.hivemq.client2.internal.util.Checks; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableIntElement.java b/src/main/java/com/hivemq/client2/internal/util/collections/ImmutableIntElement.java similarity index 94% rename from src/main/java/com/hivemq/client/internal/util/collections/ImmutableIntElement.java rename to src/main/java/com/hivemq/client2/internal/util/collections/ImmutableIntElement.java index 28e4e41b7..ec8aad3a0 100644 --- a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableIntElement.java +++ b/src/main/java/com/hivemq/client2/internal/util/collections/ImmutableIntElement.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.util.collections; +package com.hivemq.client2.internal.util.collections; -import com.hivemq.client.internal.util.Checks; +import com.hivemq.client2.internal.util.Checks; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableIntList.java b/src/main/java/com/hivemq/client2/internal/util/collections/ImmutableIntList.java similarity index 97% rename from src/main/java/com/hivemq/client/internal/util/collections/ImmutableIntList.java rename to src/main/java/com/hivemq/client2/internal/util/collections/ImmutableIntList.java index 58fab037c..7f2c3ea92 100644 --- a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableIntList.java +++ b/src/main/java/com/hivemq/client2/internal/util/collections/ImmutableIntList.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.util.collections; +package com.hivemq.client2.internal.util.collections; -import com.hivemq.client.internal.util.Checks; +import com.hivemq.client2.internal.util.Checks; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableList.java b/src/main/java/com/hivemq/client2/internal/util/collections/ImmutableList.java similarity index 99% rename from src/main/java/com/hivemq/client/internal/util/collections/ImmutableList.java rename to src/main/java/com/hivemq/client2/internal/util/collections/ImmutableList.java index 3d989f125..6c842e6a9 100644 --- a/src/main/java/com/hivemq/client/internal/util/collections/ImmutableList.java +++ b/src/main/java/com/hivemq/client2/internal/util/collections/ImmutableList.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.util.collections; +package com.hivemq.client2.internal.util.collections; -import com.hivemq.client.internal.util.Checks; +import com.hivemq.client2.internal.util.Checks; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/util/collections/Index.java b/src/main/java/com/hivemq/client2/internal/util/collections/Index.java similarity index 98% rename from src/main/java/com/hivemq/client/internal/util/collections/Index.java rename to src/main/java/com/hivemq/client2/internal/util/collections/Index.java index 269150a3e..085d85b3e 100644 --- a/src/main/java/com/hivemq/client/internal/util/collections/Index.java +++ b/src/main/java/com/hivemq/client2/internal/util/collections/Index.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.util.collections; +package com.hivemq.client2.internal.util.collections; -import com.hivemq.client.internal.annotations.NotThreadSafe; -import com.hivemq.client.internal.util.Pow2Util; +import com.hivemq.client2.internal.annotations.NotThreadSafe; +import com.hivemq.client2.internal.util.Pow2Util; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/util/collections/IntIndex.java b/src/main/java/com/hivemq/client2/internal/util/collections/IntIndex.java similarity index 98% rename from src/main/java/com/hivemq/client/internal/util/collections/IntIndex.java rename to src/main/java/com/hivemq/client2/internal/util/collections/IntIndex.java index 50d5de0f3..a1d569b81 100644 --- a/src/main/java/com/hivemq/client/internal/util/collections/IntIndex.java +++ b/src/main/java/com/hivemq/client2/internal/util/collections/IntIndex.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.util.collections; +package com.hivemq.client2.internal.util.collections; -import com.hivemq.client.internal.annotations.NotThreadSafe; -import com.hivemq.client.internal.util.Pow2Util; +import com.hivemq.client2.internal.annotations.NotThreadSafe; +import com.hivemq.client2.internal.util.Pow2Util; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/internal/util/collections/NodeList.java b/src/main/java/com/hivemq/client2/internal/util/collections/NodeList.java similarity index 96% rename from src/main/java/com/hivemq/client/internal/util/collections/NodeList.java rename to src/main/java/com/hivemq/client2/internal/util/collections/NodeList.java index b020a19c5..2c0c57a31 100644 --- a/src/main/java/com/hivemq/client/internal/util/collections/NodeList.java +++ b/src/main/java/com/hivemq/client2/internal/util/collections/NodeList.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.util.collections; +package com.hivemq.client2.internal.util.collections; -import com.hivemq.client.internal.annotations.NotThreadSafe; +import com.hivemq.client2.internal.annotations.NotThreadSafe; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClient.java b/src/main/java/com/hivemq/client2/mqtt/MqttClient.java similarity index 93% rename from src/main/java/com/hivemq/client/mqtt/MqttClient.java rename to src/main/java/com/hivemq/client2/mqtt/MqttClient.java index eecb19342..5d78737d6 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClient.java +++ b/src/main/java/com/hivemq/client2/mqtt/MqttClient.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt; +package com.hivemq.client2.mqtt; -import com.hivemq.client.internal.mqtt.MqttRxClientBuilderBase; +import com.hivemq.client2.internal.mqtt.MqttRxClientBuilderBase; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilder.java b/src/main/java/com/hivemq/client2/mqtt/MqttClientBuilder.java similarity index 75% rename from src/main/java/com/hivemq/client/mqtt/MqttClientBuilder.java rename to src/main/java/com/hivemq/client2/mqtt/MqttClientBuilder.java index 532cc2255..825cc789b 100644 --- a/src/main/java/com/hivemq/client/mqtt/MqttClientBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/MqttClientBuilder.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.mqtt; +package com.hivemq.client2.mqtt; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientBuilder; -import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientBuilder; +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.NotNull; @@ -34,7 +34,7 @@ public interface MqttClientBuilder extends MqttClientBuilderBase * This can be: *
            - *
          • {@link com.hivemq.client.mqtt.exceptions.ConnectionFailedException ConnectionFailedException} if a connect + *
          • {@link com.hivemq.client2.mqtt.exceptions.ConnectionFailedException ConnectionFailedException} if a connect * attempt failed - *
          • {@link com.hivemq.client.mqtt.mqtt3.exceptions.Mqtt3ConnAckException Mqtt3ConnAckException} or {@link - * com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5ConnAckException Mqtt5ConnAckException} (depending on the MQTT + *
          • {@link com.hivemq.client2.mqtt.mqtt3.exceptions.Mqtt3ConnAckException Mqtt3ConnAckException} or {@link + * com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5ConnAckException Mqtt5ConnAckException} (depending on the MQTT * version of the client) if the ConnAck message contained an error code, which means that the connect was * rejected - *
          • {@link com.hivemq.client.mqtt.exceptions.ConnectionClosedException ConnectionClosedException} if the + *
          • {@link com.hivemq.client2.mqtt.exceptions.ConnectionClosedException ConnectionClosedException} if the * connection was closed without sending a Disconnect message (use {@link #getSource()} to determine if the * server or the client closed the connection) - *
          • {@link com.hivemq.client.mqtt.mqtt3.exceptions.Mqtt3DisconnectException Mqtt3DisconnectException} or {@link - * com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5DisconnectException Mqtt5DisconnectException} (depending on the + *
          • {@link com.hivemq.client2.mqtt.mqtt3.exceptions.Mqtt3DisconnectException Mqtt3DisconnectException} or {@link + * com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5DisconnectException Mqtt5DisconnectException} (depending on the * MQTT version of the client) if the connection was closed with a Disconnect message (use {@link #getSource()} * to determine if the server, the user or the client sent the Disconnect message) *
          diff --git a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttDisconnectedListener.java b/src/main/java/com/hivemq/client2/mqtt/lifecycle/MqttDisconnectedListener.java similarity index 76% rename from src/main/java/com/hivemq/client/mqtt/lifecycle/MqttDisconnectedListener.java rename to src/main/java/com/hivemq/client2/mqtt/lifecycle/MqttDisconnectedListener.java index a535249c0..c944a763f 100644 --- a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttDisconnectedListener.java +++ b/src/main/java/com/hivemq/client2/mqtt/lifecycle/MqttDisconnectedListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.lifecycle; +package com.hivemq.client2.mqtt.lifecycle; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -34,19 +34,19 @@ public interface MqttDisconnectedListener { * Listener method which is notified in the following cases: *
            *
          • A client was disconnected (with or without a Disconnect message, by the server, client or user) or the - * connection failed. The client state will still be {@link com.hivemq.client.mqtt.MqttClientState#CONNECTED - * CONNECTED} and the {@link com.hivemq.client.mqtt.MqttClientConnectionConfig MqttClientConnectionConfig} will + * connection failed. The client state will still be {@link com.hivemq.client2.mqtt.MqttClientState#CONNECTED + * CONNECTED} and the {@link com.hivemq.client2.mqtt.MqttClientConnectionConfig MqttClientConnectionConfig} will * still be present. *
          • A connect attempt by the user failed. The client state will still be - * {@link com.hivemq.client.mqtt.MqttClientState#CONNECTING CONNECTING}. + * {@link com.hivemq.client2.mqtt.MqttClientState#CONNECTING CONNECTING}. *
          • A reconnect attempt by the client failed. The client state will still be - * {@link com.hivemq.client.mqtt.MqttClientState#CONNECTING_RECONNECT CONNECTING_RECONNECT}. + * {@link com.hivemq.client2.mqtt.MqttClientState#CONNECTING_RECONNECT CONNECTING_RECONNECT}. *
          * The client state will be updated after all {@link MqttDisconnectedListener}s * are called to *
            - *
          • {@link com.hivemq.client.mqtt.MqttClientState#DISCONNECTED DISCONNECTED} or - *
          • {@link com.hivemq.client.mqtt.MqttClientState#DISCONNECTED_RECONNECT DISCONNECTED_RECONNECT} if the client + *
          • {@link com.hivemq.client2.mqtt.MqttClientState#DISCONNECTED DISCONNECTED} or + *
          • {@link com.hivemq.client2.mqtt.MqttClientState#DISCONNECTED_RECONNECT DISCONNECTED_RECONNECT} if the client * is instructed to reconnect. *
          *

          diff --git a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttReconnector.java b/src/main/java/com/hivemq/client2/mqtt/lifecycle/MqttReconnector.java similarity index 96% rename from src/main/java/com/hivemq/client/mqtt/lifecycle/MqttReconnector.java rename to src/main/java/com/hivemq/client2/mqtt/lifecycle/MqttReconnector.java index d707f2314..f2944e871 100644 --- a/src/main/java/com/hivemq/client/mqtt/lifecycle/MqttReconnector.java +++ b/src/main/java/com/hivemq/client2/mqtt/lifecycle/MqttReconnector.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.lifecycle; +package com.hivemq.client2.mqtt.lifecycle; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.MqttTransportConfig; -import com.hivemq.client.mqtt.MqttTransportConfigBuilder; +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; @@ -212,7 +212,7 @@ public interface MqttReconnector { *

          * If the {@link #transportConfig(MqttTransportConfig)} method has not been called before (including previous {@link * MqttDisconnectedListener}s) it will be the transport configuration the client was connected with or the {@link - * com.hivemq.client.mqtt.MqttClientConfig#getTransportConfig() default transport configuration} if it has not been + * com.hivemq.client2.mqtt.MqttClientConfig#getTransportConfig() default transport configuration} if it has not been * connected yet. * * @return the transport configuration. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3AsyncClient.java similarity index 94% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3AsyncClient.java index c138838c1..1887bf8d7 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3AsyncClient.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3AsyncClient.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3; - -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.MqttGlobalPublishFilter; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnectBuilder; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishBuilder; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilderBase; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; +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; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3ConnectBuilder; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3Publish; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3PublishBuilder; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3PublishResult; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilderBase; +import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; +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.NotNull; @@ -62,7 +62,7 @@ public interface Mqtt3AsyncClient extends Mqtt3Client { *

            *
          • completes normally with the ConnAck message if it does not contain an Error Code (connected * successfully), - *
          • completes exceptionally with a {@link com.hivemq.client.mqtt.mqtt3.exceptions.Mqtt3ConnAckException + *
          • completes exceptionally with a {@link com.hivemq.client2.mqtt.mqtt3.exceptions.Mqtt3ConnAckException * Mqtt3ConnAckException} wrapping the ConnAck message if it contains an Error Code or *
          • completes exceptionally with a different exception if an error occurred before the Connect message * was sent or before the ConnAck message was received. @@ -95,7 +95,7 @@ public interface Mqtt3AsyncClient extends Mqtt3Client { *
              *
            • completes normally with the SubAck message if all subscriptions of the Subscribe message were * successful (the SubAck message contains no Error Codes), - *
            • completes exceptionally with a {@link com.hivemq.client.mqtt.mqtt3.exceptions.Mqtt3SubAckException + *
            • completes exceptionally with a {@link com.hivemq.client2.mqtt.mqtt3.exceptions.Mqtt3SubAckException * Mqtt3SubAckException} wrapping the SubAck message if it contains at least one Error Code or *
            • completes exceptionally with a different exception if an error occurred before the Subscribe * message was sent or before a SubAck message was received. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3BlockingClient.java similarity index 86% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3BlockingClient.java index 1fef50bd2..cb6728194 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3BlockingClient.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3BlockingClient.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3; - -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.MqttGlobalPublishFilter; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnectBuilder; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishBuilder; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilder; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; +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; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3ConnectBuilder; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3Publish; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3PublishBuilder; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3PublishResult; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilder; +import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; +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.NotNull; @@ -58,8 +58,8 @@ public interface Mqtt3BlockingClient extends Mqtt3Client { * * @param connect the Connect message sent to the broker. * @return the ConnAck message if it does not contain an Error Code (connected successfully). - * @throws com.hivemq.client.mqtt.mqtt3.exceptions.Mqtt3ConnAckException wrapping the ConnAck message if it contains - * an Error Code. + * @throws com.hivemq.client2.mqtt.mqtt3.exceptions.Mqtt3ConnAckException wrapping the ConnAck message if it + * contains an Error Code. */ @NotNull Mqtt3ConnAck connect(@NotNull Mqtt3Connect connect); @@ -83,7 +83,7 @@ public interface Mqtt3BlockingClient extends Mqtt3Client { * @param subscribe the Subscribe messages sent to the broker. * @return the SubAck message if all subscriptions of the Subscribe message were successful (the SubAck message * contains no Error Codes). - * @throws com.hivemq.client.mqtt.mqtt3.exceptions.Mqtt3SubAckException wrapping the SubAck message if it contains + * @throws com.hivemq.client2.mqtt.mqtt3.exceptions.Mqtt3SubAckException wrapping the SubAck message if it contains * at least one Error Code. */ @NotNull Mqtt3SubAck subscribe(@NotNull Mqtt3Subscribe subscribe); diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3Client.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3Client.java similarity index 90% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3Client.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3Client.java index df9ab978e..0a7d08d3d 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3Client.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3Client.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3; +package com.hivemq.client2.mqtt.mqtt3; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.internal.mqtt.mqtt3.Mqtt3RxClientViewBuilder; -import com.hivemq.client.mqtt.MqttClient; +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.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3ClientBuilder.java similarity index 89% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientBuilder.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3ClientBuilder.java index fd4e465cc..5e7d5fe4c 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3ClientBuilder.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3; +package com.hivemq.client2.mqtt.mqtt3; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.MqttClientBuilderBase; -import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; -import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuthBuilder; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3WillPublishBuilder; +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.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientConfig.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3ClientConfig.java similarity index 76% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientConfig.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3ClientConfig.java index e2f473d46..a3bbe3a53 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientConfig.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3ClientConfig.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3; +package com.hivemq.client2.mqtt.mqtt3; -import com.hivemq.client.mqtt.MqttClientConfig; -import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; +import com.hivemq.client2.mqtt.MqttClientConfig; +import com.hivemq.client2.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3Publish; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -39,11 +39,11 @@ public interface Mqtt3ClientConfig extends MqttClientConfig { /** * Returns the optional simple authentication and/or authorization related data of the client. *

              - * It is used as default if {@link com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect#getSimpleAuth() + * It is used as default if {@link com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3Connect#getSimpleAuth() * Mqtt3Connect.simpleAuth} is not set during connect. *

              * Keep in mind that the data is stored with the client in memory. If you want to use it only during connect or if - * you use a different token for each connection please set {@link com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect#getSimpleAuth() + * you use a different token for each connection please set {@link com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3Connect#getSimpleAuth() * Mqtt3Connect.simpleAuth} instead. * * @return the optional simple authentication and/or authorization related data of the client. @@ -54,11 +54,11 @@ public interface Mqtt3ClientConfig extends MqttClientConfig { /** * Returns the optional Will Publish of the client. *

              - * It is used as default if {@link com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect#getWillPublish() + * It is used as default if {@link com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3Connect#getWillPublish() * Mqtt3Connect.willPublish} is not set during connect. *

              * Keep in mind that the Will Publish is stored with the client in memory. If you use a different Will Publish for - * each connection please set {@link com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect#getWillPublish() + * each connection please set {@link com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3Connect#getWillPublish() * Mqtt3Connect.willPublish} instead. * * @return the optional Will Publish of the client. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientConnectionConfig.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3ClientConnectionConfig.java similarity index 91% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientConnectionConfig.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3ClientConnectionConfig.java index 5ebd43262..89f37337c 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3ClientConnectionConfig.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3ClientConnectionConfig.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3; +package com.hivemq.client2.mqtt.mqtt3; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.mqtt.MqttClientConnectionConfig; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.mqtt.MqttClientConnectionConfig; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3RxClient.java similarity index 89% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3RxClient.java index 7d34d490e..d0ef944e4 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/Mqtt3RxClient.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3RxClient.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3; +package com.hivemq.client2.mqtt.mqtt3; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.MqttGlobalPublishFilter; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnectBuilder; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilder; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; -import com.hivemq.client.rx.FlowableWithSingle; +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; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3ConnectBuilder; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3Publish; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3PublishResult; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilder; +import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; +import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; +import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder; +import com.hivemq.client2.rx.FlowableWithSingle; import io.reactivex.rxjava3.core.Completable; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.core.Single; @@ -66,7 +66,7 @@ public interface Mqtt3RxClient extends Mqtt3Client { * @return the {@link Single} which *

                *
              • succeeds with the ConnAck message if it does not contain an Error Code (connected successfully), - *
              • errors with a {@link com.hivemq.client.mqtt.mqtt3.exceptions.Mqtt3ConnAckException + *
              • errors with a {@link com.hivemq.client2.mqtt.mqtt3.exceptions.Mqtt3ConnAckException * Mqtt3ConnAckException} wrapping the ConnAck message if it contains an Error Code or *
              • errors with a different exception if an error occurred before the Connect message was sent or * before the ConnAck message was received. @@ -103,7 +103,7 @@ public interface Mqtt3RxClient extends Mqtt3Client { *
                  *
                • succeeds with the SubAck message if at least one subscription of the Subscribe message was * successful (the SubAck message contains at least one Return Code that is not an Error Code), - *
                • errors with a {@link com.hivemq.client.mqtt.mqtt3.exceptions.Mqtt3SubAckException + *
                • errors with a {@link com.hivemq.client2.mqtt.mqtt3.exceptions.Mqtt3SubAckException * Mqtt3SubAckException} wrapping the SubAck message if it only contains Error Codes or *
                • errors with a different exception if an error occurred before the Subscribe message was sent or * before a SubAck message was received. @@ -141,11 +141,11 @@ public interface Mqtt3RxClient extends Mqtt3Client { * Error Code) and then emits the Publish messages matching the successful subscriptions of the * Subscribe message, *
                • completes when all subscriptions of the Subscribe message were unsubscribed, - *
                • errors with a {@link com.hivemq.client.mqtt.mqtt3.exceptions.Mqtt3SubAckException + *
                • errors with a {@link com.hivemq.client2.mqtt.mqtt3.exceptions.Mqtt3SubAckException * Mqtt3SubAckException} wrapping the SubAck message if it only contains Error Codes or *
                • errors with a different exception if an error occurred before the Subscribe message was sent, * before a SubAck message was received or when a error occurs before all subscriptions of the Subscribe - * message were unsubscribed (e.g. {@link com.hivemq.client.mqtt.exceptions.MqttSessionExpiredException + * message were unsubscribed (e.g. {@link com.hivemq.client2.mqtt.exceptions.MqttSessionExpiredException * MqttSessionExpiredException}). *
                * @see #subscribePublishes(Mqtt3Subscribe, boolean) @@ -171,11 +171,11 @@ public interface Mqtt3RxClient extends Mqtt3Client { * Error Code) and then emits the Publish messages matching the successful subscriptions of the * Subscribe message, *
              • completes when all subscriptions of the Subscribe message were unsubscribed, - *
              • errors with a {@link com.hivemq.client.mqtt.mqtt3.exceptions.Mqtt3SubAckException + *
              • errors with a {@link com.hivemq.client2.mqtt.mqtt3.exceptions.Mqtt3SubAckException * Mqtt3SubAckException} wrapping the SubAck message if it only contains Error Codes or *
              • errors with a different exception if an error occurred before the Subscribe message was sent, * before a SubAck message was received or when a error occurs before all subscriptions of the Subscribe - * message were unsubscribed (e.g. {@link com.hivemq.client.mqtt.exceptions.MqttSessionExpiredException + * message were unsubscribed (e.g. {@link com.hivemq.client2.mqtt.exceptions.MqttSessionExpiredException * MqttSessionExpiredException}). *
              * @see #subscribePublishes(Mqtt3Subscribe) @@ -211,7 +211,7 @@ public interface Mqtt3RxClient extends Mqtt3Client { *
                *
              • emits the incoming Publish messages matching the given filter, *
              • never completes but - *
              • errors with a {@link com.hivemq.client.mqtt.exceptions.MqttSessionExpiredException + *
              • errors with a {@link com.hivemq.client2.mqtt.exceptions.MqttSessionExpiredException * MqttSessionExpiredException} when the MQTT session expires. *
              * @see #publishes(MqttGlobalPublishFilter, boolean) @@ -232,7 +232,7 @@ public interface Mqtt3RxClient extends Mqtt3Client { *
                *
              • emits the incoming Publish messages matching the given filter, *
              • never completes but - *
              • errors with a {@link com.hivemq.client.mqtt.exceptions.MqttSessionExpiredException + *
              • errors with a {@link com.hivemq.client2.mqtt.exceptions.MqttSessionExpiredException * MqttSessionExpiredException} when the MQTT session expires. *
              * @see #publishes(MqttGlobalPublishFilter) diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3ConnAckException.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3ConnAckException.java similarity index 92% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3ConnAckException.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3ConnAckException.java index cc1c5c919..9fc7a9488 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3ConnAckException.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3ConnAckException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.exceptions; +package com.hivemq.client2.mqtt.mqtt3.exceptions; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3ConnAck; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3DisconnectException.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3DisconnectException.java similarity index 92% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3DisconnectException.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3DisconnectException.java index 4b71206ab..ce7657664 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3DisconnectException.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3DisconnectException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.exceptions; +package com.hivemq.client2.mqtt.mqtt3.exceptions; -import com.hivemq.client.mqtt.mqtt3.message.disconnect.Mqtt3Disconnect; +import com.hivemq.client2.mqtt.mqtt3.message.disconnect.Mqtt3Disconnect; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3MessageException.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3MessageException.java similarity index 86% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3MessageException.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3MessageException.java index 263b4fa13..a5178eb82 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3MessageException.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3MessageException.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.exceptions; +package com.hivemq.client2.mqtt.mqtt3.exceptions; -import com.hivemq.client.internal.util.AsyncRuntimeException; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; +import com.hivemq.client2.internal.util.AsyncRuntimeException; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3Message; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubAckException.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3PubAckException.java similarity index 92% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubAckException.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3PubAckException.java index 9a7c60cce..7923424a4 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubAckException.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3PubAckException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.exceptions; +package com.hivemq.client2.mqtt.mqtt3.exceptions; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PubAck; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3PubAck; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubRecException.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3PubRecException.java similarity index 92% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubRecException.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3PubRecException.java index 6f6c3dc4c..e23660ccc 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubRecException.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3PubRecException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.exceptions; +package com.hivemq.client2.mqtt.mqtt3.exceptions; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PubRec; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3PubRec; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3SubAckException.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3SubAckException.java similarity index 92% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3SubAckException.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3SubAckException.java index a2afe935b..d8fd4cd89 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3SubAckException.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3SubAckException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.exceptions; +package com.hivemq.client2.mqtt.mqtt3.exceptions; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3UnsubAckException.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3UnsubAckException.java similarity index 92% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3UnsubAckException.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3UnsubAckException.java index c7c5e9b7b..8abe1d291 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3UnsubAckException.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3UnsubAckException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.exceptions; +package com.hivemq.client2.mqtt.mqtt3.exceptions; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; +import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3UnsubAck; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ConnectedContext.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/lifecycle/Mqtt3ConnectedContext.java similarity index 78% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ConnectedContext.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/lifecycle/Mqtt3ConnectedContext.java index e2c26b5b8..f007cdae4 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3ConnectedContext.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/lifecycle/Mqtt3ConnectedContext.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.lifecycle; +package com.hivemq.client2.mqtt.mqtt3.lifecycle; -import com.hivemq.client.mqtt.lifecycle.MqttConnectedContext; -import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientConfig; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; +import com.hivemq.client2.mqtt.lifecycle.MqttConnectedContext; +import com.hivemq.client2.mqtt.mqtt3.Mqtt3ClientConfig; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3ConnAck; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3Connect; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** - * A {@link MqttConnectedContext} with methods specific to an {@link com.hivemq.client.mqtt.mqtt3.Mqtt3Client + * A {@link MqttConnectedContext} with methods specific to an {@link com.hivemq.client2.mqtt.mqtt3.Mqtt3Client * Mqtt3Client}. * * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3DisconnectedContext.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/lifecycle/Mqtt3DisconnectedContext.java similarity index 82% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3DisconnectedContext.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/lifecycle/Mqtt3DisconnectedContext.java index 97fa2d949..97c798c53 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3DisconnectedContext.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/lifecycle/Mqtt3DisconnectedContext.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.lifecycle; +package com.hivemq.client2.mqtt.mqtt3.lifecycle; -import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedContext; -import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientConfig; +import com.hivemq.client2.mqtt.lifecycle.MqttDisconnectedContext; +import com.hivemq.client2.mqtt.mqtt3.Mqtt3ClientConfig; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** - * A {@link MqttDisconnectedContext} with methods specific to an {@link com.hivemq.client.mqtt.mqtt3.Mqtt3Client + * A {@link MqttDisconnectedContext} with methods specific to an {@link com.hivemq.client2.mqtt.mqtt3.Mqtt3Client * Mqtt3Client}. * * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3Reconnector.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/lifecycle/Mqtt3Reconnector.java similarity index 83% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3Reconnector.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/lifecycle/Mqtt3Reconnector.java index e9d107982..b02ea1539 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/lifecycle/Mqtt3Reconnector.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/lifecycle/Mqtt3Reconnector.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.lifecycle; +package com.hivemq.client2.mqtt.mqtt3.lifecycle; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.MqttTransportConfig; -import com.hivemq.client.mqtt.MqttTransportConfigBuilder; -import com.hivemq.client.mqtt.lifecycle.MqttReconnector; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnectBuilder; +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.NotNull; import org.jetbrains.annotations.Nullable; @@ -31,7 +31,7 @@ import java.util.function.BiConsumer; /** - * A {@link MqttReconnector} with methods specific to an {@link com.hivemq.client.mqtt.mqtt3.Mqtt3Client Mqtt3Client}. + * A {@link MqttReconnector} with methods specific to an {@link com.hivemq.client2.mqtt.mqtt3.Mqtt3Client Mqtt3Client}. * * @author Silvio Giebl * @since 1.1 @@ -86,8 +86,8 @@ public interface Mqtt3Reconnector extends MqttReconnector { * Returns the currently set Connect message the client will try to reconnect with.@ *

              * If the {@link #connect(Mqtt3Connect)} method has not been called before (including previous {@link - * com.hivemq.client.mqtt.lifecycle.MqttDisconnectedListener MqttDisconnectedListener}s) it will be the Connect - * message that is reconstructed from the {@link com.hivemq.client.mqtt.mqtt3.Mqtt3ClientConnectionConfig + * com.hivemq.client2.mqtt.lifecycle.MqttDisconnectedListener MqttDisconnectedListener}s) it will be the Connect + * message that is reconstructed from the {@link com.hivemq.client2.mqtt.mqtt3.Mqtt3ClientConnectionConfig * Mqtt3ClientConnectionConfig} or the Connect message of the previous connect try if it has not been successfully * connected. * diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/Mqtt3Message.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/Mqtt3Message.java similarity index 95% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/Mqtt3Message.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/Mqtt3Message.java index 2c5848ded..a0ae82e16 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/Mqtt3Message.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/Mqtt3Message.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message; +package com.hivemq.client2.mqtt.mqtt3.message; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/Mqtt3MessageType.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/Mqtt3MessageType.java similarity index 97% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/Mqtt3MessageType.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/Mqtt3MessageType.java index b28220de0..bc0a9d086 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/Mqtt3MessageType.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/Mqtt3MessageType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message; +package com.hivemq.client2.mqtt.mqtt3.message; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/Mqtt3ReturnCode.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/Mqtt3ReturnCode.java similarity index 91% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/Mqtt3ReturnCode.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/Mqtt3ReturnCode.java index 7761f71d9..3c607f3bf 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/Mqtt3ReturnCode.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/Mqtt3ReturnCode.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message; +package com.hivemq.client2.mqtt.mqtt3.message; -import com.hivemq.client.internal.util.UnsignedDataTypes; +import com.hivemq.client2.internal.util.UnsignedDataTypes; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuth.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/auth/Mqtt3SimpleAuth.java similarity index 84% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuth.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/auth/Mqtt3SimpleAuth.java index d804db997..4a67f31c7 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuth.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/auth/Mqtt3SimpleAuth.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.auth; +package com.hivemq.client2.mqtt.mqtt3.message.auth; -import com.hivemq.client.internal.mqtt.message.auth.mqtt3.Mqtt3SimpleAuthViewBuilder; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.internal.mqtt.message.auth.mqtt3.Mqtt3SimpleAuthViewBuilder; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -25,7 +25,7 @@ import java.util.Optional; /** - * Simple authentication and/or authorization related data in an {@link com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect + * Simple authentication and/or authorization related data in an {@link com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3Connect * MQTT 3 Connect message}. * * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilder.java similarity index 95% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilder.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilder.java index ec173b0a2..139bd1fff 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.auth; +package com.hivemq.client2.mqtt.mqtt3.message.auth; -import com.hivemq.client.annotations.CheckReturnValue; +import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilderBase.java similarity index 93% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilderBase.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilderBase.java index 940b2a9df..66dc985b5 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/auth/Mqtt3SimpleAuthBuilderBase.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.auth; +package com.hivemq.client2.mqtt.mqtt3.message.auth; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.annotations.CheckReturnValue; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnAck.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3ConnAck.java similarity index 88% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnAck.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3ConnAck.java index 8b575a40a..2f46f8c05 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnAck.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3ConnAck.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.connect; +package com.hivemq.client2.mqtt.mqtt3.message.connect; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3Message; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnAckReturnCode.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3ConnAckReturnCode.java similarity index 95% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnAckReturnCode.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3ConnAckReturnCode.java index 799e3c585..687edf20c 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnAckReturnCode.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3ConnAckReturnCode.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.connect; +package com.hivemq.client2.mqtt.mqtt3.message.connect; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3ReturnCode; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3ReturnCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3Connect.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3Connect.java similarity index 84% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3Connect.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3Connect.java index 218603e3e..3dfe75f87 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3Connect.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3Connect.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.connect; +package com.hivemq.client2.mqtt.mqtt3.message.connect; -import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectViewBuilder; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; -import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; +import com.hivemq.client2.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectViewBuilder; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3Message; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3Publish; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilder.java similarity index 93% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilder.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilder.java index 629a06fb2..7f1a9e86e 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.connect; +package com.hivemq.client2.mqtt.mqtt3.message.connect; -import com.hivemq.client.annotations.CheckReturnValue; +import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -54,7 +54,7 @@ interface Nested

              extends Mqtt3ConnectBuilderBase> { } /** - * Builder for a {@link Mqtt3Connect} that is applied to a parent {@link com.hivemq.client.mqtt.mqtt3.Mqtt3Client} + * Builder for a {@link Mqtt3Connect} that is applied to a parent {@link com.hivemq.client2.mqtt.mqtt3.Mqtt3Client} * which then sends the Connect message. * * @param

              the type of the result when the built {@link Mqtt3Connect} is sent by the parent. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java similarity index 89% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java index c7455d830..15884717f 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3ConnectBuilderBase.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.connect; +package com.hivemq.client2.mqtt.mqtt3.message.connect; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuth; -import com.hivemq.client.mqtt.mqtt3.message.auth.Mqtt3SimpleAuthBuilder; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3WillPublishBuilder; +import com.hivemq.client2.annotations.CheckReturnValue; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +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.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/disconnect/Mqtt3Disconnect.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/disconnect/Mqtt3Disconnect.java similarity index 85% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/disconnect/Mqtt3Disconnect.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/disconnect/Mqtt3Disconnect.java index 77104ee08..ee588bbd6 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/disconnect/Mqtt3Disconnect.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/disconnect/Mqtt3Disconnect.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.disconnect; +package com.hivemq.client2.mqtt.mqtt3.message.disconnect; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3Message; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/ping/Mqtt3PingReq.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/ping/Mqtt3PingReq.java similarity index 85% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/ping/Mqtt3PingReq.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/ping/Mqtt3PingReq.java index 4433b6067..cbe7d52f8 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/ping/Mqtt3PingReq.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/ping/Mqtt3PingReq.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.ping; +package com.hivemq.client2.mqtt.mqtt3.message.ping; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3Message; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/ping/Mqtt3PingResp.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/ping/Mqtt3PingResp.java similarity index 85% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/ping/Mqtt3PingResp.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/ping/Mqtt3PingResp.java index 8d59477a5..9116a4cc9 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/ping/Mqtt3PingResp.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/ping/Mqtt3PingResp.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.ping; +package com.hivemq.client2.mqtt.mqtt3.message.ping; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3Message; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubAck.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PubAck.java similarity index 85% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubAck.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PubAck.java index acb75b5cd..f909a9d7d 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubAck.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PubAck.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.publish; +package com.hivemq.client2.mqtt.mqtt3.message.publish; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3Message; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubComp.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PubComp.java similarity index 85% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubComp.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PubComp.java index 9b421c75e..ae593dd21 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubComp.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PubComp.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.publish; +package com.hivemq.client2.mqtt.mqtt3.message.publish; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3Message; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubRec.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PubRec.java similarity index 85% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubRec.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PubRec.java index e00521a02..c7552d69a 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubRec.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PubRec.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.publish; +package com.hivemq.client2.mqtt.mqtt3.message.publish; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3Message; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubRel.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PubRel.java similarity index 85% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubRel.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PubRel.java index 1465af687..0e440cb0f 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PubRel.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PubRel.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.publish; +package com.hivemq.client2.mqtt.mqtt3.message.publish; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3Message; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3Publish.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3Publish.java similarity index 88% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3Publish.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3Publish.java index 9ab44edf6..04314b35b 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3Publish.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3Publish.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.publish; +package com.hivemq.client2.mqtt.mqtt3.message.publish; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PublishViewBuilder; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.datatypes.MqttTopic; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PublishViewBuilder; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.datatypes.MqttTopic; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3Message; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PublishBuilder.java similarity index 95% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishBuilder.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PublishBuilder.java index 63bc5014c..35a664596 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PublishBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.publish; +package com.hivemq.client2.mqtt.mqtt3.message.publish; -import com.hivemq.client.annotations.CheckReturnValue; +import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -70,7 +70,7 @@ interface Complete

              extends Nested

              , Mqtt3PublishBuilderBase.Complete the type of the result when the built {@link Mqtt3Publish} is sent by the parent. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PublishBuilderBase.java similarity index 92% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishBuilderBase.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PublishBuilderBase.java index 12b8e053f..a82a47d17 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PublishBuilderBase.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.publish; +package com.hivemq.client2.mqtt.mqtt3.message.publish; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.datatypes.MqttTopic; -import com.hivemq.client.mqtt.datatypes.MqttTopicBuilder; +import com.hivemq.client2.annotations.CheckReturnValue; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.datatypes.MqttTopic; +import com.hivemq.client2.mqtt.datatypes.MqttTopicBuilder; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishResult.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PublishResult.java similarity index 91% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishResult.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PublishResult.java index 150c602a8..37896daa5 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3PublishResult.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3PublishResult.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.publish; +package com.hivemq.client2.mqtt.mqtt3.message.publish; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -25,7 +25,7 @@ * Result for an {@link Mqtt3Publish MQTT 3 Publish message} sent by the client. *

              * The result is provided if a Publish message is successfully delivered (sent or acknowledged respectively to its - * {@link com.hivemq.client.mqtt.datatypes.MqttQos QoS} level). + * {@link com.hivemq.client2.mqtt.datatypes.MqttQos QoS} level). * * @author Silvio Giebl * @since 1.0 diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3WillPublishBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3WillPublishBuilder.java similarity index 95% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3WillPublishBuilder.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3WillPublishBuilder.java index 0201c76f7..6cb092ce6 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/publish/Mqtt3WillPublishBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/publish/Mqtt3WillPublishBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.publish; +package com.hivemq.client2.mqtt.mqtt3.message.publish; -import com.hivemq.client.annotations.CheckReturnValue; +import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAck.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubAck.java similarity index 81% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAck.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubAck.java index dfcf61bec..359b438be 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAck.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubAck.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.subscribe; +package com.hivemq.client2.mqtt.mqtt3.message.subscribe; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3Message; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Unmodifiable; @@ -35,8 +35,8 @@ public interface Mqtt3SubAck extends Mqtt3Message { /** - * @return the Return Codes of this SubAck message, each belonging to a {@link com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscription - * Subscription} in the corresponding {@link com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe + * @return the Return Codes of this SubAck message, each belonging to a {@link com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscription + * Subscription} in the corresponding {@link com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe * Subscribe message} in the same order. */ @Unmodifiable @NotNull List<@NotNull Mqtt3SubAckReturnCode> getReturnCodes(); diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAckReturnCode.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubAckReturnCode.java similarity index 95% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAckReturnCode.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubAckReturnCode.java index 2b4f7a81c..be51fd594 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAckReturnCode.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubAckReturnCode.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.subscribe; +package com.hivemq.client2.mqtt.mqtt3.message.subscribe; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3ReturnCode; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3ReturnCode; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3Subscribe.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3Subscribe.java similarity index 86% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3Subscribe.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3Subscribe.java index 283712b82..6ad1580c3 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3Subscribe.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3Subscribe.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.subscribe; +package com.hivemq.client2.mqtt.mqtt3.message.subscribe; -import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubscribeViewBuilder; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubscribeViewBuilder; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3Message; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java similarity index 95% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java index a0cbc40f1..054f32773 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.subscribe; +package com.hivemq.client2.mqtt.mqtt3.message.subscribe; -import com.hivemq.client.annotations.CheckReturnValue; +import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -108,7 +108,7 @@ interface Complete

              extends Nested.Start

              , Nested.Complete

              , } /** - * Builder for a {@link Mqtt3Subscribe} that is applied to a parent {@link com.hivemq.client.mqtt.mqtt3.Mqtt3Client + * Builder for a {@link Mqtt3Subscribe} that is applied to a parent {@link com.hivemq.client2.mqtt.mqtt3.Mqtt3Client * Mqtt3Client} which then sends the Subscribe message. * * @param

              the type of the result when the built {@link Mqtt3Subscribe} is sent by the parent. @@ -153,7 +153,7 @@ interface Complete

              extends Send.Start

              , Send.Complete

              , /** * Builder for a {@link Mqtt3Subscribe} and additional arguments that are applied to a parent {@link - * com.hivemq.client.mqtt.mqtt3.Mqtt3Client Mqtt3Client} subscribePublishes call. + * com.hivemq.client2.mqtt.mqtt3.Mqtt3Client Mqtt3Client} subscribePublishes call. * * @param

              the type of the result when the built {@link Mqtt3Subscribe} is applied to the parent. * @since 1.2 @@ -191,7 +191,7 @@ interface Complete

              extends Publishes.Start

              , Publishes.Complete

              , /** * Builder for additional arguments alongside the {@link Mqtt3Subscribe} that are applied to a parent {@link - * com.hivemq.client.mqtt.mqtt3.Mqtt3Client Mqtt3Client} subscribePublishes call. + * com.hivemq.client2.mqtt.mqtt3.Mqtt3Client Mqtt3Client} subscribePublishes call. * * @param

              the type of the result when the built {@link Mqtt3Subscribe} is applied to the parent. */ diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java similarity index 97% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java index 8e04e8797..827389765 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscribeBuilderBase.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.subscribe; +package com.hivemq.client2.mqtt.mqtt3.message.subscribe; -import com.hivemq.client.annotations.CheckReturnValue; +import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3Subscription.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3Subscription.java similarity index 87% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3Subscription.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3Subscription.java index 9363176bc..5bd948180 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3Subscription.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3Subscription.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.subscribe; +package com.hivemq.client2.mqtt.mqtt3.message.subscribe; -import com.hivemq.client.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubscriptionViewBuilder; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; +import com.hivemq.client2.internal.mqtt.message.subscribe.mqtt3.Mqtt3SubscriptionViewBuilder; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilter; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilder.java similarity index 95% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilder.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilder.java index e0cf72cd9..d6fc076d5 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.subscribe; +package com.hivemq.client2.mqtt.mqtt3.message.subscribe; -import com.hivemq.client.annotations.CheckReturnValue; +import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilderBase.java similarity index 90% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilderBase.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilderBase.java index bb75f1fbf..98ab6c48b 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubscriptionBuilderBase.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.subscribe; +package com.hivemq.client2.mqtt.mqtt3.message.subscribe; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilterBuilder; +import com.hivemq.client2.annotations.CheckReturnValue; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilter; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilterBuilder; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubAck.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubAck.java similarity index 85% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubAck.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubAck.java index 6e29fbd8b..b29c84146 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubAck.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubAck.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.unsubscribe; +package com.hivemq.client2.mqtt.mqtt3.message.unsubscribe; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3Message; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3Unsubscribe.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/unsubscribe/Mqtt3Unsubscribe.java similarity index 84% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3Unsubscribe.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/unsubscribe/Mqtt3Unsubscribe.java index 3f66770a1..34a63413b 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3Unsubscribe.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/unsubscribe/Mqtt3Unsubscribe.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.unsubscribe; +package com.hivemq.client2.mqtt.mqtt3.message.unsubscribe; -import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubscribeViewBuilder; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3Message; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubscribeViewBuilder; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilter; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3Message; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilder.java similarity index 96% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilder.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilder.java index 7895eeff0..de2e24fb1 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.unsubscribe; +package com.hivemq.client2.mqtt.mqtt3.message.unsubscribe; -import com.hivemq.client.annotations.CheckReturnValue; +import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -86,7 +86,7 @@ interface Start

              extends Nested

              , Mqtt3UnsubscribeBuilderBase.Start the type of the result when the built {@link Mqtt3Unsubscribe} is sent by the parent. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java similarity index 95% rename from src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java index d9288fd5f..c9a24258f 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/message/unsubscribe/Mqtt3UnsubscribeBuilderBase.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.unsubscribe; +package com.hivemq.client2.mqtt.mqtt3.message.unsubscribe; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilterBuilder; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; +import com.hivemq.client2.annotations.CheckReturnValue; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilter; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilterBuilder; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5AsyncClient.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5AsyncClient.java similarity index 92% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5AsyncClient.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5AsyncClient.java index 16ab6e273..5bafc0950 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5AsyncClient.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5AsyncClient.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5; - -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.MqttGlobalPublishFilter; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectBuilder; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectBuilder; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishBuilder; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubscribeBuilderBase; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubscribeBuilder; +package com.hivemq.client2.mqtt.mqtt5; + +import com.hivemq.client2.annotations.CheckReturnValue; +import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnectBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PublishBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PublishResult; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubscribeBuilderBase; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubscribeBuilder; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -64,7 +64,7 @@ public interface Mqtt5AsyncClient extends Mqtt5Client { *

                *
              • completes normally with the ConnAck message if it does not contain an Error Code (connected * successfully), - *
              • completes exceptionally with a {@link com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5ConnAckException + *
              • completes exceptionally with a {@link com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5ConnAckException * Mqtt5ConnAckException} wrapping the ConnAck message if it contains an Error Code or *
              • completes exceptionally with a different exception if an error occurred before the Connect message * was sent or before the ConnAck message was received. @@ -97,7 +97,7 @@ public interface Mqtt5AsyncClient extends Mqtt5Client { *
                  *
                • completes normally with the SubAck message if all subscriptions of the Subscribe message were * successful (the SubAck message contains no Error Codes), - *
                • completes exceptionally with a {@link com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5SubAckException + *
                • completes exceptionally with a {@link com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5SubAckException * Mqtt5SubAckException} wrapping the SubAck message if it contains at least one Error Code or *
                • completes exceptionally with a different exception if an error occurred before the Subscribe * message was sent or before a SubAck message was received. @@ -272,7 +272,7 @@ void publishes( *
                • completes normally with the UnsubAck message if all Topic Filters of the Unsubscribe message were * successfully unsubscribed (the UnsubAck message contains no Error Codes), *
                • completes exceptionally with a - * {@link com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5UnsubAckException Mqtt5UnsubAckException} + * {@link com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5UnsubAckException Mqtt5UnsubAckException} * wrapping the UnsubAck message if it contains at least one Error Code or *
                • completes exceptionally with a different exception if an error occurred before the Unsubscribe * message was sent or before a UnsubAck message was received. @@ -301,8 +301,8 @@ void publishes( *
                • completes normally with the {@link Mqtt5PublishResult} if the Publish message was successfully * published (no acknowledgement message contains an Error Code, {@link Mqtt5PublishResult#getError()} * will always be absent), - *
                • completes exceptionally with a {@link com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5PubAckException - * Mqtt5PubAckException} or {@link com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5PubRecException + *
                • completes exceptionally with a {@link com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5PubAckException + * Mqtt5PubAckException} or {@link com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5PubRecException * Mqtt5PubRecException} wrapping the acknowledgement message if it contains an Error Code or *
                • completes exceptionally with a different exception if an error occurred before the Publish message * was sent or before an acknowledgement message was received. @@ -328,7 +328,7 @@ void publishes( * @return a {@link CompletableFuture} which *
                    *
                  • completes normally when the client was successfully re-authenticated, - *
                  • errors with a {@link com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5AuthException Mqtt5AuthException} + *
                  • errors with a {@link com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5AuthException Mqtt5AuthException} * wrapping the Auth message with the Error Code if not re-authenticated successfully or *
                  • errors with a different exception if an error occurred before the first Auth message was sent or * before the last Auth message was received. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5BlockingClient.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5BlockingClient.java similarity index 83% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5BlockingClient.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5BlockingClient.java index 6ae2707e3..14e3d44c6 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5BlockingClient.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5BlockingClient.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5; +package com.hivemq.client2.mqtt.mqtt5; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.MqttGlobalPublishFilter; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectBuilder; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectBuilder; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishBuilder; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubscribeBuilder; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubscribeBuilder; +import com.hivemq.client2.annotations.CheckReturnValue; +import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnectBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PublishBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PublishResult; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubscribeBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubscribeBuilder; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -60,8 +60,8 @@ public interface Mqtt5BlockingClient extends Mqtt5Client { * * @param connect the Connect message sent to the broker. * @return the ConnAck message if it does not contain an Error Code (connected successfully). - * @throws com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5ConnAckException wrapping the ConnAck message if it contains - * an Error Code. + * @throws com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5ConnAckException wrapping the ConnAck message if it + * contains an Error Code. */ @NotNull Mqtt5ConnAck connect(@NotNull Mqtt5Connect connect); @@ -85,7 +85,7 @@ public interface Mqtt5BlockingClient extends Mqtt5Client { * @param subscribe the Subscribe messages sent to the broker. * @return the SubAck message if all subscriptions of the Subscribe message were successful (the SubAck message * contains no Error Codes). - * @throws com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5SubAckException wrapping the SubAck message if it contains + * @throws com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5SubAckException wrapping the SubAck message if it contains * at least one Error Code. */ @NotNull Mqtt5SubAck subscribe(@NotNull Mqtt5Subscribe subscribe); @@ -128,7 +128,7 @@ public interface Mqtt5BlockingClient extends Mqtt5Client { * @param unsubscribe the Unsubscribe message sent to the broker. * @return the UnsubAck message if all Topic Filters of the Unsubscribe message were successfully unsubscribed (the * UnsubAck message contains no Error Codes). - * @throws com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5UnsubAckException wrapping the UnsubAck message if it + * @throws com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5UnsubAckException wrapping the UnsubAck message if it * contains at least one Error Code. */ @NotNull Mqtt5UnsubAck unsubscribe(@NotNull Mqtt5Unsubscribe unsubscribe); @@ -151,9 +151,9 @@ public interface Mqtt5BlockingClient extends Mqtt5Client { * @param publish the Publish message sent to the broker. * @return the {@link Mqtt5PublishResult} if the Publish message was successfully published (no acknowledgement * message contains an Error Code, {@link Mqtt5PublishResult#getError()} will always be absent). - * @throws com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5PubAckException wrapping the corresponding PubAck message if + * @throws com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5PubAckException wrapping the corresponding PubAck message if * it contains an Error Code. - * @throws com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5PubRecException wrapping the corresponding PubRec message if + * @throws com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5PubRecException wrapping the corresponding PubRec message if * it contains an Error Code. */ @NotNull Mqtt5PublishResult publish(@NotNull Mqtt5Publish publish); @@ -173,7 +173,7 @@ public interface Mqtt5BlockingClient extends Mqtt5Client { /** * Re-authenticates this client. * - * @throws com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5AuthException wrapping the Auth message with the Error Code + * @throws com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5AuthException wrapping the Auth message with the Error Code * if not re-authenticated successfully. */ void reauth(); diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5Client.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5Client.java similarity index 91% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5Client.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5Client.java index bcda9b535..b5f65eb8e 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5Client.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5Client.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5; +package com.hivemq.client2.mqtt.mqtt5; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.internal.mqtt.MqttRxClientBuilder; -import com.hivemq.client.mqtt.MqttClient; +import com.hivemq.client2.annotations.CheckReturnValue; +import com.hivemq.client2.internal.mqtt.MqttRxClientBuilder; +import com.hivemq.client2.mqtt.MqttClient; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5ClientBuilder.java similarity index 88% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientBuilder.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5ClientBuilder.java index a3aa644ea..eac5b6057 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5ClientBuilder.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5; +package com.hivemq.client2.mqtt.mqtt5; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.MqttClientBuilderBase; -import com.hivemq.client.mqtt.mqtt5.advanced.Mqtt5AdvancedConfig; -import com.hivemq.client.mqtt.mqtt5.advanced.Mqtt5AdvancedConfigBuilder; -import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuthBuilder; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublishBuilder; +import com.hivemq.client2.annotations.CheckReturnValue; +import com.hivemq.client2.mqtt.MqttClientBuilderBase; +import com.hivemq.client2.mqtt.mqtt5.advanced.Mqtt5AdvancedConfig; +import com.hivemq.client2.mqtt.mqtt5.advanced.Mqtt5AdvancedConfigBuilder; +import com.hivemq.client2.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5SimpleAuthBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5WillPublishBuilder; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConfig.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5ClientConfig.java similarity index 72% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConfig.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5ClientConfig.java index 1adff4031..00edd643d 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConfig.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5ClientConfig.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5; +package com.hivemq.client2.mqtt.mqtt5; -import com.hivemq.client.mqtt.MqttClientConfig; -import com.hivemq.client.mqtt.mqtt5.advanced.Mqtt5AdvancedConfig; -import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublish; +import com.hivemq.client2.mqtt.MqttClientConfig; +import com.hivemq.client2.mqtt.mqtt5.advanced.Mqtt5AdvancedConfig; +import com.hivemq.client2.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5WillPublish; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -46,11 +46,11 @@ public interface Mqtt5ClientConfig extends MqttClientConfig { /** * Returns the optional simple authentication and/or authorization related data of the client. *

                    - * It is used as default if {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect#getSimpleAuth() + * It is used as default if {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect#getSimpleAuth() * Mqtt5Connect.simpleAuth} is not set during connect. *

                    * Keep in mind that the data is stored with the client in memory. If you want to use it only during connect or if - * you use a different token for each connection please set {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect#getSimpleAuth() + * you use a different token for each connection please set {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect#getSimpleAuth() * Mqtt5Connect.simpleAuth} instead. * * @return the optional simple authentication and/or authorization related data of the client. @@ -61,11 +61,11 @@ public interface Mqtt5ClientConfig extends MqttClientConfig { /** * Returns the optional enhanced authentication and/or authorization mechanism of the client. *

                    - * It is used as default if {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect#getEnhancedAuthMechanism() + * It is used as default if {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect#getEnhancedAuthMechanism() * Mqtt5Connect.enhancedAuthMechanism} is not set during connect. *

                    * Keep in mind that the mechanism is stored with the client in memory. If you use a different mechanism for each - * connection please set {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect#getEnhancedAuthMechanism() + * connection please set {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect#getEnhancedAuthMechanism() * Mqtt5Connect.enhancedAuthMechanism} instead. * * @return the optional enhanced authentication and/or authorization mechanism of the client. @@ -76,11 +76,11 @@ public interface Mqtt5ClientConfig extends MqttClientConfig { /** * Returns the optional Will Publish of the client. *

                    - * It is used as default if {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect#getWillPublish() + * It is used as default if {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect#getWillPublish() * Mqtt5Connect.willPublish} is not set during connect. *

                    * Keep in mind that the Will Publish is stored with the client in memory. If you use a different Will Publish for - * each connection please set {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect#getWillPublish() + * each connection please set {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect#getWillPublish() * Mqtt5Connect.willPublish} instead. * * @return the optional Will Publish of the client. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConnectionConfig.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5ClientConnectionConfig.java similarity index 75% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConnectionConfig.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5ClientConnectionConfig.java index a9619552c..3f8979f90 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5ClientConnectionConfig.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5ClientConnectionConfig.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5; +package com.hivemq.client2.mqtt.mqtt5; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.mqtt.MqttClientConnectionConfig; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.mqtt.MqttClientConnectionConfig; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Range; @@ -66,7 +66,7 @@ interface RestrictionsForServer { * Returns the maximum amount of not acknowledged publishes with QoS 1 or 2 the client accepts from the server * concurrently. *

                    - * The value is determined by {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions#getReceiveMaximum + * The value is determined by {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions#getReceiveMaximum * Mqtt5ConnectRestrictions#getReceiveMaximum()}. * * @return the maximum amount of not acknowledged publishes with QoS 1 or 2 the client accepts from the server @@ -77,7 +77,7 @@ interface RestrictionsForServer { /** * Returns the maximum packet size the client accepts from the server. *

                    - * The value is determined by {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions#getMaximumPacketSize + * The value is determined by {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions#getMaximumPacketSize * Mqtt5ConnectRestrictions#getMaximumPacketSize()}. * * @return the maximum packet size the client accepts from the server. @@ -87,7 +87,7 @@ interface RestrictionsForServer { /** * Returns the maximum amount of topic aliases the client accepts from the server. *

                    - * The value is determined by {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions#getTopicAliasMaximum + * The value is determined by {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions#getTopicAliasMaximum * Mqtt5ConnectRestrictions#getTopicAliasMaximum()}. * * @return the maximum amount of topic aliases the client accepts from the server. @@ -97,7 +97,7 @@ interface RestrictionsForServer { /** * Returns whether the client requested problem information from the server. *

                    - * The value is determined by {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions#isRequestProblemInformation + * The value is determined by {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions#isRequestProblemInformation * Mqtt5ConnectRestrictions#isRequestProblemInformation()}. * * @return whether the client requested problem information from the server. @@ -107,7 +107,7 @@ interface RestrictionsForServer { /** * Returns whether the client requested response information from the server. *

                    - * The value is determined by {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions#isRequestResponseInformation + * The value is determined by {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions#isRequestResponseInformation * Mqtt5ConnectRestrictions#isRequestResponseInformation()}. * * @return whether the client requested response information from the server. @@ -125,8 +125,8 @@ interface RestrictionsForClient { * Returns the maximum amount of not acknowledged publishes with QoS 1 or 2 the client sends to the server * concurrently. *

                    - * The value is determined by the minimum of {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions#getSendMaximum - * Mqtt5ConnectRestrictions#getSendMaximum()} and {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#getReceiveMaximum() + * The value is determined by the minimum of {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions#getSendMaximum + * Mqtt5ConnectRestrictions#getSendMaximum()} and {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#getReceiveMaximum() * MqttConnAckRestrictions#getReceiveMaximum()}. * * @return the maximum amount of not acknowledged publishes with QoS 1 or 2 the client sends to the server @@ -137,8 +137,8 @@ interface RestrictionsForClient { /** * Returns the maximum packet size the client sends to the server. *

                    - * The value is determined by the minimum of {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions#getSendMaximumPacketSize - * Mqtt5ConnectRestrictions#getSendMaximumPacketSize()} and {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#getMaximumPacketSize() + * The value is determined by the minimum of {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions#getSendMaximumPacketSize + * Mqtt5ConnectRestrictions#getSendMaximumPacketSize()} and {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#getMaximumPacketSize() * MqttConnAckRestrictions#getMaximumPacketSize()}. * * @return the maximum packet size the client sends to the server. @@ -148,8 +148,8 @@ interface RestrictionsForClient { /** * Returns the maximum amount of topic aliases the client sends to the server. *

                    - * The value is determined by the minimum of {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions#getSendTopicAliasMaximum - * Mqtt5ConnectRestrictions#getSendTopicAliasMaximum()} and {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#getTopicAliasMaximum() + * The value is determined by the minimum of {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions#getSendTopicAliasMaximum + * Mqtt5ConnectRestrictions#getSendTopicAliasMaximum()} and {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#getTopicAliasMaximum() * MqttConnAckRestrictions#getTopicAliasMaximum()}. * * @return the maximum amount of topic aliases the client sends to the server. @@ -159,7 +159,7 @@ interface RestrictionsForClient { /** * Returns the maximum {@link MqttQos QoS} the server accepts from the client. *

                    - * The value is determined by {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#getMaximumQos() + * The value is determined by {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#getMaximumQos() * MqttConnAckRestrictions#getMaximumQos()}. * * @return the maximum QoS the server accepts from the client. @@ -169,7 +169,7 @@ interface RestrictionsForClient { /** * Returns whether the server accepts retained messages from the client. *

                    - * The value is determined by {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#isRetainAvailable() + * The value is determined by {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#isRetainAvailable() * MqttConnAckRestrictions#isRetainAvailable()}. * * @return whether the server accepts retained messages from the client. @@ -179,7 +179,7 @@ interface RestrictionsForClient { /** * Returns whether the server accepts wildcard subscriptions from the client. *

                    - * The value is determined by {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#isWildcardSubscriptionAvailable() + * The value is determined by {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#isWildcardSubscriptionAvailable() * MqttConnAckRestrictions#isWildcardSubscriptionAvailable()}. * * @return whether the server accepts wildcard subscriptions. @@ -189,7 +189,7 @@ interface RestrictionsForClient { /** * Returns whether the server accepts shared subscriptions from the client. *

                    - * The value is determined by {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#isSharedSubscriptionAvailable() + * The value is determined by {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#isSharedSubscriptionAvailable() * MqttConnAckRestrictions#isSharedSubscriptionAvailable()}. * * @return whether the server accepts shared subscriptions from the client. @@ -199,7 +199,7 @@ interface RestrictionsForClient { /** * Returns whether the server accepts subscription identifiers from the client. *

                    - * The value is determined by {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#areSubscriptionIdentifiersAvailable() + * The value is determined by {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions#areSubscriptionIdentifiersAvailable() * MqttConnAckRestrictions#areSubscriptionIdentifiersAvailable()}. * * @return whether the server accepts subscription identifiers from the client. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5RxClient.java similarity index 89% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5RxClient.java index 7f6d20724..465e6ccbd 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/Mqtt5RxClient.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5RxClient.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5; +package com.hivemq.client2.mqtt.mqtt5; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.MqttGlobalPublishFilter; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectBuilder; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectBuilder; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubscribeBuilder; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubscribeBuilder; -import com.hivemq.client.rx.FlowableWithSingle; +import com.hivemq.client2.annotations.CheckReturnValue; +import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnectBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PublishResult; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubscribeBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubscribeBuilder; +import com.hivemq.client2.rx.FlowableWithSingle; import io.reactivex.rxjava3.core.Completable; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.core.Single; @@ -68,7 +68,7 @@ public interface Mqtt5RxClient extends Mqtt5Client { * @return the {@link Single} which *

                      *
                    • succeeds with the ConnAck message if it does not contain an Error Code (connected successfully), - *
                    • errors with a {@link com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5ConnAckException + *
                    • errors with a {@link com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5ConnAckException * Mqtt5ConnAckException} wrapping the ConnAck message if it contains an Error Code or *
                    • errors with a different exception if an error occurred before the Connect message was sent or * before the ConnAck message was received. @@ -105,7 +105,7 @@ public interface Mqtt5RxClient extends Mqtt5Client { *
                        *
                      • succeeds with the SubAck message if at least one subscription of the Subscribe message was * successful (the SubAck message contains at least one Reason Code that is not an Error Code), - *
                      • errors with a {@link com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5SubAckException + *
                      • errors with a {@link com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5SubAckException * Mqtt5SubAckException} wrapping the SubAck message if it only contains Error Codes or *
                      • errors with a different exception if an error occurred before the Subscribe message was sent or * before a SubAck message was received. @@ -143,11 +143,11 @@ public interface Mqtt5RxClient extends Mqtt5Client { * Error Code) and then emits the Publish messages matching the successful subscriptions of the * Subscribe message, *
                      • completes when all subscriptions of the Subscribe message were unsubscribed, - *
                      • errors with a {@link com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5SubAckException + *
                      • errors with a {@link com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5SubAckException * Mqtt5SubAckException} wrapping the SubAck message if it only contains Error Codes or *
                      • errors with a different exception if an error occurred before the Subscribe message was sent, * before a SubAck message was received or when a error occurs before all subscriptions of the Subscribe - * message were unsubscribed (e.g. {@link com.hivemq.client.mqtt.exceptions.MqttSessionExpiredException + * message were unsubscribed (e.g. {@link com.hivemq.client2.mqtt.exceptions.MqttSessionExpiredException * MqttSessionExpiredException}). *
                      * @see #subscribePublishes(Mqtt5Subscribe, boolean) @@ -173,11 +173,11 @@ public interface Mqtt5RxClient extends Mqtt5Client { * Error Code) and then emits the Publish messages matching the successful subscriptions of the * Subscribe message, *
                    • completes when all subscriptions of the Subscribe message were unsubscribed, - *
                    • errors with a {@link com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5SubAckException + *
                    • errors with a {@link com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5SubAckException * Mqtt5SubAckException} wrapping the SubAck message if it only contains Error Codes or *
                    • errors with a different exception if an error occurred before the Subscribe message was sent, * before a SubAck message was received or when a error occurs before all subscriptions of the Subscribe - * message were unsubscribed (e.g. {@link com.hivemq.client.mqtt.exceptions.MqttSessionExpiredException + * message were unsubscribed (e.g. {@link com.hivemq.client2.mqtt.exceptions.MqttSessionExpiredException * MqttSessionExpiredException}). *
                    * @see #subscribePublishes(Mqtt5Subscribe) @@ -213,7 +213,7 @@ public interface Mqtt5RxClient extends Mqtt5Client { *
                      *
                    • emits the incoming Publish messages matching the given filter, *
                    • never completes but - *
                    • errors with a {@link com.hivemq.client.mqtt.exceptions.MqttSessionExpiredException + *
                    • errors with a {@link com.hivemq.client2.mqtt.exceptions.MqttSessionExpiredException * MqttSessionExpiredException} when the MQTT session expires. *
                    * @see #publishes(MqttGlobalPublishFilter, boolean) @@ -234,7 +234,7 @@ public interface Mqtt5RxClient extends Mqtt5Client { *
                      *
                    • emits the incoming Publish messages matching the given filter, *
                    • never completes but - *
                    • errors with a {@link com.hivemq.client.mqtt.exceptions.MqttSessionExpiredException + *
                    • errors with a {@link com.hivemq.client2.mqtt.exceptions.MqttSessionExpiredException * MqttSessionExpiredException} when the MQTT session expires. *
                    * @see #publishes(MqttGlobalPublishFilter) @@ -256,7 +256,7 @@ public interface Mqtt5RxClient extends Mqtt5Client { *
                  • succeeds with the UnsubAck message if at least one Topic Filter of the Unsubscribe message was * successfully unsubscribed (the UnsubAck message contains at least one Reason Code that is not an * Error Code), - *
                  • errors with a {@link com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5UnsubAckException + *
                  • errors with a {@link com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5UnsubAckException * Mqtt5UnsubAckException} wrapping the UnsubAck message if it only contains Error Codes or *
                  • errors with a different exception if an error occurred before the Unsubscribe message was sent or * before a UnsubAck message was received. @@ -308,7 +308,7 @@ public interface Mqtt5RxClient extends Mqtt5Client { * @return the {@link Completable} which *
                      *
                    • completes when the client was successfully re-authenticated, - *
                    • errors with a {@link com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5AuthException Mqtt5AuthException} + *
                    • errors with a {@link com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5AuthException Mqtt5AuthException} * wrapping the Auth message with the Error Code if not re-authenticated successfully or *
                    • errors with a different exception if an error occurred before the first Auth message was sent or * before the last Auth message was received. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfig.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/Mqtt5AdvancedConfig.java similarity index 81% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfig.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/Mqtt5AdvancedConfig.java index 38d85f2c9..3e2c56771 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfig.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/Mqtt5AdvancedConfig.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.advanced; +package com.hivemq.client2.mqtt.mqtt5.advanced; -import com.hivemq.client.internal.mqtt.advanced.MqttAdvancedConfigBuilder; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.Mqtt5ClientInterceptors; +import com.hivemq.client2.internal.mqtt.advanced.MqttAdvancedConfigBuilder; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.Mqtt5ClientInterceptors; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** - * Advanced configuration of an {@link com.hivemq.client.mqtt.mqtt5.Mqtt5Client Mqtt5Client}. + * Advanced configuration of an {@link com.hivemq.client2.mqtt.mqtt5.Mqtt5Client Mqtt5Client}. * * @author Silvio Giebl * @since 1.0 @@ -41,7 +41,7 @@ public interface Mqtt5AdvancedConfig { } /** - * Returns whether the payload format is validated if {@link com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish#getPayloadFormatIndicator + * Returns whether the payload format is validated if {@link com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish#getPayloadFormatIndicator * Mqtt5Publish#getPayloadFormatIndicator()} is present. * * @return whether the payload format is validated. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilder.java similarity index 94% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilder.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilder.java index b20ce63a9..6addfc126 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.advanced; +package com.hivemq.client2.mqtt.mqtt5.advanced; -import com.hivemq.client.annotations.CheckReturnValue; +import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java similarity index 89% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java index 88daea65b..5d378ee9c 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/Mqtt5AdvancedConfigBuilderBase.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.advanced; +package com.hivemq.client2.mqtt.mqtt5.advanced; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.Mqtt5ClientInterceptors; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.Mqtt5ClientInterceptorsBuilder; +import com.hivemq.client2.annotations.CheckReturnValue; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.Mqtt5ClientInterceptors; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.Mqtt5ClientInterceptorsBuilder; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptors.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptors.java similarity index 75% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptors.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptors.java index 500cf92f6..b5f612c5d 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptors.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptors.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.advanced.interceptor; +package com.hivemq.client2.mqtt.mqtt5.advanced.interceptor; -import com.hivemq.client.internal.mqtt.advanced.interceptor.MqttClientInterceptorsBuilder; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5InboundQos1Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5OutboundQos1Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5InboundQos2Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutboundQos2Interceptor; +import com.hivemq.client2.internal.mqtt.advanced.interceptor.MqttClientInterceptorsBuilder; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5InboundQos1Interceptor; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5OutboundQos1Interceptor; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5InboundQos2Interceptor; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutboundQos2Interceptor; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** - * Collection of interceptors of MQTT messages received or sent by an {@link com.hivemq.client.mqtt.mqtt5.Mqtt5Client + * Collection of interceptors of MQTT messages received or sent by an {@link com.hivemq.client2.mqtt.mqtt5.Mqtt5Client * MQTT5Client}. * * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilder.java similarity index 93% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilder.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilder.java index d6bf3e6b3..f0ad6e64f 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.advanced.interceptor; +package com.hivemq.client2.mqtt.mqtt5.advanced.interceptor; -import com.hivemq.client.annotations.CheckReturnValue; +import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilderBase.java similarity index 75% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilderBase.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilderBase.java index acfbf02a0..40fb9f5bf 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/Mqtt5ClientInterceptorsBuilderBase.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.advanced.interceptor; +package com.hivemq.client2.mqtt.mqtt5.advanced.interceptor; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5InboundQos1Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5OutboundQos1Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5InboundQos2Interceptor; -import com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutboundQos2Interceptor; +import com.hivemq.client2.annotations.CheckReturnValue; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5InboundQos1Interceptor; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos1.Mqtt5OutboundQos1Interceptor; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5InboundQos2Interceptor; +import com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos2.Mqtt5OutboundQos2Interceptor; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5InboundQos1Interceptor.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5InboundQos1Interceptor.java similarity index 85% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5InboundQos1Interceptor.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5InboundQos1Interceptor.java index 053c821e1..34952e856 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5InboundQos1Interceptor.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5InboundQos1Interceptor.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1; +package com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos1; -import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAckBuilder; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5ClientConfig; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubAckBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5OutboundQos1Interceptor.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5OutboundQos1Interceptor.java similarity index 84% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5OutboundQos1Interceptor.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5OutboundQos1Interceptor.java index 34142ff3d..45d13c7a4 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5OutboundQos1Interceptor.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/qos1/Mqtt5OutboundQos1Interceptor.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos1; +package com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos1; -import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAck; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5ClientConfig; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubAck; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5InboundQos2Interceptor.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5InboundQos2Interceptor.java similarity index 84% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5InboundQos2Interceptor.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5InboundQos2Interceptor.java index 7699bcaf5..a8445b476 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5InboundQos2Interceptor.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5InboundQos2Interceptor.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2; +package com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos2; -import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompBuilder; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecBuilder; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRel; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5ClientConfig; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubCompBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRecBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRel; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutboundQos2Interceptor.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutboundQos2Interceptor.java similarity index 93% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutboundQos2Interceptor.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutboundQos2Interceptor.java index c71db1697..1592f2d5d 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutboundQos2Interceptor.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/advanced/interceptor/qos2/Mqtt5OutboundQos2Interceptor.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.advanced.interceptor.qos2; +package com.hivemq.client2.mqtt.mqtt5.advanced.interceptor.qos2; -import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; -import com.hivemq.client.mqtt.mqtt5.message.publish.*; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5ClientConfig; +import com.hivemq.client2.mqtt.mqtt5.message.publish.*; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java similarity index 92% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java index 32aa0de1a..f15f16b6b 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/auth/Mqtt5EnhancedAuthMechanism.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.auth; - -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5Auth; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5AuthBuilder; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuthBuilder; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +package com.hivemq.client2.mqtt.mqtt5.auth; + +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5ClientConfig; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5Auth; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5AuthBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuthBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserProperties.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/datatypes/Mqtt5UserProperties.java similarity index 90% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserProperties.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/datatypes/Mqtt5UserProperties.java index d478c8f20..1c7a8a9b8 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserProperties.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/datatypes/Mqtt5UserProperties.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.datatypes; +package com.hivemq.client2.mqtt.mqtt5.datatypes; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; -import com.hivemq.client.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImplBuilder; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilder.java similarity index 94% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilder.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilder.java index 606aaec7d..049cb22db 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.datatypes; +package com.hivemq.client2.mqtt.mqtt5.datatypes; -import com.hivemq.client.annotations.CheckReturnValue; +import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilderBase.java similarity index 94% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilderBase.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilderBase.java index d54d25472..7ae9479ae 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/datatypes/Mqtt5UserPropertiesBuilderBase.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.datatypes; +package com.hivemq.client2.mqtt.mqtt5.datatypes; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.annotations.CheckReturnValue; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserProperty.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/datatypes/Mqtt5UserProperty.java similarity index 89% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserProperty.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/datatypes/Mqtt5UserProperty.java index 143c8d039..98ad49837 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/datatypes/Mqtt5UserProperty.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/datatypes/Mqtt5UserProperty.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.datatypes; +package com.hivemq.client2.mqtt.mqtt5.datatypes; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.util.MqttChecks; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.util.MqttChecks; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5AuthException.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5AuthException.java similarity index 92% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5AuthException.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5AuthException.java index e81c394e9..c2db3f388 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5AuthException.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5AuthException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.exceptions; +package com.hivemq.client2.mqtt.mqtt5.exceptions; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5Auth; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5Auth; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5ConnAckException.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5ConnAckException.java similarity index 92% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5ConnAckException.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5ConnAckException.java index 396951d02..b3b79307d 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5ConnAckException.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5ConnAckException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.exceptions; +package com.hivemq.client2.mqtt.mqtt5.exceptions; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5DisconnectException.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5DisconnectException.java similarity index 92% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5DisconnectException.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5DisconnectException.java index 19cf7bead..106e213df 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5DisconnectException.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5DisconnectException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.exceptions; +package com.hivemq.client2.mqtt.mqtt5.exceptions; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5MessageException.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5MessageException.java similarity index 86% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5MessageException.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5MessageException.java index 779bf0612..b98acaf28 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5MessageException.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5MessageException.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.exceptions; +package com.hivemq.client2.mqtt.mqtt5.exceptions; -import com.hivemq.client.internal.util.AsyncRuntimeException; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; +import com.hivemq.client2.internal.util.AsyncRuntimeException; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5Message; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubAckException.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5PubAckException.java similarity index 91% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubAckException.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5PubAckException.java index 39f756e59..bd137bb1d 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubAckException.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5PubAckException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.exceptions; +package com.hivemq.client2.mqtt.mqtt5.exceptions; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAck; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubAck; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubRecException.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5PubRecException.java similarity index 91% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubRecException.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5PubRecException.java index a6ffeb1f1..79b31d969 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubRecException.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5PubRecException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.exceptions; +package com.hivemq.client2.mqtt.mqtt5.exceptions; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRec; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRec; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5SubAckException.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5SubAckException.java similarity index 91% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5SubAckException.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5SubAckException.java index e4b2d4e39..4d59a026d 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5SubAckException.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5SubAckException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.exceptions; +package com.hivemq.client2.mqtt.mqtt5.exceptions; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5UnsubAckException.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5UnsubAckException.java similarity index 91% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5UnsubAckException.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5UnsubAckException.java index d01fb09de..570b7fc6c 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5UnsubAckException.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5UnsubAckException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.exceptions; +package com.hivemq.client2.mqtt.mqtt5.exceptions; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ConnectedContext.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/lifecycle/Mqtt5ConnectedContext.java similarity index 78% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ConnectedContext.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/lifecycle/Mqtt5ConnectedContext.java index 327cb44d2..f46466943 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5ConnectedContext.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/lifecycle/Mqtt5ConnectedContext.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.lifecycle; +package com.hivemq.client2.mqtt.mqtt5.lifecycle; -import com.hivemq.client.mqtt.lifecycle.MqttConnectedContext; -import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; +import com.hivemq.client2.mqtt.lifecycle.MqttConnectedContext; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5ClientConfig; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** - * A {@link MqttConnectedContext} with methods specific to an {@link com.hivemq.client.mqtt.mqtt5.Mqtt5Client + * A {@link MqttConnectedContext} with methods specific to an {@link com.hivemq.client2.mqtt.mqtt5.Mqtt5Client * Mqtt5Client}. * * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5DisconnectedContext.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/lifecycle/Mqtt5DisconnectedContext.java similarity index 82% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5DisconnectedContext.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/lifecycle/Mqtt5DisconnectedContext.java index 8006da7c6..cc0c4c0c7 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5DisconnectedContext.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/lifecycle/Mqtt5DisconnectedContext.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.lifecycle; +package com.hivemq.client2.mqtt.mqtt5.lifecycle; -import com.hivemq.client.mqtt.lifecycle.MqttDisconnectedContext; -import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; +import com.hivemq.client2.mqtt.lifecycle.MqttDisconnectedContext; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5ClientConfig; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** - * A {@link MqttDisconnectedContext} with methods specific to an {@link com.hivemq.client.mqtt.mqtt5.Mqtt5Client + * A {@link MqttDisconnectedContext} with methods specific to an {@link com.hivemq.client2.mqtt.mqtt5.Mqtt5Client * Mqtt5Client}. * * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5Reconnector.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/lifecycle/Mqtt5Reconnector.java similarity index 83% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5Reconnector.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/lifecycle/Mqtt5Reconnector.java index be56a2fa6..bf9efe81e 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/lifecycle/Mqtt5Reconnector.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/lifecycle/Mqtt5Reconnector.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.lifecycle; +package com.hivemq.client2.mqtt.mqtt5.lifecycle; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.MqttTransportConfig; -import com.hivemq.client.mqtt.MqttTransportConfigBuilder; -import com.hivemq.client.mqtt.lifecycle.MqttReconnector; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectBuilder; +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.mqtt5.message.connect.Mqtt5Connect; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnectBuilder; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -31,7 +31,7 @@ import java.util.function.BiConsumer; /** - * A {@link MqttReconnector} with methods specific to an {@link com.hivemq.client.mqtt.mqtt5.Mqtt5Client Mqtt5Client}. + * A {@link MqttReconnector} with methods specific to an {@link com.hivemq.client2.mqtt.mqtt5.Mqtt5Client Mqtt5Client}. * * @author Silvio Giebl * @since 1.1 @@ -86,8 +86,8 @@ public interface Mqtt5Reconnector extends MqttReconnector { * Returns the currently set Connect message the client will try to reconnect with. *

                      * If the {@link #connect(Mqtt5Connect)} method has not been called before (including previous {@link - * com.hivemq.client.mqtt.lifecycle.MqttDisconnectedListener MqttDisconnectedListener}s) it will be the Connect - * message that is reconstructed from the {@link com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConnectionConfig + * com.hivemq.client2.mqtt.lifecycle.MqttDisconnectedListener MqttDisconnectedListener}s) it will be the Connect + * message that is reconstructed from the {@link com.hivemq.client2.mqtt.mqtt5.Mqtt5ClientConnectionConfig * Mqtt5ClientConnectionConfig} or the Connect message of the previous connect try if it has not been successfully * connected. * diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5Message.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/Mqtt5Message.java similarity index 95% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5Message.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/Mqtt5Message.java index 8cd0a61d4..d5d962d93 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5Message.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/Mqtt5Message.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message; +package com.hivemq.client2.mqtt.mqtt5.message; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5MessageType.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/Mqtt5MessageType.java similarity index 97% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5MessageType.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/Mqtt5MessageType.java index 5eb259a75..f2d408b5d 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5MessageType.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/Mqtt5MessageType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message; +package com.hivemq.client2.mqtt.mqtt5.message; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5ReasonCode.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/Mqtt5ReasonCode.java similarity index 94% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5ReasonCode.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/Mqtt5ReasonCode.java index aca77fed5..5b5741b32 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5ReasonCode.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/Mqtt5ReasonCode.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message; +package com.hivemq.client2.mqtt.mqtt5.message; -import com.hivemq.client.internal.util.UnsignedDataTypes; +import com.hivemq.client2.internal.util.UnsignedDataTypes; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5Auth.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5Auth.java similarity index 83% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5Auth.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5Auth.java index 30d1460a5..aa1dc8933 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5Auth.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5Auth.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.auth; +package com.hivemq.client2.mqtt.mqtt5.message.auth; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5Message; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5AuthBuilder.java similarity index 89% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthBuilder.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5AuthBuilder.java index 7d22541a0..ce79834a5 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5AuthBuilder.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.auth; +package com.hivemq.client2.mqtt.mqtt5.message.auth; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; +import com.hivemq.client2.annotations.CheckReturnValue; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthReasonCode.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5AuthReasonCode.java similarity index 92% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthReasonCode.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5AuthReasonCode.java index 2cefe9016..6809510b8 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthReasonCode.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5AuthReasonCode.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.auth; +package com.hivemq.client2.mqtt.mqtt5.message.auth; -import com.hivemq.client.internal.mqtt.message.MqttReasonCodes; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; +import com.hivemq.client2.internal.mqtt.message.MqttReasonCodes; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5ReasonCode; import org.jetbrains.annotations.Nullable; /** diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuth.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuth.java similarity index 91% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuth.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuth.java index 4022c5cb9..e2df03cf9 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuth.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuth.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.auth; +package com.hivemq.client2.mqtt.mqtt5.message.auth; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuthBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuthBuilder.java similarity index 96% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuthBuilder.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuthBuilder.java index c643f5b47..04fd03574 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuthBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5EnhancedAuthBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.auth; +package com.hivemq.client2.mqtt.mqtt5.message.auth; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuth.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5SimpleAuth.java similarity index 85% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuth.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5SimpleAuth.java index 84b0167c7..c1cf14449 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuth.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5SimpleAuth.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.auth; +package com.hivemq.client2.mqtt.mqtt5.message.auth; -import com.hivemq.client.internal.mqtt.message.auth.MqttSimpleAuthBuilder; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.internal.mqtt.message.auth.MqttSimpleAuthBuilder; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -25,7 +25,7 @@ import java.util.Optional; /** - * Simple authentication and/or authorization related data in an {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect + * Simple authentication and/or authorization related data in an {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect * MQTT 5 Connect message}. * * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilder.java similarity index 95% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilder.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilder.java index ae116249d..ecf0ea461 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.auth; +package com.hivemq.client2.mqtt.mqtt5.message.auth; -import com.hivemq.client.annotations.CheckReturnValue; +import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilderBase.java similarity index 94% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilderBase.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilderBase.java index a52245701..a5aa8fc9f 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5SimpleAuthBuilderBase.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.auth; +package com.hivemq.client2.mqtt.mqtt5.message.auth; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.annotations.CheckReturnValue; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAck.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnAck.java similarity index 86% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAck.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnAck.java index 38a66e0b8..44b23910c 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAck.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnAck.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.connect; - -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.mqtt.datatypes.MqttClientIdentifier; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuth; +package com.hivemq.client2.mqtt.mqtt5.message.connect; + +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.mqtt.datatypes.MqttClientIdentifier; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5Message; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuth; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCode.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCode.java similarity index 96% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCode.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCode.java index cde804931..57098d647 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCode.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCode.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.connect; +package com.hivemq.client2.mqtt.mqtt5.message.connect; -import com.hivemq.client.internal.mqtt.message.MqttReasonCodes; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; +import com.hivemq.client2.internal.mqtt.message.MqttReasonCodes; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5ReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckRestrictions.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnAckRestrictions.java similarity index 92% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckRestrictions.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnAckRestrictions.java index 3f31cebdf..1fdf49ae0 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckRestrictions.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnAckRestrictions.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.connect; +package com.hivemq.client2.mqtt.mqtt5.message.connect; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.mqtt.datatypes.MqttQos; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.mqtt.datatypes.MqttQos; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Range; @@ -26,8 +26,8 @@ /** * Restrictions for the client set by the server in an {@link Mqtt5ConnAck MQTT 5 ConnAck message}. *

                      - * These restrictions are used in conjunction with the {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions - * Mqtt5ConnectRestrictions} to form the {@link com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConnectionConfig.RestrictionsForClient + * These restrictions are used in conjunction with the {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnectRestrictions + * Mqtt5ConnectRestrictions} to form the {@link com.hivemq.client2.mqtt.mqtt5.Mqtt5ClientConnectionConfig.RestrictionsForClient * Mqtt5ClientConnectionConfig.RestrictionsForClient}. * * @author Silvio Giebl diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5Connect.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5Connect.java similarity index 85% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5Connect.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5Connect.java index fb2321904..118b49405 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5Connect.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5Connect.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.connect; - -import com.hivemq.client.internal.mqtt.message.connect.MqttConnectBuilder; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublish; +package com.hivemq.client2.mqtt.mqtt5.message.connect; + +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnectBuilder; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5Message; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5WillPublish; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilder.java similarity index 93% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilder.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilder.java index 30e613fcf..0bd8feab1 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.connect; +package com.hivemq.client2.mqtt.mqtt5.message.connect; -import com.hivemq.client.annotations.CheckReturnValue; +import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -54,7 +54,7 @@ interface Nested

                      extends Mqtt5ConnectBuilderBase> { } /** - * Builder for a {@link Mqtt5Connect} that is applied to a parent {@link com.hivemq.client.mqtt.mqtt5.Mqtt5Client} + * Builder for a {@link Mqtt5Connect} that is applied to a parent {@link com.hivemq.client2.mqtt.mqtt5.Mqtt5Client} * which then sends the Connect message. * * @param

                      the type of the result when the built {@link Mqtt5Connect} is sent by the parent. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilderBase.java similarity index 90% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilderBase.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilderBase.java index 306b37e6f..7013a5fb9 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectBuilderBase.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.connect; - -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5SimpleAuthBuilder; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublishBuilder; +package com.hivemq.client2.mqtt.mqtt5.message.connect; + +import com.hivemq.client2.annotations.CheckReturnValue; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5SimpleAuth; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5SimpleAuthBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5WillPublishBuilder; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictions.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictions.java similarity index 93% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictions.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictions.java index 70e6b7eef..21ea31190 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictions.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictions.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.connect; +package com.hivemq.client2.mqtt.mqtt5.message.connect; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnectRestrictionsBuilder; -import com.hivemq.client.internal.util.UnsignedDataTypes; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnectRestrictionsBuilder; +import com.hivemq.client2.internal.util.UnsignedDataTypes; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Range; @@ -30,13 +30,13 @@ *

                        *
                      • Restrictions for the server. *

                        - * These are used to form the {@link com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConnectionConfig.RestrictionsForServer + * These are used to form the {@link com.hivemq.client2.mqtt.mqtt5.Mqtt5ClientConnectionConfig.RestrictionsForServer * Mqtt5ClientConnectionConfig.RestrictionsForServer} *

                      • Restrictions for the client set by the client itself. *

                        * These restrictions are used in conjunction with the * {@link Mqtt5ConnAckRestrictions} - * to form the {@link com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConnectionConfig.RestrictionsForClient + * to form the {@link com.hivemq.client2.mqtt.mqtt5.Mqtt5ClientConnectionConfig.RestrictionsForClient * Mqtt5ClientConnectionConfig.RestrictionsForClient}. *

                      * diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilder.java similarity index 94% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilder.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilder.java index b22ca93ff..32236222f 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.connect; +package com.hivemq.client2.mqtt.mqtt5.message.connect; -import com.hivemq.client.annotations.CheckReturnValue; +import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilderBase.java similarity index 95% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilderBase.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilderBase.java index 472761549..fed328434 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnectRestrictionsBuilderBase.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.connect; +package com.hivemq.client2.mqtt.mqtt5.message.connect; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.util.UnsignedDataTypes; +import com.hivemq.client2.annotations.CheckReturnValue; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.util.UnsignedDataTypes; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5Disconnect.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/disconnect/Mqtt5Disconnect.java similarity index 85% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5Disconnect.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/disconnect/Mqtt5Disconnect.java index 78f5342ef..a37249296 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5Disconnect.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/disconnect/Mqtt5Disconnect.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.disconnect; +package com.hivemq.client2.mqtt.mqtt5.message.disconnect; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnectBuilder; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnectBuilder; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5Message; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Range; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilder.java similarity index 92% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilder.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilder.java index c7e23a0ce..1b2a36f44 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.disconnect; +package com.hivemq.client2.mqtt.mqtt5.message.disconnect; -import com.hivemq.client.annotations.CheckReturnValue; +import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -54,7 +54,7 @@ interface Nested

                      extends Mqtt5DisconnectBuilderBase> { } /** - * Builder for a {@link Mqtt5Disconnect} that is applied to a parent {@link com.hivemq.client.mqtt.mqtt5.Mqtt5Client} + * Builder for a {@link Mqtt5Disconnect} that is applied to a parent {@link com.hivemq.client2.mqtt.mqtt5.Mqtt5Client} * which then sends the Disconnect message. * * @param

                      the type of the result when the built {@link Mqtt5Disconnect} is sent by the parent. @@ -71,7 +71,7 @@ interface Send

                      extends Mqtt5DisconnectBuilderBase> { } /** - * Builder for a {@link Mqtt5Disconnect} that is applied to a parent {@link com.hivemq.client.mqtt.mqtt5.Mqtt5Client} + * Builder for a {@link Mqtt5Disconnect} that is applied to a parent {@link com.hivemq.client2.mqtt.mqtt5.Mqtt5Client} * which then sends the Disconnect message without returning a result. */ @ApiStatus.NonExtendable diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilderBase.java similarity index 88% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilderBase.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilderBase.java index 020aab56b..f2886a7c3 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectBuilderBase.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.disconnect; +package com.hivemq.client2.mqtt.mqtt5.message.disconnect; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.internal.util.UnsignedDataTypes; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; +import com.hivemq.client2.annotations.CheckReturnValue; +import com.hivemq.client2.internal.util.UnsignedDataTypes; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -59,7 +59,7 @@ public interface Mqtt5DisconnectBuilderBase the type of the result when the built {@link Mqtt5Publish} is sent by the parent. @@ -88,7 +88,7 @@ interface Complete

                      extends Nested

                      , Mqtt5PublishBuilderBase.Complete * The result is provided if a Publish message is successfully delivered (sent or acknowledged respectively to its - * {@link com.hivemq.client.mqtt.datatypes.MqttQos QoS} level). + * {@link com.hivemq.client2.mqtt.datatypes.MqttQos QoS} level). * * @author Silvio Giebl * @since 1.0 @@ -44,7 +44,7 @@ public interface Mqtt5PublishResult { @NotNull Optional getError(); /** - * Result for a {@link Mqtt5Publish MQTT 5 Publish message} with {@link com.hivemq.client.mqtt.datatypes.MqttQos#AT_LEAST_ONCE + * Result for a {@link Mqtt5Publish MQTT 5 Publish message} with {@link com.hivemq.client2.mqtt.datatypes.MqttQos#AT_LEAST_ONCE * QoS level 1} sent by the client. *

                      * This result additionally provides the {@link Mqtt5PubAck PubAck message} that acknowledged the Publish message. @@ -59,7 +59,7 @@ interface Mqtt5Qos1Result extends Mqtt5PublishResult { } /** - * Result for a {@link Mqtt5Publish MQTT 5 Publish message} with {@link com.hivemq.client.mqtt.datatypes.MqttQos#EXACTLY_ONCE + * Result for a {@link Mqtt5Publish MQTT 5 Publish message} with {@link com.hivemq.client2.mqtt.datatypes.MqttQos#EXACTLY_ONCE * QoS level 2} sent by the client. *

                      * This result additionally provides the {@link Mqtt5PubRec PubRec message} that acknowledged the Publish message. @@ -74,7 +74,7 @@ interface Mqtt5Qos2Result extends Mqtt5PublishResult { } /** - * Result for a {@link Mqtt5Publish MQTT 5 Publish message} with {@link com.hivemq.client.mqtt.datatypes.MqttQos#EXACTLY_ONCE + * Result for a {@link Mqtt5Publish MQTT 5 Publish message} with {@link com.hivemq.client2.mqtt.datatypes.MqttQos#EXACTLY_ONCE * QoS level 2} sent by the client. *

                      * This result additionally provides the {@link Mqtt5PubRec PubRec message}, {@link Mqtt5PubRel PubRel message} and diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5WillPublish.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5WillPublish.java similarity index 85% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5WillPublish.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5WillPublish.java index 7e3807cee..06b0e5722 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5WillPublish.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5WillPublish.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.publish; +package com.hivemq.client2.mqtt.mqtt5.message.publish; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublishBuilder; -import com.hivemq.client.internal.util.UnsignedDataTypes; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublishBuilder; +import com.hivemq.client2.internal.util.UnsignedDataTypes; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Range; /** - * MQTT 5 Will Publish which can be a part of an {@link com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect MQTT 5 - * Connect message}. + * MQTT 5 Will Publish which can be a part of an {@link com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect MQTT + * 5 Connect message}. * * @author Silvio Giebl * @since 1.0 diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5WillPublishBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5WillPublishBuilder.java similarity index 95% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5WillPublishBuilder.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5WillPublishBuilder.java index b166b3aac..9b96188c6 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5WillPublishBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5WillPublishBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.publish; +package com.hivemq.client2.mqtt.mqtt5.message.publish; -import com.hivemq.client.annotations.CheckReturnValue; +import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandling.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandling.java similarity index 97% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandling.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandling.java index d5871e380..67cf65005 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandling.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandling.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.subscribe; +package com.hivemq.client2.mqtt.mqtt5.message.subscribe; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAck.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubAck.java similarity index 79% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAck.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubAck.java index f979414df..e9338ab9b 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAck.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubAck.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.subscribe; +package com.hivemq.client2.mqtt.mqtt5.message.subscribe; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5Message; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Unmodifiable; @@ -37,8 +37,8 @@ public interface Mqtt5SubAck extends Mqtt5Message { /** - * @return the Reason Codes of this SubAck message, each belonging to a {@link com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscription - * Subscription} in the corresponding {@link com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe + * @return the Reason Codes of this SubAck message, each belonging to a {@link com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5Subscription + * Subscription} in the corresponding {@link com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe * Subscribe message} in the same order. */ @Unmodifiable @NotNull List<@NotNull Mqtt5SubAckReasonCode> getReasonCodes(); diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCode.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCode.java similarity index 95% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCode.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCode.java index 4313f04ba..e16d8d69b 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCode.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCode.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.subscribe; +package com.hivemq.client2.mqtt.mqtt5.message.subscribe; -import com.hivemq.client.internal.mqtt.message.MqttReasonCodes; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; +import com.hivemq.client2.internal.mqtt.message.MqttReasonCodes; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5ReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5Subscribe.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5Subscribe.java similarity index 85% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5Subscribe.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5Subscribe.java index 7fdc10708..c5873a0f2 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5Subscribe.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5Subscribe.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.subscribe; +package com.hivemq.client2.mqtt.mqtt5.message.subscribe; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribeBuilder; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscribeBuilder; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5Message; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilder.java similarity index 95% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilder.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilder.java index 5104ce81d..4550337f7 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.subscribe; +package com.hivemq.client2.mqtt.mqtt5.message.subscribe; -import com.hivemq.client.annotations.CheckReturnValue; +import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -108,7 +108,7 @@ interface Complete

                      extends Nested.Start

                      , Nested.Complete

                      , } /** - * Builder for a {@link Mqtt5Subscribe} that is applied to a parent {@link com.hivemq.client.mqtt.mqtt5.Mqtt5Client + * Builder for a {@link Mqtt5Subscribe} that is applied to a parent {@link com.hivemq.client2.mqtt.mqtt5.Mqtt5Client * Mqtt5Client} which then sends the Subscribe message. * * @param

                      the type of the result when the built {@link Mqtt5Subscribe} is sent by the parent. @@ -153,7 +153,7 @@ interface Complete

                      extends Send.Start

                      , Send.Complete

                      , /** * Builder for a {@link Mqtt5Subscribe} and additional arguments that are applied to a parent {@link - * com.hivemq.client.mqtt.mqtt5.Mqtt5Client Mqtt5Client} subscribePublishes call. + * com.hivemq.client2.mqtt.mqtt5.Mqtt5Client Mqtt5Client} subscribePublishes call. * * @param

                      the type of the result when the built {@link Mqtt5Subscribe} is applied to the parent. * @since 1.2 @@ -191,7 +191,7 @@ interface Complete

                      extends Publishes.Start

                      , Publishes.Complete

                      , /** * Builder for additional arguments alongside the {@link Mqtt5Subscribe} that are applied to a parent {@link - * com.hivemq.client.mqtt.mqtt5.Mqtt5Client Mqtt5Client} subscribePublishes call. + * com.hivemq.client2.mqtt.mqtt5.Mqtt5Client Mqtt5Client} subscribePublishes call. * * @param

                      the type of the result when the built {@link Mqtt5Subscribe} is applied to the parent. */ diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilderBase.java similarity index 95% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilderBase.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilderBase.java index 910906c93..36ece9dbc 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscribeBuilderBase.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.subscribe; +package com.hivemq.client2.mqtt.mqtt5.message.subscribe; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; +import com.hivemq.client2.annotations.CheckReturnValue; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5Subscription.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5Subscription.java similarity index 91% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5Subscription.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5Subscription.java index b39eaea84..453e4f5f1 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5Subscription.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5Subscription.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.subscribe; +package com.hivemq.client2.mqtt.mqtt5.message.subscribe; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscriptionBuilder; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscriptionBuilder; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilter; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilder.java similarity index 95% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilder.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilder.java index f2a816120..c463c77fa 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.subscribe; +package com.hivemq.client2.mqtt.mqtt5.message.subscribe; -import com.hivemq.client.annotations.CheckReturnValue; +import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilderBase.java similarity index 93% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilderBase.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilderBase.java index 4b40f9350..5d314945c 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubscriptionBuilderBase.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.subscribe; +package com.hivemq.client2.mqtt.mqtt5.message.subscribe; -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilterBuilder; +import com.hivemq.client2.annotations.CheckReturnValue; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilter; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilterBuilder; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAck.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAck.java similarity index 79% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAck.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAck.java index 565ba5c75..9bd4f1b15 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAck.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAck.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.unsubscribe; +package com.hivemq.client2.mqtt.mqtt5.message.unsubscribe; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5Message; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Unmodifiable; @@ -38,7 +38,7 @@ public interface Mqtt5UnsubAck extends Mqtt5Message { /** * @return the Reason Codes of this UnsubAck message, each belonging to a Topic Filter in the corresponding {@link - * com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe Unsubscribe message} in the same + * com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe Unsubscribe message} in the same * order. */ @Unmodifiable @NotNull List<@NotNull Mqtt5UnsubAckReasonCode> getReasonCodes(); diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCode.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCode.java similarity index 93% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCode.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCode.java index e8892df00..43f6b5a8a 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCode.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCode.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.unsubscribe; +package com.hivemq.client2.mqtt.mqtt5.message.unsubscribe; -import com.hivemq.client.internal.mqtt.message.MqttReasonCodes; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5ReasonCode; +import com.hivemq.client2.internal.mqtt.message.MqttReasonCodes; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5ReasonCode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5Unsubscribe.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5Unsubscribe.java similarity index 82% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5Unsubscribe.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5Unsubscribe.java index 9d82cf069..81f40e2f2 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5Unsubscribe.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5Unsubscribe.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.unsubscribe; +package com.hivemq.client2.mqtt.mqtt5.message.unsubscribe; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribeBuilder; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubscribeBuilder; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilter; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5Message; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Unmodifiable; diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilder.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilder.java similarity index 96% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilder.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilder.java index edb2ace04..b544ee7aa 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilder.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.unsubscribe; +package com.hivemq.client2.mqtt.mqtt5.message.unsubscribe; -import com.hivemq.client.annotations.CheckReturnValue; +import com.hivemq.client2.annotations.CheckReturnValue; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -86,7 +86,7 @@ interface Start

                      extends Nested

                      , Mqtt5UnsubscribeBuilderBase.Start the type of the result when the built {@link Mqtt5Unsubscribe} is sent by the parent. diff --git a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilderBase.java similarity index 94% rename from src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilderBase.java rename to src/main/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilderBase.java index 4b96ad576..1888d5261 100644 --- a/src/main/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubscribeBuilderBase.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.unsubscribe; - -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilterBuilder; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; +package com.hivemq.client2.mqtt.mqtt5.message.unsubscribe; + +import com.hivemq.client2.annotations.CheckReturnValue; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilter; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilterBuilder; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/client/rx/FlowableWithSingle.java b/src/main/java/com/hivemq/client2/rx/FlowableWithSingle.java similarity index 97% rename from src/main/java/com/hivemq/client/rx/FlowableWithSingle.java rename to src/main/java/com/hivemq/client2/rx/FlowableWithSingle.java index 900088bee..615f4d833 100644 --- a/src/main/java/com/hivemq/client/rx/FlowableWithSingle.java +++ b/src/main/java/com/hivemq/client2/rx/FlowableWithSingle.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.rx; - -import com.hivemq.client.annotations.CheckReturnValue; -import com.hivemq.client.internal.rx.WithSingleStrictSubscriber; -import com.hivemq.client.internal.rx.operators.FlowableWithSingleMap; -import com.hivemq.client.internal.rx.operators.FlowableWithSingleMapError; -import com.hivemq.client.internal.rx.operators.FlowableWithSingleObserveOn; -import com.hivemq.client.internal.util.Checks; -import com.hivemq.client.rx.reactivestreams.PublisherWithSingle; -import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; +package com.hivemq.client2.rx; + +import com.hivemq.client2.annotations.CheckReturnValue; +import com.hivemq.client2.internal.rx.WithSingleStrictSubscriber; +import com.hivemq.client2.internal.rx.operators.FlowableWithSingleMap; +import com.hivemq.client2.internal.rx.operators.FlowableWithSingleMapError; +import com.hivemq.client2.internal.rx.operators.FlowableWithSingleObserveOn; +import com.hivemq.client2.internal.util.Checks; +import com.hivemq.client2.rx.reactivestreams.PublisherWithSingle; +import com.hivemq.client2.rx.reactivestreams.WithSingleSubscriber; import io.reactivex.rxjava3.annotations.BackpressureKind; import io.reactivex.rxjava3.annotations.BackpressureSupport; import io.reactivex.rxjava3.annotations.SchedulerSupport; diff --git a/src/main/java/com/hivemq/client/rx/FlowableWithSingleSubscriber.java b/src/main/java/com/hivemq/client2/rx/FlowableWithSingleSubscriber.java similarity index 92% rename from src/main/java/com/hivemq/client/rx/FlowableWithSingleSubscriber.java rename to src/main/java/com/hivemq/client2/rx/FlowableWithSingleSubscriber.java index 42a7e4e96..353ba1dc7 100644 --- a/src/main/java/com/hivemq/client/rx/FlowableWithSingleSubscriber.java +++ b/src/main/java/com/hivemq/client2/rx/FlowableWithSingleSubscriber.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.rx; +package com.hivemq.client2.rx; -import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; +import com.hivemq.client2.rx.reactivestreams.WithSingleSubscriber; import io.reactivex.rxjava3.core.FlowableSubscriber; /** diff --git a/src/main/java/com/hivemq/client/rx/reactivestreams/PublisherWithSingle.java b/src/main/java/com/hivemq/client2/rx/reactivestreams/PublisherWithSingle.java similarity index 97% rename from src/main/java/com/hivemq/client/rx/reactivestreams/PublisherWithSingle.java rename to src/main/java/com/hivemq/client2/rx/reactivestreams/PublisherWithSingle.java index d5a6ad36a..57b3eb080 100644 --- a/src/main/java/com/hivemq/client/rx/reactivestreams/PublisherWithSingle.java +++ b/src/main/java/com/hivemq/client2/rx/reactivestreams/PublisherWithSingle.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.rx.reactivestreams; +package com.hivemq.client2.rx.reactivestreams; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Publisher; diff --git a/src/main/java/com/hivemq/client/rx/reactivestreams/WithSingleSubscriber.java b/src/main/java/com/hivemq/client2/rx/reactivestreams/WithSingleSubscriber.java similarity index 96% rename from src/main/java/com/hivemq/client/rx/reactivestreams/WithSingleSubscriber.java rename to src/main/java/com/hivemq/client2/rx/reactivestreams/WithSingleSubscriber.java index aa4c57cb0..3562eb766 100644 --- a/src/main/java/com/hivemq/client/rx/reactivestreams/WithSingleSubscriber.java +++ b/src/main/java/com/hivemq/client2/rx/reactivestreams/WithSingleSubscriber.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.rx.reactivestreams; +package com.hivemq.client2.rx.reactivestreams; import org.jetbrains.annotations.NotNull; import org.reactivestreams.Subscriber; diff --git a/src/main/java/com/hivemq/client/util/KeyStoreUtil.java b/src/main/java/com/hivemq/client2/util/KeyStoreUtil.java similarity index 97% rename from src/main/java/com/hivemq/client/util/KeyStoreUtil.java rename to src/main/java/com/hivemq/client2/util/KeyStoreUtil.java index 42a9c4685..89c1de836 100644 --- a/src/main/java/com/hivemq/client/util/KeyStoreUtil.java +++ b/src/main/java/com/hivemq/client2/util/KeyStoreUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.util; +package com.hivemq.client2.util; -import com.hivemq.client.internal.util.Checks; +import com.hivemq.client2.internal.util.Checks; import org.jetbrains.annotations.NotNull; import javax.net.ssl.KeyManagerFactory; diff --git a/src/main/java/com/hivemq/client/util/TypeSwitch.java b/src/main/java/com/hivemq/client2/util/TypeSwitch.java similarity index 99% rename from src/main/java/com/hivemq/client/util/TypeSwitch.java rename to src/main/java/com/hivemq/client2/util/TypeSwitch.java index cbe5f921c..32a6c6090 100644 --- a/src/main/java/com/hivemq/client/util/TypeSwitch.java +++ b/src/main/java/com/hivemq/client2/util/TypeSwitch.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.util; +package com.hivemq.client2.util; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java b/src/test/java/com/hivemq/client2/example/Mqtt3ClientExample.java similarity index 90% rename from src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java rename to src/test/java/com/hivemq/client2/example/Mqtt3ClientExample.java index da31a029b..32c3bce00 100644 --- a/src/test/java/com/hivemq/client/example/Mqtt3ClientExample.java +++ b/src/test/java/com/hivemq/client2/example/Mqtt3ClientExample.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.hivemq.client.example; - -import com.hivemq.client.mqtt.MqttClient; -import com.hivemq.client.mqtt.MqttClientBuilder; -import com.hivemq.client.mqtt.MqttTlsConfig; -import com.hivemq.client.mqtt.MqttWebSocketConfig; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt3.Mqtt3RxClient; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishBuilder; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscription; +package com.hivemq.client2.example; + +import com.hivemq.client2.mqtt.MqttClient; +import com.hivemq.client2.mqtt.MqttClientBuilder; +import com.hivemq.client2.mqtt.MqttTlsConfig; +import com.hivemq.client2.mqtt.MqttWebSocketConfig; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.mqtt3.Mqtt3RxClient; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3ConnAck; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3Connect; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3Publish; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3PublishBuilder; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3PublishResult; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscription; import io.reactivex.rxjava3.core.Completable; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.core.Single; diff --git a/src/test/java/com/hivemq/client/example/Mqtt3SmokeTest.java b/src/test/java/com/hivemq/client2/example/Mqtt3SmokeTest.java similarity index 97% rename from src/test/java/com/hivemq/client/example/Mqtt3SmokeTest.java rename to src/test/java/com/hivemq/client2/example/Mqtt3SmokeTest.java index 33a2fc117..3f0b30a06 100644 --- a/src/test/java/com/hivemq/client/example/Mqtt3SmokeTest.java +++ b/src/test/java/com/hivemq/client2/example/Mqtt3SmokeTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.example; +package com.hivemq.client2.example; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.util.KeyStoreUtil; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.util.KeyStoreUtil; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImplTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/MqttExecutorConfigImplTest.java similarity index 96% rename from src/test/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImplTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/MqttExecutorConfigImplTest.java index 98957b765..e8354aa76 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/MqttExecutorConfigImplTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/MqttExecutorConfigImplTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt; +package com.hivemq.client2.internal.mqtt; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImplTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/MqttProxyConfigImplTest.java similarity index 96% rename from src/test/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImplTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/MqttProxyConfigImplTest.java index a3aa06208..72107c659 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/MqttProxyConfigImplTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/MqttProxyConfigImplTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt; +package com.hivemq.client2.internal.mqtt; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImplTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/MqttTlsConfigImplTest.java similarity index 97% rename from src/test/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImplTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/MqttTlsConfigImplTest.java index ef41bbb0a..edb0ba620 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/MqttTlsConfigImplTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/MqttTlsConfigImplTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt; +package com.hivemq.client2.internal.mqtt; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImplTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/MqttTransportConfigImplTest.java similarity index 97% rename from src/test/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImplTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/MqttTransportConfigImplTest.java index d26ffe16c..47e3666b3 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/MqttTransportConfigImplTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/MqttTransportConfigImplTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt; +package com.hivemq.client2.internal.mqtt; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImplTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/MqttWebSocketConfigImplTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImplTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/MqttWebSocketConfigImplTest.java index eb02a54f9..ac3223726 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/MqttWebSocketConfigImplTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/MqttWebSocketConfigImplTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt; +package com.hivemq.client2.internal.mqtt; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfigTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/advanced/MqttAdvancedConfigTest.java similarity index 94% rename from src/test/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfigTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/advanced/MqttAdvancedConfigTest.java index c9eb9e822..e2c2a9718 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/advanced/MqttAdvancedConfigTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/advanced/MqttAdvancedConfigTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.advanced; +package com.hivemq.client2.internal.mqtt.advanced; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptorsTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/advanced/interceptor/MqttClientInterceptorsTest.java similarity index 93% rename from src/test/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptorsTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/advanced/interceptor/MqttClientInterceptorsTest.java index 50c1ae774..c5f3ea70a 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/advanced/interceptor/MqttClientInterceptorsTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/advanced/interceptor/MqttClientInterceptorsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.advanced.interceptor; +package com.hivemq.client2.internal.mqtt.advanced.interceptor; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/AbstractMqttDecoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/AbstractMqttDecoderTest.java similarity index 81% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/AbstractMqttDecoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/AbstractMqttDecoderTest.java index a8c97d713..8984fb6e0 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/AbstractMqttDecoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/AbstractMqttDecoderTest.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder; - -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.MqttExecutorConfigImpl; -import com.hivemq.client.internal.mqtt.MqttTransportConfigImpl; -import com.hivemq.client.internal.mqtt.advanced.MqttAdvancedConfig; -import com.hivemq.client.internal.mqtt.advanced.MqttAdvancedConfigBuilder; -import com.hivemq.client.internal.mqtt.datatypes.MqttClientIdentifierImpl; -import com.hivemq.client.internal.mqtt.handler.disconnect.MqttDisconnectEvent; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.MqttVersion; -import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5MessageException; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message; +package com.hivemq.client2.internal.mqtt.codec.decoder; + +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.MqttExecutorConfigImpl; +import com.hivemq.client2.internal.mqtt.MqttTransportConfigImpl; +import com.hivemq.client2.internal.mqtt.advanced.MqttAdvancedConfig; +import com.hivemq.client2.internal.mqtt.advanced.MqttAdvancedConfigBuilder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttClientIdentifierImpl; +import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectEvent; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.MqttVersion; +import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5MessageException; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5Message; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/AbstractMqtt3DecoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/AbstractMqtt3DecoderTest.java similarity index 73% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/AbstractMqtt3DecoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/AbstractMqtt3DecoderTest.java index 0726edf2f..2a79193c9 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/AbstractMqtt3DecoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/AbstractMqtt3DecoderTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.decoder.AbstractMqttDecoderTest; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectView; -import com.hivemq.client.mqtt.MqttVersion; +import com.hivemq.client2.internal.mqtt.codec.decoder.AbstractMqttDecoderTest; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectView; +import com.hivemq.client2.mqtt.MqttVersion; import org.jetbrains.annotations.NotNull; /** diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ClientMessageDecodersTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3ClientMessageDecodersTest.java similarity index 92% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ClientMessageDecodersTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3ClientMessageDecodersTest.java index ad972d684..1ec495d8e 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ClientMessageDecodersTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3ClientMessageDecodersTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.decoder.AbstractMqttDecoderTest; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttPingRespDecoder; +import com.hivemq.client2.internal.mqtt.codec.decoder.AbstractMqttDecoderTest; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttPingRespDecoder; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ConnAckDecoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3ConnAckDecoderTest.java similarity index 96% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ConnAckDecoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3ConnAckDecoderTest.java index b5d9a79b3..5581bc149 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3ConnAckDecoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3ConnAckDecoderTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt3; import com.google.common.primitives.Bytes; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckReasonCode; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnAck; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAckReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubAckDecoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubAckDecoderTest.java similarity index 92% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubAckDecoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubAckDecoderTest.java index 30cb8017a..ff643d5ee 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubAckDecoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubAckDecoderTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt3; import com.google.common.primitives.Bytes; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubAck; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubAck; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubCompDecoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubCompDecoderTest.java similarity index 92% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubCompDecoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubCompDecoderTest.java index 49c0acefb..b8b8b16ec 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubCompDecoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubCompDecoderTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt3; import com.google.common.primitives.Bytes; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubComp; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubComp; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRecDecoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRecDecoderTest.java similarity index 92% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRecDecoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRecDecoderTest.java index b7cc03351..56109bc39 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRecDecoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRecDecoderTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt3; import com.google.common.primitives.Bytes; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubRec; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubRec; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRelDecoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRelDecoderTest.java similarity index 92% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRelDecoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRelDecoderTest.java index bcdc60142..c1f2a985f 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRelDecoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PubRelDecoderTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt3; import com.google.common.primitives.Bytes; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubRel; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubRel; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PublishDecoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PublishDecoderTest.java similarity index 96% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PublishDecoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PublishDecoderTest.java index 1d0ddd9c7..cce83a7a3 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3PublishDecoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3PublishDecoderTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.internal.mqtt.message.publish.MqttStatefulPublish; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3SubAckDecoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3SubAckDecoderTest.java similarity index 93% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3SubAckDecoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3SubAckDecoderTest.java index 568ae8821..f51f68783 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3SubAckDecoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3SubAckDecoderTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt3; import com.google.common.primitives.Bytes; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAckReasonCode; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubAck; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAckReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3UnsubAckDecoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3UnsubAckDecoderTest.java similarity index 92% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3UnsubAckDecoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3UnsubAckDecoderTest.java index 7ca626abc..66808b660 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt3/Mqtt3UnsubAckDecoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt3/Mqtt3UnsubAckDecoderTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt3; import com.google.common.primitives.Bytes; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubAck; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubAck; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/AbstractMqtt5DecoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/AbstractMqtt5DecoderTest.java similarity index 75% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/AbstractMqtt5DecoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/AbstractMqtt5DecoderTest.java index c14820d3c..5f22d840d 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/AbstractMqtt5DecoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/AbstractMqtt5DecoderTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; -import com.hivemq.client.internal.mqtt.codec.decoder.AbstractMqttDecoderTest; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnectBuilder; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnectRestrictions; -import com.hivemq.client.mqtt.MqttVersion; +import com.hivemq.client2.internal.mqtt.codec.decoder.AbstractMqttDecoderTest; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnectBuilder; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnectRestrictions; +import com.hivemq.client2.mqtt.MqttVersion; import org.jetbrains.annotations.NotNull; /** diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5AuthDecoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5AuthDecoderTest.java similarity index 97% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5AuthDecoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5AuthDecoderTest.java index 6fafbe6d2..58e7c5fbc 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5AuthDecoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5AuthDecoderTest.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.message.auth.MqttAuth; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5Auth; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5AuthReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.message.auth.MqttAuth; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5Auth; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5AuthReasonCode; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ClientMessageDecodersTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5ClientMessageDecodersTest.java similarity index 93% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ClientMessageDecodersTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5ClientMessageDecodersTest.java index 57ce0ac7a..79946d579 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ClientMessageDecodersTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5ClientMessageDecodersTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; -import com.hivemq.client.internal.mqtt.codec.decoder.AbstractMqttDecoderTest; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttPingRespDecoder; +import com.hivemq.client2.internal.mqtt.codec.decoder.AbstractMqttDecoderTest; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttPingRespDecoder; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ConnAckDecoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5ConnAckDecoderTest.java similarity index 98% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ConnAckDecoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5ConnAckDecoderTest.java index 54593d404..8ac133986 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5ConnAckDecoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5ConnAckDecoderTest.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnAck; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnAckRestrictions; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuth; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnAck; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnAckRestrictions; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuth; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAckReasonCode; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAckRestrictions; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5DisconnectDecoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5DisconnectDecoderTest.java similarity index 97% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5DisconnectDecoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5DisconnectDecoderTest.java index 333819b86..60dd41c67 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5DisconnectDecoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5DisconnectDecoderTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5MessageDecoderUtilTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5MessageDecoderUtilTest.java similarity index 93% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5MessageDecoderUtilTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5MessageDecoderUtilTest.java index 967ab72c8..6220a8567 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5MessageDecoderUtilTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5MessageDecoderUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttDecoderException; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoderException; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.junit.jupiter.api.AfterEach; @@ -25,8 +25,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import static com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.MALFORMED_PACKET; -import static com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.PROTOCOL_ERROR; +import static com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.MALFORMED_PACKET; +import static com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.PROTOCOL_ERROR; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PingRespDecoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PingRespDecoderTest.java similarity index 87% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PingRespDecoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PingRespDecoderTest.java index 28404b332..8e4f67fa6 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PingRespDecoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PingRespDecoderTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.ping.Mqtt5PingResp; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +import com.hivemq.client2.mqtt.mqtt5.message.ping.Mqtt5PingResp; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubAckDecoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubAckDecoderTest.java similarity index 97% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubAckDecoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubAckDecoderTest.java index 0d2bfc352..9e5454806 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubAckDecoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubAckDecoderTest.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubAck; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAckReasonCode; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubAck; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubAckReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubCompDecoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubCompDecoderTest.java similarity index 97% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubCompDecoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubCompDecoderTest.java index fe4a4731a..0e86859ea 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubCompDecoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubCompDecoderTest.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubComp; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubComp; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRecDecoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRecDecoderTest.java similarity index 93% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRecDecoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRecDecoderTest.java index 28105b258..6c9c15279 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRecDecoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRecDecoderTest.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubRec; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubRec; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -31,8 +31,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import static com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.MALFORMED_PACKET; -import static com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode.SUCCESS; +import static com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.MALFORMED_PACKET; +import static com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode.SUCCESS; import static org.junit.jupiter.api.Assertions.*; /** diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRelDecoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRelDecoderTest.java similarity index 93% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRelDecoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRelDecoderTest.java index 85463b6fa..aa852082f 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRelDecoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PubRelDecoderTest.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubRel; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode; +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubRel; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -31,8 +31,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import static com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.MALFORMED_PACKET; -import static com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode.SUCCESS; +import static com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.MALFORMED_PACKET; +import static com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode.SUCCESS; import static org.junit.jupiter.api.Assertions.*; /** diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PublishDecoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PublishDecoderTest.java similarity index 97% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PublishDecoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PublishDecoderTest.java index 273c67054..91c25c77f 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5PublishDecoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5PublishDecoderTest.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish; -import com.hivemq.client.internal.util.collections.ImmutableIntList; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PayloadFormatIndicator; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.mqtt.message.publish.MqttStatefulPublish; +import com.hivemq.client2.internal.util.collections.ImmutableIntList; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PayloadFormatIndicator; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; @@ -34,7 +34,7 @@ import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; -import static com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.*; +import static com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.*; import static org.junit.jupiter.api.Assertions.*; /** diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5SubAckDecoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5SubAckDecoderTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5SubAckDecoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5SubAckDecoderTest.java index ed1aef20c..30fe718c9 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5SubAckDecoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5SubAckDecoderTest.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubAck; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAckReasonCode; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubAck; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAckReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -31,7 +31,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import static com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.MALFORMED_PACKET; +import static com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.MALFORMED_PACKET; import static org.junit.jupiter.api.Assertions.*; /** diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoderTest.java similarity index 94% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoderTest.java index 296f5842f..aec500c38 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/decoder/mqtt5/Mqtt5UnsubAckDecoderTest.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.decoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.decoder.MqttMessageDecoders; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubAck; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperty; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; +package com.hivemq.client2.internal.mqtt.codec.decoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.decoder.MqttMessageDecoders; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubAck; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperty; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; import io.netty.buffer.ByteBuf; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -36,9 +36,9 @@ import java.util.List; import java.util.Optional; -import static com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.MALFORMED_PACKET; -import static com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.PROTOCOL_ERROR; -import static com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode.*; +import static com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.MALFORMED_PACKET; +import static com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.PROTOCOL_ERROR; +import static com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode.*; import static org.junit.jupiter.api.Assertions.*; /** diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/AbstractMqttEncoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/AbstractMqttEncoderTest.java similarity index 90% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/AbstractMqttEncoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/AbstractMqttEncoderTest.java index 2897b5b64..12c841d7b 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/AbstractMqttEncoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/AbstractMqttEncoderTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder; +package com.hivemq.client2.internal.mqtt.codec.encoder; -import com.hivemq.client.internal.mqtt.MqttClientConnectionConfig; -import com.hivemq.client.internal.mqtt.MqttTransportConfigImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.mqtt.datatypes.MqttQos; +import com.hivemq.client2.internal.mqtt.MqttClientConnectionConfig; +import com.hivemq.client2.internal.mqtt.MqttTransportConfigImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.mqtt.datatypes.MqttQos; import io.netty.buffer.ByteBuf; import io.netty.channel.embedded.EmbeddedChannel; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/AbstractMqtt3EncoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/AbstractMqtt3EncoderTest.java similarity index 85% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/AbstractMqtt3EncoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/AbstractMqtt3EncoderTest.java index 8cac80a9c..1bde23765 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/AbstractMqtt3EncoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/AbstractMqtt3EncoderTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt3; import com.google.common.primitives.Bytes; -import com.hivemq.client.internal.mqtt.codec.encoder.AbstractMqttEncoderTest; -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; +import com.hivemq.client2.internal.mqtt.codec.encoder.AbstractMqttEncoderTest; +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoders; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.internal.wire.MqttWireMessage; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3ConnectEncoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3ConnectEncoderTest.java similarity index 88% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3ConnectEncoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3ConnectEncoderTest.java index e03b6985f..7363efdca 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3ConnectEncoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3ConnectEncoderTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.datatypes.MqttClientIdentifierImpl; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.MqttStatefulConnect; -import com.hivemq.client.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectViewBuilder; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoders; +import com.hivemq.client2.internal.mqtt.datatypes.MqttClientIdentifierImpl; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.message.connect.MqttStatefulConnect; +import com.hivemq.client2.internal.mqtt.message.connect.mqtt3.Mqtt3ConnectViewBuilder; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PingReqEncoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PingReqEncoderTest.java similarity index 82% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PingReqEncoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PingReqEncoderTest.java index 6d489c57e..efc49d569 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PingReqEncoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PingReqEncoderTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.message.ping.MqttPingReq; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoders; +import com.hivemq.client2.internal.mqtt.message.ping.MqttPingReq; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import org.eclipse.paho.client.mqttv3.MqttException; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubAckEncoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubAckEncoderTest.java similarity index 79% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubAckEncoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubAckEncoderTest.java index 0d18422b5..3ae7efbe3 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubAckEncoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubAckEncoderTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubAck; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubAckView; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoders; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubAck; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PubAckView; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import org.eclipse.paho.client.mqttv3.MqttException; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubCompEncoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubCompEncoderTest.java similarity index 79% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubCompEncoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubCompEncoderTest.java index 6f68287f2..ccfd90f42 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubCompEncoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubCompEncoderTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubComp; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubCompView; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoders; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubComp; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PubCompView; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import org.eclipse.paho.client.mqttv3.MqttException; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRecEncoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRecEncoderTest.java similarity index 82% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRecEncoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRecEncoderTest.java index 59851affd..c96f2948d 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRecEncoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRecEncoderTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubRec; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubRecView; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoders; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubRec; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PubRecView; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; import org.eclipse.paho.client.mqttv3.internal.wire.MqttPublish; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRelEncoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRelEncoderTest.java similarity index 82% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRelEncoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRelEncoderTest.java index 6a1db16d9..ba7682f23 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRelEncoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt3/Mqtt3PubRelEncoderTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt3; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt3; -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubRel; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubRelView; -import com.hivemq.client.mqtt.mqtt3.message.Mqtt3MessageType; +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoders; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubRel; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PubRelView; +import com.hivemq.client2.mqtt.mqtt3.message.Mqtt3MessageType; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; import org.eclipse.paho.client.mqttv3.internal.wire.MqttPubRec; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/AbstractMqtt5EncoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/AbstractMqtt5EncoderTest.java similarity index 81% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/AbstractMqtt5EncoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/AbstractMqtt5EncoderTest.java index 1f785c266..780053680 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/AbstractMqtt5EncoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/AbstractMqtt5EncoderTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; -import com.hivemq.client.internal.mqtt.codec.encoder.AbstractMqttEncoderTest; -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; +import com.hivemq.client2.internal.mqtt.codec.encoder.AbstractMqttEncoderTest; +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoders; import org.jetbrains.annotations.NotNull; /** diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/AbstractMqtt5EncoderWithUserPropertiesTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/AbstractMqtt5EncoderWithUserPropertiesTest.java similarity index 90% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/AbstractMqtt5EncoderWithUserPropertiesTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/AbstractMqtt5EncoderWithUserPropertiesTest.java index 48a03514c..81d20197c 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/AbstractMqtt5EncoderWithUserPropertiesTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/AbstractMqtt5EncoderWithUserPropertiesTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.util.collections.ImmutableList; +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoders; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.util.collections.ImmutableList; import org.jetbrains.annotations.NotNull; import java.util.Arrays; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5AuthEncoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5AuthEncoderTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5AuthEncoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5AuthEncoderTest.java index 8c5c054f2..9efdbb983 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5AuthEncoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5AuthEncoderTest.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.mqtt.message.auth.MqttAuth; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5AuthReasonCode; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoders; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.mqtt.message.auth.MqttAuth; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5AuthReasonCode; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.handler.codec.EncoderException; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoderTest.java similarity index 94% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoderTest.java index 8d6894e98..fb29d9e86 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5ConnectEncoderTest.java @@ -14,31 +14,31 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.datatypes.*; -import com.hivemq.client.internal.mqtt.message.auth.MqttEnhancedAuth; -import com.hivemq.client.internal.mqtt.message.auth.MqttSimpleAuth; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnect; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnectRestrictions; -import com.hivemq.client.internal.mqtt.message.connect.MqttConnectRestrictionsBuilder; -import com.hivemq.client.internal.mqtt.message.connect.MqttStatefulConnect; -import com.hivemq.client.internal.mqtt.message.publish.MqttWillPublish; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.datatypes.MqttUtf8String; -import com.hivemq.client.mqtt.exceptions.MqttEncodeException; -import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientConfig; -import com.hivemq.client.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5Auth; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5AuthBuilder; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuthBuilder; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5Connect; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PayloadFormatIndicator; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoders; +import com.hivemq.client2.internal.mqtt.datatypes.*; +import com.hivemq.client2.internal.mqtt.message.auth.MqttEnhancedAuth; +import com.hivemq.client2.internal.mqtt.message.auth.MqttSimpleAuth; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnectRestrictions; +import com.hivemq.client2.internal.mqtt.message.connect.MqttConnectRestrictionsBuilder; +import com.hivemq.client2.internal.mqtt.message.connect.MqttStatefulConnect; +import com.hivemq.client2.internal.mqtt.message.publish.MqttWillPublish; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.datatypes.MqttUtf8String; +import com.hivemq.client2.mqtt.exceptions.MqttEncodeException; +import com.hivemq.client2.mqtt.mqtt5.Mqtt5ClientConfig; +import com.hivemq.client2.mqtt.mqtt5.auth.Mqtt5EnhancedAuthMechanism; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5Auth; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5AuthBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5EnhancedAuthBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5Connect; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PayloadFormatIndicator; import io.netty.handler.codec.EncoderException; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Disabled; @@ -48,7 +48,7 @@ import java.util.Arrays; import java.util.concurrent.CompletableFuture; -import static com.hivemq.client.internal.mqtt.message.connect.MqttConnectRestrictions.DEFAULT; +import static com.hivemq.client2.internal.mqtt.message.connect.MqttConnectRestrictions.DEFAULT; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5DisconnectEncoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5DisconnectEncoderTest.java similarity index 93% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5DisconnectEncoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5DisconnectEncoderTest.java index 3140a2004..42e217248 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5DisconnectEncoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5DisconnectEncoderTest.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoders; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.jetbrains.annotations.NotNull; @@ -34,8 +34,8 @@ import java.util.Arrays; -import static com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect.SESSION_EXPIRY_INTERVAL_FROM_CONNECT; -import static com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.*; +import static com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect.SESSION_EXPIRY_INTERVAL_FROM_CONNECT; +import static com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode.*; import static org.junit.jupiter.params.provider.EnumSource.Mode.EXCLUDE; /** diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PingReqEncoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PingReqEncoderTest.java similarity index 85% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PingReqEncoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PingReqEncoderTest.java index 3a4c9de9a..841760c1e 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PingReqEncoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PingReqEncoderTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.message.ping.MqttPingReq; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoders; +import com.hivemq.client2.internal.mqtt.message.ping.MqttPingReq; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; import io.netty.buffer.ByteBuf; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubAckEncoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubAckEncoderTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubAckEncoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubAckEncoderTest.java index 7e9924ce1..1e8e6b17d 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubAckEncoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubAckEncoderTest.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubAck; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAckReasonCode; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoders; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubAck; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubAckReasonCode; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.jetbrains.annotations.NotNull; @@ -32,7 +32,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import static com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT; +import static com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT; import static org.junit.jupiter.params.provider.EnumSource.Mode.EXCLUDE; /** diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubCompEncoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubCompEncoderTest.java similarity index 91% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubCompEncoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubCompEncoderTest.java index d4919435c..36ce57ab4 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubCompEncoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubCompEncoderTest.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubComp; -import com.hivemq.client.mqtt.exceptions.MqttEncodeException; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoders; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubComp; +import com.hivemq.client2.mqtt.exceptions.MqttEncodeException; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.jetbrains.annotations.NotNull; @@ -31,9 +31,9 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import static com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT; -import static com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode.PACKET_IDENTIFIER_NOT_FOUND; -import static com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode.SUCCESS; +import static com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT; +import static com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode.PACKET_IDENTIFIER_NOT_FOUND; +import static com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubCompReasonCode.SUCCESS; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.params.provider.EnumSource.Mode.EXCLUDE; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRecEncoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRecEncoderTest.java similarity index 93% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRecEncoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRecEncoderTest.java index 9f947b65e..c4d724b0c 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRecEncoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRecEncoderTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubRec; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoders; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubRec; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.jetbrains.annotations.NotNull; @@ -29,8 +29,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import static com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT; -import static com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode.SUCCESS; +import static com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT; +import static com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRecReasonCode.SUCCESS; import static org.junit.jupiter.params.provider.EnumSource.Mode.EXCLUDE; /** diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRelEncoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRelEncoderTest.java similarity index 92% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRelEncoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRelEncoderTest.java index d86640f94..1d6f41856 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRelEncoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PubRelEncoderTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger; -import com.hivemq.client.internal.mqtt.message.publish.MqttPubRel; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoders; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPubRel; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.jetbrains.annotations.NotNull; @@ -30,8 +30,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -import static com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT; -import static com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode.SUCCESS; +import static com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT; +import static com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRelReasonCode.SUCCESS; import static org.junit.jupiter.params.provider.EnumSource.Mode.EXCLUDE; /** diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PublishEncoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PublishEncoderTest.java similarity index 96% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PublishEncoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PublishEncoderTest.java index 64158e4ac..dc6e45b66 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5PublishEncoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5PublishEncoderTest.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.datatypes.*; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublishProperty; -import com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish; -import com.hivemq.client.internal.util.collections.ImmutableIntList; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.exceptions.MqttEncodeException; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PayloadFormatIndicator; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoders; +import com.hivemq.client2.internal.mqtt.datatypes.*; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublishProperty; +import com.hivemq.client2.internal.mqtt.message.publish.MqttStatefulPublish; +import com.hivemq.client2.internal.util.collections.ImmutableIntList; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.exceptions.MqttEncodeException; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PayloadFormatIndicator; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.jetbrains.annotations.NotNull; @@ -34,9 +34,9 @@ import java.nio.ByteBuffer; -import static com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl.NO_USER_PROPERTIES; -import static com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish.DEFAULT_NO_SUBSCRIPTION_IDENTIFIERS; -import static com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish.DEFAULT_NO_TOPIC_ALIAS; +import static com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl.NO_USER_PROPERTIES; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttStatefulPublish.DEFAULT_NO_SUBSCRIPTION_IDENTIFIERS; +import static com.hivemq.client2.internal.mqtt.message.publish.MqttStatefulPublish.DEFAULT_NO_TOPIC_ALIAS; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5SubscribeEncoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5SubscribeEncoderTest.java similarity index 93% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5SubscribeEncoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5SubscribeEncoderTest.java index 009d9d288..5baf15dcc 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5SubscribeEncoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5SubscribeEncoderTest.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttStatefulSubscribe; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscription; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.exceptions.MqttEncodeException; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5RetainHandling; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoders; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicFilterImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttStatefulSubscribe; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscribe; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscription; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.exceptions.MqttEncodeException; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5RetainHandling; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -39,8 +39,8 @@ import java.util.Collections; import java.util.List; -import static com.hivemq.client.internal.mqtt.datatypes.MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT; -import static com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscription.*; +import static com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger.MAXIMUM_PACKET_SIZE_LIMIT; +import static com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5Subscription.*; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5UnsubscribeEncoderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5UnsubscribeEncoderTest.java similarity index 94% rename from src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5UnsubscribeEncoderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5UnsubscribeEncoderTest.java index 3c6b72faf..0f74dab1c 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/codec/encoder/mqtt5/Mqtt5UnsubscribeEncoderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/codec/encoder/mqtt5/Mqtt5UnsubscribeEncoderTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.codec.encoder.mqtt5; - -import com.hivemq.client.internal.mqtt.codec.encoder.MqttMessageEncoders; -import com.hivemq.client.internal.mqtt.datatypes.*; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttStatefulUnsubscribe; -import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.exceptions.MqttEncodeException; -import com.hivemq.client.mqtt.mqtt5.message.Mqtt5MessageType; +package com.hivemq.client2.internal.mqtt.codec.encoder.mqtt5; + +import com.hivemq.client2.internal.mqtt.codec.encoder.MqttMessageEncoders; +import com.hivemq.client2.internal.mqtt.datatypes.*; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttStatefulUnsubscribe; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.MqttUnsubscribe; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.exceptions.MqttEncodeException; +import com.hivemq.client2.mqtt.mqtt5.message.Mqtt5MessageType; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttBinaryDataTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttBinaryDataTest.java similarity index 98% rename from src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttBinaryDataTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttBinaryDataTest.java index ce3652ef3..a1e3520d0 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttBinaryDataTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttBinaryDataTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttClientIdentifierImplTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttClientIdentifierImplTest.java similarity index 98% rename from src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttClientIdentifierImplTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttClientIdentifierImplTest.java index 8dd1479e3..8c91c37f3 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttClientIdentifierImplTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttClientIdentifierImplTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttSharedTopicFilterImplTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttSharedTopicFilterImplTest.java similarity index 99% rename from src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttSharedTopicFilterImplTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttSharedTopicFilterImplTest.java index bb7b18629..cb981ec65 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttSharedTopicFilterImplTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttSharedTopicFilterImplTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; -import com.hivemq.client.internal.util.collections.ImmutableList; +import com.hivemq.client2.internal.util.collections.ImmutableList; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImplTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicFilterImplTest.java similarity index 99% rename from src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImplTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicFilterImplTest.java index 41b3ea98e..0c75ccf91 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicFilterImplTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicFilterImplTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; -import com.hivemq.client.internal.util.collections.ImmutableList; +import com.hivemq.client2.internal.util.collections.ImmutableList; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicImplTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicImplTest.java similarity index 98% rename from src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicImplTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicImplTest.java index 2aa9cb718..be9f54bad 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicImplTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicImplTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; -import com.hivemq.client.internal.util.collections.ImmutableList; +import com.hivemq.client2.internal.util.collections.ImmutableList; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicIteratorTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicIteratorTest.java similarity index 99% rename from src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicIteratorTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicIteratorTest.java index c4ac1ef24..fbda64679 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicIteratorTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicIteratorTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicLevelTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicLevelTest.java similarity index 98% rename from src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicLevelTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicLevelTest.java index 756e00e2c..e47038f3c 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicLevelTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicLevelTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicLevelsTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicLevelsTest.java similarity index 98% rename from src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicLevelsTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicLevelsTest.java index 33306bd34..b60e632f8 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttTopicLevelsTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttTopicLevelsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImplBuilderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUserPropertiesImplBuilderTest.java similarity index 96% rename from src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImplBuilderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUserPropertiesImplBuilderTest.java index 27681e7f2..8498bebf8 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImplBuilderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUserPropertiesImplBuilderTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperties; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; -import com.hivemq.client.mqtt.mqtt5.datatypes.Mqtt5UserProperty; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperties; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserPropertiesBuilder; +import com.hivemq.client2.mqtt.mqtt5.datatypes.Mqtt5UserProperty; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImplTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUserPropertiesImplTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImplTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUserPropertiesImplTest.java index d80bb5bf8..3b7c46b92 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertiesImplTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUserPropertiesImplTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; -import com.hivemq.client.internal.mqtt.message.MqttProperty; -import com.hivemq.client.internal.util.collections.ImmutableList; +import com.hivemq.client2.internal.mqtt.message.MqttProperty; +import com.hivemq.client2.internal.util.collections.ImmutableList; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertyImplTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUserPropertyImplTest.java similarity index 97% rename from src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertyImplTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUserPropertyImplTest.java index 8e8cd516f..a8a6eb92e 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttUserPropertyImplTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUserPropertyImplTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttUtf8StringImplTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUtf8StringImplTest.java similarity index 99% rename from src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttUtf8StringImplTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUtf8StringImplTest.java index b93af02c1..6da80e8ea 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttUtf8StringImplTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttUtf8StringImplTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; import com.google.common.base.Utf8; import io.netty.buffer.ByteBuf; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttVariableByteIntegerTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttVariableByteIntegerTest.java similarity index 99% rename from src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttVariableByteIntegerTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttVariableByteIntegerTest.java index 0253b5764..322773c1e 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/datatypes/MqttVariableByteIntegerTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/datatypes/MqttVariableByteIntegerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.datatypes; +package com.hivemq.client2.internal.mqtt.datatypes; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTreeTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTreeTest.java similarity index 97% rename from src/test/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTreeTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTreeTest.java index 7071a831e..534433929 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTreeTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowTreeTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.incoming; +package com.hivemq.client2.internal.mqtt.handler.publish.incoming; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImpl; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscription; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscriptionBuilder; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicFilterImpl; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscription; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscriptionBuilder; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowsTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowsTest.java similarity index 98% rename from src/test/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowsTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowsTest.java index 163645bff..bdc3cf801 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowsTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttSubscribedPublishFlowsTest.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.publish.incoming; +package com.hivemq.client2.internal.mqtt.handler.publish.incoming; import com.google.common.collect.ImmutableSet; -import com.hivemq.client.internal.mqtt.datatypes.MqttTopicFilterImpl; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublishBuilder; -import com.hivemq.client.internal.mqtt.message.publish.MqttStatefulPublish; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscription; -import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscriptionBuilder; -import com.hivemq.client.internal.util.collections.HandleList; -import com.hivemq.client.internal.util.collections.ImmutableList; +import com.hivemq.client2.internal.mqtt.datatypes.MqttTopicFilterImpl; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublishBuilder; +import com.hivemq.client2.internal.mqtt.message.publish.MqttStatefulPublish; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscription; +import com.hivemq.client2.internal.mqtt.message.subscribe.MqttSubscriptionBuilder; +import com.hivemq.client2.internal.util.collections.HandleList; +import com.hivemq.client2.internal.util.collections.ImmutableList; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsInitializerTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/handler/tls/MqttTlsInitializerTest.java similarity index 96% rename from src/test/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsInitializerTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/handler/tls/MqttTlsInitializerTest.java index cbd76de8e..094f869cf 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/handler/tls/MqttTlsInitializerTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/handler/tls/MqttTlsInitializerTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.handler.tls; +package com.hivemq.client2.internal.mqtt.handler.tls; -import com.hivemq.client.internal.mqtt.MqttTlsConfigImpl; -import com.hivemq.client.internal.mqtt.MqttTlsConfigImplBuilder; -import com.hivemq.client.internal.util.collections.ImmutableList; +import com.hivemq.client2.internal.mqtt.MqttTlsConfigImpl; +import com.hivemq.client2.internal.mqtt.MqttTlsConfigImplBuilder; +import com.hivemq.client2.internal.util.collections.ImmutableList; import io.netty.channel.Channel; import io.netty.channel.embedded.EmbeddedChannel; import io.netty.handler.ssl.SslContextBuilder; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/MqttPropertyTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/MqttPropertyTest.java similarity index 98% rename from src/test/java/com/hivemq/client/internal/mqtt/message/MqttPropertyTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/MqttPropertyTest.java index ad8dacb85..07877c239 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/MqttPropertyTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/MqttPropertyTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message; +package com.hivemq.client2.internal.mqtt.message; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/MqttReasonCodesTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/MqttReasonCodesTest.java similarity index 99% rename from src/test/java/com/hivemq/client/internal/mqtt/message/MqttReasonCodesTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/MqttReasonCodesTest.java index 5132bf6df..b30ae9a5c 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/MqttReasonCodesTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/MqttReasonCodesTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message; +package com.hivemq.client2.internal.mqtt.message; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuthTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/auth/MqttAuthTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuthTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/auth/MqttAuthTest.java index 546570ba3..ddf6b43ba 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/auth/MqttAuthTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/auth/MqttAuthTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.auth; +package com.hivemq.client2.internal.mqtt.message.auth; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/auth/MqttEnhancedAuthTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/auth/MqttEnhancedAuthTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/message/auth/MqttEnhancedAuthTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/auth/MqttEnhancedAuthTest.java index 7190eda04..0a2f7c776 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/auth/MqttEnhancedAuthTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/auth/MqttEnhancedAuthTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.auth; +package com.hivemq.client2.internal.mqtt.message.auth; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/auth/MqttSimpleAuthTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/auth/MqttSimpleAuthTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/message/auth/MqttSimpleAuthTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/auth/MqttSimpleAuthTest.java index e8dc20414..d8e35cb13 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/auth/MqttSimpleAuthTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/auth/MqttSimpleAuthTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.auth; +package com.hivemq.client2.internal.mqtt.message.auth; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthViewTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthViewTest.java similarity index 93% rename from src/test/java/com/hivemq/client/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthViewTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthViewTest.java index 6b8a3df73..cac87f291 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthViewTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/auth/mqtt3/Mqtt3SimpleAuthViewTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.auth.mqtt3; +package com.hivemq.client2.internal.mqtt.message.auth.mqtt3; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckRestrictionsTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnAckRestrictionsTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckRestrictionsTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnAckRestrictionsTest.java index 810630077..2742d2ae1 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckRestrictionsTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnAckRestrictionsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect; +package com.hivemq.client2.internal.mqtt.message.connect; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnAckTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnAckTest.java index 9b719d561..95522cbdd 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnAckTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnAckTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect; +package com.hivemq.client2.internal.mqtt.message.connect; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictionsTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnectRestrictionsTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictionsTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnectRestrictionsTest.java index 6b58281da..c57b4ec17 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectRestrictionsTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnectRestrictionsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect; +package com.hivemq.client2.internal.mqtt.message.connect; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnectTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnectTest.java index 304adab2c..af42ffea5 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/connect/MqttConnectTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/connect/MqttConnectTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect; +package com.hivemq.client2.internal.mqtt.message.connect; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckViewTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckViewTest.java similarity index 93% rename from src/test/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckViewTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckViewTest.java index 7e3ed56c5..dfd974275 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckViewTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/connect/mqtt3/Mqtt3ConnAckViewTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect.mqtt3; +package com.hivemq.client2.internal.mqtt.message.connect.mqtt3; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewTest.java similarity index 93% rename from src/test/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewTest.java index a0aab8591..d6e8519d2 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/connect/mqtt3/Mqtt3ConnectViewTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.connect.mqtt3; +package com.hivemq.client2.internal.mqtt.message.connect.mqtt3; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnectTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/disconnect/MqttDisconnectTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnectTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/disconnect/MqttDisconnectTest.java index cc9f009b6..cdddc1276 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/disconnect/MqttDisconnectTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/disconnect/MqttDisconnectTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.disconnect; +package com.hivemq.client2.internal.mqtt.message.disconnect; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAckTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubAckTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAckTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubAckTest.java index 48e0702ab..824444218 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubAckTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubAckTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; +package com.hivemq.client2.internal.mqtt.message.publish; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubCompTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubCompTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubCompTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubCompTest.java index 832fdfa62..218b049b5 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubCompTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubCompTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; +package com.hivemq.client2.internal.mqtt.message.publish; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRecTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRecTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRecTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRecTest.java index 08f3be3bc..b579fdb60 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRecTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRecTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; +package com.hivemq.client2.internal.mqtt.message.publish; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRelTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRelTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRelTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRelTest.java index db6651499..3fbf4a757 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPubRelTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPubRelTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; +package com.hivemq.client2.internal.mqtt.message.publish; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishResultTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPublishResultTest.java similarity index 98% rename from src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishResultTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPublishResultTest.java index 185055edd..df7cfe98b 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishResultTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPublishResultTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; +package com.hivemq.client2.internal.mqtt.message.publish; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPublishTest.java similarity index 97% rename from src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPublishTest.java index e7476e828..19f701d5e 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttPublishTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/publish/MqttPublishTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; +package com.hivemq.client2.internal.mqtt.message.publish; import nl.jqno.equalsverifier.EqualsVerifier; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublishTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/publish/MqttWillPublishTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublishTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/publish/MqttWillPublishTest.java index d43bce5c6..e0a20c9b1 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/MqttWillPublishTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/publish/MqttWillPublishTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish; +package com.hivemq.client2.internal.mqtt.message.publish; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishResultViewTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PublishResultViewTest.java similarity index 93% rename from src/test/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishResultViewTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PublishResultViewTest.java index cb448fd25..f767e4e13 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishResultViewTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PublishResultViewTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.mqtt3; +package com.hivemq.client2.internal.mqtt.message.publish.mqtt3; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewTest.java similarity index 90% rename from src/test/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewTest.java index 177bd0aa1..eb1b03042 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/publish/mqtt3/Mqtt3PublishViewTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.publish.mqtt3; +package com.hivemq.client2.internal.mqtt.message.publish.mqtt3; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublish; -import com.hivemq.client.internal.mqtt.message.publish.MqttPublishBuilder; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublish; +import com.hivemq.client2.internal.mqtt.message.publish.MqttPublishBuilder; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubAckTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubAckTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubAckTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubAckTest.java index 52cd79060..e9e3b0ba8 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubAckTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubAckTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe; +package com.hivemq.client2.internal.mqtt.message.subscribe; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscribeBuilderTest.java similarity index 97% rename from src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscribeBuilderTest.java index c4bf82007..48dabb4ee 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeBuilderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscribeBuilderTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe; - -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5RetainHandling; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubscribeBuilder; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5Subscription; +package com.hivemq.client2.internal.mqtt.message.subscribe; + +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5RetainHandling; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5Subscribe; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubscribeBuilder; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5Subscription; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscribeTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscribeTest.java index d4e44bfc7..33d61ce7d 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscribeTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscribeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe; +package com.hivemq.client2.internal.mqtt.message.subscribe; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscriptionTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscriptionTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscriptionTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscriptionTest.java index cf73f3c95..899d3efcc 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/MqttSubscriptionTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttSubscriptionTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe; +package com.hivemq.client2.internal.mqtt.message.subscribe; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckViewTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckViewTest.java similarity index 93% rename from src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckViewTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckViewTest.java index afa226031..1f0e54cd2 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckViewTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubAckViewTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe.mqtt3; +package com.hivemq.client2.internal.mqtt.message.subscribe.mqtt3; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilderTest.java similarity index 97% rename from src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilderTest.java index f6e253307..8955a4615 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewBuilderTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe.mqtt3; +package com.hivemq.client2.internal.mqtt.message.subscribe.mqtt3; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilder; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscription; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3SubscribeBuilder; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscription; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewTest.java similarity index 93% rename from src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewTest.java index a13cccbbd..735d066bf 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscribeViewTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe.mqtt3; +package com.hivemq.client2.internal.mqtt.message.subscribe.mqtt3; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewTest.java similarity index 93% rename from src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewTest.java index 59868c9fb..d397fd6db 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/subscribe/mqtt3/Mqtt3SubscriptionViewTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.subscribe.mqtt3; +package com.hivemq.client2.internal.mqtt.message.subscribe.mqtt3; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubAckTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubAckTest.java similarity index 88% rename from src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubAckTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubAckTest.java index c746285b5..eb5965d2b 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubAckTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubAckTest.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.unsubscribe; +package com.hivemq.client2.internal.mqtt.message.unsubscribe; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertyImpl; -import com.hivemq.client.internal.mqtt.datatypes.MqttUtf8StringImpl; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertyImpl; +import com.hivemq.client2.internal.mqtt.datatypes.MqttUtf8StringImpl; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAckReasonCode; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; -import static com.hivemq.client.internal.mqtt.datatypes.MqttUserPropertiesImpl.NO_USER_PROPERTIES; +import static com.hivemq.client2.internal.mqtt.datatypes.MqttUserPropertiesImpl.NO_USER_PROPERTIES; import static org.junit.jupiter.api.Assertions.*; /** diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilderTest.java similarity index 98% rename from src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilderTest.java index dbdeb81a1..343f11d7f 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubscribeBuilderTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.unsubscribe; +package com.hivemq.client2.internal.mqtt.message.unsubscribe; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilter; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubscribeTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubscribeTest.java index b087061c9..7c8f9f7a2 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/MqttUnsubscribeTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/MqttUnsubscribeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.unsubscribe; +package com.hivemq.client2.internal.mqtt.message.unsubscribe; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilderTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilderTest.java similarity index 98% rename from src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilderTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilderTest.java index 71a4cef8e..f68ed83ad 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilderTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewBuilderTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3; +package com.hivemq.client2.internal.mqtt.message.unsubscribe.mqtt3; -import com.hivemq.client.internal.util.collections.ImmutableList; -import com.hivemq.client.mqtt.datatypes.MqttTopicFilter; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; +import com.hivemq.client2.internal.util.collections.ImmutableList; +import com.hivemq.client2.mqtt.datatypes.MqttTopicFilter; +import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewTest.java similarity index 93% rename from src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewTest.java index 482e9daa6..a72cf1e4b 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/message/unsubscribe/mqtt3/Mqtt3UnsubscribeViewTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3; +package com.hivemq.client2.internal.mqtt.message.unsubscribe.mqtt3; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; diff --git a/src/test/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewExceptionsTest.java b/src/test/java/com/hivemq/client2/internal/mqtt/mqtt3/Mqtt3RxClientViewExceptionsTest.java similarity index 84% rename from src/test/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewExceptionsTest.java rename to src/test/java/com/hivemq/client2/internal/mqtt/mqtt3/Mqtt3RxClientViewExceptionsTest.java index ca45620b8..bef53e522 100644 --- a/src/test/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientViewExceptionsTest.java +++ b/src/test/java/com/hivemq/client2/internal/mqtt/mqtt3/Mqtt3RxClientViewExceptionsTest.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package com.hivemq.client.internal.mqtt.mqtt3; - -import com.hivemq.client.internal.mqtt.MqttClientConfig; -import com.hivemq.client.internal.mqtt.MqttRxClient; -import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect; -import com.hivemq.client.mqtt.MqttGlobalPublishFilter; -import com.hivemq.client.mqtt.datatypes.MqttQos; -import com.hivemq.client.mqtt.mqtt3.exceptions.Mqtt3MessageException; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3Connect; -import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3Subscription; -import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; -import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5DisconnectException; -import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5MessageException; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; -import com.hivemq.client.rx.FlowableWithSingleSplit; +package com.hivemq.client2.internal.mqtt.mqtt3; + +import com.hivemq.client2.internal.mqtt.MqttClientConfig; +import com.hivemq.client2.internal.mqtt.MqttRxClient; +import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect; +import com.hivemq.client2.mqtt.MqttGlobalPublishFilter; +import com.hivemq.client2.mqtt.datatypes.MqttQos; +import com.hivemq.client2.mqtt.mqtt3.exceptions.Mqtt3MessageException; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3Connect; +import com.hivemq.client2.mqtt.mqtt3.message.publish.Mqtt3Publish; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscribe; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3Subscription; +import com.hivemq.client2.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe; +import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5DisconnectException; +import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5MessageException; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; +import com.hivemq.client2.rx.FlowableWithSingleSplit; import io.reactivex.rxjava3.core.Completable; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.core.Single; diff --git a/src/test/java/com/hivemq/client/internal/util/AsyncRuntimeExceptionTest.java b/src/test/java/com/hivemq/client2/internal/util/AsyncRuntimeExceptionTest.java similarity index 99% rename from src/test/java/com/hivemq/client/internal/util/AsyncRuntimeExceptionTest.java rename to src/test/java/com/hivemq/client2/internal/util/AsyncRuntimeExceptionTest.java index 91350fa8b..56962ebd4 100644 --- a/src/test/java/com/hivemq/client/internal/util/AsyncRuntimeExceptionTest.java +++ b/src/test/java/com/hivemq/client2/internal/util/AsyncRuntimeExceptionTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/test/java/com/hivemq/client/internal/util/ByteArrayTest.java b/src/test/java/com/hivemq/client2/internal/util/ByteArrayTest.java similarity index 96% rename from src/test/java/com/hivemq/client/internal/util/ByteArrayTest.java rename to src/test/java/com/hivemq/client2/internal/util/ByteArrayTest.java index 5bfacc162..652c9e35c 100644 --- a/src/test/java/com/hivemq/client/internal/util/ByteArrayTest.java +++ b/src/test/java/com/hivemq/client2/internal/util/ByteArrayTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/util/ByteArrayUtilTest.java b/src/test/java/com/hivemq/client2/internal/util/ByteArrayUtilTest.java similarity index 99% rename from src/test/java/com/hivemq/client/internal/util/ByteArrayUtilTest.java rename to src/test/java/com/hivemq/client2/internal/util/ByteArrayUtilTest.java index a36222f0c..64c62e5bf 100644 --- a/src/test/java/com/hivemq/client/internal/util/ByteArrayUtilTest.java +++ b/src/test/java/com/hivemq/client2/internal/util/ByteArrayUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/util/ByteBufferUtilTest.java b/src/test/java/com/hivemq/client2/internal/util/ByteBufferUtilTest.java similarity index 99% rename from src/test/java/com/hivemq/client/internal/util/ByteBufferUtilTest.java rename to src/test/java/com/hivemq/client2/internal/util/ByteBufferUtilTest.java index 4f14038f3..e47878b48 100644 --- a/src/test/java/com/hivemq/client/internal/util/ByteBufferUtilTest.java +++ b/src/test/java/com/hivemq/client2/internal/util/ByteBufferUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/com/hivemq/client/internal/util/ChecksTest.java b/src/test/java/com/hivemq/client2/internal/util/ChecksTest.java similarity index 97% rename from src/test/java/com/hivemq/client/internal/util/ChecksTest.java rename to src/test/java/com/hivemq/client2/internal/util/ChecksTest.java index ce04afb80..31f2939dd 100644 --- a/src/test/java/com/hivemq/client/internal/util/ChecksTest.java +++ b/src/test/java/com/hivemq/client2/internal/util/ChecksTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; -import com.hivemq.client.internal.util.collections.ImmutableList; +import com.hivemq.client2.internal.util.collections.ImmutableList; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; @@ -75,7 +75,7 @@ void notImplemented_otherImpl() { final IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> Checks.notImplemented(o, Impl.class, "test-name")); assertEquals( - "test-name must not be implemented by the user, but was implemented by com.hivemq.client.internal.util.ChecksTest$OtherImpl.", + "test-name must not be implemented by the user, but was implemented by com.hivemq.client2.internal.util.ChecksTest$OtherImpl.", exception.getMessage()); } @@ -99,7 +99,7 @@ void notImplementedOrNull_otherImpl() { final IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> Checks.notImplementedOrNull(o, Impl.class, "test-name")); assertEquals( - "test-name must not be implemented by the user, but was implemented by com.hivemq.client.internal.util.ChecksTest$OtherImpl.", + "test-name must not be implemented by the user, but was implemented by com.hivemq.client2.internal.util.ChecksTest$OtherImpl.", exception.getMessage()); } @@ -155,7 +155,7 @@ void elementsNotImplemented_otherImpl() { final IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> Checks.elementsNotImplemented(o, Impl.class, "test-name")); assertEquals( - "test-name must not be implemented by the user, but was implemented by com.hivemq.client.internal.util.ChecksTest$OtherImpl.", + "test-name must not be implemented by the user, but was implemented by com.hivemq.client2.internal.util.ChecksTest$OtherImpl.", exception.getMessage()); } diff --git a/src/test/java/com/hivemq/client/internal/util/ClassUtilTest.java b/src/test/java/com/hivemq/client2/internal/util/ClassUtilTest.java similarity index 82% rename from src/test/java/com/hivemq/client/internal/util/ClassUtilTest.java rename to src/test/java/com/hivemq/client2/internal/util/ClassUtilTest.java index 0830dda2f..5f6600aa6 100644 --- a/src/test/java/com/hivemq/client/internal/util/ClassUtilTest.java +++ b/src/test/java/com/hivemq/client2/internal/util/ClassUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; import org.junit.jupiter.api.Test; @@ -29,11 +29,11 @@ class ClassUtilTest { @Test void isAvailable_true() { assertTrue(ClassUtil.isAvailable("java.lang.String")); - assertTrue(ClassUtil.isAvailable("com.hivemq.client.internal.util.ClassUtilTest")); + assertTrue(ClassUtil.isAvailable("com.hivemq.client2.internal.util.ClassUtilTest")); } @Test void isAvailable_unknownClass() { - assertFalse(ClassUtil.isAvailable("com.hivemq.client.UnknownClass")); + assertFalse(ClassUtil.isAvailable("com.hivemq.client2.UnknownClass")); } } \ No newline at end of file diff --git a/src/test/java/com/hivemq/client/internal/util/ExecutorUtilTest.java b/src/test/java/com/hivemq/client2/internal/util/ExecutorUtilTest.java similarity index 97% rename from src/test/java/com/hivemq/client/internal/util/ExecutorUtilTest.java rename to src/test/java/com/hivemq/client2/internal/util/ExecutorUtilTest.java index 7ba2dbbd1..1d66eafc0 100644 --- a/src/test/java/com/hivemq/client/internal/util/ExecutorUtilTest.java +++ b/src/test/java/com/hivemq/client2/internal/util/ExecutorUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/util/Pow2UtilTest.java b/src/test/java/com/hivemq/client2/internal/util/Pow2UtilTest.java similarity index 96% rename from src/test/java/com/hivemq/client/internal/util/Pow2UtilTest.java rename to src/test/java/com/hivemq/client2/internal/util/Pow2UtilTest.java index 605800341..30813dadc 100644 --- a/src/test/java/com/hivemq/client/internal/util/Pow2UtilTest.java +++ b/src/test/java/com/hivemq/client2/internal/util/Pow2UtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/util/RangesTest.java b/src/test/java/com/hivemq/client2/internal/util/RangesTest.java similarity index 98% rename from src/test/java/com/hivemq/client/internal/util/RangesTest.java rename to src/test/java/com/hivemq/client2/internal/util/RangesTest.java index d9529db9a..2c349b5f5 100644 --- a/src/test/java/com/hivemq/client/internal/util/RangesTest.java +++ b/src/test/java/com/hivemq/client2/internal/util/RangesTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/com/hivemq/client/internal/util/StringUtilTest.java b/src/test/java/com/hivemq/client2/internal/util/StringUtilTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/util/StringUtilTest.java rename to src/test/java/com/hivemq/client2/internal/util/StringUtilTest.java index 54248a17c..fc5a63e2d 100644 --- a/src/test/java/com/hivemq/client/internal/util/StringUtilTest.java +++ b/src/test/java/com/hivemq/client2/internal/util/StringUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/util/UnsignedDataTypesTest.java b/src/test/java/com/hivemq/client2/internal/util/UnsignedDataTypesTest.java similarity index 97% rename from src/test/java/com/hivemq/client/internal/util/UnsignedDataTypesTest.java rename to src/test/java/com/hivemq/client2/internal/util/UnsignedDataTypesTest.java index 26b488d84..451398fe0 100644 --- a/src/test/java/com/hivemq/client/internal/util/UnsignedDataTypesTest.java +++ b/src/test/java/com/hivemq/client2/internal/util/UnsignedDataTypesTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/src/test/java/com/hivemq/client/internal/util/Utf8UtilTest.java b/src/test/java/com/hivemq/client2/internal/util/Utf8UtilTest.java similarity index 97% rename from src/test/java/com/hivemq/client/internal/util/Utf8UtilTest.java rename to src/test/java/com/hivemq/client2/internal/util/Utf8UtilTest.java index 06f557aee..ae14ec551 100644 --- a/src/test/java/com/hivemq/client/internal/util/Utf8UtilTest.java +++ b/src/test/java/com/hivemq/client2/internal/util/Utf8UtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util; +package com.hivemq.client2.internal.util; import com.google.common.base.Utf8; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/util/collections/ChunkedArrayQueueTest.java b/src/test/java/com/hivemq/client2/internal/util/collections/ChunkedArrayQueueTest.java similarity index 97% rename from src/test/java/com/hivemq/client/internal/util/collections/ChunkedArrayQueueTest.java rename to src/test/java/com/hivemq/client2/internal/util/collections/ChunkedArrayQueueTest.java index a4efc9550..798bb8ae5 100644 --- a/src/test/java/com/hivemq/client/internal/util/collections/ChunkedArrayQueueTest.java +++ b/src/test/java/com/hivemq/client2/internal/util/collections/ChunkedArrayQueueTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util.collections; +package com.hivemq.client2.internal.util.collections; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/com/hivemq/client/internal/util/collections/HandleListTest.java b/src/test/java/com/hivemq/client2/internal/util/collections/HandleListTest.java similarity index 95% rename from src/test/java/com/hivemq/client/internal/util/collections/HandleListTest.java rename to src/test/java/com/hivemq/client2/internal/util/collections/HandleListTest.java index d2cc66544..cc2fd8166 100644 --- a/src/test/java/com/hivemq/client/internal/util/collections/HandleListTest.java +++ b/src/test/java/com/hivemq/client2/internal/util/collections/HandleListTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.internal.util.collections; +package com.hivemq.client2.internal.util.collections; -import com.hivemq.client.internal.util.collections.HandleList.Handle; +import com.hivemq.client2.internal.util.collections.HandleList.Handle; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/src/test/java/com/hivemq/client/internal/util/collections/ImmutableIntListTest.java b/src/test/java/com/hivemq/client2/internal/util/collections/ImmutableIntListTest.java similarity index 99% rename from src/test/java/com/hivemq/client/internal/util/collections/ImmutableIntListTest.java rename to src/test/java/com/hivemq/client2/internal/util/collections/ImmutableIntListTest.java index 26060539c..4d1c8233e 100644 --- a/src/test/java/com/hivemq/client/internal/util/collections/ImmutableIntListTest.java +++ b/src/test/java/com/hivemq/client2/internal/util/collections/ImmutableIntListTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util.collections; +package com.hivemq.client2.internal.util.collections; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/util/collections/ImmutableListTest.java b/src/test/java/com/hivemq/client2/internal/util/collections/ImmutableListTest.java similarity index 99% rename from src/test/java/com/hivemq/client/internal/util/collections/ImmutableListTest.java rename to src/test/java/com/hivemq/client2/internal/util/collections/ImmutableListTest.java index 7be22bdca..19d61826b 100644 --- a/src/test/java/com/hivemq/client/internal/util/collections/ImmutableListTest.java +++ b/src/test/java/com/hivemq/client2/internal/util/collections/ImmutableListTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util.collections; +package com.hivemq.client2.internal.util.collections; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/internal/util/collections/IntIndexTest.java b/src/test/java/com/hivemq/client2/internal/util/collections/IntIndexTest.java similarity index 99% rename from src/test/java/com/hivemq/client/internal/util/collections/IntIndexTest.java rename to src/test/java/com/hivemq/client2/internal/util/collections/IntIndexTest.java index ec707280e..a54cd7f3d 100644 --- a/src/test/java/com/hivemq/client/internal/util/collections/IntIndexTest.java +++ b/src/test/java/com/hivemq/client2/internal/util/collections/IntIndexTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util.collections; +package com.hivemq.client2.internal.util.collections; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/test/java/com/hivemq/client/internal/util/collections/NodeListTest.java b/src/test/java/com/hivemq/client2/internal/util/collections/NodeListTest.java similarity index 99% rename from src/test/java/com/hivemq/client/internal/util/collections/NodeListTest.java rename to src/test/java/com/hivemq/client2/internal/util/collections/NodeListTest.java index c7268af27..021ab5baa 100644 --- a/src/test/java/com/hivemq/client/internal/util/collections/NodeListTest.java +++ b/src/test/java/com/hivemq/client2/internal/util/collections/NodeListTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.internal.util.collections; +package com.hivemq.client2.internal.util.collections; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/MqttClientStateTest.java b/src/test/java/com/hivemq/client2/mqtt/MqttClientStateTest.java similarity index 98% rename from src/test/java/com/hivemq/client/mqtt/MqttClientStateTest.java rename to src/test/java/com/hivemq/client2/mqtt/MqttClientStateTest.java index de81ec286..a2a220873 100644 --- a/src/test/java/com/hivemq/client/mqtt/MqttClientStateTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/MqttClientStateTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt; +package com.hivemq.client2.mqtt; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/com/hivemq/client/mqtt/MqttTlsConfigBuilderTest.java b/src/test/java/com/hivemq/client2/mqtt/MqttTlsConfigBuilderTest.java similarity index 98% rename from src/test/java/com/hivemq/client/mqtt/MqttTlsConfigBuilderTest.java rename to src/test/java/com/hivemq/client2/mqtt/MqttTlsConfigBuilderTest.java index 1fbebccca..064d62ac8 100644 --- a/src/test/java/com/hivemq/client/mqtt/MqttTlsConfigBuilderTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/MqttTlsConfigBuilderTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt; +package com.hivemq.client2.mqtt; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/datatypes/MqttQosTest.java b/src/test/java/com/hivemq/client2/mqtt/datatypes/MqttQosTest.java similarity index 97% rename from src/test/java/com/hivemq/client/mqtt/datatypes/MqttQosTest.java rename to src/test/java/com/hivemq/client2/mqtt/datatypes/MqttQosTest.java index afafa9442..4fd369bda 100644 --- a/src/test/java/com/hivemq/client/mqtt/datatypes/MqttQosTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/datatypes/MqttQosTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.datatypes; +package com.hivemq.client2.mqtt.datatypes; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/exceptions/ConnectionClosedExceptionTest.java b/src/test/java/com/hivemq/client2/mqtt/exceptions/ConnectionClosedExceptionTest.java similarity index 95% rename from src/test/java/com/hivemq/client/mqtt/exceptions/ConnectionClosedExceptionTest.java rename to src/test/java/com/hivemq/client2/mqtt/exceptions/ConnectionClosedExceptionTest.java index e27b0f678..53dd10783 100644 --- a/src/test/java/com/hivemq/client/mqtt/exceptions/ConnectionClosedExceptionTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/exceptions/ConnectionClosedExceptionTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.exceptions; +package com.hivemq.client2.mqtt.exceptions; -import com.hivemq.client.internal.util.AsyncRuntimeException; +import com.hivemq.client2.internal.util.AsyncRuntimeException; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/exceptions/ConnectionFailedExceptionTest.java b/src/test/java/com/hivemq/client2/mqtt/exceptions/ConnectionFailedExceptionTest.java similarity index 95% rename from src/test/java/com/hivemq/client/mqtt/exceptions/ConnectionFailedExceptionTest.java rename to src/test/java/com/hivemq/client2/mqtt/exceptions/ConnectionFailedExceptionTest.java index d08793180..93187a148 100644 --- a/src/test/java/com/hivemq/client/mqtt/exceptions/ConnectionFailedExceptionTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/exceptions/ConnectionFailedExceptionTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.exceptions; +package com.hivemq.client2.mqtt.exceptions; -import com.hivemq.client.internal.util.AsyncRuntimeException; +import com.hivemq.client2.internal.util.AsyncRuntimeException; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/exceptions/MqttClientStateExceptionTest.java b/src/test/java/com/hivemq/client2/mqtt/exceptions/MqttClientStateExceptionTest.java similarity index 95% rename from src/test/java/com/hivemq/client/mqtt/exceptions/MqttClientStateExceptionTest.java rename to src/test/java/com/hivemq/client2/mqtt/exceptions/MqttClientStateExceptionTest.java index 85d0e38a3..aff231ab4 100644 --- a/src/test/java/com/hivemq/client/mqtt/exceptions/MqttClientStateExceptionTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/exceptions/MqttClientStateExceptionTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.exceptions; +package com.hivemq.client2.mqtt.exceptions; -import com.hivemq.client.internal.util.AsyncRuntimeException; +import com.hivemq.client2.internal.util.AsyncRuntimeException; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/exceptions/MqttDecodeExceptionTest.java b/src/test/java/com/hivemq/client2/mqtt/exceptions/MqttDecodeExceptionTest.java similarity index 94% rename from src/test/java/com/hivemq/client/mqtt/exceptions/MqttDecodeExceptionTest.java rename to src/test/java/com/hivemq/client2/mqtt/exceptions/MqttDecodeExceptionTest.java index a2eb81199..8f8ce7368 100644 --- a/src/test/java/com/hivemq/client/mqtt/exceptions/MqttDecodeExceptionTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/exceptions/MqttDecodeExceptionTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.exceptions; +package com.hivemq.client2.mqtt.exceptions; -import com.hivemq.client.internal.util.AsyncRuntimeException; +import com.hivemq.client2.internal.util.AsyncRuntimeException; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/exceptions/MqttEncodeExceptionTest.java b/src/test/java/com/hivemq/client2/mqtt/exceptions/MqttEncodeExceptionTest.java similarity index 94% rename from src/test/java/com/hivemq/client/mqtt/exceptions/MqttEncodeExceptionTest.java rename to src/test/java/com/hivemq/client2/mqtt/exceptions/MqttEncodeExceptionTest.java index 17b1116c8..f4179cbdd 100644 --- a/src/test/java/com/hivemq/client/mqtt/exceptions/MqttEncodeExceptionTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/exceptions/MqttEncodeExceptionTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.exceptions; +package com.hivemq.client2.mqtt.exceptions; -import com.hivemq.client.internal.util.AsyncRuntimeException; +import com.hivemq.client2.internal.util.AsyncRuntimeException; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/exceptions/MqttSessionExpiredExceptionTest.java b/src/test/java/com/hivemq/client2/mqtt/exceptions/MqttSessionExpiredExceptionTest.java similarity index 95% rename from src/test/java/com/hivemq/client/mqtt/exceptions/MqttSessionExpiredExceptionTest.java rename to src/test/java/com/hivemq/client2/mqtt/exceptions/MqttSessionExpiredExceptionTest.java index 406f09dfa..9c8346bca 100644 --- a/src/test/java/com/hivemq/client/mqtt/exceptions/MqttSessionExpiredExceptionTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/exceptions/MqttSessionExpiredExceptionTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.exceptions; +package com.hivemq.client2.mqtt.exceptions; -import com.hivemq.client.internal.util.AsyncRuntimeException; +import com.hivemq.client2.internal.util.AsyncRuntimeException; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3ConnAckExceptionTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3ConnAckExceptionTest.java similarity index 95% rename from src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3ConnAckExceptionTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3ConnAckExceptionTest.java index d4124306a..bad81ca42 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3ConnAckExceptionTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3ConnAckExceptionTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.exceptions; +package com.hivemq.client2.mqtt.mqtt3.exceptions; -import com.hivemq.client.internal.util.AsyncRuntimeException; -import com.hivemq.client.mqtt.mqtt3.message.connect.Mqtt3ConnAck; +import com.hivemq.client2.internal.util.AsyncRuntimeException; +import com.hivemq.client2.mqtt.mqtt3.message.connect.Mqtt3ConnAck; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3DisconnectExceptionTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3DisconnectExceptionTest.java similarity index 94% rename from src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3DisconnectExceptionTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3DisconnectExceptionTest.java index 91a2c7f6e..ee7268517 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3DisconnectExceptionTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3DisconnectExceptionTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.exceptions; +package com.hivemq.client2.mqtt.mqtt3.exceptions; -import com.hivemq.client.internal.mqtt.message.disconnect.mqtt3.Mqtt3DisconnectView; -import com.hivemq.client.internal.util.AsyncRuntimeException; +import com.hivemq.client2.internal.mqtt.message.disconnect.mqtt3.Mqtt3DisconnectView; +import com.hivemq.client2.internal.util.AsyncRuntimeException; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubAckExceptionTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3PubAckExceptionTest.java similarity index 94% rename from src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubAckExceptionTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3PubAckExceptionTest.java index 6e9a8b6eb..7f8bfc110 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubAckExceptionTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3PubAckExceptionTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.exceptions; +package com.hivemq.client2.mqtt.mqtt3.exceptions; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubAckView; -import com.hivemq.client.internal.util.AsyncRuntimeException; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PubAckView; +import com.hivemq.client2.internal.util.AsyncRuntimeException; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubRecExceptionTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3PubRecExceptionTest.java similarity index 94% rename from src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubRecExceptionTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3PubRecExceptionTest.java index 5e6e950c2..a7c684416 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3PubRecExceptionTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3PubRecExceptionTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.exceptions; +package com.hivemq.client2.mqtt.mqtt3.exceptions; -import com.hivemq.client.internal.mqtt.message.publish.mqtt3.Mqtt3PubRecView; -import com.hivemq.client.internal.util.AsyncRuntimeException; +import com.hivemq.client2.internal.mqtt.message.publish.mqtt3.Mqtt3PubRecView; +import com.hivemq.client2.internal.util.AsyncRuntimeException; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3SubAckExceptionTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3SubAckExceptionTest.java similarity index 95% rename from src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3SubAckExceptionTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3SubAckExceptionTest.java index c0a7cdad6..86d5e9e04 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3SubAckExceptionTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3SubAckExceptionTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.exceptions; +package com.hivemq.client2.mqtt.mqtt3.exceptions; -import com.hivemq.client.internal.util.AsyncRuntimeException; -import com.hivemq.client.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; +import com.hivemq.client2.internal.util.AsyncRuntimeException; +import com.hivemq.client2.mqtt.mqtt3.message.subscribe.Mqtt3SubAck; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3UnsubAckExceptionTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3UnsubAckExceptionTest.java similarity index 94% rename from src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3UnsubAckExceptionTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3UnsubAckExceptionTest.java index 4a624a151..cbfb23c25 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt3/exceptions/Mqtt3UnsubAckExceptionTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt3/exceptions/Mqtt3UnsubAckExceptionTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.exceptions; +package com.hivemq.client2.mqtt.mqtt3.exceptions; -import com.hivemq.client.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; -import com.hivemq.client.internal.util.AsyncRuntimeException; +import com.hivemq.client2.internal.mqtt.message.unsubscribe.mqtt3.Mqtt3UnsubAckView; +import com.hivemq.client2.internal.util.AsyncRuntimeException; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt3/message/Mqtt3MessageTypeTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt3/message/Mqtt3MessageTypeTest.java similarity index 98% rename from src/test/java/com/hivemq/client/mqtt/mqtt3/message/Mqtt3MessageTypeTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt3/message/Mqtt3MessageTypeTest.java index 39c828ccc..2be99cb45 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt3/message/Mqtt3MessageTypeTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt3/message/Mqtt3MessageTypeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message; +package com.hivemq.client2.mqtt.mqtt3.message; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnAckReturnCodeTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3ConnAckReturnCodeTest.java similarity index 98% rename from src/test/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnAckReturnCodeTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3ConnAckReturnCodeTest.java index 236881093..b38f685b5 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt3/message/connect/Mqtt3ConnAckReturnCodeTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt3/message/connect/Mqtt3ConnAckReturnCodeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.connect; +package com.hivemq.client2.mqtt.mqtt3.message.connect; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAckReturnCodeTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubAckReturnCodeTest.java similarity index 97% rename from src/test/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAckReturnCodeTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubAckReturnCodeTest.java index c7e1e9fd1..c8407d346 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt3/message/subscribe/Mqtt3SubAckReturnCodeTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt3/message/subscribe/Mqtt3SubAckReturnCodeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt3.message.subscribe; +package com.hivemq.client2.mqtt.mqtt3.message.subscribe; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5AuthExceptionTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5AuthExceptionTest.java similarity index 92% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5AuthExceptionTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5AuthExceptionTest.java index e9adcfc62..c693c1590 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5AuthExceptionTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5AuthExceptionTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.exceptions; +package com.hivemq.client2.mqtt.mqtt5.exceptions; -import com.hivemq.client.internal.util.AsyncRuntimeException; -import com.hivemq.client.mqtt.mqtt5.message.auth.Mqtt5Auth; +import com.hivemq.client2.internal.util.AsyncRuntimeException; +import com.hivemq.client2.mqtt.mqtt5.message.auth.Mqtt5Auth; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5ConnAckExceptionTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5ConnAckExceptionTest.java similarity index 92% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5ConnAckExceptionTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5ConnAckExceptionTest.java index 85f156c3f..0f87b8b64 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5ConnAckExceptionTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5ConnAckExceptionTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.exceptions; +package com.hivemq.client2.mqtt.mqtt5.exceptions; -import com.hivemq.client.internal.util.AsyncRuntimeException; -import com.hivemq.client.mqtt.mqtt5.message.connect.Mqtt5ConnAck; +import com.hivemq.client2.internal.util.AsyncRuntimeException; +import com.hivemq.client2.mqtt.mqtt5.message.connect.Mqtt5ConnAck; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5DisconnectExceptionTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5DisconnectExceptionTest.java similarity index 94% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5DisconnectExceptionTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5DisconnectExceptionTest.java index 26c401636..0ee6fd91c 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5DisconnectExceptionTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5DisconnectExceptionTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.exceptions; +package com.hivemq.client2.mqtt.mqtt5.exceptions; -import com.hivemq.client.internal.util.AsyncRuntimeException; -import com.hivemq.client.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; +import com.hivemq.client2.internal.util.AsyncRuntimeException; +import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5Disconnect; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubAckExceptionTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5PubAckExceptionTest.java similarity index 92% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubAckExceptionTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5PubAckExceptionTest.java index 445290337..d2b1f475a 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubAckExceptionTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5PubAckExceptionTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.exceptions; +package com.hivemq.client2.mqtt.mqtt5.exceptions; -import com.hivemq.client.internal.util.AsyncRuntimeException; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubAck; +import com.hivemq.client2.internal.util.AsyncRuntimeException; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubAck; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubRecExceptionTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5PubRecExceptionTest.java similarity index 92% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubRecExceptionTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5PubRecExceptionTest.java index cdd945300..500beeab8 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5PubRecExceptionTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5PubRecExceptionTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.exceptions; +package com.hivemq.client2.mqtt.mqtt5.exceptions; -import com.hivemq.client.internal.util.AsyncRuntimeException; -import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PubRec; +import com.hivemq.client2.internal.util.AsyncRuntimeException; +import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5PubRec; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5SubAckExceptionTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5SubAckExceptionTest.java similarity index 92% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5SubAckExceptionTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5SubAckExceptionTest.java index 97ba8daef..744349f0a 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5SubAckExceptionTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5SubAckExceptionTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.exceptions; +package com.hivemq.client2.mqtt.mqtt5.exceptions; -import com.hivemq.client.internal.util.AsyncRuntimeException; -import com.hivemq.client.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; +import com.hivemq.client2.internal.util.AsyncRuntimeException; +import com.hivemq.client2.mqtt.mqtt5.message.subscribe.Mqtt5SubAck; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5UnsubAckExceptionTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5UnsubAckExceptionTest.java similarity index 92% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5UnsubAckExceptionTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5UnsubAckExceptionTest.java index 04e898fd6..65266b2ee 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/exceptions/Mqtt5UnsubAckExceptionTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt5/exceptions/Mqtt5UnsubAckExceptionTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.exceptions; +package com.hivemq.client2.mqtt.mqtt5.exceptions; -import com.hivemq.client.internal.util.AsyncRuntimeException; -import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; +import com.hivemq.client2.internal.util.AsyncRuntimeException; +import com.hivemq.client2.mqtt.mqtt5.message.unsubscribe.Mqtt5UnsubAck; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5MessageTypeTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/Mqtt5MessageTypeTest.java similarity index 99% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5MessageTypeTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt5/message/Mqtt5MessageTypeTest.java index 3e5086771..ac77b591f 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/Mqtt5MessageTypeTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/Mqtt5MessageTypeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message; +package com.hivemq.client2.mqtt.mqtt5.message; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthReasonCodeTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5AuthReasonCodeTest.java similarity index 98% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthReasonCodeTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5AuthReasonCodeTest.java index 55aa73f87..d6d5f3406 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/auth/Mqtt5AuthReasonCodeTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/auth/Mqtt5AuthReasonCodeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.auth; +package com.hivemq.client2.mqtt.mqtt5.message.auth; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCodeTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCodeTest.java similarity index 99% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCodeTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCodeTest.java index 308ada9ab..fedf7c2ab 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCodeTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/connect/Mqtt5ConnAckReasonCodeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.connect; +package com.hivemq.client2.mqtt.mqtt5.message.connect; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectReasonCodeTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectReasonCodeTest.java similarity index 99% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectReasonCodeTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectReasonCodeTest.java index b6bb789a1..2f0c58a25 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectReasonCodeTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/disconnect/Mqtt5DisconnectReasonCodeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.disconnect; +package com.hivemq.client2.mqtt.mqtt5.message.disconnect; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PayloadFormatIndicatorTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PayloadFormatIndicatorTest.java similarity index 96% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PayloadFormatIndicatorTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PayloadFormatIndicatorTest.java index 78008e3e4..98cb65896 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PayloadFormatIndicatorTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PayloadFormatIndicatorTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.publish; +package com.hivemq.client2.mqtt.mqtt5.message.publish; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckReasonCodeTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubAckReasonCodeTest.java similarity index 98% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckReasonCodeTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubAckReasonCodeTest.java index a05d6b7b5..1ce9ce41d 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubAckReasonCodeTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubAckReasonCodeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.publish; +package com.hivemq.client2.mqtt.mqtt5.message.publish; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompReasonCodeTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubCompReasonCodeTest.java similarity index 98% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompReasonCodeTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubCompReasonCodeTest.java index 59e3c86f7..80283e9ce 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubCompReasonCodeTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubCompReasonCodeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.publish; +package com.hivemq.client2.mqtt.mqtt5.message.publish; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecReasonCodeTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubRecReasonCodeTest.java similarity index 98% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecReasonCodeTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubRecReasonCodeTest.java index eb7feaea2..f9b996cb2 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRecReasonCodeTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubRecReasonCodeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.publish; +package com.hivemq.client2.mqtt.mqtt5.message.publish; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelReasonCodeTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubRelReasonCodeTest.java similarity index 98% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelReasonCodeTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubRelReasonCodeTest.java index d528557ad..8121fdd28 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/publish/Mqtt5PubRelReasonCodeTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/publish/Mqtt5PubRelReasonCodeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.publish; +package com.hivemq.client2.mqtt.mqtt5.message.publish; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandlingTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandlingTest.java similarity index 97% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandlingTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandlingTest.java index 9166514a2..9e7f56ef5 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandlingTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5RetainHandlingTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.subscribe; +package com.hivemq.client2.mqtt.mqtt5.message.subscribe; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCodeTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCodeTest.java similarity index 98% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCodeTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCodeTest.java index 73b25ae13..f048ec012 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCodeTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/subscribe/Mqtt5SubAckReasonCodeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.subscribe; +package com.hivemq.client2.mqtt.mqtt5.message.subscribe; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCodeTest.java b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCodeTest.java similarity index 98% rename from src/test/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCodeTest.java rename to src/test/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCodeTest.java index 80114bf25..b0a3b5cdf 100644 --- a/src/test/java/com/hivemq/client/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCodeTest.java +++ b/src/test/java/com/hivemq/client2/mqtt/mqtt5/message/unsubscribe/Mqtt5UnsubAckReasonCodeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.mqtt.mqtt5.message.unsubscribe; +package com.hivemq.client2.mqtt.mqtt5.message.unsubscribe; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/rx/FlowableWithSingleItem.java b/src/test/java/com/hivemq/client2/rx/FlowableWithSingleItem.java similarity index 97% rename from src/test/java/com/hivemq/client/rx/FlowableWithSingleItem.java rename to src/test/java/com/hivemq/client2/rx/FlowableWithSingleItem.java index ca84cd597..366bd4b14 100644 --- a/src/test/java/com/hivemq/client/rx/FlowableWithSingleItem.java +++ b/src/test/java/com/hivemq/client2/rx/FlowableWithSingleItem.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.rx; +package com.hivemq.client2.rx; -import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; +import com.hivemq.client2.rx.reactivestreams.WithSingleSubscriber; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.core.FlowableSubscriber; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/com/hivemq/client/rx/FlowableWithSingleSplit.java b/src/test/java/com/hivemq/client2/rx/FlowableWithSingleSplit.java similarity index 97% rename from src/test/java/com/hivemq/client/rx/FlowableWithSingleSplit.java rename to src/test/java/com/hivemq/client2/rx/FlowableWithSingleSplit.java index 013ead311..3bf7f5d4c 100644 --- a/src/test/java/com/hivemq/client/rx/FlowableWithSingleSplit.java +++ b/src/test/java/com/hivemq/client2/rx/FlowableWithSingleSplit.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hivemq.client.rx; +package com.hivemq.client2.rx; -import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; +import com.hivemq.client2.rx.reactivestreams.WithSingleSubscriber; import io.reactivex.rxjava3.core.Flowable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/test/java/com/hivemq/client/rx/FlowableWithSingleTest.java b/src/test/java/com/hivemq/client2/rx/FlowableWithSingleTest.java similarity index 99% rename from src/test/java/com/hivemq/client/rx/FlowableWithSingleTest.java rename to src/test/java/com/hivemq/client2/rx/FlowableWithSingleTest.java index 37982094a..f352b5c36 100644 --- a/src/test/java/com/hivemq/client/rx/FlowableWithSingleTest.java +++ b/src/test/java/com/hivemq/client2/rx/FlowableWithSingleTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.client.rx; +package com.hivemq.client2.rx; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import com.hivemq.client.rx.reactivestreams.WithSingleSubscriber; +import com.hivemq.client2.rx.reactivestreams.WithSingleSubscriber; import io.reactivex.rxjava3.core.BackpressureStrategy; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.schedulers.Schedulers; diff --git a/src/test/java/com/hivemq/client/util/KeyStoreUtilTest.java b/src/test/java/com/hivemq/client2/util/KeyStoreUtilTest.java similarity index 98% rename from src/test/java/com/hivemq/client/util/KeyStoreUtilTest.java rename to src/test/java/com/hivemq/client2/util/KeyStoreUtilTest.java index 852377df9..4a13e6da9 100644 --- a/src/test/java/com/hivemq/client/util/KeyStoreUtilTest.java +++ b/src/test/java/com/hivemq/client2/util/KeyStoreUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.util; +package com.hivemq.client2.util; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/hivemq/client/util/TestKeyStoreGenerator.java b/src/test/java/com/hivemq/client2/util/TestKeyStoreGenerator.java similarity index 99% rename from src/test/java/com/hivemq/client/util/TestKeyStoreGenerator.java rename to src/test/java/com/hivemq/client2/util/TestKeyStoreGenerator.java index 2f8474508..5d1c65f38 100644 --- a/src/test/java/com/hivemq/client/util/TestKeyStoreGenerator.java +++ b/src/test/java/com/hivemq/client2/util/TestKeyStoreGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.util; +package com.hivemq.client2.util; import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.asn1.x509.AlgorithmIdentifier; diff --git a/src/test/java/com/hivemq/client/util/TypeSwitchTest.java b/src/test/java/com/hivemq/client2/util/TypeSwitchTest.java similarity index 98% rename from src/test/java/com/hivemq/client/util/TypeSwitchTest.java rename to src/test/java/com/hivemq/client2/util/TypeSwitchTest.java index 1426e2624..638b2c10a 100644 --- a/src/test/java/com/hivemq/client/util/TypeSwitchTest.java +++ b/src/test/java/com/hivemq/client2/util/TypeSwitchTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.client.util; +package com.hivemq.client2.util; import org.junit.jupiter.api.Test; diff --git a/websocket/build.gradle.kts b/websocket/build.gradle.kts index b0fc69c3e..1913891f0 100644 --- a/websocket/build.gradle.kts +++ b/websocket/build.gradle.kts @@ -8,7 +8,7 @@ plugins { description = "Adds dependencies for the HiveMQ MQTT Client websocket module" metadata { - moduleName.set("com.hivemq.client.mqtt.websocket") + moduleName.set("com.hivemq.client2.mqtt.websocket") readableName.set("HiveMQ MQTT Client websocket module") } From 04381a4a1f1b72c5349740a493652be1b17eb59f Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Mon, 21 Dec 2020 23:10:28 +0100 Subject: [PATCH 52/62] Formatting --- .../client2/mqtt/mqtt3/Mqtt3BlockingClient.java | 2 +- .../client2/mqtt/mqtt5/Mqtt5BlockingClient.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3BlockingClient.java b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3BlockingClient.java index cb6728194..97951b0ed 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3BlockingClient.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt3/Mqtt3BlockingClient.java @@ -84,7 +84,7 @@ public interface Mqtt3BlockingClient extends Mqtt3Client { * @return the SubAck message if all subscriptions of the Subscribe message were successful (the SubAck message * contains no Error Codes). * @throws com.hivemq.client2.mqtt.mqtt3.exceptions.Mqtt3SubAckException wrapping the SubAck message if it contains - * at least one Error Code. + * at least one Error Code. */ @NotNull Mqtt3SubAck subscribe(@NotNull Mqtt3Subscribe subscribe); diff --git a/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5BlockingClient.java b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5BlockingClient.java index 14e3d44c6..9fce7773b 100644 --- a/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5BlockingClient.java +++ b/src/main/java/com/hivemq/client2/mqtt/mqtt5/Mqtt5BlockingClient.java @@ -86,7 +86,7 @@ public interface Mqtt5BlockingClient extends Mqtt5Client { * @return the SubAck message if all subscriptions of the Subscribe message were successful (the SubAck message * contains no Error Codes). * @throws com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5SubAckException wrapping the SubAck message if it contains - * at least one Error Code. + * at least one Error Code. */ @NotNull Mqtt5SubAck subscribe(@NotNull Mqtt5Subscribe subscribe); @@ -129,7 +129,7 @@ public interface Mqtt5BlockingClient extends Mqtt5Client { * @return the UnsubAck message if all Topic Filters of the Unsubscribe message were successfully unsubscribed (the * UnsubAck message contains no Error Codes). * @throws com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5UnsubAckException wrapping the UnsubAck message if it - * contains at least one Error Code. + * contains at least one Error Code. */ @NotNull Mqtt5UnsubAck unsubscribe(@NotNull Mqtt5Unsubscribe unsubscribe); @@ -151,10 +151,10 @@ public interface Mqtt5BlockingClient extends Mqtt5Client { * @param publish the Publish message sent to the broker. * @return the {@link Mqtt5PublishResult} if the Publish message was successfully published (no acknowledgement * message contains an Error Code, {@link Mqtt5PublishResult#getError()} will always be absent). - * @throws com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5PubAckException wrapping the corresponding PubAck message if - * it contains an Error Code. - * @throws com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5PubRecException wrapping the corresponding PubRec message if - * it contains an Error Code. + * @throws com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5PubAckException wrapping the corresponding PubAck message + * if it contains an Error Code. + * @throws com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5PubRecException wrapping the corresponding PubRec message + * if it contains an Error Code. */ @NotNull Mqtt5PublishResult publish(@NotNull Mqtt5Publish publish); @@ -174,7 +174,7 @@ public interface Mqtt5BlockingClient extends Mqtt5Client { * Re-authenticates this client. * * @throws com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5AuthException wrapping the Auth message with the Error Code - * if not re-authenticated successfully. + * if not re-authenticated successfully. */ void reauth(); From 31d25e6f5a93c50092a4d9eeaeb2da817b3679d7 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Sat, 13 Mar 2021 17:50:55 +0100 Subject: [PATCH 53/62] Update dependencies --- gradle.properties | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2ff177d23..ce35c3ac4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,22 +3,22 @@ prevVersion=2.0.0 # # main dependencies # -rxjava.version=3.0.8 +rxjava.version=3.0.11 reactive-streams.version=1.0.3 -netty.version=4.1.56.Final -jctools.version=3.2.0 +netty.version=4.1.60.Final +jctools.version=3.3.0 annotations.version=20.1.0 -dagger.version=2.30.1 +dagger.version=2.33 slf4j.version=1.7.30 -reactor.version=3.4.1 +reactor.version=3.4.2 # # test dependencies # -junit-jupiter.version=5.7.0 -equalsverifier.version=3.5 -mockito.version=3.6.28 +junit-jupiter.version=5.7.1 +equalsverifier.version=3.5.5 +mockito.version=3.8.0 guava.version=30.1-jre -bouncycastle.version=1.67 +bouncycastle.version=1.68 paho.version=1.2.5 # # plugins From dcb0c97ee03d5e86cabddb4577bf53f5a4cf7200 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Sat, 13 Mar 2021 22:08:01 +0100 Subject: [PATCH 54/62] MqttWebSocketConfig.serverPath -> path MqttWebSocketConfig.queryString -> query DEFAULT_MQTT_SUBPROTOCOL -> DEFAULT_SUBPROTOCOL --- .../mqtt/MqttWebSocketConfigImpl.java | 31 +++++++++---------- .../mqtt/MqttWebSocketConfigImplBuilder.java | 20 ++++++------ .../websocket/MqttWebSocketInitializer.java | 4 +-- .../client2/mqtt/MqttWebSocketConfig.java | 22 ++++++------- .../mqtt/MqttWebSocketConfigBuilderBase.java | 16 +++++----- .../client2/example/Mqtt3ClientExample.java | 2 +- 6 files changed, 47 insertions(+), 48 deletions(-) diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/MqttWebSocketConfigImpl.java b/src/main/java/com/hivemq/client2/internal/mqtt/MqttWebSocketConfigImpl.java index a658978a2..b14b9c93a 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/MqttWebSocketConfigImpl.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/MqttWebSocketConfigImpl.java @@ -30,34 +30,33 @@ public class MqttWebSocketConfigImpl implements MqttWebSocketConfig { static final @NotNull MqttWebSocketConfigImpl DEFAULT = - new MqttWebSocketConfigImpl(DEFAULT_SERVER_PATH, DEFAULT_QUERY_STRING, DEFAULT_MQTT_SUBPROTOCOL, - DEFAULT_HANDSHAKE_TIMEOUT_MS); + new MqttWebSocketConfigImpl(DEFAULT_PATH, DEFAULT_QUERY, DEFAULT_SUBPROTOCOL, DEFAULT_HANDSHAKE_TIMEOUT_MS); - private final @NotNull String serverPath; - private final @NotNull String queryString; + private final @NotNull String path; + private final @NotNull String query; private final @NotNull String subprotocol; private final @Range(from = 0, to = Integer.MAX_VALUE) int handshakeTimeoutMs; MqttWebSocketConfigImpl( - final @NotNull String serverPath, - final @NotNull String queryString, + final @NotNull String path, + final @NotNull String query, final @NotNull String subprotocol, final @Range(from = 0, to = Integer.MAX_VALUE) int handshakeTimeoutMs) { - this.serverPath = serverPath; - this.queryString = queryString; + this.path = path; + this.query = query; this.subprotocol = subprotocol; this.handshakeTimeoutMs = handshakeTimeoutMs; } @Override - public @NotNull String getServerPath() { - return serverPath; + public @NotNull String getPath() { + return path; } @Override - public @NotNull String getQueryString() { - return queryString; + public @NotNull String getQuery() { + return query; } @Override @@ -85,14 +84,14 @@ public boolean equals(final @Nullable Object o) { } final MqttWebSocketConfigImpl that = (MqttWebSocketConfigImpl) o; - return serverPath.equals(that.serverPath) && queryString.equals(that.queryString) && - subprotocol.equals(that.subprotocol) && (handshakeTimeoutMs == that.handshakeTimeoutMs); + return path.equals(that.path) && query.equals(that.query) && subprotocol.equals(that.subprotocol) && + (handshakeTimeoutMs == that.handshakeTimeoutMs); } @Override public int hashCode() { - int result = serverPath.hashCode(); - result = 31 * result + queryString.hashCode(); + int result = path.hashCode(); + result = 31 * result + query.hashCode(); result = 31 * result + subprotocol.hashCode(); result = 31 * result + Integer.hashCode(handshakeTimeoutMs); return result; diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/MqttWebSocketConfigImplBuilder.java b/src/main/java/com/hivemq/client2/internal/mqtt/MqttWebSocketConfigImplBuilder.java index 35a3b2010..5ab43dcf8 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/MqttWebSocketConfigImplBuilder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/MqttWebSocketConfigImplBuilder.java @@ -30,9 +30,9 @@ */ public abstract class MqttWebSocketConfigImplBuilder> { - private @NotNull String serverPath = MqttWebSocketConfigImpl.DEFAULT_SERVER_PATH; - private @NotNull String queryString = MqttWebSocketConfigImpl.DEFAULT_QUERY_STRING; - private @NotNull String subprotocol = MqttWebSocketConfigImpl.DEFAULT_MQTT_SUBPROTOCOL; + private @NotNull String path = MqttWebSocketConfigImpl.DEFAULT_PATH; + private @NotNull String query = MqttWebSocketConfigImpl.DEFAULT_QUERY; + private @NotNull String subprotocol = MqttWebSocketConfigImpl.DEFAULT_SUBPROTOCOL; private @Range(from = 0, to = Integer.MAX_VALUE) int handshakeTimeoutMs = MqttWebSocketConfigImpl.DEFAULT_HANDSHAKE_TIMEOUT_MS; @@ -40,8 +40,8 @@ public abstract class MqttWebSocketConfigImplBuilder implements MqttWebSocketConfigBuilder { diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java index 62910da7b..f0a12f1b9 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/websocket/MqttWebSocketInitializer.java @@ -64,8 +64,8 @@ public void initChannel( 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(), - webSocketConfig.getQueryString(), null); + serverAddress.getHostString(), serverAddress.getPort(), "/" + webSocketConfig.getPath(), + webSocketConfig.getQuery(), null); } catch (final URISyntaxException e) { onError.accept(channel, e); return; diff --git a/src/main/java/com/hivemq/client2/mqtt/MqttWebSocketConfig.java b/src/main/java/com/hivemq/client2/mqtt/MqttWebSocketConfig.java index 432f160c9..737fa171c 100644 --- a/src/main/java/com/hivemq/client2/mqtt/MqttWebSocketConfig.java +++ b/src/main/java/com/hivemq/client2/mqtt/MqttWebSocketConfig.java @@ -32,22 +32,22 @@ public interface MqttWebSocketConfig { /** - * The default WebSocket server path. + * The default WebSocket path. */ - @NotNull String DEFAULT_SERVER_PATH = ""; + @NotNull String DEFAULT_PATH = ""; /** - * The default WebSocket query string. + * The default WebSocket query. */ - @NotNull String DEFAULT_QUERY_STRING = ""; + @NotNull String DEFAULT_QUERY = ""; /** * The default WebSocket subprotocol. *

                      * See the WebSocket Subprotocol * Name Registry */ - @NotNull String DEFAULT_MQTT_SUBPROTOCOL = "mqtt"; + @NotNull String DEFAULT_SUBPROTOCOL = "mqtt"; /** - * The default websocket handshake timeout in milliseconds. + * The default WebSocket handshake timeout in milliseconds. * * @since 1.2 */ @@ -63,14 +63,14 @@ public interface MqttWebSocketConfig { } /** - * @return the WebSocket server path. + * @return the WebSocket path. */ - @NotNull String getServerPath(); + @NotNull String getPath(); /** - * @return the WebSocket query string. + * @return the WebSocket query. */ - @NotNull String getQueryString(); + @NotNull String getQuery(); /** * @return the WebSocket subprotocol. @@ -78,7 +78,7 @@ public interface MqttWebSocketConfig { @NotNull String getSubprotocol(); /** - * @return the websocket handshake timeout in milliseconds. + * @return the WebSocket handshake timeout in milliseconds. * @since 1.2 */ @Range(from = 0, to = Integer.MAX_VALUE) int getHandshakeTimeoutMs(); diff --git a/src/main/java/com/hivemq/client2/mqtt/MqttWebSocketConfigBuilderBase.java b/src/main/java/com/hivemq/client2/mqtt/MqttWebSocketConfigBuilderBase.java index df7c3133b..2093b2271 100644 --- a/src/main/java/com/hivemq/client2/mqtt/MqttWebSocketConfigBuilderBase.java +++ b/src/main/java/com/hivemq/client2/mqtt/MqttWebSocketConfigBuilderBase.java @@ -33,22 +33,22 @@ public interface MqttWebSocketConfigBuilderBase> { /** - * Sets the {@link MqttWebSocketConfig#getServerPath() server path}. + * Sets the {@link MqttWebSocketConfig#getPath() path}. * - * @param serverPath the server path. + * @param path the path. * @return the builder. */ @CheckReturnValue - @NotNull B serverPath(@NotNull String serverPath); + @NotNull B path(@NotNull String path); /** - * Sets the {@link MqttWebSocketConfig#getQueryString() query string}. + * Sets the {@link MqttWebSocketConfig#getQuery() query}. * - * @param queryString the query string. + * @param query the query. * @return the builder. */ @CheckReturnValue - @NotNull B queryString(@NotNull String queryString); + @NotNull B query(@NotNull String query); /** * Sets the {@link MqttWebSocketConfig#getSubprotocol() subprotocol}. @@ -60,11 +60,11 @@ public interface MqttWebSocketConfigBuilderBase * The timeout in milliseconds must be in the range: [0, {@link Integer#MAX_VALUE}]. * - * @param timeout the websocket handshake timeout or 0 to disable the timeout. + * @param timeout the WebSocket handshake timeout or 0 to disable the timeout. * @param timeUnit the time unit of the given timeout (this timeout only supports millisecond precision). * @return the builder. * @since 1.2 diff --git a/src/test/java/com/hivemq/client2/example/Mqtt3ClientExample.java b/src/test/java/com/hivemq/client2/example/Mqtt3ClientExample.java index 32c3bce00..0c466c28f 100644 --- a/src/test/java/com/hivemq/client2/example/Mqtt3ClientExample.java +++ b/src/test/java/com/hivemq/client2/example/Mqtt3ClientExample.java @@ -175,7 +175,7 @@ private Mqtt3RxClient getClient() { } if (isNotUsingMqttPort(port)) { - mqttClientBuilder.webSocketConfig(MqttWebSocketConfig.builder().serverPath(serverPath).build()); + mqttClientBuilder.webSocketConfig(MqttWebSocketConfig.builder().path(serverPath).build()); } return mqttClientBuilder.useMqttVersion3().buildRx(); From 80def8f68406948cc2071a8f5971331c608f5768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Sch=C3=A4fer?= Date: Tue, 23 Mar 2021 19:46:55 +0100 Subject: [PATCH 55/62] Added missing ", " to toAttributeString in MqttStatefulSubscribe --- .../internal/mqtt/message/subscribe/MqttStatefulSubscribe.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttStatefulSubscribe.java b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttStatefulSubscribe.java index 5e8c1f9fd..25e3773eb 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttStatefulSubscribe.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/message/subscribe/MqttStatefulSubscribe.java @@ -44,7 +44,7 @@ public int getSubscriptionIdentifier() { @Override protected @NotNull String toAttributeString() { return super.toAttributeString() + ((subscriptionIdentifier == DEFAULT_NO_SUBSCRIPTION_IDENTIFIER) ? "" : - "subscriptionIdentifier=" + subscriptionIdentifier); + ", subscriptionIdentifier=" + subscriptionIdentifier); } @Override From cf13f8b8c284adba8f112bdaa89d40098364d6fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Sch=C3=A4fer?= Date: Mon, 1 Feb 2021 10:05:35 +0100 Subject: [PATCH 56/62] Added log level trace to InternalLogger --- .../client2/internal/logging/InternalLogger.java | 6 ++++++ .../internal/logging/InternalNoopLogger.java | 10 ++++++++++ .../internal/logging/InternalSlf4jLogger.java | 15 +++++++++++++++ 3 files changed, 31 insertions(+) diff --git a/src/main/java/com/hivemq/client2/internal/logging/InternalLogger.java b/src/main/java/com/hivemq/client2/internal/logging/InternalLogger.java index 07fff16a5..17e35d02d 100644 --- a/src/main/java/com/hivemq/client2/internal/logging/InternalLogger.java +++ b/src/main/java/com/hivemq/client2/internal/logging/InternalLogger.java @@ -36,4 +36,10 @@ public interface InternalLogger { void warn(@NotNull String format, @NotNull Object arg); void warn(@NotNull String format, @NotNull Object arg1, @NotNull Object arg2); + + void trace(@NotNull String message); + + void trace(@NotNull String format, @NotNull Object arg); + + void trace(@NotNull String format, @NotNull Object arg1, @NotNull Object arg2); } diff --git a/src/main/java/com/hivemq/client2/internal/logging/InternalNoopLogger.java b/src/main/java/com/hivemq/client2/internal/logging/InternalNoopLogger.java index 163e3c2b2..b51cdd194 100644 --- a/src/main/java/com/hivemq/client2/internal/logging/InternalNoopLogger.java +++ b/src/main/java/com/hivemq/client2/internal/logging/InternalNoopLogger.java @@ -47,4 +47,14 @@ public void warn(final @NotNull String format, final @NotNull Object arg) {} @Override public void warn(final @NotNull String format, final @NotNull Object arg1, final @NotNull Object arg2) {} + + @Override + public void trace(@NotNull String message) {} + + @Override + public void trace(@NotNull String format, @NotNull Object arg) {} + + @Override + public void trace(@NotNull String format, @NotNull Object arg1, @NotNull Object arg2) {} + } diff --git a/src/main/java/com/hivemq/client2/internal/logging/InternalSlf4jLogger.java b/src/main/java/com/hivemq/client2/internal/logging/InternalSlf4jLogger.java index de81da102..3c531fe70 100644 --- a/src/main/java/com/hivemq/client2/internal/logging/InternalSlf4jLogger.java +++ b/src/main/java/com/hivemq/client2/internal/logging/InternalSlf4jLogger.java @@ -65,4 +65,19 @@ public void warn(final @NotNull String format, final @NotNull Object arg) { public void warn(final @NotNull String format, final @NotNull Object arg1, final @NotNull Object arg2) { delegate.warn(format, arg1, arg2); } + + @Override + public void trace(@NotNull String message) { + delegate.trace(message); + } + + @Override + public void trace(@NotNull String format, @NotNull Object arg) { + delegate.trace(format, arg); + } + + @Override + public void trace(@NotNull String format, @NotNull Object arg1, @NotNull Object arg2) { + delegate.trace(format, arg1, arg2); + } } From d87d0b7c90130abf7610d221092af09d70070eb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Sch=C3=A4fer?= Date: Mon, 22 Mar 2021 19:28:23 +0100 Subject: [PATCH 57/62] Added log level debug to InternalLogger --- .../internal/logging/InternalLogger.java | 8 ++++++++ .../internal/logging/InternalNoopLogger.java | 12 +++++++++++ .../internal/logging/InternalSlf4jLogger.java | 20 +++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/src/main/java/com/hivemq/client2/internal/logging/InternalLogger.java b/src/main/java/com/hivemq/client2/internal/logging/InternalLogger.java index 17e35d02d..bad153ae5 100644 --- a/src/main/java/com/hivemq/client2/internal/logging/InternalLogger.java +++ b/src/main/java/com/hivemq/client2/internal/logging/InternalLogger.java @@ -37,6 +37,14 @@ public interface InternalLogger { void warn(@NotNull String format, @NotNull Object arg1, @NotNull Object arg2); + void debug(@NotNull String message); + + void debug(@NotNull String format, @NotNull Object arg); + + void debug(@NotNull String format, @NotNull Object arg1, @NotNull Object arg2); + + void debug(@NotNull String format, @NotNull Object arg1, @NotNull Object arg2, @NotNull Object arg3); + void trace(@NotNull String message); void trace(@NotNull String format, @NotNull Object arg); diff --git a/src/main/java/com/hivemq/client2/internal/logging/InternalNoopLogger.java b/src/main/java/com/hivemq/client2/internal/logging/InternalNoopLogger.java index b51cdd194..fd2d26f30 100644 --- a/src/main/java/com/hivemq/client2/internal/logging/InternalNoopLogger.java +++ b/src/main/java/com/hivemq/client2/internal/logging/InternalNoopLogger.java @@ -48,6 +48,18 @@ public void warn(final @NotNull String format, final @NotNull Object arg) {} @Override public void warn(final @NotNull String format, final @NotNull Object arg1, final @NotNull Object arg2) {} + @Override + public void debug(@NotNull String message) {} + + @Override + public void debug(@NotNull String format, @NotNull Object arg) {} + + @Override + public void debug(@NotNull String format, @NotNull Object arg1, @NotNull Object arg2) {} + + @Override + public void debug(@NotNull String format, @NotNull Object arg1, @NotNull Object arg2, @NotNull Object arg3) {} + @Override public void trace(@NotNull String message) {} diff --git a/src/main/java/com/hivemq/client2/internal/logging/InternalSlf4jLogger.java b/src/main/java/com/hivemq/client2/internal/logging/InternalSlf4jLogger.java index 3c531fe70..bec9d7681 100644 --- a/src/main/java/com/hivemq/client2/internal/logging/InternalSlf4jLogger.java +++ b/src/main/java/com/hivemq/client2/internal/logging/InternalSlf4jLogger.java @@ -66,6 +66,26 @@ public void warn(final @NotNull String format, final @NotNull Object arg1, final delegate.warn(format, arg1, arg2); } + @Override + public void debug(@NotNull String message) { + delegate.debug(message); + } + + @Override + public void debug(@NotNull String format, @NotNull Object arg) { + delegate.debug(format, arg); + } + + @Override + public void debug(@NotNull String format, @NotNull Object arg1, @NotNull Object arg2) { + delegate.debug(format, arg1, arg2); + } + + @Override + public void debug(@NotNull String format, @NotNull Object arg1, @NotNull Object arg2, @NotNull Object arg3) { + delegate.debug(format, arg1, arg2, arg3); + } + @Override public void trace(@NotNull String message) { delegate.trace(message); From 874e7b6ca8de67d36d3f4e3b12b149f7134696f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Sch=C3=A4fer?= Date: Tue, 23 Mar 2021 19:52:49 +0100 Subject: [PATCH 58/62] Added logs for incoming publishes --- .../internal/mqtt/codec/decoder/MqttDecoder.java | 14 +++++++++++--- .../internal/mqtt/codec/encoder/MqttEncoder.java | 6 ++++++ .../publish/incoming/MqttIncomingPublishFlow.java | 4 ++++ .../incoming/MqttIncomingPublishService.java | 1 + .../publish/incoming/MqttIncomingQosHandler.java | 5 +++++ 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttDecoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttDecoder.java index 56ebeddb1..d97daa31f 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttDecoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/decoder/MqttDecoder.java @@ -16,10 +16,13 @@ package com.hivemq.client2.internal.mqtt.codec.decoder; +import com.hivemq.client2.internal.logging.InternalLogger; +import com.hivemq.client2.internal.logging.InternalLoggerFactory; import com.hivemq.client2.internal.mqtt.MqttClientConfig; import com.hivemq.client2.internal.mqtt.datatypes.MqttVariableByteInteger; import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectUtil; import com.hivemq.client2.internal.mqtt.ioc.ConnectionScope; +import com.hivemq.client2.internal.mqtt.message.MqttMessage; import com.hivemq.client2.internal.mqtt.message.connect.MqttConnect; import com.hivemq.client2.internal.mqtt.message.connect.MqttConnectRestrictions; import com.hivemq.client2.mqtt.exceptions.MqttDecodeException; @@ -31,6 +34,7 @@ import org.jetbrains.annotations.NotNull; import javax.inject.Inject; + import java.util.List; /** @@ -43,6 +47,7 @@ public class MqttDecoder extends ByteToMessageDecoder { public static final @NotNull String NAME = "decoder"; + private static final @NotNull InternalLogger LOGGER = InternalLoggerFactory.getLogger(MqttDecoder.class); private static final int MIN_FIXED_HEADER_LENGTH = 2; private final @NotNull MqttMessageDecoders decoders; @@ -106,15 +111,18 @@ protected void decode( } in.writerIndex(readerIndexAfterFixedHeader + remainingLength); - out.add(decoder.decode(flags, in, context)); + MqttMessage msg = decoder.decode(flags, in, context); + LOGGER.trace("Decoded MqttMessage {} from {}", msg, ctx.channel().remoteAddress()); + out.add(msg); in.writerIndex(writerIndex); - } catch (final MqttDecoderException e) { in.clear(); final Mqtt5MessageType type = Mqtt5MessageType.fromCode(messageType); final String message = "Exception while decoding " + ((type == null) ? "UNKNOWN" : type) + ": " + e.getMessage(); - MqttDisconnectUtil.disconnect(ctx.channel(), e.getReasonCode(), new MqttDecodeException(message)); + LOGGER.debug(message + ", Reason code: {}, remote address: {}", e.getReasonCode(), ctx.channel().remoteAddress()); + MqttDisconnectUtil.disconnect(ctx.channel(), e.getReasonCode(), + new MqttDecodeException(message.concat(", Reason code: ").concat(e.getReasonCode().toString()))); } } diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttEncoder.java index 74d9c525c..58f944ede 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttEncoder.java @@ -16,6 +16,8 @@ package com.hivemq.client2.internal.mqtt.codec.encoder; +import com.hivemq.client2.internal.logging.InternalLogger; +import com.hivemq.client2.internal.logging.InternalLoggerFactory; import com.hivemq.client2.internal.mqtt.MqttClientConnectionConfig; import com.hivemq.client2.internal.mqtt.ioc.ConnectionScope; import com.hivemq.client2.internal.mqtt.message.MqttMessage; @@ -37,6 +39,7 @@ public class MqttEncoder extends ChannelDuplexHandler { public static final @NotNull String NAME = "encoder"; + private static final @NotNull InternalLogger LOGGER = InternalLoggerFactory.getLogger(MqttEncoder.class); private final @NotNull MqttMessageEncoders encoders; private final @NotNull MqttEncoderContext context; @@ -84,16 +87,19 @@ public void flush(final @NotNull ChannelHandlerContext ctx) { @Override public void channelRead(final @NotNull ChannelHandlerContext ctx, final @NotNull Object msg) { + LOGGER.trace("channelRead: {} from {}", msg, ctx.channel().remoteAddress()); inRead = true; ctx.fireChannelRead(msg); } @Override public void channelReadComplete(final @NotNull ChannelHandlerContext ctx) { + LOGGER.trace("channelRead complete"); ctx.fireChannelReadComplete(); inRead = false; if (pendingFlush) { pendingFlush = false; + LOGGER.trace("flush pendingFlush"); ctx.flush(); } } diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlow.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlow.java index 5bbf6e841..58d923ebd 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlow.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlow.java @@ -17,6 +17,8 @@ package com.hivemq.client2.internal.mqtt.handler.publish.incoming; import com.hivemq.client2.internal.annotations.CallByThread; +import com.hivemq.client2.internal.logging.InternalLogger; +import com.hivemq.client2.internal.logging.InternalLoggerFactory; import com.hivemq.client2.internal.mqtt.MqttClientConfig; import com.hivemq.client2.internal.mqtt.handler.util.FlowWithEventLoop; import com.hivemq.client2.mqtt.mqtt5.message.publish.Mqtt5Publish; @@ -36,6 +38,7 @@ */ abstract class MqttIncomingPublishFlow extends FlowWithEventLoop implements Emitter, Subscription, Runnable { + private static final @NotNull InternalLogger LOGGER = InternalLoggerFactory.getLogger(MqttIncomingPublishFlow.class); private static final int STATE_NO_NEW_REQUESTS = 0; private static final int STATE_NEW_REQUESTS = 1; @@ -72,6 +75,7 @@ abstract class MqttIncomingPublishFlow extends FlowWithEventLoop @CallByThread("Netty EventLoop") @Override public void onNext(final @NotNull Mqtt5Publish result) { + LOGGER.trace("onNext: {}, {}", result, subscriber); subscriber.onNext(result); if (requested != Long.MAX_VALUE) { requested--; diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingPublishService.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingPublishService.java index cdeb3adf5..8df58ae00 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingPublishService.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingPublishService.java @@ -109,6 +109,7 @@ private void onPublish(final @NotNull MqttStatefulPublishWithFlows publishWithFl referencedFlowCount++; } } + LOGGER.trace("emit {}", publishWithFlows.publish); emit(publishWithFlows); } diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingQosHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingQosHandler.java index e64c7e7c8..d21dc9530 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingQosHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/incoming/MqttIncomingQosHandler.java @@ -97,6 +97,7 @@ public void channelRead(final @NotNull ChannelHandlerContext ctx, final @NotNull } private void readPublish(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttStatefulPublish publish) { + LOGGER.debug("Read PUBLISH {} from {}", publish, ctx.channel().remoteAddress()); switch (publish.stateless().getQos()) { case AT_MOST_ONCE: readPublishQos0(publish); @@ -264,14 +265,17 @@ private boolean ack( } private void writePubAck(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttPubAck pubAck) { + LOGGER.debug("Write PUBACK {} to {}", pubAck, ctx.channel().remoteAddress()); ctx.writeAndFlush(pubAck, ctx.voidPromise()); } private void writePubRec(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttPubRec pubRec) { + LOGGER.debug("Write PUBREC {} to {}", pubRec, ctx.channel().remoteAddress()); ctx.writeAndFlush(pubRec, ctx.voidPromise()); } private void readPubRel(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttPubRel pubRel) { + LOGGER.debug("Read PUBREL {} from {}", pubRel, ctx.channel().remoteAddress()); final Object prevMessage = messages.remove(pubRel.getPacketIdentifier()); if (prevMessage instanceof MqttPubRec) { // normal case writePubComp(ctx, buildPubComp(new MqttPubCompBuilder(pubRel))); @@ -298,6 +302,7 @@ ctx, buildPubComp(new MqttPubCompBuilder(pubRel).reasonCode( } private void writePubComp(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttPubComp pubComp) { + LOGGER.debug("Write PUBCOMP {} to {}", pubComp, ctx.channel().remoteAddress()); ctx.writeAndFlush(pubComp, ctx.voidPromise()); } From 04187fdd3018273585f51386b38242c4b9688f08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Sch=C3=A4fer?= Date: Tue, 23 Mar 2021 19:54:08 +0100 Subject: [PATCH 59/62] Added logs for PINGREQ and PINGRESP --- .../internal/mqtt/handler/ping/MqttPingHandler.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/handler/ping/MqttPingHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/ping/MqttPingHandler.java index 3335d8f09..fd979fa0f 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/handler/ping/MqttPingHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/ping/MqttPingHandler.java @@ -16,6 +16,8 @@ package com.hivemq.client2.internal.mqtt.handler.ping; +import com.hivemq.client2.internal.logging.InternalLogger; +import com.hivemq.client2.internal.logging.InternalLoggerFactory; import com.hivemq.client2.internal.mqtt.handler.MqttConnectionAwareHandler; import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectEvent; import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectUtil; @@ -46,6 +48,7 @@ public class MqttPingHandler extends MqttConnectionAwareHandler implements DefaultChannelOutboundHandler, Runnable, ChannelFutureListener { public static final @NotNull String NAME = "ping"; + private static final @NotNull InternalLogger LOGGER = InternalLoggerFactory.getLogger(MqttPingHandler.class); private static final boolean PINGRESP_REQUIRED = false; // TODO configurable private final long keepAliveNanos; @@ -78,6 +81,7 @@ public void flush(final @NotNull ChannelHandlerContext ctx) { public void channelRead(final @NotNull ChannelHandlerContext ctx, final @NotNull Object msg) { lastReadTimeNanos = System.nanoTime(); if (msg instanceof MqttPingResp) { + LOGGER.debug("Read PINGRESP from {}", ctx.channel().remoteAddress()); messageRead = true; } else { messageRead = !PINGRESP_REQUIRED; @@ -100,10 +104,12 @@ public void run() { } if (pingReqWritten) { if (!pingReqFlushed) { + LOGGER.warn("Timeout while writing PINGREQ to {}", ctx.channel().remoteAddress()); MqttDisconnectUtil.close(ctx.channel(), "Timeout while writing PINGREQ"); return; } if (!messageRead) { + LOGGER.warn("Timeout while waiting for PINGRESP from {}", ctx.channel().remoteAddress()); MqttDisconnectUtil.close(ctx.channel(), "Timeout while waiting for PINGRESP"); return; } @@ -116,6 +122,7 @@ public void run() { pingReqWritten = false; schedule(ctx, nextDelayNanos); } else { + LOGGER.debug("Write PINGREQ to {}", ctx.channel().remoteAddress()); pingReqWritten = true; schedule(ctx, keepAliveNanos); lastFlushTimeNanos = timeNanos; @@ -126,7 +133,10 @@ public void run() { @Override public void operationComplete(final @NotNull ChannelFuture future) { if (future.isSuccess()) { + LOGGER.trace("PINGREQ sent"); pingReqFlushed = true; + } else { + LOGGER.debug("PINGREQ failed: cancelled: {}, cause: {}", future.isCancelled(), future.cause()); } } From 68cad61ebed685df567cbbea83dfd88676f1375f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Sch=C3=A4fer?= Date: Tue, 23 Mar 2021 20:04:55 +0100 Subject: [PATCH 60/62] Added logs for outgoing publishes --- .../mqtt/codec/encoder/MqttEncoder.java | 3 +++ .../outgoing/MqttOutgoingQosHandler.java | 18 ++++++++++++++++-- .../publish/outgoing/MqttPublishFlowables.java | 2 ++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttEncoder.java b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttEncoder.java index 58f944ede..c8a57f23e 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttEncoder.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/codec/encoder/MqttEncoder.java @@ -70,8 +70,10 @@ public void write( throw new UnsupportedOperationException(); } final ByteBuf out = messageEncoder.castAndEncode(message, context); + LOGGER.trace("Write MqttMessage {} to {}", message, ctx.channel().remoteAddress()); ctx.write(out, promise); } else { + LOGGER.trace("Write message {} to {}", msg, ctx.channel().remoteAddress()); ctx.write(msg, promise); } } @@ -81,6 +83,7 @@ public void flush(final @NotNull ChannelHandlerContext ctx) { if (inRead) { pendingFlush = true; } else { + LOGGER.trace("flush"); ctx.flush(); } } diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java index 68e8e2b0d..d19bab965 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java @@ -146,8 +146,11 @@ public void onSubscribe(final @NotNull Subscription subscription) { @Override public void onNext(final @NotNull MqttPublishWithFlow publishWithFlow) { + LOGGER.trace("onNext: queuing/scheduling outgoing {}", publishWithFlow.getPublish()); + queue.offer(publishWithFlow); if (queuedCounter.getAndIncrement() == 0) { + LOGGER.trace("Trigger actual publish (runnable)"); publishWithFlow.getAckFlow().getEventLoop().execute(this); } } @@ -180,14 +183,17 @@ void request(final long n) { @CallByThread("Netty EventLoop") @Override public void run() { + LOGGER.trace("run BEGIN"); if (!hasSession) { if (!isRepublishIfSessionExpired()) { clearQueued(MqttClientStateExceptions.notConnected()); } + LOGGER.trace("run: !hasSession"); return; } final ChannelHandlerContext ctx = this.ctx; if (ctx == null) { + LOGGER.trace("run: ctx == null"); return; } final Channel channel = ctx.channel(); @@ -213,9 +219,11 @@ public void run() { final boolean wasWritable = channel.isWritable(); ctx.flush(); if ((dequeued > 0) && (queuedCounter.addAndGet(-dequeued) > 0) && wasWritable) { + LOGGER.trace("Retrigger actual publish (runnable)"); channel.eventLoop().execute(this); } } + LOGGER.trace("run END"); } @Override @@ -254,7 +262,7 @@ private void writePublish( private void writeQos0Publish( final @NotNull ChannelHandlerContext ctx, final @NotNull MqttPublishWithFlow publishWithFlow) { - + LOGGER.debug("Write PUBLISH {} to {}", publishWithFlow.getPublish(), ctx.channel().remoteAddress()); ctx.write(publishWithFlow.getPublish().createStateful(NO_PACKET_IDENTIFIER_QOS_0, false, topicAliasMapping), new DefaultContextPromise<>(ctx.channel(), publishWithFlow)).addListener(this); } @@ -294,7 +302,7 @@ private void writeQos1Or2Publish( final @NotNull ChannelHandlerContext ctx, final @NotNull MqttStatefulPublish publish, final @NotNull MqttPublishWithFlow publishWithFlow) { - + LOGGER.debug("Write PUBLISH {} to {}", publish, ctx.channel().remoteAddress()); currentPending = publishWithFlow; ctx.write(publish, ctx.voidPromise()); currentPending = null; @@ -314,6 +322,7 @@ public void channelRead(final @NotNull ChannelHandlerContext ctx, final @NotNull } private void readPubAck(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttPubAck pubAck) { + LOGGER.debug("Read PUBACK {} from {}", pubAck, ctx.channel().remoteAddress()); final int packetIdentifier = pubAck.getPacketIdentifier(); final MqttPubOrRelWithFlow removed = pendingIndex.remove(packetIdentifier); @@ -344,6 +353,7 @@ private void readPubAck(final @NotNull ChannelHandlerContext ctx, final @NotNull } private void readPubRec(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttPubRec pubRec) { + LOGGER.debug("Read PUBREC {} from {}", pubRec, ctx.channel().remoteAddress()); final int packetIdentifier = pubRec.getPacketIdentifier(); final MqttPubOrRelWithFlow got = pendingIndex.get(packetIdentifier); @@ -390,6 +400,7 @@ private void readPubRec(final @NotNull ChannelHandlerContext ctx, final @NotNull } private void writePubRel(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttPubRel pubRel) { + LOGGER.debug("Write PUBREL {} to {}", pubRel, ctx.channel().remoteAddress()); ctx.write(pubRel, ctx.voidPromise()); } @@ -402,6 +413,7 @@ private void replacePending( } private void readPubComp(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttPubComp pubComp) { + LOGGER.debug("Read PUBCOMP {} from {}", pubComp, ctx.channel().remoteAddress()); final int packetIdentifier = pubComp.getPacketIdentifier(); final MqttPubOrRelWithFlow removed = pendingIndex.remove(packetIdentifier); @@ -457,6 +469,7 @@ private void completePending( @Override public void exceptionCaught(final @NotNull ChannelHandlerContext ctx, final @NotNull Throwable cause) { if (!(cause instanceof IOException) && (currentPending != null)) { + LOGGER.debug("Exception caught: {}, remote address: {}", cause, ctx.channel().remoteAddress()); pendingIndex.remove(currentPending.packetIdentifier); currentPending.getAckFlow().onNext(new MqttPublishResult(currentPending.getPublish(), cause)); completePending(ctx, currentPending); @@ -502,6 +515,7 @@ private boolean isRepublishIfSessionExpired() { } private void clearQueued(final @NotNull Throwable cause) { + LOGGER.trace("clear queued, cause: {}", cause); int polled = 0; while (true) { final MqttPublishWithFlow publishWithFlow = queue.poll(); diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttPublishFlowables.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttPublishFlowables.java index 9727369e7..4de60e075 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttPublishFlowables.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/publish/outgoing/MqttPublishFlowables.java @@ -50,7 +50,9 @@ public void add(final @NotNull Flowable publishFlowable) { synchronized (this) { while (requested == 0) { try { + LOGGER.debug("Publish blocked (requested == 0)"); this.wait(); + LOGGER.debug("Publish unblocked"); } catch (final InterruptedException e) { LOGGER.error("thread interrupted while waiting to publish.", e); return; From ecb866dd4d50c83ec3ad7e31dd678ca53080bf44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Sch=C3=A4fer?= Date: Tue, 23 Mar 2021 20:06:18 +0100 Subject: [PATCH 61/62] Added logs for SUBSCRIBE, UNSUBSCRIBE, SUBACK, UNSUBACK --- .../mqtt/handler/subscribe/MqttSubscriptionHandler.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttSubscriptionHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttSubscriptionHandler.java index 57a04588e..067edd62f 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttSubscriptionHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/subscribe/MqttSubscriptionHandler.java @@ -119,6 +119,7 @@ public void onSessionStartOrResume( public void subscribe( final @NotNull MqttSubscribe subscribe, final @NotNull MqttSubscriptionFlow flow) { + LOGGER.trace("subscribe: schedule SUBSCRIBE {}", subscribe); flow.getEventLoop().execute(() -> { if (flow.init()) { @@ -132,6 +133,7 @@ public void subscribe( public void unsubscribe( final @NotNull MqttUnsubscribe unsubscribe, final @NotNull MqttSubOrUnsubAckFlow flow) { + LOGGER.trace("unsubscribe: schedule UNSUBSCRIBE {}", unsubscribe); flow.getEventLoop().execute(() -> { if (flow.init()) { @@ -199,6 +201,7 @@ private void writeSubscribe( subscribeWithFlow.subscribe.createStateful(subscribeWithFlow.packetIdentifier, subscriptionIdentifier); currentPending = subscribeWithFlow; + LOGGER.debug("Write SUBSCRIBE {} to {}", statefulSubscribe, ctx.channel().remoteAddress()); ctx.write(statefulSubscribe, ctx.voidPromise()); currentPending = null; } @@ -210,6 +213,7 @@ private void writeUnsubscribe( unsubscribeWithFlow.unsubscribe.createStateful(unsubscribeWithFlow.packetIdentifier); currentPending = unsubscribeWithFlow; + LOGGER.debug("Write UNSUBSCRIBE {} to {}", statefulUnsubscribe, ctx.channel().remoteAddress()); ctx.write(statefulUnsubscribe, ctx.voidPromise()); currentPending = null; } @@ -226,6 +230,7 @@ public void channelRead(final @NotNull ChannelHandlerContext ctx, final @NotNull } private void readSubAck(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttSubAck subAck) { + LOGGER.debug("Read SUBACK {} from {}", subAck, ctx.channel().remoteAddress()); final MqttSubOrUnsubWithFlow subOrUnsubWithFlow = pendingIndex.remove(subAck.getPacketIdentifier()); if (subOrUnsubWithFlow == null) { @@ -273,6 +278,7 @@ private void readSubAck(final @NotNull ChannelHandlerContext ctx, final @NotNull } private void readUnsubAck(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttUnsubAck unsubAck) { + LOGGER.debug("Read UNSUBACK {} from {}", unsubAck, ctx.channel().remoteAddress()); final MqttSubOrUnsubWithFlow subOrUnsubWithFlow = pendingIndex.remove(unsubAck.getPacketIdentifier()); if (subOrUnsubWithFlow == null) { @@ -326,6 +332,7 @@ private void completePending(final @NotNull MqttSubOrUnsubWithFlow oldPending) { @Override public void exceptionCaught(final @NotNull ChannelHandlerContext ctx, final @NotNull Throwable cause) { + LOGGER.debug("Exception caught: {}, remote address: {}", cause, ctx.channel().remoteAddress()); if (!(cause instanceof IOException) && (currentPending != null)) { pending.remove(currentPending); packetIdentifiers.returnId(currentPending.packetIdentifier); From c7774b6e9c9daf9a38b6f65b27dbdbf9200fade2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Sch=C3=A4fer?= Date: Tue, 23 Mar 2021 20:09:54 +0100 Subject: [PATCH 62/62] Added logs for CONNECT, DISCONNECT and channel initialization --- .../mqtt/handler/MqttChannelInitializer.java | 10 ++++++ .../internal/mqtt/handler/MqttSession.java | 19 +++++++++--- .../handler/auth/AbstractMqttAuthHandler.java | 7 +++-- .../handler/auth/MqttConnectAuthHandler.java | 8 +++++ .../auth/MqttDisconnectOnAuthHandler.java | 6 ++++ .../mqtt/handler/auth/MqttReAuthHandler.java | 15 +++++++-- .../handler/connect/MqttConnAckSingle.java | 4 +++ .../handler/connect/MqttConnectHandler.java | 9 ++++-- .../disconnect/MqttDisconnectHandler.java | 31 ++++++++++++++++--- .../disconnect/MqttDisconnectUtil.java | 7 ++++- .../util/MqttTimeoutInboundHandler.java | 4 +++ 11 files changed, 105 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/handler/MqttChannelInitializer.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/MqttChannelInitializer.java index cdae2a492..3cee57c03 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/handler/MqttChannelInitializer.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/MqttChannelInitializer.java @@ -16,6 +16,8 @@ package com.hivemq.client2.internal.mqtt.handler; +import com.hivemq.client2.internal.logging.InternalLogger; +import com.hivemq.client2.internal.logging.InternalLoggerFactory; import com.hivemq.client2.internal.mqtt.MqttClientConfig; import com.hivemq.client2.internal.mqtt.MqttProxyConfigImpl; import com.hivemq.client2.internal.mqtt.MqttTlsConfigImpl; @@ -57,6 +59,7 @@ @ConnectionScope public class MqttChannelInitializer extends ChannelInboundHandlerAdapter { + private static final @NotNull InternalLogger LOGGER = InternalLoggerFactory.getLogger(MqttChannelInitializer.class); private final @NotNull MqttClientConfig clientConfig; private final @NotNull MqttConnect connect; private final @NotNull MqttConnAckFlow connAckFlow; @@ -91,6 +94,7 @@ public class MqttChannelInitializer extends ChannelInboundHandlerAdapter { @Override public void handlerAdded(final @NotNull ChannelHandlerContext ctx) { + LOGGER.debug("Initialize channel"); ctx.pipeline().remove(this); ((SocketChannel) ctx.channel()).config() @@ -109,6 +113,7 @@ private void initProxy(final @NotNull Channel channel) { if (proxyConfig == null) { initTls(channel); } else { + LOGGER.trace("initProxy"); MqttProxyInitializer.initChannel(channel, clientConfig, proxyConfig, this::initTls, this::onError); } } @@ -118,6 +123,7 @@ private void initTls(final @NotNull Channel channel) { if (tlsConfig == null) { initWebsocket(channel); } else { + LOGGER.trace("initTls"); MqttTlsInitializer.initChannel(channel, clientConfig, tlsConfig, this::initWebsocket, this::onError); } } @@ -128,20 +134,24 @@ private void initWebsocket(final @NotNull Channel channel) { if (webSocketConfig == null) { initMqtt(channel); } else { + LOGGER.trace("initWebsocket"); webSocketInitializer.get() .initChannel(channel, clientConfig, webSocketConfig, this::initMqtt, this::onError); } } private void initMqtt(final @NotNull Channel channel) { + LOGGER.trace("initMqtt"); channel.pipeline() .addLast(MqttEncoder.NAME, encoder) .addLast(MqttAuthHandler.NAME, authHandler) .addLast(MqttConnectHandler.NAME, connectHandler) .addLast(MqttDisconnectHandler.NAME, disconnectHandler); + LOGGER.debug("Channel initialization succeeded"); } private void onError(final @NotNull Channel channel, final @NotNull Throwable cause) { + LOGGER.debug("Channel initialization failed: {}", cause); channel.close(); MqttConnAckSingle.reconnect(clientConfig, MqttDisconnectSource.CLIENT, new ConnectionFailedException(cause), connect, connAckFlow, channel.eventLoop()); diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/handler/MqttSession.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/MqttSession.java index 63fdb3847..0fd18dd6d 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/handler/MqttSession.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/MqttSession.java @@ -17,6 +17,8 @@ package com.hivemq.client2.internal.mqtt.handler; import com.hivemq.client2.internal.annotations.CallByThread; +import com.hivemq.client2.internal.logging.InternalLogger; +import com.hivemq.client2.internal.logging.InternalLoggerFactory; import com.hivemq.client2.internal.mqtt.MqttClientConnectionConfig; import com.hivemq.client2.internal.mqtt.codec.decoder.MqttDecoder; import com.hivemq.client2.internal.mqtt.handler.publish.incoming.MqttIncomingQosHandler; @@ -34,6 +36,7 @@ import org.jetbrains.annotations.Nullable; import javax.inject.Inject; + import java.util.concurrent.TimeUnit; /** @@ -42,6 +45,7 @@ @ClientScope public class MqttSession { + private static final @NotNull InternalLogger LOGGER = InternalLoggerFactory.getLogger(MqttSession.class); private final @NotNull MqttSubscriptionHandler subscriptionHandler; private final @NotNull MqttIncomingQosHandler incomingQosHandler; private final @NotNull MqttOutgoingQosHandler outgoingQosHandler; @@ -65,10 +69,16 @@ public void startOrResume( final @NotNull MqttClientConnectionConfig connectionConfig, final @NotNull ChannelPipeline pipeline, final @NotNull EventLoop eventLoop) { - - if (hasSession && !connAck.isSessionPresent()) { - final String message = "Session expired as CONNACK did not contain the session present flag."; - end(new MqttSessionExpiredException(message, new Mqtt5ConnAckException(connAck, message))); + if (hasSession) { + if (!connAck.isSessionPresent()) { + final String message = "Session expired as CONNACK did not contain the session present flag."; + end(new MqttSessionExpiredException(message, new Mqtt5ConnAckException(connAck, message))); + LOGGER.trace("Session START"); + } else { + LOGGER.trace("Session RESUME"); + } + } else { + LOGGER.trace("Session START"); } hasSession = true; @@ -109,6 +119,7 @@ public void expire( @CallByThread("Netty EventLoop") private void end(final @NotNull Throwable cause) { + LOGGER.debug("Session END, cause {}", cause); if (hasSession) { hasSession = false; outgoingQosHandler.onSessionEnd(cause); diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/AbstractMqttAuthHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/AbstractMqttAuthHandler.java index 0b92bea73..a6516ed77 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/AbstractMqttAuthHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/AbstractMqttAuthHandler.java @@ -50,7 +50,7 @@ */ abstract class AbstractMqttAuthHandler extends MqttTimeoutInboundHandler implements MqttAuthHandler { - static final @NotNull InternalLogger LOGGER = InternalLoggerFactory.getLogger(AbstractMqttAuthHandler.class); + private static final @NotNull InternalLogger LOGGER = InternalLoggerFactory.getLogger(AbstractMqttAuthHandler.class); enum MqttAuthState { NONE, @@ -130,6 +130,7 @@ private boolean validateAuth(final @NotNull ChannelHandlerContext ctx, final @No * @param auth the incoming AUTH message. */ private void readAuthContinue(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttAuth auth) { + LOGGER.debug("Read AUTH continue {}", auth); if (state != MqttAuthState.WAIT_FOR_SERVER) { MqttDisconnectUtil.disconnect(ctx.channel(), Mqtt5DisconnectReasonCode.PROTOCOL_ERROR, new Mqtt5AuthException(auth, "Must not receive AUTH with reason code CONTINUE_AUTHENTICATION " + @@ -141,7 +142,9 @@ private void readAuthContinue(final @NotNull ChannelHandlerContext ctx, final @N state = MqttAuthState.IN_PROGRESS_RESPONSE; callMechanismFutureResult(() -> authMechanism.onContinue(clientConfig, auth, authBuilder), ctx2 -> { state = MqttAuthState.WAIT_FOR_SERVER; - ctx2.writeAndFlush(authBuilder.build()).addListener(this); + MqttAuth auth2 = authBuilder.build(); + LOGGER.debug("Write AUTH {}", auth2); + ctx2.writeAndFlush(auth2).addListener(this); }, (ctx2, throwable) -> MqttDisconnectUtil.disconnect(ctx2.channel(), Mqtt5DisconnectReasonCode.NOT_AUTHORIZED, new Mqtt5AuthException(auth, "Server auth not accepted."))); diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttConnectAuthHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttConnectAuthHandler.java index 51d997d4d..7a6a48c30 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttConnectAuthHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttConnectAuthHandler.java @@ -16,6 +16,8 @@ package com.hivemq.client2.internal.mqtt.handler.auth; +import com.hivemq.client2.internal.logging.InternalLogger; +import com.hivemq.client2.internal.logging.InternalLoggerFactory; import com.hivemq.client2.internal.mqtt.MqttClientConfig; import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectEvent; import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectUtil; @@ -54,6 +56,8 @@ @ConnectionScope public class MqttConnectAuthHandler extends AbstractMqttAuthHandler implements DefaultChannelOutboundHandler { + private static final @NotNull InternalLogger LOGGER = InternalLoggerFactory.getLogger(MqttConnectAuthHandler.class); + @Inject MqttConnectAuthHandler(final @NotNull MqttClientConfig clientConfig, final @NotNull MqttConnect connect) { super(clientConfig, Checks.stateNotNull(connect.getRawEnhancedAuthMechanism(), "Auth mechanism")); @@ -92,6 +96,7 @@ private void writeConnect(final @NotNull MqttConnect connect, final @NotNull Cha state = MqttAuthState.WAIT_FOR_SERVER; final MqttStatefulConnect statefulConnect = connect.createStateful(clientConfig.getRawClientIdentifier(), enhancedAuthBuilder.build()); + LOGGER.debug("Write CONNECT {}", statefulConnect); ctx.writeAndFlush(statefulConnect, promise).addListener(this); }, (ctx, throwable) -> MqttDisconnectUtil.close(ctx.channel(), new ConnectionFailedException(throwable))); @@ -117,6 +122,7 @@ public void channelRead(final @NotNull ChannelHandlerContext ctx, final @NotNull * @param connAck the received CONNACK message. */ private void readConnAck(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttConnAck connAck) { + LOGGER.debug("Read CONNACK {}", connAck); cancelTimeout(); if (connAck.getReasonCode().isError()) { @@ -207,6 +213,7 @@ private boolean validateConnAck(final @NotNull ChannelHandlerContext ctx, final */ @Override void readAuthSuccess(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttAuth auth) { + LOGGER.debug("Read AUTH success {}", auth); MqttDisconnectUtil.disconnect(ctx.channel(), Mqtt5DisconnectReasonCode.PROTOCOL_ERROR, new Mqtt5AuthException(auth, "Must not receive AUTH with reason code SUCCESS during connect auth.")); } @@ -219,6 +226,7 @@ void readAuthSuccess(final @NotNull ChannelHandlerContext ctx, final @NotNull Mq */ @Override void readReAuth(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttAuth auth) { + LOGGER.debug("Read re-AUTH {}", auth); MqttDisconnectUtil.disconnect(ctx.channel(), Mqtt5DisconnectReasonCode.PROTOCOL_ERROR, new Mqtt5AuthException(auth, "Must not receive AUTH with reason code REAUTHENTICATE during connect auth.")); diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttDisconnectOnAuthHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttDisconnectOnAuthHandler.java index 5384fb085..672f7f3ae 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttDisconnectOnAuthHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttDisconnectOnAuthHandler.java @@ -16,6 +16,8 @@ package com.hivemq.client2.internal.mqtt.handler.auth; +import com.hivemq.client2.internal.logging.InternalLogger; +import com.hivemq.client2.internal.logging.InternalLoggerFactory; import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectUtil; import com.hivemq.client2.internal.mqtt.message.auth.MqttAuth; import com.hivemq.client2.internal.mqtt.message.connect.MqttConnAck; @@ -40,6 +42,8 @@ @Singleton public class MqttDisconnectOnAuthHandler extends ChannelInboundHandlerAdapter implements MqttAuthHandler { + private static final @NotNull InternalLogger LOGGER = InternalLoggerFactory.getLogger(MqttDisconnectOnAuthHandler.class); + @Inject MqttDisconnectOnAuthHandler() {} @@ -55,12 +59,14 @@ public void channelRead(final @NotNull ChannelHandlerContext ctx, final @NotNull } private void readAuth(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttAuth auth) { + LOGGER.debug("Read AUTH {}", auth); MqttDisconnectUtil.disconnect(ctx.channel(), Mqtt5DisconnectReasonCode.PROTOCOL_ERROR, new Mqtt5AuthException(auth, "Server must not send AUTH")); } private void readConnAck(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttConnAck connAck) { if (connAck.getRawEnhancedAuth() != null) { + LOGGER.debug("Read CONNACK with auth {}", connAck); MqttDisconnectUtil.disconnect(ctx.channel(), Mqtt5DisconnectReasonCode.PROTOCOL_ERROR, new Mqtt5ConnAckException(connAck, "Server must not include auth in CONNACK")); } else { diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttReAuthHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttReAuthHandler.java index bdb7dc4d7..5f5bafec1 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttReAuthHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/auth/MqttReAuthHandler.java @@ -16,6 +16,8 @@ package com.hivemq.client2.internal.mqtt.handler.auth; +import com.hivemq.client2.internal.logging.InternalLogger; +import com.hivemq.client2.internal.logging.InternalLoggerFactory; import com.hivemq.client2.internal.mqtt.exceptions.MqttClientStateExceptions; import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectEvent; import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectUtil; @@ -46,6 +48,8 @@ @ConnectionScope public class MqttReAuthHandler extends AbstractMqttAuthHandler { + private static final @NotNull InternalLogger LOGGER = InternalLoggerFactory.getLogger(MqttReAuthHandler.class); + private @Nullable CompletableFlow flow; MqttReAuthHandler(final @NotNull MqttConnectAuthHandler connectAuthHandler) { @@ -87,7 +91,9 @@ private void writeReAuth(final @NotNull CompletableFlow flow) { state = MqttAuthState.IN_PROGRESS_INIT; callMechanismFuture(() -> authMechanism.onReAuth(clientConfig, authBuilder), ctx -> { state = MqttAuthState.WAIT_FOR_SERVER; - ctx.writeAndFlush(authBuilder.build()).addListener(this); + MqttAuth auth = authBuilder.build(); + LOGGER.debug("Write re-AUTH {}", auth); + ctx.writeAndFlush(auth).addListener(this); }, (ctx, throwable) -> { callMechanism(() -> authMechanism.onReAuthError(clientConfig, throwable)); state = MqttAuthState.NONE; @@ -122,6 +128,7 @@ public void channelRead(final @NotNull ChannelHandlerContext ctx, final @NotNull */ @Override void readAuthSuccess(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttAuth auth) { + LOGGER.debug("Read AUTH success {}", auth); if (state != MqttAuthState.WAIT_FOR_SERVER) { MqttDisconnectUtil.disconnect(ctx.channel(), Mqtt5DisconnectReasonCode.PROTOCOL_ERROR, new Mqtt5AuthException(auth, @@ -160,6 +167,7 @@ void readAuthSuccess(final @NotNull ChannelHandlerContext ctx, final @NotNull Mq */ @Override void readReAuth(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttAuth auth) { + LOGGER.debug("Read re-AUTH {}", auth); if (state != MqttAuthState.NONE) { MqttDisconnectUtil.disconnect(ctx.channel(), Mqtt5DisconnectReasonCode.PROTOCOL_ERROR, new Mqtt5AuthException(auth, @@ -171,7 +179,9 @@ void readReAuth(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttAut state = MqttAuthState.IN_PROGRESS_INIT; callMechanismFutureResult(() -> authMechanism.onServerReAuth(clientConfig, auth, authBuilder), ctx2 -> { state = MqttAuthState.WAIT_FOR_SERVER; - ctx2.writeAndFlush(authBuilder.build()).addListener(this); + MqttAuth auth2 = authBuilder.build(); + LOGGER.debug("Write AUTH {}", auth2); + ctx2.writeAndFlush(auth2).addListener(this); }, (ctx2, throwable) -> MqttDisconnectUtil.disconnect(ctx2.channel(), Mqtt5DisconnectReasonCode.NOT_AUTHORIZED, new Mqtt5AuthException(auth, "Server AUTH with reason code REAUTHENTICATE not accepted."))); @@ -186,6 +196,7 @@ void readReAuth(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttAut * @param disconnect the incoming DISCONNECT message. */ private void readDisconnect(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttDisconnect disconnect) { + LOGGER.trace("Read DISCONNECT {}", disconnect); cancelTimeout(); if (state != MqttAuthState.NONE) { diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/handler/connect/MqttConnAckSingle.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/connect/MqttConnAckSingle.java index f17985585..51e4c15d3 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/handler/connect/MqttConnAckSingle.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/connect/MqttConnAckSingle.java @@ -87,12 +87,14 @@ private static void connect( final MqttTransportConfigImpl transportConfig = clientConfig.getCurrentTransportConfig(); + LOGGER.trace("connect: schedule CONNECT {} to {}", connect, transportConfig.getRemoteAddress()); bootstrap.group(eventLoop) .connect(transportConfig.getRemoteAddress(), transportConfig.getRawLocalAddress()) .addListener(future -> { final Throwable cause = future.cause(); if (cause != null) { final ConnectionFailedException e = new ConnectionFailedException(cause); + LOGGER.debug("connect failed: {}, remote address {}", e, transportConfig.getRemoteAddress()); if (eventLoop.inEventLoop()) { reconnect(clientConfig, MqttDisconnectSource.CLIENT, e, connect, flow, eventLoop); } else { @@ -151,6 +153,7 @@ private static void reconnect( } if (reconnector.isReconnect()) { + LOGGER.debug("Schedule reconnect."); clientConfig.getRawState().set(DISCONNECTED_RECONNECT); eventLoop.schedule(() -> { reconnector.getFuture().whenComplete((ignored, throwable) -> { @@ -177,6 +180,7 @@ private static void reconnect( clientConfig.setRepublishIfSessionExpired(reconnector.isRepublishIfSessionExpired()); reconnector.afterOnDisconnected(); } else { + LOGGER.debug("Do not schedule reconnect."); clientConfig.getRawState().set(DISCONNECTED); clientConfig.releaseEventLoop(); if (flow != null) { diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/handler/connect/MqttConnectHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/connect/MqttConnectHandler.java index 6de6be8e0..b06c5f086 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/handler/connect/MqttConnectHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/connect/MqttConnectHandler.java @@ -118,13 +118,16 @@ private void writeConnect(final @NotNull ChannelHandlerContext ctx) { if (!connectWritten) { connectWritten = true; connectFlushTime = System.nanoTime(); - ctx.writeAndFlush((connect.getRawEnhancedAuthMechanism() == null) ? - connect.createStateful(clientConfig.getRawClientIdentifier(), null) : connect).addListener(this); + Object connectObj = connect.getRawEnhancedAuthMechanism() == null ? + connect.createStateful(clientConfig.getRawClientIdentifier(), null) : connect; + LOGGER.debug("Write CONNECT {} to {}", connectObj, ctx.channel().remoteAddress()); + ctx.writeAndFlush(connectObj).addListener(this); } } @Override protected void operationSuccessful(final @NotNull ChannelHandlerContext ctx) { + LOGGER.trace("operationSuccessful"); if (connect.getRawEnhancedAuthMechanism() == null) { scheduleTimeout(ctx.channel()); } @@ -154,6 +157,7 @@ public void channelRead(final @NotNull ChannelHandlerContext ctx, final @NotNull * @param channel the channel. */ private void readConnAck(final @NotNull MqttConnAck connAck, final @NotNull Channel channel) { + LOGGER.debug("Read CONNACK {} from {}", connAck, ctx.channel().remoteAddress()); if (connAck.getReasonCode().isError()) { MqttDisconnectUtil.fireDisconnectEvent(channel, new Mqtt5ConnAckException(connAck, "CONNECT failed as CONNACK contained an Error Code: " + connAck.getReasonCode() + "."), @@ -204,6 +208,7 @@ private void readConnAck(final @NotNull MqttConnAck connAck, final @NotNull Chan * @param channel the channel. */ private void readOtherThanConnAck(final @NotNull Object msg, final @NotNull Channel channel) { + LOGGER.error("Read NON CONNACK {} from {}", msg, ctx.channel().remoteAddress()); if (msg instanceof MqttMessage) { MqttDisconnectUtil.disconnect(channel, Mqtt5DisconnectReasonCode.PROTOCOL_ERROR, ((MqttMessage) msg).getType() + " message must not be received before CONNACK"); diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/handler/disconnect/MqttDisconnectHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/disconnect/MqttDisconnectHandler.java index 116257a59..2def0398b 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/handler/disconnect/MqttDisconnectHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/disconnect/MqttDisconnectHandler.java @@ -38,6 +38,7 @@ import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5ConnAckException; import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5DisconnectException; import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; + import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.EventLoop; @@ -91,6 +92,7 @@ public void channelRead(final @NotNull ChannelHandlerContext ctx, final @NotNull } private void readDisconnect(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttDisconnect disconnect) { + LOGGER.debug("Read DISCONNECT {} from {}", disconnect, ctx.channel().remoteAddress()); if (state == null) { state = STATE_CLOSED; fireDisconnectEvent(ctx.channel(), new Mqtt5DisconnectException(disconnect, "Server sent DISCONNECT."), @@ -99,6 +101,7 @@ private void readDisconnect(final @NotNull ChannelHandlerContext ctx, final @Not } private void readConnAck(final @NotNull ChannelHandlerContext ctx, final @NotNull MqttConnAck connAck) { + LOGGER.debug("Read CONNACK {} from {}", connAck, ctx.channel().remoteAddress()); if (state == null) { state = STATE_CLOSED; MqttDisconnectUtil.disconnect(ctx.channel(), Mqtt5DisconnectReasonCode.PROTOCOL_ERROR, @@ -127,13 +130,15 @@ public void channelInactive(final @NotNull ChannelHandlerContext ctx) { public void exceptionCaught(final @NotNull ChannelHandlerContext ctx, final @NotNull Throwable cause) { if (state == null) { state = STATE_CLOSED; + // will be logged in MqttDisconnectUtil fireDisconnectEvent(ctx.channel(), new ConnectionClosedException(cause), MqttDisconnectSource.CLIENT); } else if (!(cause instanceof IOException)) { - LOGGER.warn("Exception while disconnecting: {}", cause); + LOGGER.warn("Exception while disconnecting: {}, remote address: {}", cause, ctx.channel().remoteAddress()); } } public void disconnect(final @NotNull MqttDisconnect disconnect, final @NotNull CompletableFlow flow) { + LOGGER.trace("disconnect: schedule DISCONNECT {}", disconnect); if (!clientConfig.executeInEventLoop(() -> writeDisconnect(disconnect, flow))) { flow.onError(MqttClientStateExceptions.notConnected()); } @@ -143,6 +148,7 @@ private void writeDisconnect(final @NotNull MqttDisconnect disconnect, final @No final ChannelHandlerContext ctx = this.ctx; if ((ctx != null) && (state == null)) { state = STATE_CLOSED; + LOGGER.trace("Fire DISCONNECT event {}", disconnect); fireDisconnectEvent(ctx.channel(), new MqttDisconnectEvent.ByUser(disconnect, flow)); } else { flow.onError(MqttClientStateExceptions.notConnected()); @@ -158,10 +164,14 @@ protected void onDisconnectEvent( final Channel channel = ctx.channel(); if (disconnectEvent.getSource() == MqttDisconnectSource.SERVER) { + LOGGER.debug("OnDisconnectedEvent: server closed connection: source: {}, cause: {}, remote address: {}", + disconnectEvent.getSource(), disconnectEvent.getCause(), ctx.channel().remoteAddress()); disconnected(channel, disconnectEvent); channel.close(); return; } + LOGGER.debug("OnDisconnectedEvent: source: {}, cause: {}", disconnectEvent.getSource(), + disconnectEvent.getCause()); MqttDisconnect disconnect = disconnectEvent.getDisconnect(); if (disconnect != null) { @@ -182,31 +192,44 @@ protected void onDisconnectEvent( if (disconnectEvent instanceof MqttDisconnectEvent.ByUser) { final MqttDisconnectEvent.ByUser disconnectEventByUser = (MqttDisconnectEvent.ByUser) disconnectEvent; + LOGGER.debug("Write DISCONNECT (by user) {} to {}", disconnect, ctx.channel().remoteAddress()); ctx.writeAndFlush(disconnect).addListener(f -> { if (f.isSuccess()) { ((DuplexChannel) channel).shutdownOutput().addListener(cf -> { if (cf.isSuccess()) { + LOGGER.trace("DISCONNECT successful"); state = new DisconnectingState(channel, disconnectEventByUser); } else { + LOGGER.debug("DISCONNECT failed: {}, remote address {}", cf.cause(), ctx.channel().remoteAddress()); disconnected(channel, disconnectEvent); disconnectEventByUser.getFlow().onError(new ConnectionClosedException(cf.cause())); } }); } else { + LOGGER.debug("DISCONNECT failed: {}, remote address {}", f.cause(), ctx.channel().remoteAddress()); disconnected(channel, disconnectEvent); disconnectEventByUser.getFlow().onError(new ConnectionClosedException(f.cause())); } }); } else if (clientConfig.getMqttVersion() == MqttVersion.MQTT_5_0) { + LOGGER.debug("Write DISCONNECT {} to {}", disconnect, ctx.channel().remoteAddress()); ctx.writeAndFlush(disconnect) - .addListener(f -> channel.close().addListener(cf -> disconnected(channel, disconnectEvent))); + .addListener(f -> channel.close().addListener(cf -> { + LOGGER.trace("DISCONNECT done"); + disconnected(channel, disconnectEvent);})); } else { - channel.close().addListener(cf -> disconnected(channel, disconnectEvent)); + LOGGER.debug("Close channel (DISCONNECT) {} to {}", disconnect, ctx.channel().remoteAddress()); + channel.close().addListener(cf -> { + LOGGER.trace("DISCONNECT done"); + disconnected(channel, disconnectEvent);}); } } else { - channel.close().addListener(cf -> disconnected(channel, disconnectEvent)); + LOGGER.debug("Close channel (DISCONNECT) to {}", ctx.channel().remoteAddress()); + channel.close().addListener(cf -> { + LOGGER.trace("DISCONNECT done"); + disconnected(channel, disconnectEvent);}); } } diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/handler/disconnect/MqttDisconnectUtil.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/disconnect/MqttDisconnectUtil.java index b3b19dcaf..44d599911 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/handler/disconnect/MqttDisconnectUtil.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/disconnect/MqttDisconnectUtil.java @@ -16,6 +16,8 @@ package com.hivemq.client2.internal.mqtt.handler.disconnect; +import com.hivemq.client2.internal.logging.InternalLogger; +import com.hivemq.client2.internal.logging.InternalLoggerFactory; import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnect; import com.hivemq.client2.internal.mqtt.message.disconnect.MqttDisconnectBuilder; import com.hivemq.client2.mqtt.exceptions.ConnectionClosedException; @@ -23,6 +25,7 @@ import com.hivemq.client2.mqtt.mqtt5.exceptions.Mqtt5DisconnectException; import com.hivemq.client2.mqtt.mqtt5.message.disconnect.Mqtt5DisconnectReasonCode; import io.netty.channel.Channel; + import org.jetbrains.annotations.NotNull; /** @@ -33,6 +36,7 @@ */ public final class MqttDisconnectUtil { + private static final @NotNull InternalLogger LOGGER = InternalLoggerFactory.getLogger(MqttDisconnectUtil.class); /** * Closes the channel from the client side without sending a DISCONNECT message. * @@ -98,7 +102,8 @@ public static void fireDisconnectEvent( static void fireDisconnectEvent( final @NotNull Channel channel, final @NotNull MqttDisconnectEvent disconnectEvent) { - + LOGGER.trace("Fire DISCONNECT event: source: {}, cause: {}", disconnectEvent.getSource(), + disconnectEvent.getCause()); channel.pipeline().fireUserEventTriggered(disconnectEvent); } diff --git a/src/main/java/com/hivemq/client2/internal/mqtt/handler/util/MqttTimeoutInboundHandler.java b/src/main/java/com/hivemq/client2/internal/mqtt/handler/util/MqttTimeoutInboundHandler.java index 7d2276d62..166479edc 100644 --- a/src/main/java/com/hivemq/client2/internal/mqtt/handler/util/MqttTimeoutInboundHandler.java +++ b/src/main/java/com/hivemq/client2/internal/mqtt/handler/util/MqttTimeoutInboundHandler.java @@ -17,6 +17,8 @@ package com.hivemq.client2.internal.mqtt.handler.util; import com.hivemq.client2.internal.annotations.CallByThread; +import com.hivemq.client2.internal.logging.InternalLogger; +import com.hivemq.client2.internal.logging.InternalLoggerFactory; import com.hivemq.client2.internal.mqtt.handler.MqttConnectionAwareHandler; import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectEvent; import com.hivemq.client2.internal.mqtt.handler.disconnect.MqttDisconnectUtil; @@ -40,6 +42,7 @@ public abstract class MqttTimeoutInboundHandler extends MqttConnectionAwareHandler implements Runnable, ChannelFutureListener { + private static final @NotNull InternalLogger LOGGER = InternalLoggerFactory.getLogger(MqttTimeoutInboundHandler.class); private @Nullable ScheduledFuture timeoutFuture; /** @@ -109,6 +112,7 @@ protected void cancelTimeout() { @Override protected void onDisconnectEvent( final @NotNull ChannelHandlerContext ctx, final @NotNull MqttDisconnectEvent disconnectEvent) { + LOGGER.debug("OnDisconnectedEvent: source: {}, cause: {}", disconnectEvent.getSource(), disconnectEvent.getCause()); cancelTimeout(); }