From 52c656c0a7446d1caced859d87929e0098512aef Mon Sep 17 00:00:00 2001 From: Silvio Giebl Date: Mon, 20 Nov 2023 15:56:49 +0100 Subject: [PATCH] Move packages rx -> rxjava3 --- .../mqtt/client2/ext/{rx => rxjava3}/FlowableWithSingle.java | 2 +- .../client2/ext/{rx => rxjava3}/FlowableWithSingleCombine.java | 2 +- .../mqtt/client2/ext/{rx => rxjava3}/FlowableWithSingleMap.java | 2 +- .../client2/ext/{rx => rxjava3}/FlowableWithSingleMapError.java | 2 +- .../ext/{rx => rxjava3}/FlowableWithSingleObserveOn.java | 2 +- .../client2/ext/{rx => rxjava3}/FlowableWithSingleOperator.java | 2 +- .../ext/{rx => rxjava3}/FlowableWithSingleSubscriber.java | 2 +- .../ext/{rx => rxjava3}/WithSingleConditionalSubscriber.java | 2 +- .../client2/ext/{rx => rxjava3}/WithSingleStrictSubscriber.java | 2 +- .../java/com/hivemq/mqtt/client2/internal/MqttRxClient.java | 2 +- .../handler/publish/incoming/MqttSubscribedPublishFlow.java | 2 +- .../handler/publish/incoming/MqttSubscribedPublishFlowable.java | 2 +- .../hivemq/mqtt/client2/internal/mqtt3/Mqtt3RxClientView.java | 2 +- src/main/java/com/hivemq/mqtt/client2/mqtt3/Mqtt3RxClient.java | 2 +- src/main/java/com/hivemq/mqtt/client2/mqtt5/Mqtt5RxClient.java | 2 +- .../client2/ext/{rx => rxjava3}/FlowableWithSingleItem.java | 2 +- .../client2/ext/{rx => rxjava3}/FlowableWithSingleSplit.java | 2 +- .../client2/ext/{rx => rxjava3}/FlowableWithSingleTest.java | 2 +- .../client2/internal/mqtt3/Mqtt3RxClientViewExceptionsTest.java | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) rename src/main/java/com/hivemq/mqtt/client2/ext/{rx => rxjava3}/FlowableWithSingle.java (99%) rename src/main/java/com/hivemq/mqtt/client2/ext/{rx => rxjava3}/FlowableWithSingleCombine.java (99%) rename src/main/java/com/hivemq/mqtt/client2/ext/{rx => rxjava3}/FlowableWithSingleMap.java (99%) rename src/main/java/com/hivemq/mqtt/client2/ext/{rx => rxjava3}/FlowableWithSingleMapError.java (99%) rename src/main/java/com/hivemq/mqtt/client2/ext/{rx => rxjava3}/FlowableWithSingleObserveOn.java (97%) rename src/main/java/com/hivemq/mqtt/client2/ext/{rx => rxjava3}/FlowableWithSingleOperator.java (95%) rename src/main/java/com/hivemq/mqtt/client2/ext/{rx => rxjava3}/FlowableWithSingleSubscriber.java (96%) rename src/main/java/com/hivemq/mqtt/client2/ext/{rx => rxjava3}/WithSingleConditionalSubscriber.java (94%) rename src/main/java/com/hivemq/mqtt/client2/ext/{rx => rxjava3}/WithSingleStrictSubscriber.java (99%) rename src/test/java/com/hivemq/mqtt/client2/ext/{rx => rxjava3}/FlowableWithSingleItem.java (98%) rename src/test/java/com/hivemq/mqtt/client2/ext/{rx => rxjava3}/FlowableWithSingleSplit.java (98%) rename src/test/java/com/hivemq/mqtt/client2/ext/{rx => rxjava3}/FlowableWithSingleTest.java (99%) diff --git a/src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingle.java b/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingle.java similarity index 99% rename from src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingle.java rename to src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingle.java index 9a7bd1b2f..41868dbe4 100644 --- a/src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingle.java +++ b/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingle.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.mqtt.client2.ext.rx; +package com.hivemq.mqtt.client2.ext.rxjava3; import com.hivemq.mqtt.client2.ext.reactivestreams.PublisherWithSingle; import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber; diff --git a/src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleCombine.java b/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleCombine.java similarity index 99% rename from src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleCombine.java rename to src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleCombine.java index 505e202de..9b3b3dd4c 100644 --- a/src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleCombine.java +++ b/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleCombine.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.mqtt.client2.ext.rx; +package com.hivemq.mqtt.client2.ext.rxjava3; import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber; import io.reactivex.rxjava3.core.Flowable; diff --git a/src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleMap.java b/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleMap.java similarity index 99% rename from src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleMap.java rename to src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleMap.java index e75bf11d6..8d8011caf 100644 --- a/src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleMap.java +++ b/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.mqtt.client2.ext.rx; +package com.hivemq.mqtt.client2.ext.rxjava3; import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber; import com.hivemq.mqtt.client2.internal.util.Checks; diff --git a/src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleMapError.java b/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleMapError.java similarity index 99% rename from src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleMapError.java rename to src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleMapError.java index 5f1e958ed..53f21acdf 100644 --- a/src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleMapError.java +++ b/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleMapError.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.mqtt.client2.ext.rx; +package com.hivemq.mqtt.client2.ext.rxjava3; import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber; import com.hivemq.mqtt.client2.internal.util.Checks; diff --git a/src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleObserveOn.java b/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleObserveOn.java similarity index 97% rename from src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleObserveOn.java rename to src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleObserveOn.java index 79dbe7f17..0b2e908b8 100644 --- a/src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleObserveOn.java +++ b/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleObserveOn.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.mqtt.client2.ext.rx; +package com.hivemq.mqtt.client2.ext.rxjava3; import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber; import io.reactivex.rxjava3.core.Scheduler; diff --git a/src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleOperator.java b/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleOperator.java similarity index 95% rename from src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleOperator.java rename to src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleOperator.java index cb56bad3c..7ae59a82b 100644 --- a/src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleOperator.java +++ b/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleOperator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.mqtt.client2.ext.rx; +package com.hivemq.mqtt.client2.ext.rxjava3; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleSubscriber.java b/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleSubscriber.java similarity index 96% rename from src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleSubscriber.java rename to src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleSubscriber.java index 1f2ee62a1..e3bb04827 100644 --- a/src/main/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleSubscriber.java +++ b/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleSubscriber.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.mqtt.client2.ext.rx; +package com.hivemq.mqtt.client2.ext.rxjava3; import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber; import io.reactivex.rxjava3.core.FlowableSubscriber; diff --git a/src/main/java/com/hivemq/mqtt/client2/ext/rx/WithSingleConditionalSubscriber.java b/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/WithSingleConditionalSubscriber.java similarity index 94% rename from src/main/java/com/hivemq/mqtt/client2/ext/rx/WithSingleConditionalSubscriber.java rename to src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/WithSingleConditionalSubscriber.java index 8da523b46..1a08ab5a0 100644 --- a/src/main/java/com/hivemq/mqtt/client2/ext/rx/WithSingleConditionalSubscriber.java +++ b/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/WithSingleConditionalSubscriber.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.mqtt.client2.ext.rx; +package com.hivemq.mqtt.client2.ext.rxjava3; import io.reactivex.rxjava3.operators.ConditionalSubscriber; diff --git a/src/main/java/com/hivemq/mqtt/client2/ext/rx/WithSingleStrictSubscriber.java b/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/WithSingleStrictSubscriber.java similarity index 99% rename from src/main/java/com/hivemq/mqtt/client2/ext/rx/WithSingleStrictSubscriber.java rename to src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/WithSingleStrictSubscriber.java index ccb59ccc0..bb65e8313 100644 --- a/src/main/java/com/hivemq/mqtt/client2/ext/rx/WithSingleStrictSubscriber.java +++ b/src/main/java/com/hivemq/mqtt/client2/ext/rxjava3/WithSingleStrictSubscriber.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.mqtt.client2.ext.rx; +package com.hivemq.mqtt.client2.ext.rxjava3; import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber; import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper; 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 52aef8ac0..7f617c450 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,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.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; 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 28dc66861..123266c2e 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,7 +16,7 @@ package com.hivemq.mqtt.client2.internal.handler.publish.incoming; -import com.hivemq.mqtt.client2.ext.rx.FlowableWithSingleSubscriber; +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; 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 acb7a0aa1..0d079df22 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 @@ -17,7 +17,7 @@ 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.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; 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 3b176049c..f2a9d9bc2 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,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.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; 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 14a679214..f127e49c6 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.rx.FlowableWithSingle; +import com.hivemq.mqtt.client2.ext.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 83fe983df..55466ed1c 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.rx.FlowableWithSingle; +import com.hivemq.mqtt.client2.ext.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/ext/rx/FlowableWithSingleItem.java b/src/test/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleItem.java similarity index 98% rename from src/test/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleItem.java rename to src/test/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleItem.java index d4e2012b5..2af472fdb 100644 --- a/src/test/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleItem.java +++ b/src/test/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.mqtt.client2.ext.rx; +package com.hivemq.mqtt.client2.ext.rxjava3; import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber; import io.reactivex.rxjava3.core.Flowable; diff --git a/src/test/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleSplit.java b/src/test/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleSplit.java similarity index 98% rename from src/test/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleSplit.java rename to src/test/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleSplit.java index 5c13130b8..4dbfc0be3 100644 --- a/src/test/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleSplit.java +++ b/src/test/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleSplit.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.mqtt.client2.ext.rx; +package com.hivemq.mqtt.client2.ext.rxjava3; import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber; import io.reactivex.rxjava3.core.Flowable; diff --git a/src/test/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleTest.java b/src/test/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleTest.java similarity index 99% rename from src/test/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleTest.java rename to src/test/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleTest.java index 661fb71bd..dadc03b50 100644 --- a/src/test/java/com/hivemq/mqtt/client2/ext/rx/FlowableWithSingleTest.java +++ b/src/test/java/com/hivemq/mqtt/client2/ext/rxjava3/FlowableWithSingleTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hivemq.mqtt.client2.ext.rx; +package com.hivemq.mqtt.client2.ext.rxjava3; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.hivemq.mqtt.client2.ext.reactivestreams.WithSingleSubscriber; 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 126000098..561f4de67 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,7 +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.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;