From 0b0ba6250a5c5686151ea027700e07931f2562ef Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Sun, 19 Nov 2023 02:02:14 +0100 Subject: [PATCH] Move packages reactivestreams, rx, reactor into ext (extensions to other libraries) --- .../client2/{ => ext}/reactor/CorePublisherWithSingle.java | 6 +++--- .../client2/{ => ext}/reactor/CoreWithSingleSubscriber.java | 4 ++-- .../mqtt/client2/{ => ext}/reactor/FluxWithSingle.java | 6 +++--- .../client2/{ => ext}/reactor/FluxWithSingleCombine.java | 2 +- .../mqtt/client2/{ => ext}/reactor/FluxWithSingleFrom.java | 4 ++-- .../mqtt/client2/{ => ext}/reactor/FluxWithSingleMap.java | 2 +- .../client2/{ => ext}/reactor/FluxWithSingleOperator.java | 2 +- .../client2/{ => ext}/reactor/FluxWithSinglePublishOn.java | 2 +- .../{ => ext}/reactor/WithSingleConditionalSubscriber.java | 2 +- .../{ => ext}/reactor/WithSingleStrictSubscriber.java | 4 ++-- .../mqtt/client2/internal/reactor/MqttReactorClient.java | 2 +- .../internal/reactor/mqtt3/Mqtt3ReactorClientView.java | 2 +- .../mqtt/client2/mqtt3/reactor/Mqtt3ReactorClient.java | 2 +- .../mqtt/client2/mqtt5/reactor/Mqtt5ReactorClient.java | 2 +- .../mqtt/client2/{ => ext}/reactor/FluxWithSingleItem.java | 2 +- .../mqtt/client2/{ => ext}/reactor/FluxWithSingleSplit.java | 4 ++-- .../mqtt/client2/{ => ext}/reactor/FluxWithSingleTest.java | 4 ++-- .../{ => ext}/reactivestreams/PublisherWithSingle.java | 2 +- .../{ => ext}/reactivestreams/WithSingleSubscriber.java | 2 +- .../mqtt/client2/{ => ext}/rx/FlowableWithSingle.java | 6 +++--- .../client2/{ => ext}/rx/FlowableWithSingleCombine.java | 4 ++-- .../mqtt/client2/{ => ext}/rx/FlowableWithSingleMap.java | 4 ++-- .../client2/{ => ext}/rx/FlowableWithSingleMapError.java | 4 ++-- .../client2/{ => ext}/rx/FlowableWithSingleObserveOn.java | 4 ++-- .../client2/{ => ext}/rx/FlowableWithSingleOperator.java | 2 +- .../client2/{ => ext}/rx/FlowableWithSingleSubscriber.java | 4 ++-- .../{ => ext}/rx/WithSingleConditionalSubscriber.java | 2 +- .../client2/{ => ext}/rx/WithSingleStrictSubscriber.java | 4 ++-- .../java/com/hivemq/mqtt/client2/internal/MqttRxClient.java | 2 +- .../handler/publish/incoming/MqttSubscribedPublishFlow.java | 2 +- .../publish/incoming/MqttSubscribedPublishFlowable.java | 4 ++-- .../mqtt/client2/internal/mqtt3/Mqtt3RxClientView.java | 2 +- .../java/com/hivemq/mqtt/client2/mqtt3/Mqtt3RxClient.java | 2 +- .../java/com/hivemq/mqtt/client2/mqtt5/Mqtt5RxClient.java | 2 +- .../mqtt/client2/{ => ext}/rx/FlowableWithSingleItem.java | 4 ++-- .../mqtt/client2/{ => ext}/rx/FlowableWithSingleSplit.java | 4 ++-- .../mqtt/client2/{ => ext}/rx/FlowableWithSingleTest.java | 4 ++-- .../internal/mqtt3/Mqtt3RxClientViewExceptionsTest.java | 2 +- 38 files changed, 59 insertions(+), 59 deletions(-) rename reactor/src/main/java/com/hivemq/mqtt/client2/{ => ext}/reactor/CorePublisherWithSingle.java (90%) rename reactor/src/main/java/com/hivemq/mqtt/client2/{ => ext}/reactor/CoreWithSingleSubscriber.java (90%) rename reactor/src/main/java/com/hivemq/mqtt/client2/{ => ext}/reactor/FluxWithSingle.java (99%) rename reactor/src/main/java/com/hivemq/mqtt/client2/{ => ext}/reactor/FluxWithSingleCombine.java (99%) rename reactor/src/main/java/com/hivemq/mqtt/client2/{ => ext}/reactor/FluxWithSingleFrom.java (91%) rename reactor/src/main/java/com/hivemq/mqtt/client2/{ => ext}/reactor/FluxWithSingleMap.java (99%) rename reactor/src/main/java/com/hivemq/mqtt/client2/{ => ext}/reactor/FluxWithSingleOperator.java (95%) rename reactor/src/main/java/com/hivemq/mqtt/client2/{ => ext}/reactor/FluxWithSinglePublishOn.java (97%) rename reactor/src/main/java/com/hivemq/mqtt/client2/{ => ext}/reactor/WithSingleConditionalSubscriber.java (94%) rename reactor/src/main/java/com/hivemq/mqtt/client2/{ => ext}/reactor/WithSingleStrictSubscriber.java (97%) rename reactor/src/test/java/com/hivemq/mqtt/client2/{ => ext}/reactor/FluxWithSingleItem.java (98%) rename reactor/src/test/java/com/hivemq/mqtt/client2/{ => ext}/reactor/FluxWithSingleSplit.java (96%) rename reactor/src/test/java/com/hivemq/mqtt/client2/{ => ext}/reactor/FluxWithSingleTest.java (99%) rename src/main/java/com/hivemq/mqtt/client2/{ => ext}/reactivestreams/PublisherWithSingle.java (96%) rename src/main/java/com/hivemq/mqtt/client2/{ => ext}/reactivestreams/WithSingleSubscriber.java (95%) rename src/main/java/com/hivemq/mqtt/client2/{ => ext}/rx/FlowableWithSingle.java (99%) rename src/main/java/com/hivemq/mqtt/client2/{ => ext}/rx/FlowableWithSingleCombine.java (98%) rename src/main/java/com/hivemq/mqtt/client2/{ => ext}/rx/FlowableWithSingleMap.java (98%) rename src/main/java/com/hivemq/mqtt/client2/{ => ext}/rx/FlowableWithSingleMapError.java (98%) rename src/main/java/com/hivemq/mqtt/client2/{ => ext}/rx/FlowableWithSingleObserveOn.java (94%) rename src/main/java/com/hivemq/mqtt/client2/{ => ext}/rx/FlowableWithSingleOperator.java (96%) rename src/main/java/com/hivemq/mqtt/client2/{ => ext}/rx/FlowableWithSingleSubscriber.java (91%) rename src/main/java/com/hivemq/mqtt/client2/{ => ext}/rx/WithSingleConditionalSubscriber.java (95%) rename src/main/java/com/hivemq/mqtt/client2/{ => ext}/rx/WithSingleStrictSubscriber.java (97%) rename src/test/java/com/hivemq/mqtt/client2/{ => ext}/rx/FlowableWithSingleItem.java (96%) rename src/test/java/com/hivemq/mqtt/client2/{ => ext}/rx/FlowableWithSingleSplit.java (97%) rename src/test/java/com/hivemq/mqtt/client2/{ => ext}/rx/FlowableWithSingleTest.java (99%) diff --git a/reactor/src/main/java/com/hivemq/mqtt/client2/reactor/CorePublisherWithSingle.java b/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/CorePublisherWithSingle.java similarity index 90% rename from reactor/src/main/java/com/hivemq/mqtt/client2/reactor/CorePublisherWithSingle.java rename to reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/CorePublisherWithSingle.java index 2a0501449..25098d325 100644 --- a/reactor/src/main/java/com/hivemq/mqtt/client2/reactor/CorePublisherWithSingle.java +++ b/reactor/src/main/java/com/hivemq/mqtt/client2/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/reactor/src/main/java/com/hivemq/mqtt/client2/reactor/CoreWithSingleSubscriber.java b/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/CoreWithSingleSubscriber.java similarity index 90% rename from reactor/src/main/java/com/hivemq/mqtt/client2/reactor/CoreWithSingleSubscriber.java rename to reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/CoreWithSingleSubscriber.java index 1d22cf962..5cd6674bb 100644 --- a/reactor/src/main/java/com/hivemq/mqtt/client2/reactor/CoreWithSingleSubscriber.java +++ b/reactor/src/main/java/com/hivemq/mqtt/client2/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/reactor/src/main/java/com/hivemq/mqtt/client2/reactor/FluxWithSingle.java b/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingle.java similarity index 99% rename from reactor/src/main/java/com/hivemq/mqtt/client2/reactor/FluxWithSingle.java rename to reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingle.java index c63b58223..420d49f68 100644 --- a/reactor/src/main/java/com/hivemq/mqtt/client2/reactor/FluxWithSingle.java +++ b/reactor/src/main/java/com/hivemq/mqtt/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/reactor/src/main/java/com/hivemq/mqtt/client2/reactor/FluxWithSingleCombine.java b/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleCombine.java similarity index 99% rename from reactor/src/main/java/com/hivemq/mqtt/client2/reactor/FluxWithSingleCombine.java rename to reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleCombine.java index d4fcebb7e..3354fdb59 100644 --- a/reactor/src/main/java/com/hivemq/mqtt/client2/reactor/FluxWithSingleCombine.java +++ b/reactor/src/main/java/com/hivemq/mqtt/client2/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/reactor/src/main/java/com/hivemq/mqtt/client2/reactor/FluxWithSingleFrom.java b/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleFrom.java similarity index 91% rename from reactor/src/main/java/com/hivemq/mqtt/client2/reactor/FluxWithSingleFrom.java rename to reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleFrom.java index 3791454dc..b2941a9f2 100644 --- a/reactor/src/main/java/com/hivemq/mqtt/client2/reactor/FluxWithSingleFrom.java +++ b/reactor/src/main/java/com/hivemq/mqtt/client2/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/reactor/src/main/java/com/hivemq/mqtt/client2/reactor/FluxWithSingleMap.java b/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleMap.java similarity index 99% rename from reactor/src/main/java/com/hivemq/mqtt/client2/reactor/FluxWithSingleMap.java rename to reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleMap.java index 256f7539b..43f16d59c 100644 --- a/reactor/src/main/java/com/hivemq/mqtt/client2/reactor/FluxWithSingleMap.java +++ b/reactor/src/main/java/com/hivemq/mqtt/client2/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/reactor/src/main/java/com/hivemq/mqtt/client2/reactor/FluxWithSingleOperator.java b/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleOperator.java similarity index 95% rename from reactor/src/main/java/com/hivemq/mqtt/client2/reactor/FluxWithSingleOperator.java rename to reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleOperator.java index 0600941ec..8fe3cf40b 100644 --- a/reactor/src/main/java/com/hivemq/mqtt/client2/reactor/FluxWithSingleOperator.java +++ b/reactor/src/main/java/com/hivemq/mqtt/client2/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/reactor/src/main/java/com/hivemq/mqtt/client2/reactor/FluxWithSinglePublishOn.java b/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSinglePublishOn.java similarity index 97% rename from reactor/src/main/java/com/hivemq/mqtt/client2/reactor/FluxWithSinglePublishOn.java rename to reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSinglePublishOn.java index 2dc750dc2..91fc6e23d 100644 --- a/reactor/src/main/java/com/hivemq/mqtt/client2/reactor/FluxWithSinglePublishOn.java +++ b/reactor/src/main/java/com/hivemq/mqtt/client2/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/reactor/src/main/java/com/hivemq/mqtt/client2/reactor/WithSingleConditionalSubscriber.java b/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/WithSingleConditionalSubscriber.java similarity index 94% rename from reactor/src/main/java/com/hivemq/mqtt/client2/reactor/WithSingleConditionalSubscriber.java rename to reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/WithSingleConditionalSubscriber.java index bff270de5..b1aa58cc1 100644 --- a/reactor/src/main/java/com/hivemq/mqtt/client2/reactor/WithSingleConditionalSubscriber.java +++ b/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/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/reactor/src/main/java/com/hivemq/mqtt/client2/reactor/WithSingleStrictSubscriber.java b/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/WithSingleStrictSubscriber.java similarity index 97% rename from reactor/src/main/java/com/hivemq/mqtt/client2/reactor/WithSingleStrictSubscriber.java rename to reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/WithSingleStrictSubscriber.java index 9bb62d228..1dd50f8d9 100644 --- a/reactor/src/main/java/com/hivemq/mqtt/client2/reactor/WithSingleStrictSubscriber.java +++ b/reactor/src/main/java/com/hivemq/mqtt/client2/ext/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 index a8338bab3..a46b33f6a 100644 --- 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/reactor/src/main/java/com/hivemq/mqtt/client2/internal/reactor/mqtt3/Mqtt3ReactorClientView.java b/reactor/src/main/java/com/hivemq/mqtt/client2/internal/reactor/mqtt3/Mqtt3ReactorClientView.java index 5872b514a..4d49ca369 100644 --- a/reactor/src/main/java/com/hivemq/mqtt/client2/internal/reactor/mqtt3/Mqtt3ReactorClientView.java +++ b/reactor/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 index 02914ae01..6079a9dcc 100644 --- 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 index 346608624..aeaa21564 100644 --- 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/reactor/src/test/java/com/hivemq/mqtt/client2/reactor/FluxWithSingleItem.java b/reactor/src/test/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleItem.java similarity index 98% rename from reactor/src/test/java/com/hivemq/mqtt/client2/reactor/FluxWithSingleItem.java rename to reactor/src/test/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleItem.java index 5bc575ddb..3ec41fd3e 100644 --- a/reactor/src/test/java/com/hivemq/mqtt/client2/reactor/FluxWithSingleItem.java +++ b/reactor/src/test/java/com/hivemq/mqtt/client2/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/reactor/src/test/java/com/hivemq/mqtt/client2/reactor/FluxWithSingleSplit.java b/reactor/src/test/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleSplit.java similarity index 96% rename from reactor/src/test/java/com/hivemq/mqtt/client2/reactor/FluxWithSingleSplit.java rename to reactor/src/test/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleSplit.java index c02d9a76c..f64157044 100644 --- a/reactor/src/test/java/com/hivemq/mqtt/client2/reactor/FluxWithSingleSplit.java +++ b/reactor/src/test/java/com/hivemq/mqtt/client2/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/reactor/src/test/java/com/hivemq/mqtt/client2/reactor/FluxWithSingleTest.java b/reactor/src/test/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleTest.java similarity index 99% rename from reactor/src/test/java/com/hivemq/mqtt/client2/reactor/FluxWithSingleTest.java rename to reactor/src/test/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleTest.java index 07741b23c..1c2e566b3 100644 --- a/reactor/src/test/java/com/hivemq/mqtt/client2/reactor/FluxWithSingleTest.java +++ b/reactor/src/test/java/com/hivemq/mqtt/client2/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/src/main/java/com/hivemq/mqtt/client2/reactivestreams/PublisherWithSingle.java b/src/main/java/com/hivemq/mqtt/client2/ext/reactivestreams/PublisherWithSingle.java similarity index 96% rename from src/main/java/com/hivemq/mqtt/client2/reactivestreams/PublisherWithSingle.java rename to src/main/java/com/hivemq/mqtt/client2/ext/reactivestreams/PublisherWithSingle.java index c75c021e7..dde099cd8 100644 --- a/src/main/java/com/hivemq/mqtt/client2/reactivestreams/PublisherWithSingle.java +++ b/src/main/java/com/hivemq/mqtt/client2/ext/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/src/main/java/com/hivemq/mqtt/client2/reactivestreams/WithSingleSubscriber.java b/src/main/java/com/hivemq/mqtt/client2/ext/reactivestreams/WithSingleSubscriber.java similarity index 95% rename from src/main/java/com/hivemq/mqtt/client2/reactivestreams/WithSingleSubscriber.java rename to src/main/java/com/hivemq/mqtt/client2/ext/reactivestreams/WithSingleSubscriber.java index fd37089b3..0cd59235a 100644 --- a/src/main/java/com/hivemq/mqtt/client2/reactivestreams/WithSingleSubscriber.java +++ b/src/main/java/com/hivemq/mqtt/client2/ext/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/src/main/java/com/hivemq/mqtt/client2/rx/FlowableWithSingle.java b/src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingle.java similarity index 99% rename from src/main/java/com/hivemq/mqtt/client2/rx/FlowableWithSingle.java rename to src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingle.java index 6f5b376d0..9a7bd1b2f 100644 --- a/src/main/java/com/hivemq/mqtt/client2/rx/FlowableWithSingle.java +++ b/src/main/java/com/hivemq/mqtt/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/src/main/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleCombine.java b/src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleCombine.java similarity index 98% rename from src/main/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleCombine.java rename to src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleCombine.java index 5823f632f..505e202de 100644 --- a/src/main/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleCombine.java +++ b/src/main/java/com/hivemq/mqtt/client2/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/src/main/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleMap.java b/src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleMap.java similarity index 98% rename from src/main/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleMap.java rename to src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleMap.java index 4c382720e..e75bf11d6 100644 --- a/src/main/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleMap.java +++ b/src/main/java/com/hivemq/mqtt/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/src/main/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleMapError.java b/src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleMapError.java similarity index 98% rename from src/main/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleMapError.java rename to src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleMapError.java index 027924fb1..5f1e958ed 100644 --- a/src/main/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleMapError.java +++ b/src/main/java/com/hivemq/mqtt/client2/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/src/main/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleObserveOn.java b/src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleObserveOn.java similarity index 94% rename from src/main/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleObserveOn.java rename to src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleObserveOn.java index 2d914caae..79dbe7f17 100644 --- a/src/main/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleObserveOn.java +++ b/src/main/java/com/hivemq/mqtt/client2/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/src/main/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleOperator.java b/src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleOperator.java similarity index 96% rename from src/main/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleOperator.java rename to src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleOperator.java index b5a30bd75..cb56bad3c 100644 --- a/src/main/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleOperator.java +++ b/src/main/java/com/hivemq/mqtt/client2/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/src/main/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleSubscriber.java b/src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleSubscriber.java similarity index 91% rename from src/main/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleSubscriber.java rename to src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleSubscriber.java index d60dc0add..1f2ee62a1 100644 --- a/src/main/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleSubscriber.java +++ b/src/main/java/com/hivemq/mqtt/client2/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/src/main/java/com/hivemq/mqtt/client2/rx/WithSingleConditionalSubscriber.java b/src/main/java/com/hivemq/mqtt/client2/ext/rx/WithSingleConditionalSubscriber.java similarity index 95% rename from src/main/java/com/hivemq/mqtt/client2/rx/WithSingleConditionalSubscriber.java rename to src/main/java/com/hivemq/mqtt/client2/ext/rx/WithSingleConditionalSubscriber.java index e84a0ac09..8da523b46 100644 --- a/src/main/java/com/hivemq/mqtt/client2/rx/WithSingleConditionalSubscriber.java +++ b/src/main/java/com/hivemq/mqtt/client2/ext/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/src/main/java/com/hivemq/mqtt/client2/rx/WithSingleStrictSubscriber.java b/src/main/java/com/hivemq/mqtt/client2/ext/rx/WithSingleStrictSubscriber.java similarity index 97% rename from src/main/java/com/hivemq/mqtt/client2/rx/WithSingleStrictSubscriber.java rename to src/main/java/com/hivemq/mqtt/client2/ext/rx/WithSingleStrictSubscriber.java index f895ec231..ccb59ccc0 100644 --- a/src/main/java/com/hivemq/mqtt/client2/rx/WithSingleStrictSubscriber.java +++ b/src/main/java/com/hivemq/mqtt/client2/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 index af960395e..52aef8ac0 100644 --- 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/src/main/java/com/hivemq/mqtt/client2/internal/handler/publish/incoming/MqttSubscribedPublishFlow.java b/src/main/java/com/hivemq/mqtt/client2/internal/handler/publish/incoming/MqttSubscribedPublishFlow.java index b2314f319..28dc66861 100644 --- a/src/main/java/com/hivemq/mqtt/client2/internal/handler/publish/incoming/MqttSubscribedPublishFlow.java +++ b/src/main/java/com/hivemq/mqtt/client2/internal/handler/publish/incoming/MqttSubscribedPublishFlow.java @@ -16,6 +16,7 @@ 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; @@ -23,7 +24,6 @@ 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/src/main/java/com/hivemq/mqtt/client2/internal/handler/publish/incoming/MqttSubscribedPublishFlowable.java b/src/main/java/com/hivemq/mqtt/client2/internal/handler/publish/incoming/MqttSubscribedPublishFlowable.java index 860026069..acb7a0aa1 100644 --- a/src/main/java/com/hivemq/mqtt/client2/internal/handler/publish/incoming/MqttSubscribedPublishFlowable.java +++ b/src/main/java/com/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 index fe0b91fc3..3b176049c 100644 --- 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; diff --git a/src/main/java/com/hivemq/mqtt/client2/mqtt3/Mqtt3RxClient.java b/src/main/java/com/hivemq/mqtt/client2/mqtt3/Mqtt3RxClient.java index 19e929cea..14a679214 100644 --- a/src/main/java/com/hivemq/mqtt/client2/mqtt3/Mqtt3RxClient.java +++ b/src/main/java/com/hivemq/mqtt/client2/mqtt3/Mqtt3RxClient.java @@ -17,6 +17,7 @@ package com.hivemq.mqtt.client2.mqtt3; import com.hivemq.mqtt.client2.MqttGlobalPublishFilter; +import com.hivemq.mqtt.client2.ext.rx.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; @@ -28,7 +29,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.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/mqtt/client2/mqtt5/Mqtt5RxClient.java b/src/main/java/com/hivemq/mqtt/client2/mqtt5/Mqtt5RxClient.java index fb9a96089..83fe983df 100644 --- a/src/main/java/com/hivemq/mqtt/client2/mqtt5/Mqtt5RxClient.java +++ b/src/main/java/com/hivemq/mqtt/client2/mqtt5/Mqtt5RxClient.java @@ -17,6 +17,7 @@ package com.hivemq.mqtt.client2.mqtt5; import com.hivemq.mqtt.client2.MqttGlobalPublishFilter; +import com.hivemq.mqtt.client2.ext.rx.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; @@ -30,7 +31,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.rx.FlowableWithSingle; 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/mqtt/client2/rx/FlowableWithSingleItem.java b/src/test/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleItem.java similarity index 96% rename from src/test/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleItem.java rename to src/test/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleItem.java index 1ea227f7d..d4e2012b5 100644 --- a/src/test/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleItem.java +++ b/src/test/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleItem.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.core.FlowableSubscriber; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleSplit.java b/src/test/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleSplit.java similarity index 97% rename from src/test/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleSplit.java rename to src/test/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleSplit.java index 127e8c93b..5c13130b8 100644 --- a/src/test/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleSplit.java +++ b/src/test/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleSplit.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 org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/test/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleTest.java b/src/test/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleTest.java similarity index 99% rename from src/test/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleTest.java rename to src/test/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleTest.java index 1c95e93c5..661fb71bd 100644 --- a/src/test/java/com/hivemq/mqtt/client2/rx/FlowableWithSingleTest.java +++ b/src/test/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hivemq.mqtt.client2.rx; +package com.hivemq.mqtt.client2.ext.rx; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import com.hivemq.mqtt.client2.reactivestreams.WithSingleSubscriber; +import com.hivemq.mqtt.client2.ext.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/mqtt/client2/internal/mqtt3/Mqtt3RxClientViewExceptionsTest.java b/src/test/java/com/hivemq/mqtt/client2/internal/mqtt3/Mqtt3RxClientViewExceptionsTest.java index 8efd7faf7..126000098 100644 --- a/src/test/java/com/hivemq/mqtt/client2/internal/mqtt3/Mqtt3RxClientViewExceptionsTest.java +++ b/src/test/java/com/hivemq/mqtt/client2/internal/mqtt3/Mqtt3RxClientViewExceptionsTest.java @@ -18,6 +18,7 @@ import com.hivemq.mqtt.client2.MqttGlobalPublishFilter; import com.hivemq.mqtt.client2.datatypes.MqttQos; +import com.hivemq.mqtt.client2.ext.rx.FlowableWithSingleSplit; import com.hivemq.mqtt.client2.internal.MqttClientConfig; import com.hivemq.mqtt.client2.internal.MqttRxClient; import com.hivemq.mqtt.client2.internal.message.disconnect.MqttDisconnect; @@ -31,7 +32,6 @@ import com.hivemq.mqtt.client2.mqtt5.exceptions.Mqtt5MessageException; import com.hivemq.mqtt.client2.mqtt5.message.publish.Mqtt5Publish; import com.hivemq.mqtt.client2.mqtt5.message.subscribe.Mqtt5SubAck; -import com.hivemq.mqtt.client2.rx.FlowableWithSingleSplit; import io.reactivex.rxjava3.core.Completable; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.core.Single;