Move packages rx -> rxjava3

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

Hide file tree

Showing 19 changed files with 19 additions and 19 deletions.
diff --git a/...tt/client2/ext/rx/FlowableWithSingle.java → ...ient2/ext/rxjava3/FlowableWithSingle.java b/...tt/client2/ext/rx/FlowableWithSingle.java → ...ient2/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/...nt2/ext/rx/FlowableWithSingleCombine.java → ...xt/rxjava3/FlowableWithSingleCombine.java b/...nt2/ext/rx/FlowableWithSingleCombine.java → ...xt/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/...client2/ext/rx/FlowableWithSingleMap.java → ...t2/ext/rxjava3/FlowableWithSingleMap.java b/...client2/ext/rx/FlowableWithSingleMap.java → ...t2/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/...t2/ext/rx/FlowableWithSingleMapError.java → ...t/rxjava3/FlowableWithSingleMapError.java b/...t2/ext/rx/FlowableWithSingleMapError.java → ...t/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/...2/ext/rx/FlowableWithSingleObserveOn.java → .../rxjava3/FlowableWithSingleObserveOn.java b/...2/ext/rx/FlowableWithSingleObserveOn.java → .../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/...t2/ext/rx/FlowableWithSingleOperator.java → ...t/rxjava3/FlowableWithSingleOperator.java b/...t2/ext/rx/FlowableWithSingleOperator.java → ...t/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/.../ext/rx/FlowableWithSingleSubscriber.java → ...rxjava3/FlowableWithSingleSubscriber.java b/.../ext/rx/FlowableWithSingleSubscriber.java → ...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/...t/rx/WithSingleConditionalSubscriber.java → ...ava3/WithSingleConditionalSubscriber.java b/...t/rx/WithSingleConditionalSubscriber.java → ...ava3/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/...t2/ext/rx/WithSingleStrictSubscriber.java → ...t/rxjava3/WithSingleStrictSubscriber.java b/...t2/ext/rx/WithSingleStrictSubscriber.java → ...t/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
@@ -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/.../com/hivemq/mqtt/client2/internal/handler/publish/incoming/MqttSubscribedPublishFlow.java b/.../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/.../hivemq/mqtt/client2/internal/handler/publish/incoming/MqttSubscribedPublishFlowable.java b/.../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
@@ -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
@@ -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
@@ -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/...lient2/ext/rx/FlowableWithSingleItem.java → ...2/ext/rxjava3/FlowableWithSingleItem.java b/...lient2/ext/rx/FlowableWithSingleItem.java → ...2/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/...ient2/ext/rx/FlowableWithSingleSplit.java → .../ext/rxjava3/FlowableWithSingleSplit.java b/...ient2/ext/rx/FlowableWithSingleSplit.java → .../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/...lient2/ext/rx/FlowableWithSingleTest.java → ...2/ext/rxjava3/FlowableWithSingleTest.java b/...lient2/ext/rx/FlowableWithSingleTest.java → ...2/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
@@ -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;