From 3c4edb887971bb10618a36433b87a62b356f8866 Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Mon, 20 Nov 2023 16:07:41 +0100 Subject: [PATCH] Move packages ext -> libs --- .../mqtt/client2/internal/reactor/MqttReactorClient.java | 2 +- .../internal/reactor/mqtt3/Mqtt3ReactorClientView.java | 2 +- .../{ext => libs}/reactor/CorePublisherWithSingle.java | 6 +++--- .../{ext => libs}/reactor/CoreWithSingleSubscriber.java | 4 ++-- .../mqtt/client2/{ext => libs}/reactor/FluxWithSingle.java | 6 +++--- .../{ext => libs}/reactor/FluxWithSingleCombine.java | 2 +- .../client2/{ext => libs}/reactor/FluxWithSingleFrom.java | 4 ++-- .../client2/{ext => libs}/reactor/FluxWithSingleMap.java | 2 +- .../{ext => libs}/reactor/FluxWithSingleOperator.java | 2 +- .../{ext => libs}/reactor/FluxWithSinglePublishOn.java | 2 +- .../reactor/WithSingleConditionalSubscriber.java | 2 +- .../{ext => libs}/reactor/WithSingleStrictSubscriber.java | 4 ++-- .../mqtt/client2/mqtt3/reactor/Mqtt3ReactorClient.java | 2 +- .../mqtt/client2/mqtt5/reactor/Mqtt5ReactorClient.java | 2 +- .../client2/{ext => libs}/reactor/FluxWithSingleItem.java | 2 +- .../client2/{ext => libs}/reactor/FluxWithSingleSplit.java | 4 ++-- .../client2/{ext => libs}/reactor/FluxWithSingleTest.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 +- .../{ext => libs}/reactivestreams/PublisherWithSingle.java | 2 +- .../{ext => libs}/reactivestreams/WithSingleSubscriber.java | 2 +- .../client2/{ext => libs}/rxjava3/FlowableWithSingle.java | 6 +++--- .../{ext => libs}/rxjava3/FlowableWithSingleCombine.java | 4 ++-- .../{ext => libs}/rxjava3/FlowableWithSingleMap.java | 4 ++-- .../{ext => libs}/rxjava3/FlowableWithSingleMapError.java | 4 ++-- .../{ext => libs}/rxjava3/FlowableWithSingleObserveOn.java | 4 ++-- .../{ext => libs}/rxjava3/FlowableWithSingleOperator.java | 2 +- .../{ext => libs}/rxjava3/FlowableWithSingleSubscriber.java | 4 ++-- .../rxjava3/WithSingleConditionalSubscriber.java | 2 +- .../{ext => libs}/rxjava3/WithSingleStrictSubscriber.java | 4 ++-- .../java/com/hivemq/mqtt/client2/mqtt3/Mqtt3RxClient.java | 2 +- .../java/com/hivemq/mqtt/client2/mqtt5/Mqtt5RxClient.java | 2 +- .../internal/mqtt3/Mqtt3RxClientViewExceptionsTest.java | 2 +- .../{ext => libs}/rxjava3/FlowableWithSingleItem.java | 4 ++-- .../{ext => libs}/rxjava3/FlowableWithSingleSplit.java | 4 ++-- .../{ext => libs}/rxjava3/FlowableWithSingleTest.java | 4 ++-- 38 files changed, 59 insertions(+), 59 deletions(-) rename reactor/src/main/java/com/hivemq/mqtt/client2/{ext => libs}/reactor/CorePublisherWithSingle.java (90%) rename reactor/src/main/java/com/hivemq/mqtt/client2/{ext => libs}/reactor/CoreWithSingleSubscriber.java (90%) rename reactor/src/main/java/com/hivemq/mqtt/client2/{ext => libs}/reactor/FluxWithSingle.java (98%) rename reactor/src/main/java/com/hivemq/mqtt/client2/{ext => libs}/reactor/FluxWithSingleCombine.java (99%) rename reactor/src/main/java/com/hivemq/mqtt/client2/{ext => libs}/reactor/FluxWithSingleFrom.java (91%) rename reactor/src/main/java/com/hivemq/mqtt/client2/{ext => libs}/reactor/FluxWithSingleMap.java (99%) rename reactor/src/main/java/com/hivemq/mqtt/client2/{ext => libs}/reactor/FluxWithSingleOperator.java (95%) rename reactor/src/main/java/com/hivemq/mqtt/client2/{ext => libs}/reactor/FluxWithSinglePublishOn.java (97%) rename reactor/src/main/java/com/hivemq/mqtt/client2/{ext => libs}/reactor/WithSingleConditionalSubscriber.java (94%) rename reactor/src/main/java/com/hivemq/mqtt/client2/{ext => libs}/reactor/WithSingleStrictSubscriber.java (97%) rename reactor/src/test/java/com/hivemq/mqtt/client2/{ext => libs}/reactor/FluxWithSingleItem.java (98%) rename reactor/src/test/java/com/hivemq/mqtt/client2/{ext => libs}/reactor/FluxWithSingleSplit.java (96%) rename reactor/src/test/java/com/hivemq/mqtt/client2/{ext => libs}/reactor/FluxWithSingleTest.java (99%) rename src/main/java/com/hivemq/mqtt/client2/{ext => libs}/reactivestreams/PublisherWithSingle.java (96%) rename src/main/java/com/hivemq/mqtt/client2/{ext => libs}/reactivestreams/WithSingleSubscriber.java (95%) rename src/main/java/com/hivemq/mqtt/client2/{ext => libs}/rxjava3/FlowableWithSingle.java (99%) rename src/main/java/com/hivemq/mqtt/client2/{ext => libs}/rxjava3/FlowableWithSingleCombine.java (98%) rename src/main/java/com/hivemq/mqtt/client2/{ext => libs}/rxjava3/FlowableWithSingleMap.java (98%) rename src/main/java/com/hivemq/mqtt/client2/{ext => libs}/rxjava3/FlowableWithSingleMapError.java (98%) rename src/main/java/com/hivemq/mqtt/client2/{ext => libs}/rxjava3/FlowableWithSingleObserveOn.java (93%) rename src/main/java/com/hivemq/mqtt/client2/{ext => libs}/rxjava3/FlowableWithSingleOperator.java (95%) rename src/main/java/com/hivemq/mqtt/client2/{ext => libs}/rxjava3/FlowableWithSingleSubscriber.java (90%) rename src/main/java/com/hivemq/mqtt/client2/{ext => libs}/rxjava3/WithSingleConditionalSubscriber.java (94%) rename src/main/java/com/hivemq/mqtt/client2/{ext => libs}/rxjava3/WithSingleStrictSubscriber.java (97%) rename src/test/java/com/hivemq/mqtt/client2/{ext => libs}/rxjava3/FlowableWithSingleItem.java (96%) rename src/test/java/com/hivemq/mqtt/client2/{ext => libs}/rxjava3/FlowableWithSingleSplit.java (96%) rename src/test/java/com/hivemq/mqtt/client2/{ext => libs}/rxjava3/FlowableWithSingleTest.java (99%) 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 a46b33f6a..8654b0e5c 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,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/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 4d49ca369..678b31468 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,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/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/CorePublisherWithSingle.java b/reactor/src/main/java/com/hivemq/mqtt/client2/libs/reactor/CorePublisherWithSingle.java similarity index 90% rename from reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/CorePublisherWithSingle.java rename to reactor/src/main/java/com/hivemq/mqtt/client2/libs/reactor/CorePublisherWithSingle.java index 25098d325..5b11da438 100644 --- a/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/CorePublisherWithSingle.java +++ b/reactor/src/main/java/com/hivemq/mqtt/client2/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/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/CoreWithSingleSubscriber.java b/reactor/src/main/java/com/hivemq/mqtt/client2/libs/reactor/CoreWithSingleSubscriber.java similarity index 90% rename from reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/CoreWithSingleSubscriber.java rename to reactor/src/main/java/com/hivemq/mqtt/client2/libs/reactor/CoreWithSingleSubscriber.java index 5cd6674bb..796445075 100644 --- a/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/CoreWithSingleSubscriber.java +++ b/reactor/src/main/java/com/hivemq/mqtt/client2/libs/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/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingle.java b/reactor/src/main/java/com/hivemq/mqtt/client2/libs/reactor/FluxWithSingle.java similarity index 98% rename from reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingle.java rename to reactor/src/main/java/com/hivemq/mqtt/client2/libs/reactor/FluxWithSingle.java index 420d49f68..33dbd3018 100644 --- a/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingle.java +++ b/reactor/src/main/java/com/hivemq/mqtt/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/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleCombine.java b/reactor/src/main/java/com/hivemq/mqtt/client2/libs/reactor/FluxWithSingleCombine.java similarity index 99% rename from reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleCombine.java rename to reactor/src/main/java/com/hivemq/mqtt/client2/libs/reactor/FluxWithSingleCombine.java index 3354fdb59..1e0cf3447 100644 --- a/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleCombine.java +++ b/reactor/src/main/java/com/hivemq/mqtt/client2/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/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleFrom.java b/reactor/src/main/java/com/hivemq/mqtt/client2/libs/reactor/FluxWithSingleFrom.java similarity index 91% rename from reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleFrom.java rename to reactor/src/main/java/com/hivemq/mqtt/client2/libs/reactor/FluxWithSingleFrom.java index b2941a9f2..c4baed5a7 100644 --- a/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleFrom.java +++ b/reactor/src/main/java/com/hivemq/mqtt/client2/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/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleMap.java b/reactor/src/main/java/com/hivemq/mqtt/client2/libs/reactor/FluxWithSingleMap.java similarity index 99% rename from reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleMap.java rename to reactor/src/main/java/com/hivemq/mqtt/client2/libs/reactor/FluxWithSingleMap.java index 43f16d59c..f05d5aec2 100644 --- a/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleMap.java +++ b/reactor/src/main/java/com/hivemq/mqtt/client2/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/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleOperator.java b/reactor/src/main/java/com/hivemq/mqtt/client2/libs/reactor/FluxWithSingleOperator.java similarity index 95% rename from reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleOperator.java rename to reactor/src/main/java/com/hivemq/mqtt/client2/libs/reactor/FluxWithSingleOperator.java index 8fe3cf40b..cf5b385f9 100644 --- a/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleOperator.java +++ b/reactor/src/main/java/com/hivemq/mqtt/client2/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/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSinglePublishOn.java b/reactor/src/main/java/com/hivemq/mqtt/client2/libs/reactor/FluxWithSinglePublishOn.java similarity index 97% rename from reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSinglePublishOn.java rename to reactor/src/main/java/com/hivemq/mqtt/client2/libs/reactor/FluxWithSinglePublishOn.java index 91fc6e23d..cfb94425a 100644 --- a/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSinglePublishOn.java +++ b/reactor/src/main/java/com/hivemq/mqtt/client2/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/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/WithSingleConditionalSubscriber.java b/reactor/src/main/java/com/hivemq/mqtt/client2/libs/reactor/WithSingleConditionalSubscriber.java similarity index 94% rename from reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/WithSingleConditionalSubscriber.java rename to reactor/src/main/java/com/hivemq/mqtt/client2/libs/reactor/WithSingleConditionalSubscriber.java index b1aa58cc1..6f544c239 100644 --- a/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/WithSingleConditionalSubscriber.java +++ b/reactor/src/main/java/com/hivemq/mqtt/client2/libs/reactor/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/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/WithSingleStrictSubscriber.java b/reactor/src/main/java/com/hivemq/mqtt/client2/libs/reactor/WithSingleStrictSubscriber.java similarity index 97% rename from reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/WithSingleStrictSubscriber.java rename to reactor/src/main/java/com/hivemq/mqtt/client2/libs/reactor/WithSingleStrictSubscriber.java index 1dd50f8d9..d79fb20e0 100644 --- a/reactor/src/main/java/com/hivemq/mqtt/client2/ext/reactor/WithSingleStrictSubscriber.java +++ b/reactor/src/main/java/com/hivemq/mqtt/client2/libs/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 index 6079a9dcc..af02a011c 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,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 index aeaa21564..c9f21e1d4 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,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/reactor/src/test/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleItem.java b/reactor/src/test/java/com/hivemq/mqtt/client2/libs/reactor/FluxWithSingleItem.java similarity index 98% rename from reactor/src/test/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleItem.java rename to reactor/src/test/java/com/hivemq/mqtt/client2/libs/reactor/FluxWithSingleItem.java index 3ec41fd3e..cb70fbe9e 100644 --- a/reactor/src/test/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleItem.java +++ b/reactor/src/test/java/com/hivemq/mqtt/client2/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/reactor/src/test/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleSplit.java b/reactor/src/test/java/com/hivemq/mqtt/client2/libs/reactor/FluxWithSingleSplit.java similarity index 96% rename from reactor/src/test/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleSplit.java rename to reactor/src/test/java/com/hivemq/mqtt/client2/libs/reactor/FluxWithSingleSplit.java index f64157044..9cd02850c 100644 --- a/reactor/src/test/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleSplit.java +++ b/reactor/src/test/java/com/hivemq/mqtt/client2/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/reactor/src/test/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleTest.java b/reactor/src/test/java/com/hivemq/mqtt/client2/libs/reactor/FluxWithSingleTest.java similarity index 99% rename from reactor/src/test/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleTest.java rename to reactor/src/test/java/com/hivemq/mqtt/client2/libs/reactor/FluxWithSingleTest.java index 1c2e566b3..973784702 100644 --- a/reactor/src/test/java/com/hivemq/mqtt/client2/ext/reactor/FluxWithSingleTest.java +++ b/reactor/src/test/java/com/hivemq/mqtt/client2/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 index 7f617c450..a2ccf0638 100644 --- 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/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 123266c2e..cbdb88e32 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,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/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 0d079df22..436fd0c28 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,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 index f2a9d9bc2..fab023a95 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,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/src/main/java/com/hivemq/mqtt/client2/ext/reactivestreams/PublisherWithSingle.java b/src/main/java/com/hivemq/mqtt/client2/libs/reactivestreams/PublisherWithSingle.java similarity index 96% rename from src/main/java/com/hivemq/mqtt/client2/ext/reactivestreams/PublisherWithSingle.java rename to src/main/java/com/hivemq/mqtt/client2/libs/reactivestreams/PublisherWithSingle.java index dde099cd8..bd9b45ac7 100644 --- a/src/main/java/com/hivemq/mqtt/client2/ext/reactivestreams/PublisherWithSingle.java +++ b/src/main/java/com/hivemq/mqtt/client2/libs/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/src/main/java/com/hivemq/mqtt/client2/ext/reactivestreams/WithSingleSubscriber.java b/src/main/java/com/hivemq/mqtt/client2/libs/reactivestreams/WithSingleSubscriber.java similarity index 95% rename from src/main/java/com/hivemq/mqtt/client2/ext/reactivestreams/WithSingleSubscriber.java rename to src/main/java/com/hivemq/mqtt/client2/libs/reactivestreams/WithSingleSubscriber.java index 0cd59235a..b52d03cc9 100644 --- a/src/main/java/com/hivemq/mqtt/client2/ext/reactivestreams/WithSingleSubscriber.java +++ b/src/main/java/com/hivemq/mqtt/client2/libs/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/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingle.java b/src/main/java/com/hivemq/mqtt/client2/libs/rxjava3/FlowableWithSingle.java similarity index 99% rename from src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingle.java rename to src/main/java/com/hivemq/mqtt/client2/libs/rxjava3/FlowableWithSingle.java index 41868dbe4..6179b32bf 100644 --- a/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingle.java +++ b/src/main/java/com/hivemq/mqtt/client2/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/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleCombine.java b/src/main/java/com/hivemq/mqtt/client2/libs/rxjava3/FlowableWithSingleCombine.java similarity index 98% rename from src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleCombine.java rename to src/main/java/com/hivemq/mqtt/client2/libs/rxjava3/FlowableWithSingleCombine.java index 9b3b3dd4c..e1cc512ae 100644 --- a/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleCombine.java +++ b/src/main/java/com/hivemq/mqtt/client2/libs/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/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleMap.java b/src/main/java/com/hivemq/mqtt/client2/libs/rxjava3/FlowableWithSingleMap.java similarity index 98% rename from src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleMap.java rename to src/main/java/com/hivemq/mqtt/client2/libs/rxjava3/FlowableWithSingleMap.java index 8d8011caf..636bb01f4 100644 --- a/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleMap.java +++ b/src/main/java/com/hivemq/mqtt/client2/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/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleMapError.java b/src/main/java/com/hivemq/mqtt/client2/libs/rxjava3/FlowableWithSingleMapError.java similarity index 98% rename from src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleMapError.java rename to src/main/java/com/hivemq/mqtt/client2/libs/rxjava3/FlowableWithSingleMapError.java index 53f21acdf..ff958c765 100644 --- a/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleMapError.java +++ b/src/main/java/com/hivemq/mqtt/client2/libs/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/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleObserveOn.java b/src/main/java/com/hivemq/mqtt/client2/libs/rxjava3/FlowableWithSingleObserveOn.java similarity index 93% rename from src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleObserveOn.java rename to src/main/java/com/hivemq/mqtt/client2/libs/rxjava3/FlowableWithSingleObserveOn.java index 0b2e908b8..8858ff199 100644 --- a/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleObserveOn.java +++ b/src/main/java/com/hivemq/mqtt/client2/libs/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/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleOperator.java b/src/main/java/com/hivemq/mqtt/client2/libs/rxjava3/FlowableWithSingleOperator.java similarity index 95% rename from src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleOperator.java rename to src/main/java/com/hivemq/mqtt/client2/libs/rxjava3/FlowableWithSingleOperator.java index 7ae59a82b..69b211426 100644 --- a/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleOperator.java +++ b/src/main/java/com/hivemq/mqtt/client2/libs/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/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleSubscriber.java b/src/main/java/com/hivemq/mqtt/client2/libs/rxjava3/FlowableWithSingleSubscriber.java similarity index 90% rename from src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleSubscriber.java rename to src/main/java/com/hivemq/mqtt/client2/libs/rxjava3/FlowableWithSingleSubscriber.java index e3bb04827..ced75f003 100644 --- a/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleSubscriber.java +++ b/src/main/java/com/hivemq/mqtt/client2/libs/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/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/WithSingleConditionalSubscriber.java b/src/main/java/com/hivemq/mqtt/client2/libs/rxjava3/WithSingleConditionalSubscriber.java similarity index 94% rename from src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/WithSingleConditionalSubscriber.java rename to src/main/java/com/hivemq/mqtt/client2/libs/rxjava3/WithSingleConditionalSubscriber.java index 1a08ab5a0..1ecbc072a 100644 --- a/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/WithSingleConditionalSubscriber.java +++ b/src/main/java/com/hivemq/mqtt/client2/libs/rxjava3/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/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/WithSingleStrictSubscriber.java b/src/main/java/com/hivemq/mqtt/client2/libs/rxjava3/WithSingleStrictSubscriber.java similarity index 97% rename from src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/WithSingleStrictSubscriber.java rename to src/main/java/com/hivemq/mqtt/client2/libs/rxjava3/WithSingleStrictSubscriber.java index bb65e8313..87b8a43ba 100644 --- a/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/WithSingleStrictSubscriber.java +++ b/src/main/java/com/hivemq/mqtt/client2/libs/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 index f127e49c6..fe18ba997 100644 --- 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 index 55466ed1c..0e3a7aa25 100644 --- 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; 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 561f4de67..a8597e5b2 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,10 +18,10 @@ import com.hivemq.mqtt.client2.MqttGlobalPublishFilter; import com.hivemq.mqtt.client2.datatypes.MqttQos; -import com.hivemq.mqtt.client2.ext.rxjava3.FlowableWithSingleSplit; import com.hivemq.mqtt.client2.internal.MqttClientConfig; import com.hivemq.mqtt.client2.internal.MqttRxClient; import com.hivemq.mqtt.client2.internal.message.disconnect.MqttDisconnect; +import com.hivemq.mqtt.client2.libs.rxjava3.FlowableWithSingleSplit; import com.hivemq.mqtt.client2.mqtt3.exceptions.Mqtt3MessageException; import com.hivemq.mqtt.client2.mqtt3.message.connect.Mqtt3Connect; import com.hivemq.mqtt.client2.mqtt3.message.publish.Mqtt3Publish; diff --git a/src/test/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleItem.java b/src/test/java/com/hivemq/mqtt/client2/libs/rxjava3/FlowableWithSingleItem.java similarity index 96% rename from src/test/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleItem.java rename to src/test/java/com/hivemq/mqtt/client2/libs/rxjava3/FlowableWithSingleItem.java index 2af472fdb..bbf0f6a97 100644 --- a/src/test/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleItem.java +++ b/src/test/java/com/hivemq/mqtt/client2/libs/rxjava3/FlowableWithSingleItem.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.core.FlowableSubscriber; import org.jetbrains.annotations.NotNull; diff --git a/src/test/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleSplit.java b/src/test/java/com/hivemq/mqtt/client2/libs/rxjava3/FlowableWithSingleSplit.java similarity index 96% rename from src/test/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleSplit.java rename to src/test/java/com/hivemq/mqtt/client2/libs/rxjava3/FlowableWithSingleSplit.java index 4dbfc0be3..d35f74ab1 100644 --- a/src/test/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleSplit.java +++ b/src/test/java/com/hivemq/mqtt/client2/libs/rxjava3/FlowableWithSingleSplit.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 org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/test/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleTest.java b/src/test/java/com/hivemq/mqtt/client2/libs/rxjava3/FlowableWithSingleTest.java similarity index 99% rename from src/test/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleTest.java rename to src/test/java/com/hivemq/mqtt/client2/libs/rxjava3/FlowableWithSingleTest.java index dadc03b50..8f815254c 100644 --- a/src/test/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleTest.java +++ b/src/test/java/com/hivemq/mqtt/client2/libs/rxjava3/FlowableWithSingleTest.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.google.common.util.concurrent.ThreadFactoryBuilder; -import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber; +import com.hivemq.mqtt.client2.libs.reactivestreams.WithSingleSubscriber; import io.reactivex.rxjava3.core.BackpressureStrategy; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.schedulers.Schedulers;