Move packages ext -> libs

hivemq · Nov 20, 2023 · 3c4edb8 · 3c4edb8
1 parent 52c656c
commit 3c4edb8
Show file tree

Hide file tree

Showing 38 changed files with 59 additions and 59 deletions.
diff --git a/reactor/src/main/java/com/hivemq/mqtt/client2/internal/reactor/MqttReactorClient.java b/reactor/src/main/java/com/hivemq/mqtt/client2/internal/reactor/MqttReactorClient.java
@@ -17,13 +17,13 @@
 package com.hivemq.mqtt.client2.internal.reactor;
 
 import com.hivemq.mqtt.client2.MqttGlobalPublishFilter;
-import com.hivemq.mqtt.client2.ext.reactor.FluxWithSingle;
 import com.hivemq.mqtt.client2.internal.message.connect.MqttConnect;
 import com.hivemq.mqtt.client2.internal.message.connect.MqttConnectBuilder;
 import com.hivemq.mqtt.client2.internal.message.disconnect.MqttDisconnect;
 import com.hivemq.mqtt.client2.internal.message.disconnect.MqttDisconnectBuilder;
 import com.hivemq.mqtt.client2.internal.message.subscribe.MqttSubscribeBuilder;
 import com.hivemq.mqtt.client2.internal.message.unsubscribe.MqttUnsubscribeBuilder;
+import com.hivemq.mqtt.client2.libs.reactor.FluxWithSingle;
 import com.hivemq.mqtt.client2.mqtt5.Mqtt5AsyncClient;
 import com.hivemq.mqtt.client2.mqtt5.Mqtt5BlockingClient;
 import com.hivemq.mqtt.client2.mqtt5.Mqtt5ClientConfig;

diff --git a/.../src/main/java/com/hivemq/mqtt/client2/internal/reactor/mqtt3/Mqtt3ReactorClientView.java b/.../src/main/java/com/hivemq/mqtt/client2/internal/reactor/mqtt3/Mqtt3ReactorClientView.java
@@ -17,11 +17,11 @@
 package com.hivemq.mqtt.client2.internal.reactor.mqtt3;
 
 import com.hivemq.mqtt.client2.MqttGlobalPublishFilter;
-import com.hivemq.mqtt.client2.ext.reactor.FluxWithSingle;
 import com.hivemq.mqtt.client2.internal.message.connect.mqtt3.Mqtt3ConnectView;
 import com.hivemq.mqtt.client2.internal.message.connect.mqtt3.Mqtt3ConnectViewBuilder;
 import com.hivemq.mqtt.client2.internal.message.subscribe.mqtt3.Mqtt3SubscribeViewBuilder;
 import com.hivemq.mqtt.client2.internal.message.unsubscribe.mqtt3.Mqtt3UnsubscribeViewBuilder;
+import com.hivemq.mqtt.client2.libs.reactor.FluxWithSingle;
 import com.hivemq.mqtt.client2.mqtt3.Mqtt3AsyncClient;
 import com.hivemq.mqtt.client2.mqtt3.Mqtt3BlockingClient;
 import com.hivemq.mqtt.client2.mqtt3.Mqtt3ClientConfig;

diff --git a/.../ext/reactor/CorePublisherWithSingle.java → ...libs/reactor/CorePublisherWithSingle.java b/.../ext/reactor/CorePublisherWithSingle.java → ...libs/reactor/CorePublisherWithSingle.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.reactor;
+package com.hivemq.mqtt.client2.libs.reactor;
 
-import com.hivemq.mqtt.client2.ext.reactivestreams.PublisherWithSingle;
-import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber;
+import com.hivemq.mqtt.client2.libs.reactivestreams.PublisherWithSingle;
+import com.hivemq.mqtt.client2.libs.reactivestreams.WithSingleSubscriber;
 import org.jetbrains.annotations.NotNull;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;

diff --git a/...ext/reactor/CoreWithSingleSubscriber.java → ...ibs/reactor/CoreWithSingleSubscriber.java b/...ext/reactor/CoreWithSingleSubscriber.java → ...ibs/reactor/CoreWithSingleSubscriber.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.reactor;
+package com.hivemq.mqtt.client2.libs.reactor;
 
-import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber;
+import com.hivemq.mqtt.client2.libs.reactivestreams.WithSingleSubscriber;
 import reactor.core.CoreSubscriber;
 
 /**

diff --git a/...t/client2/ext/reactor/FluxWithSingle.java → .../client2/libs/reactor/FluxWithSingle.java b/...t/client2/ext/reactor/FluxWithSingle.java → .../client2/libs/reactor/FluxWithSingle.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.reactor;
+package com.hivemq.mqtt.client2.libs.reactor;
 
-import com.hivemq.mqtt.client2.ext.reactivestreams.PublisherWithSingle;
-import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber;
 import com.hivemq.mqtt.client2.internal.util.Checks;
+import com.hivemq.mqtt.client2.libs.reactivestreams.PublisherWithSingle;
+import com.hivemq.mqtt.client2.libs.reactivestreams.WithSingleSubscriber;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.reactivestreams.Subscriber;

diff --git a/...t2/ext/reactor/FluxWithSingleCombine.java → ...2/libs/reactor/FluxWithSingleCombine.java b/...t2/ext/reactor/FluxWithSingleCombine.java → ...2/libs/reactor/FluxWithSingleCombine.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.reactor;
+package com.hivemq.mqtt.client2.libs.reactor;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

diff --git a/...ient2/ext/reactor/FluxWithSingleFrom.java → ...ent2/libs/reactor/FluxWithSingleFrom.java b/...ient2/ext/reactor/FluxWithSingleFrom.java → ...ent2/libs/reactor/FluxWithSingleFrom.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.reactor;
+package com.hivemq.mqtt.client2.libs.reactor;
 
-import com.hivemq.mqtt.client2.ext.reactivestreams.PublisherWithSingle;
+import com.hivemq.mqtt.client2.libs.reactivestreams.PublisherWithSingle;
 import org.jetbrains.annotations.NotNull;
 import reactor.core.CoreSubscriber;
 

diff --git a/...lient2/ext/reactor/FluxWithSingleMap.java → ...ient2/libs/reactor/FluxWithSingleMap.java b/...lient2/ext/reactor/FluxWithSingleMap.java → ...ient2/libs/reactor/FluxWithSingleMap.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.reactor;
+package com.hivemq.mqtt.client2.libs.reactor;
 
 import com.hivemq.mqtt.client2.internal.util.Checks;
 import org.jetbrains.annotations.NotNull;

diff --git a/...2/ext/reactor/FluxWithSingleOperator.java → .../libs/reactor/FluxWithSingleOperator.java b/...2/ext/reactor/FluxWithSingleOperator.java → .../libs/reactor/FluxWithSingleOperator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.reactor;
+package com.hivemq.mqtt.client2.libs.reactor;
 
 import org.jetbrains.annotations.NotNull;
 

diff --git a/.../ext/reactor/FluxWithSinglePublishOn.java → ...libs/reactor/FluxWithSinglePublishOn.java b/.../ext/reactor/FluxWithSinglePublishOn.java → ...libs/reactor/FluxWithSinglePublishOn.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.reactor;
+package com.hivemq.mqtt.client2.libs.reactor;
 
 import org.jetbrains.annotations.NotNull;
 import reactor.core.CoreSubscriber;

diff --git a/...ctor/WithSingleConditionalSubscriber.java → ...ctor/WithSingleConditionalSubscriber.java b/...ctor/WithSingleConditionalSubscriber.java → ...ctor/WithSingleConditionalSubscriber.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.reactor;
+package com.hivemq.mqtt.client2.libs.reactor;
 
 import reactor.core.Fuseable;
 

diff --git a/...t/reactor/WithSingleStrictSubscriber.java → ...s/reactor/WithSingleStrictSubscriber.java b/...t/reactor/WithSingleStrictSubscriber.java → ...s/reactor/WithSingleStrictSubscriber.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.reactor;
+package com.hivemq.mqtt.client2.libs.reactor;
 
-import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber;
+import com.hivemq.mqtt.client2.libs.reactivestreams.WithSingleSubscriber;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.reactivestreams.Subscription;

diff --git a/reactor/src/main/java/com/hivemq/mqtt/client2/mqtt3/reactor/Mqtt3ReactorClient.java b/reactor/src/main/java/com/hivemq/mqtt/client2/mqtt3/reactor/Mqtt3ReactorClient.java
@@ -17,8 +17,8 @@
 package com.hivemq.mqtt.client2.mqtt3.reactor;
 
 import com.hivemq.mqtt.client2.MqttGlobalPublishFilter;
-import com.hivemq.mqtt.client2.ext.reactor.FluxWithSingle;
 import com.hivemq.mqtt.client2.internal.reactor.mqtt3.Mqtt3ReactorClientView;
+import com.hivemq.mqtt.client2.libs.reactor.FluxWithSingle;
 import com.hivemq.mqtt.client2.mqtt3.Mqtt3Client;
 import com.hivemq.mqtt.client2.mqtt3.message.connect.Mqtt3ConnAck;
 import com.hivemq.mqtt.client2.mqtt3.message.connect.Mqtt3Connect;

diff --git a/reactor/src/main/java/com/hivemq/mqtt/client2/mqtt5/reactor/Mqtt5ReactorClient.java b/reactor/src/main/java/com/hivemq/mqtt/client2/mqtt5/reactor/Mqtt5ReactorClient.java
@@ -17,8 +17,8 @@
 package com.hivemq.mqtt.client2.mqtt5.reactor;
 
 import com.hivemq.mqtt.client2.MqttGlobalPublishFilter;
-import com.hivemq.mqtt.client2.ext.reactor.FluxWithSingle;
 import com.hivemq.mqtt.client2.internal.reactor.MqttReactorClient;
+import com.hivemq.mqtt.client2.libs.reactor.FluxWithSingle;
 import com.hivemq.mqtt.client2.mqtt5.Mqtt5Client;
 import com.hivemq.mqtt.client2.mqtt5.message.connect.Mqtt5ConnAck;
 import com.hivemq.mqtt.client2.mqtt5.message.connect.Mqtt5Connect;

diff --git a/...ient2/ext/reactor/FluxWithSingleItem.java → ...ent2/libs/reactor/FluxWithSingleItem.java b/...ient2/ext/reactor/FluxWithSingleItem.java → ...ent2/libs/reactor/FluxWithSingleItem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.reactor;
+package com.hivemq.mqtt.client2.libs.reactor;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

diff --git a/...ent2/ext/reactor/FluxWithSingleSplit.java → ...nt2/libs/reactor/FluxWithSingleSplit.java b/...ent2/ext/reactor/FluxWithSingleSplit.java → ...nt2/libs/reactor/FluxWithSingleSplit.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.reactor;
+package com.hivemq.mqtt.client2.libs.reactor;
 
-import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber;
+import com.hivemq.mqtt.client2.libs.reactivestreams.WithSingleSubscriber;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.reactivestreams.Subscriber;

diff --git a/...ient2/ext/reactor/FluxWithSingleTest.java → ...ent2/libs/reactor/FluxWithSingleTest.java b/...ient2/ext/reactor/FluxWithSingleTest.java → ...ent2/libs/reactor/FluxWithSingleTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.reactor;
+package com.hivemq.mqtt.client2.libs.reactor;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber;
+import com.hivemq.mqtt.client2.libs.reactivestreams.WithSingleSubscriber;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.function.ThrowingSupplier;

diff --git a/src/main/java/com/hivemq/mqtt/client2/internal/MqttRxClient.java b/src/main/java/com/hivemq/mqtt/client2/internal/MqttRxClient.java
@@ -17,7 +17,6 @@
 package com.hivemq.mqtt.client2.internal;
 
 import com.hivemq.mqtt.client2.MqttGlobalPublishFilter;
-import com.hivemq.mqtt.client2.ext.rxjava3.FlowableWithSingle;
 import com.hivemq.mqtt.client2.internal.handler.auth.MqttReAuthCompletable;
 import com.hivemq.mqtt.client2.internal.handler.connect.MqttConnAckSingle;
 import com.hivemq.mqtt.client2.internal.handler.disconnect.MqttDisconnectCompletable;
@@ -39,6 +38,7 @@
 import com.hivemq.mqtt.client2.internal.message.unsubscribe.MqttUnsubscribeBuilder;
 import com.hivemq.mqtt.client2.internal.util.Checks;
 import com.hivemq.mqtt.client2.internal.util.MqttChecks;
+import com.hivemq.mqtt.client2.libs.rxjava3.FlowableWithSingle;
 import com.hivemq.mqtt.client2.mqtt5.Mqtt5RxClient;
 import com.hivemq.mqtt.client2.mqtt5.message.connect.Mqtt5ConnAck;
 import com.hivemq.mqtt.client2.mqtt5.message.connect.Mqtt5Connect;

diff --git a/.../com/hivemq/mqtt/client2/internal/handler/publish/incoming/MqttSubscribedPublishFlow.java b/.../com/hivemq/mqtt/client2/internal/handler/publish/incoming/MqttSubscribedPublishFlow.java
@@ -16,12 +16,12 @@
 
 package com.hivemq.mqtt.client2.internal.handler.publish.incoming;
 
-import com.hivemq.mqtt.client2.ext.rxjava3.FlowableWithSingleSubscriber;
 import com.hivemq.mqtt.client2.internal.MqttClientConfig;
 import com.hivemq.mqtt.client2.internal.collections.HandleList;
 import com.hivemq.mqtt.client2.internal.datatypes.MqttTopicFilterImpl;
 import com.hivemq.mqtt.client2.internal.handler.subscribe.MqttSubscriptionFlow;
 import com.hivemq.mqtt.client2.internal.message.subscribe.MqttSubAck;
+import com.hivemq.mqtt.client2.libs.rxjava3.FlowableWithSingleSubscriber;
 import com.hivemq.mqtt.client2.mqtt5.message.publish.Mqtt5Publish;
 import com.hivemq.mqtt.client2.mqtt5.message.subscribe.Mqtt5SubAck;
 import org.jetbrains.annotations.NotNull;

diff --git a/.../hivemq/mqtt/client2/internal/handler/publish/incoming/MqttSubscribedPublishFlowable.java b/.../hivemq/mqtt/client2/internal/handler/publish/incoming/MqttSubscribedPublishFlowable.java
@@ -16,12 +16,12 @@
 
 package com.hivemq.mqtt.client2.internal.handler.publish.incoming;
 
-import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber;
-import com.hivemq.mqtt.client2.ext.rxjava3.FlowableWithSingle;
 import com.hivemq.mqtt.client2.internal.MqttClientConfig;
 import com.hivemq.mqtt.client2.internal.handler.subscribe.MqttSubscriptionHandler;
 import com.hivemq.mqtt.client2.internal.ioc.ClientComponent;
 import com.hivemq.mqtt.client2.internal.message.subscribe.MqttSubscribe;
+import com.hivemq.mqtt.client2.libs.reactivestreams.WithSingleSubscriber;
+import com.hivemq.mqtt.client2.libs.rxjava3.FlowableWithSingle;
 import com.hivemq.mqtt.client2.mqtt5.message.publish.Mqtt5Publish;
 import com.hivemq.mqtt.client2.mqtt5.message.subscribe.Mqtt5SubAck;
 import org.jetbrains.annotations.NotNull;

diff --git a/src/main/java/com/hivemq/mqtt/client2/internal/mqtt3/Mqtt3RxClientView.java b/src/main/java/com/hivemq/mqtt/client2/internal/mqtt3/Mqtt3RxClientView.java
@@ -17,7 +17,6 @@
 package com.hivemq.mqtt.client2.internal.mqtt3;
 
 import com.hivemq.mqtt.client2.MqttGlobalPublishFilter;
-import com.hivemq.mqtt.client2.ext.rxjava3.FlowableWithSingle;
 import com.hivemq.mqtt.client2.internal.MqttRxClient;
 import com.hivemq.mqtt.client2.internal.exceptions.mqtt3.Mqtt3ExceptionFactory;
 import com.hivemq.mqtt.client2.internal.message.connect.MqttConnect;
@@ -36,6 +35,7 @@
 import com.hivemq.mqtt.client2.internal.message.unsubscribe.mqtt3.Mqtt3UnsubscribeViewBuilder;
 import com.hivemq.mqtt.client2.internal.util.Checks;
 import com.hivemq.mqtt.client2.internal.util.MqttChecks;
+import com.hivemq.mqtt.client2.libs.rxjava3.FlowableWithSingle;
 import com.hivemq.mqtt.client2.mqtt3.Mqtt3RxClient;
 import com.hivemq.mqtt.client2.mqtt3.message.connect.Mqtt3ConnAck;
 import com.hivemq.mqtt.client2.mqtt3.message.connect.Mqtt3Connect;

diff --git a/.../reactivestreams/PublisherWithSingle.java → .../reactivestreams/PublisherWithSingle.java b/.../reactivestreams/PublisherWithSingle.java → .../reactivestreams/PublisherWithSingle.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.reactivestreams;
+package com.hivemq.mqtt.client2.libs.reactivestreams;
 
 import org.jetbrains.annotations.NotNull;
 import org.reactivestreams.Publisher;

diff --git a/...reactivestreams/WithSingleSubscriber.java → ...reactivestreams/WithSingleSubscriber.java b/...reactivestreams/WithSingleSubscriber.java → ...reactivestreams/WithSingleSubscriber.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.reactivestreams;
+package com.hivemq.mqtt.client2.libs.reactivestreams;
 
 import org.jetbrains.annotations.NotNull;
 import org.reactivestreams.Subscriber;

diff --git a/...ient2/ext/rxjava3/FlowableWithSingle.java → ...ent2/libs/rxjava3/FlowableWithSingle.java b/...ient2/ext/rxjava3/FlowableWithSingle.java → ...ent2/libs/rxjava3/FlowableWithSingle.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.rxjava3;
+package com.hivemq.mqtt.client2.libs.rxjava3;
 
-import com.hivemq.mqtt.client2.ext.reactivestreams.PublisherWithSingle;
-import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber;
 import com.hivemq.mqtt.client2.internal.util.Checks;
+import com.hivemq.mqtt.client2.libs.reactivestreams.PublisherWithSingle;
+import com.hivemq.mqtt.client2.libs.reactivestreams.WithSingleSubscriber;
 import io.reactivex.rxjava3.annotations.BackpressureKind;
 import io.reactivex.rxjava3.annotations.BackpressureSupport;
 import io.reactivex.rxjava3.annotations.SchedulerSupport;

diff --git a/...xt/rxjava3/FlowableWithSingleCombine.java → ...bs/rxjava3/FlowableWithSingleCombine.java b/...xt/rxjava3/FlowableWithSingleCombine.java → ...bs/rxjava3/FlowableWithSingleCombine.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.rxjava3;
+package com.hivemq.mqtt.client2.libs.rxjava3;
 
-import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber;
+import com.hivemq.mqtt.client2.libs.reactivestreams.WithSingleSubscriber;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
 import io.reactivex.rxjava3.operators.ConditionalSubscriber;

diff --git a/...t2/ext/rxjava3/FlowableWithSingleMap.java → ...2/libs/rxjava3/FlowableWithSingleMap.java b/...t2/ext/rxjava3/FlowableWithSingleMap.java → ...2/libs/rxjava3/FlowableWithSingleMap.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.rxjava3;
+package com.hivemq.mqtt.client2.libs.rxjava3;
 
-import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber;
 import com.hivemq.mqtt.client2.internal.util.Checks;
+import com.hivemq.mqtt.client2.libs.reactivestreams.WithSingleSubscriber;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.operators.ConditionalSubscriber;

diff --git a/...t/rxjava3/FlowableWithSingleMapError.java → ...s/rxjava3/FlowableWithSingleMapError.java b/...t/rxjava3/FlowableWithSingleMapError.java → ...s/rxjava3/FlowableWithSingleMapError.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.rxjava3;
+package com.hivemq.mqtt.client2.libs.rxjava3;
 
-import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber;
 import com.hivemq.mqtt.client2.internal.util.Checks;
+import com.hivemq.mqtt.client2.libs.reactivestreams.WithSingleSubscriber;
 import io.reactivex.rxjava3.core.FlowableSubscriber;
 import io.reactivex.rxjava3.exceptions.CompositeException;
 import io.reactivex.rxjava3.exceptions.Exceptions;

diff --git a/.../rxjava3/FlowableWithSingleObserveOn.java → .../rxjava3/FlowableWithSingleObserveOn.java b/.../rxjava3/FlowableWithSingleObserveOn.java → .../rxjava3/FlowableWithSingleObserveOn.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.rxjava3;
+package com.hivemq.mqtt.client2.libs.rxjava3;
 
-import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber;
+import com.hivemq.mqtt.client2.libs.reactivestreams.WithSingleSubscriber;
 import io.reactivex.rxjava3.core.Scheduler;
 import org.jetbrains.annotations.NotNull;
 import org.reactivestreams.Subscriber;

diff --git a/...t/rxjava3/FlowableWithSingleOperator.java → ...s/rxjava3/FlowableWithSingleOperator.java b/...t/rxjava3/FlowableWithSingleOperator.java → ...s/rxjava3/FlowableWithSingleOperator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.rxjava3;
+package com.hivemq.mqtt.client2.libs.rxjava3;
 
 import org.jetbrains.annotations.NotNull;
 

diff --git a/...rxjava3/FlowableWithSingleSubscriber.java → ...rxjava3/FlowableWithSingleSubscriber.java b/...rxjava3/FlowableWithSingleSubscriber.java → ...rxjava3/FlowableWithSingleSubscriber.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.rxjava3;
+package com.hivemq.mqtt.client2.libs.rxjava3;
 
-import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber;
+import com.hivemq.mqtt.client2.libs.reactivestreams.WithSingleSubscriber;
 import io.reactivex.rxjava3.core.FlowableSubscriber;
 
 /**

diff --git a/...ava3/WithSingleConditionalSubscriber.java → ...ava3/WithSingleConditionalSubscriber.java b/...ava3/WithSingleConditionalSubscriber.java → ...ava3/WithSingleConditionalSubscriber.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.rxjava3;
+package com.hivemq.mqtt.client2.libs.rxjava3;
 
 import io.reactivex.rxjava3.operators.ConditionalSubscriber;
 

diff --git a/...t/rxjava3/WithSingleStrictSubscriber.java → ...s/rxjava3/WithSingleStrictSubscriber.java b/...t/rxjava3/WithSingleStrictSubscriber.java → ...s/rxjava3/WithSingleStrictSubscriber.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.ext.rxjava3;
+package com.hivemq.mqtt.client2.libs.rxjava3;
 
-import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber;
+import com.hivemq.mqtt.client2.libs.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/mqtt/client2/mqtt3/Mqtt3RxClient.java b/src/main/java/com/hivemq/mqtt/client2/mqtt3/Mqtt3RxClient.java
@@ -17,7 +17,7 @@
 package com.hivemq.mqtt.client2.mqtt3;
 
 import com.hivemq.mqtt.client2.MqttGlobalPublishFilter;
-import com.hivemq.mqtt.client2.ext.rxjava3.FlowableWithSingle;
+import com.hivemq.mqtt.client2.libs.rxjava3.FlowableWithSingle;
 import com.hivemq.mqtt.client2.mqtt3.message.connect.Mqtt3ConnAck;
 import com.hivemq.mqtt.client2.mqtt3.message.connect.Mqtt3Connect;
 import com.hivemq.mqtt.client2.mqtt3.message.connect.Mqtt3ConnectBuilder;

diff --git a/src/main/java/com/hivemq/mqtt/client2/mqtt5/Mqtt5RxClient.java b/src/main/java/com/hivemq/mqtt/client2/mqtt5/Mqtt5RxClient.java
@@ -17,7 +17,7 @@
 package com.hivemq.mqtt.client2.mqtt5;
 
 import com.hivemq.mqtt.client2.MqttGlobalPublishFilter;
-import com.hivemq.mqtt.client2.ext.rxjava3.FlowableWithSingle;
+import com.hivemq.mqtt.client2.libs.rxjava3.FlowableWithSingle;
 import com.hivemq.mqtt.client2.mqtt5.message.connect.Mqtt5ConnAck;
 import com.hivemq.mqtt.client2.mqtt5.message.connect.Mqtt5Connect;
 import com.hivemq.mqtt.client2.mqtt5.message.connect.Mqtt5ConnectBuilder;