Move packages reactivestreams, rx, reactor into ext (extensions to ot…

…her libraries)
hivemq · Nov 19, 2023 · 0b0ba62 · 0b0ba62
1 parent 0c9fad3
commit 0b0ba62
Show file tree

Hide file tree

Showing 38 changed files with 59 additions and 59 deletions.
diff --git a/...ent2/reactor/CorePublisherWithSingle.java → .../ext/reactor/CorePublisherWithSingle.java b/...ent2/reactor/CorePublisherWithSingle.java → .../ext/reactor/CorePublisherWithSingle.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.reactor;
+package com.hivemq.mqtt.client2.ext.reactor;
 
-import com.hivemq.mqtt.client2.reactivestreams.PublisherWithSingle;
-import com.hivemq.mqtt.client2.reactivestreams.WithSingleSubscriber;
+import com.hivemq.mqtt.client2.ext.reactivestreams.PublisherWithSingle;
+import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber;
 import org.jetbrains.annotations.NotNull;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;

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

diff --git a/.../mqtt/client2/reactor/FluxWithSingle.java → ...t/client2/ext/reactor/FluxWithSingle.java b/.../mqtt/client2/reactor/FluxWithSingle.java → ...t/client2/ext/reactor/FluxWithSingle.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.reactor;
+package com.hivemq.mqtt.client2.ext.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.reactivestreams.PublisherWithSingle;
-import com.hivemq.mqtt.client2.reactivestreams.WithSingleSubscriber;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.reactivestreams.Subscriber;

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

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

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

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

diff --git a/...ent2/reactor/FluxWithSinglePublishOn.java → .../ext/reactor/FluxWithSinglePublishOn.java b/...ent2/reactor/FluxWithSinglePublishOn.java → .../ext/reactor/FluxWithSinglePublishOn.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.reactor;
+package com.hivemq.mqtt.client2.ext.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.reactor;
+package com.hivemq.mqtt.client2.ext.reactor;
 
 import reactor.core.Fuseable;
 

diff --git a/...2/reactor/WithSingleStrictSubscriber.java → ...t/reactor/WithSingleStrictSubscriber.java b/...2/reactor/WithSingleStrictSubscriber.java → ...t/reactor/WithSingleStrictSubscriber.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.reactor;
+package com.hivemq.mqtt.client2.ext.reactor;
 
-import com.hivemq.mqtt.client2.reactivestreams.WithSingleSubscriber;
+import com.hivemq.mqtt.client2.ext.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/internal/reactor/MqttReactorClient.java b/reactor/src/main/java/com/hivemq/mqtt/client2/internal/reactor/MqttReactorClient.java
@@ -17,6 +17,7 @@
 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;
@@ -37,7 +38,6 @@
 import com.hivemq.mqtt.client2.mqtt5.message.unsubscribe.Mqtt5UnsubAck;
 import com.hivemq.mqtt.client2.mqtt5.message.unsubscribe.Mqtt5Unsubscribe;
 import com.hivemq.mqtt.client2.mqtt5.reactor.Mqtt5ReactorClient;
-import com.hivemq.mqtt.client2.reactor.FluxWithSingle;
 import io.reactivex.rxjava3.core.Flowable;
 import org.jetbrains.annotations.NotNull;
 import org.reactivestreams.Publisher;

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,6 +17,7 @@
 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;
@@ -34,7 +35,6 @@
 import com.hivemq.mqtt.client2.mqtt3.message.unsubscribe.Mqtt3UnsubAck;
 import com.hivemq.mqtt.client2.mqtt3.message.unsubscribe.Mqtt3Unsubscribe;
 import com.hivemq.mqtt.client2.mqtt3.reactor.Mqtt3ReactorClient;
-import com.hivemq.mqtt.client2.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/mqtt/client2/mqtt3/reactor/Mqtt3ReactorClient.java b/reactor/src/main/java/com/hivemq/mqtt/client2/mqtt3/reactor/Mqtt3ReactorClient.java
@@ -17,6 +17,7 @@
 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.mqtt3.Mqtt3Client;
 import com.hivemq.mqtt.client2.mqtt3.message.connect.Mqtt3ConnAck;
@@ -30,7 +31,6 @@
 import com.hivemq.mqtt.client2.mqtt3.message.unsubscribe.Mqtt3UnsubAck;
 import com.hivemq.mqtt.client2.mqtt3.message.unsubscribe.Mqtt3Unsubscribe;
 import com.hivemq.mqtt.client2.mqtt3.message.unsubscribe.Mqtt3UnsubscribeBuilder;
-import com.hivemq.mqtt.client2.reactor.FluxWithSingle;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.CheckReturnValue;
 import org.jetbrains.annotations.NotNull;

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,6 +17,7 @@
 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.mqtt5.Mqtt5Client;
 import com.hivemq.mqtt.client2.mqtt5.message.connect.Mqtt5ConnAck;
@@ -32,7 +33,6 @@
 import com.hivemq.mqtt.client2.mqtt5.message.unsubscribe.Mqtt5UnsubAck;
 import com.hivemq.mqtt.client2.mqtt5.message.unsubscribe.Mqtt5Unsubscribe;
 import com.hivemq.mqtt.client2.mqtt5.message.unsubscribe.Mqtt5UnsubscribeBuilder;
-import com.hivemq.mqtt.client2.reactor.FluxWithSingle;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.CheckReturnValue;
 import org.jetbrains.annotations.NotNull;

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

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

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

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.reactivestreams;
+package com.hivemq.mqtt.client2.ext.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.reactivestreams;
+package com.hivemq.mqtt.client2.ext.reactivestreams;
 
 import org.jetbrains.annotations.NotNull;
 import org.reactivestreams.Subscriber;

diff --git a/...q/mqtt/client2/rx/FlowableWithSingle.java → ...tt/client2/ext/rx/FlowableWithSingle.java b/...q/mqtt/client2/rx/FlowableWithSingle.java → ...tt/client2/ext/rx/FlowableWithSingle.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.rx;
+package com.hivemq.mqtt.client2.ext.rx;
 
+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.reactivestreams.PublisherWithSingle;
-import com.hivemq.mqtt.client2.reactivestreams.WithSingleSubscriber;
 import io.reactivex.rxjava3.annotations.BackpressureKind;
 import io.reactivex.rxjava3.annotations.BackpressureSupport;
 import io.reactivex.rxjava3.annotations.SchedulerSupport;

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

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

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

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

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

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

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

diff --git a/...lient2/rx/WithSingleStrictSubscriber.java → ...t2/ext/rx/WithSingleStrictSubscriber.java b/...lient2/rx/WithSingleStrictSubscriber.java → ...t2/ext/rx/WithSingleStrictSubscriber.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.hivemq.mqtt.client2.rx;
+package com.hivemq.mqtt.client2.ext.rx;
 
-import com.hivemq.mqtt.client2.reactivestreams.WithSingleSubscriber;
+import com.hivemq.mqtt.client2.ext.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/internal/MqttRxClient.java b/src/main/java/com/hivemq/mqtt/client2/internal/MqttRxClient.java
@@ -17,6 +17,7 @@
 package com.hivemq.mqtt.client2.internal;
 
 import com.hivemq.mqtt.client2.MqttGlobalPublishFilter;
+import com.hivemq.mqtt.client2.ext.rx.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;
@@ -48,7 +49,6 @@
 import com.hivemq.mqtt.client2.mqtt5.message.subscribe.Mqtt5Subscribe;
 import com.hivemq.mqtt.client2.mqtt5.message.unsubscribe.Mqtt5UnsubAck;
 import com.hivemq.mqtt.client2.mqtt5.message.unsubscribe.Mqtt5Unsubscribe;
-import com.hivemq.mqtt.client2.rx.FlowableWithSingle;
 import io.reactivex.rxjava3.core.Completable;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.core.Scheduler;

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,14 +16,14 @@
 
 package com.hivemq.mqtt.client2.internal.handler.publish.incoming;
 
+import com.hivemq.mqtt.client2.ext.rx.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.mqtt5.message.publish.Mqtt5Publish;
 import com.hivemq.mqtt.client2.mqtt5.message.subscribe.Mqtt5SubAck;
-import com.hivemq.mqtt.client2.rx.FlowableWithSingleSubscriber;
 import org.jetbrains.annotations.NotNull;
 import org.reactivestreams.Subscriber;
 

diff --git a/.../hivemq/mqtt/client2/internal/handler/publish/incoming/MqttSubscribedPublishFlowable.java b/.../hivemq/mqtt/client2/internal/handler/publish/incoming/MqttSubscribedPublishFlowable.java
@@ -16,14 +16,14 @@
 
 package com.hivemq.mqtt.client2.internal.handler.publish.incoming;
 
+import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber;
+import com.hivemq.mqtt.client2.ext.rx.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.mqtt5.message.publish.Mqtt5Publish;
 import com.hivemq.mqtt.client2.mqtt5.message.subscribe.Mqtt5SubAck;
-import com.hivemq.mqtt.client2.reactivestreams.WithSingleSubscriber;
-import com.hivemq.mqtt.client2.rx.FlowableWithSingle;
 import org.jetbrains.annotations.NotNull;
 import org.reactivestreams.Subscriber;
 

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,6 +17,7 @@
 package com.hivemq.mqtt.client2.internal.mqtt3;
 
 import com.hivemq.mqtt.client2.MqttGlobalPublishFilter;
+import com.hivemq.mqtt.client2.ext.rx.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;
@@ -49,7 +50,6 @@
 import com.hivemq.mqtt.client2.mqtt5.message.publish.Mqtt5PublishResult;
 import com.hivemq.mqtt.client2.mqtt5.message.subscribe.Mqtt5SubAck;
 import com.hivemq.mqtt.client2.mqtt5.message.unsubscribe.Mqtt5UnsubAck;
-import com.hivemq.mqtt.client2.rx.FlowableWithSingle;
 import io.reactivex.rxjava3.core.Completable;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.core.Single;