Skip to content

Commit 7cbf29b

Browse files
wilxwilx
committed
Replace RxJava 2 with RxJava 3.
1 parent b78047d commit 7cbf29b

File tree

51 files changed

+128
-134
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+128
-134
lines changed

‎build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ allprojects {
6666
/* ******************** dependencies ******************** */
6767

6868
dependencies {
69-
api("io.reactivex.rxjava2:rxjava:${property("rxjava.version")}")
69+
api("io.reactivex.rxjava3:rxjava:${property("rxjava.version")}")
7070
api("org.reactivestreams:reactive-streams:${property("reactive-streams.version")}")
7171

7272
implementation("io.netty:netty-buffer:${property("netty.version")}")

‎gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ prevVersion=1.3.4
33
#
44
# main dependencies
55
#
6-
rxjava.version=2.2.21
6+
rxjava.version=3.1.10
77
reactive-streams.version=1.0.4
88
netty.version=4.1.119.Final
99
jctools.version=2.1.2

‎reactor/src/main/java/com/hivemq/client/internal/mqtt/mqtt3/reactor/Mqtt3ReactorClientView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import com.hivemq.client.mqtt.mqtt3.message.unsubscribe.Mqtt3Unsubscribe;
3535
import com.hivemq.client.mqtt.mqtt3.reactor.Mqtt3ReactorClient;
3636
import com.hivemq.client.rx.reactor.FluxWithSingle;
37-
import io.reactivex.Flowable;
37+
import io.reactivex.rxjava3.core.Flowable;
3838
import org.jetbrains.annotations.NotNull;
3939
import org.reactivestreams.Publisher;
4040
import reactor.adapter.rxjava.RxJava2Adapter;

‎reactor/src/main/java/com/hivemq/client/internal/mqtt/reactor/MqttReactorClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAck;
3939
import com.hivemq.client.mqtt.mqtt5.reactor.Mqtt5ReactorClient;
4040
import com.hivemq.client.rx.reactor.FluxWithSingle;
41-
import io.reactivex.Flowable;
41+
import io.reactivex.rxjava3.core.Flowable;
4242
import org.jetbrains.annotations.NotNull;
4343
import org.reactivestreams.Publisher;
4444
import reactor.adapter.rxjava.RxJava2Adapter;

‎src/main/java/com/hivemq/client/internal/mqtt/MqttAsyncClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck;
4141
import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe;
4242
import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAck;
43-
import io.reactivex.FlowableSubscriber;
44-
import io.reactivex.schedulers.Schedulers;
43+
import io.reactivex.rxjava3.core.FlowableSubscriber;
44+
import io.reactivex.rxjava3.schedulers.Schedulers;
4545
import org.jetbrains.annotations.NotNull;
4646
import org.jetbrains.annotations.Nullable;
4747
import org.reactivestreams.Subscription;

‎src/main/java/com/hivemq/client/internal/mqtt/MqttBlockingClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck;
4646
import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe;
4747
import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAck;
48-
import io.reactivex.Flowable;
49-
import io.reactivex.FlowableSubscriber;
50-
import io.reactivex.internal.subscriptions.SubscriptionHelper;
48+
import io.reactivex.rxjava3.core.Flowable;
49+
import io.reactivex.rxjava3.core.FlowableSubscriber;
50+
import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
5151
import org.jetbrains.annotations.NotNull;
5252
import org.jetbrains.annotations.Nullable;
5353
import org.reactivestreams.Subscription;

‎src/main/java/com/hivemq/client/internal/mqtt/MqttClientExecutorConfigImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package com.hivemq.client.internal.mqtt;
1818

1919
import com.hivemq.client.mqtt.MqttClientExecutorConfig;
20-
import io.reactivex.Scheduler;
20+
import io.reactivex.rxjava3.core.Scheduler;
2121
import org.jetbrains.annotations.NotNull;
2222
import org.jetbrains.annotations.Nullable;
2323

‎src/main/java/com/hivemq/client/internal/mqtt/MqttClientExecutorConfigImplBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import com.hivemq.client.internal.util.Checks;
2020
import com.hivemq.client.mqtt.MqttClientExecutorConfigBuilder;
21-
import io.reactivex.Scheduler;
21+
import io.reactivex.rxjava3.core.Scheduler;
2222
import org.jetbrains.annotations.NotNull;
2323
import org.jetbrains.annotations.Nullable;
2424

‎src/main/java/com/hivemq/client/internal/mqtt/MqttRxClient.java

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.hivemq.client.internal.mqtt.handler.publish.incoming.MqttSubscribedPublishFlowable;
2424
import com.hivemq.client.internal.mqtt.handler.publish.outgoing.MqttAckFlowable;
2525
import com.hivemq.client.internal.mqtt.handler.publish.outgoing.MqttAckSingle;
26-
import com.hivemq.client.internal.mqtt.handler.publish.outgoing.MqttAckSingleFlowable;
2726
import com.hivemq.client.internal.mqtt.handler.subscribe.MqttSubAckSingle;
2827
import com.hivemq.client.internal.mqtt.handler.subscribe.MqttUnsubAckSingle;
2928
import com.hivemq.client.internal.mqtt.message.connect.MqttConnect;
@@ -49,12 +48,11 @@
4948
import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.Mqtt5Unsubscribe;
5049
import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAck;
5150
import com.hivemq.client.rx.FlowableWithSingle;
52-
import io.reactivex.Completable;
53-
import io.reactivex.Flowable;
54-
import io.reactivex.Scheduler;
55-
import io.reactivex.Single;
56-
import io.reactivex.functions.Function;
57-
import io.reactivex.internal.fuseable.ScalarCallable;
51+
import io.reactivex.rxjava3.core.Completable;
52+
import io.reactivex.rxjava3.core.Flowable;
53+
import io.reactivex.rxjava3.core.Scheduler;
54+
import io.reactivex.rxjava3.core.Single;
55+
import io.reactivex.rxjava3.functions.Function;
5856
import org.jetbrains.annotations.NotNull;
5957
import org.jetbrains.annotations.Nullable;
6058

@@ -214,20 +212,6 @@ public MqttRxClient(final @NotNull MqttClientConfig clientConfig) {
214212
final @NotNull Flowable<P> publishFlowable, final @NotNull Function<P, MqttPublish> publishMapper) {
215213

216214
final Scheduler applicationScheduler = clientConfig.getExecutorConfig().getApplicationScheduler();
217-
if (publishFlowable instanceof ScalarCallable) {
218-
//noinspection unchecked
219-
final P publish = ((ScalarCallable<P>) publishFlowable).call();
220-
if (publish == null) {
221-
return Flowable.empty();
222-
}
223-
final MqttPublish mqttPublish;
224-
try {
225-
mqttPublish = publishMapper.apply(publish);
226-
} catch (final Throwable t) {
227-
return Flowable.error(t);
228-
}
229-
return new MqttAckSingleFlowable(clientConfig, mqttPublish).observeOn(applicationScheduler, true);
230-
}
231215
return new MqttAckFlowable(
232216
clientConfig, publishFlowable.subscribeOn(applicationScheduler).map(publishMapper)).observeOn(
233217
applicationScheduler, true);

‎src/main/java/com/hivemq/client/internal/mqtt/exceptions/mqtt3/Mqtt3ExceptionFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.hivemq.client.mqtt.mqtt3.exceptions.*;
2525
import com.hivemq.client.mqtt.mqtt5.exceptions.Mqtt5MessageException;
2626
import com.hivemq.client.mqtt.mqtt5.message.Mqtt5Message;
27-
import io.reactivex.functions.Function;
27+
import io.reactivex.rxjava3.functions.Function;
2828
import org.jetbrains.annotations.NotNull;
2929

3030
/**

‎src/main/java/com/hivemq/client/internal/mqtt/handler/auth/MqttReAuthCompletable.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import com.hivemq.client.internal.rx.CompletableFlow;
2323
import io.netty.channel.Channel;
2424
import io.netty.channel.ChannelHandler;
25-
import io.reactivex.Completable;
26-
import io.reactivex.CompletableObserver;
27-
import io.reactivex.internal.disposables.EmptyDisposable;
25+
import io.reactivex.rxjava3.core.Completable;
26+
import io.reactivex.rxjava3.core.CompletableObserver;
27+
import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
2828
import org.jetbrains.annotations.NotNull;
2929

3030
/**

‎src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckFlow.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package com.hivemq.client.internal.mqtt.handler.connect;
1818

1919
import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck;
20-
import io.reactivex.SingleObserver;
21-
import io.reactivex.disposables.Disposable;
20+
import io.reactivex.rxjava3.core.SingleObserver;
21+
import io.reactivex.rxjava3.disposables.Disposable;
2222
import org.jetbrains.annotations.NotNull;
2323
import org.jetbrains.annotations.Nullable;
2424

‎src/main/java/com/hivemq/client/internal/mqtt/handler/connect/MqttConnAckSingle.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck;
3232
import io.netty.bootstrap.Bootstrap;
3333
import io.netty.channel.EventLoop;
34-
import io.reactivex.Single;
35-
import io.reactivex.SingleObserver;
36-
import io.reactivex.internal.disposables.EmptyDisposable;
34+
import io.reactivex.rxjava3.core.Single;
35+
import io.reactivex.rxjava3.core.SingleObserver;
36+
import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
3737
import org.jetbrains.annotations.NotNull;
3838
import org.jetbrains.annotations.Nullable;
3939

‎src/main/java/com/hivemq/client/internal/mqtt/handler/disconnect/MqttDisconnectCompletable.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import com.hivemq.client.internal.mqtt.message.disconnect.MqttDisconnect;
2323
import com.hivemq.client.internal.rx.CompletableFlow;
2424
import io.netty.channel.Channel;
25-
import io.reactivex.Completable;
26-
import io.reactivex.CompletableObserver;
27-
import io.reactivex.internal.disposables.EmptyDisposable;
25+
import io.reactivex.rxjava3.core.Completable;
26+
import io.reactivex.rxjava3.core.CompletableObserver;
27+
import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
2828
import org.jetbrains.annotations.NotNull;
2929

3030
/**

‎src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttGlobalIncomingPublishFlowable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.hivemq.client.internal.mqtt.ioc.ClientComponent;
2222
import com.hivemq.client.mqtt.MqttGlobalPublishFilter;
2323
import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish;
24-
import io.reactivex.Flowable;
24+
import io.reactivex.rxjava3.core.Flowable;
2525
import org.jetbrains.annotations.NotNull;
2626
import org.reactivestreams.Subscriber;
2727

‎src/main/java/com/hivemq/client/internal/mqtt/handler/publish/incoming/MqttIncomingPublishFlow.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
import com.hivemq.client.internal.mqtt.MqttClientConfig;
2121
import com.hivemq.client.internal.mqtt.handler.util.FlowWithEventLoop;
2222
import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish;
23-
import io.reactivex.Emitter;
24-
import io.reactivex.internal.util.BackpressureHelper;
25-
import io.reactivex.plugins.RxJavaPlugins;
23+
import io.reactivex.rxjava3.core.Emitter;
24+
import io.reactivex.rxjava3.internal.util.BackpressureHelper;
25+
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
2626
import org.jetbrains.annotations.NotNull;
2727
import org.jetbrains.annotations.Nullable;
2828
import org.reactivestreams.Subscriber;

‎src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckFlowable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import com.hivemq.client.internal.mqtt.ioc.ClientComponent;
2222
import com.hivemq.client.internal.mqtt.message.publish.MqttPublish;
2323
import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult;
24-
import io.reactivex.Flowable;
25-
import io.reactivex.internal.subscriptions.EmptySubscription;
24+
import io.reactivex.rxjava3.core.Flowable;
25+
import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription;
2626
import org.jetbrains.annotations.NotNull;
2727
import org.reactivestreams.Subscriber;
2828

‎src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckFlowableFlow.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import com.hivemq.client.internal.mqtt.handler.publish.outgoing.MqttPublishFlowableAckLink.LinkedFlow;
2222
import com.hivemq.client.internal.mqtt.message.publish.MqttPublishResult;
2323
import com.hivemq.client.internal.util.collections.ChunkedArrayQueue;
24-
import io.reactivex.internal.util.BackpressureHelper;
25-
import io.reactivex.plugins.RxJavaPlugins;
24+
import io.reactivex.rxjava3.internal.util.BackpressureHelper;
25+
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
2626
import org.jetbrains.annotations.NotNull;
2727
import org.jetbrains.annotations.Nullable;
2828
import org.reactivestreams.Subscriber;

‎src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckSingle.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
import com.hivemq.client.internal.mqtt.message.publish.MqttPublish;
2424
import com.hivemq.client.internal.mqtt.message.publish.MqttPublishResult;
2525
import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult;
26-
import io.reactivex.Flowable;
27-
import io.reactivex.Single;
28-
import io.reactivex.SingleObserver;
29-
import io.reactivex.disposables.Disposable;
30-
import io.reactivex.internal.disposables.EmptyDisposable;
26+
import io.reactivex.rxjava3.core.Flowable;
27+
import io.reactivex.rxjava3.core.Single;
28+
import io.reactivex.rxjava3.core.SingleObserver;
29+
import io.reactivex.rxjava3.disposables.Disposable;
30+
import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
3131
import org.jetbrains.annotations.NotNull;
3232
import org.jetbrains.annotations.Nullable;
3333

‎src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttAckSingleFlowable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import com.hivemq.client.internal.mqtt.message.publish.MqttPublish;
2424
import com.hivemq.client.internal.mqtt.message.publish.MqttPublishResult;
2525
import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult;
26-
import io.reactivex.Flowable;
27-
import io.reactivex.internal.subscriptions.EmptySubscription;
26+
import io.reactivex.rxjava3.core.Flowable;
27+
import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription;
2828
import org.jetbrains.annotations.NotNull;
2929
import org.jetbrains.annotations.Nullable;
3030
import org.reactivestreams.Subscriber;

‎src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttOutgoingQosHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
import io.netty.channel.Channel;
5959
import io.netty.channel.ChannelHandlerContext;
6060
import io.netty.channel.EventLoop;
61-
import io.reactivex.Flowable;
62-
import io.reactivex.FlowableSubscriber;
61+
import io.reactivex.rxjava3.core.Flowable;
62+
import io.reactivex.rxjava3.core.FlowableSubscriber;
6363
import org.jctools.queues.SpscUnboundedArrayQueue;
6464
import org.jetbrains.annotations.NotNull;
6565
import org.jetbrains.annotations.Nullable;

‎src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPublishFlowableAckLink.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import com.hivemq.client.internal.logging.InternalLogger;
2020
import com.hivemq.client.internal.logging.InternalLoggerFactory;
2121
import com.hivemq.client.internal.mqtt.message.publish.MqttPublish;
22-
import io.reactivex.Flowable;
23-
import io.reactivex.FlowableSubscriber;
24-
import io.reactivex.plugins.RxJavaPlugins;
22+
import io.reactivex.rxjava3.core.Flowable;
23+
import io.reactivex.rxjava3.core.FlowableSubscriber;
24+
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
2525
import org.jetbrains.annotations.NotNull;
2626
import org.jetbrains.annotations.Nullable;
2727
import org.reactivestreams.Subscriber;

‎src/main/java/com/hivemq/client/internal/mqtt/handler/publish/outgoing/MqttPublishFlowables.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import com.hivemq.client.internal.logging.InternalLogger;
2020
import com.hivemq.client.internal.logging.InternalLoggerFactory;
2121
import com.hivemq.client.internal.mqtt.ioc.ClientScope;
22-
import io.reactivex.Flowable;
23-
import io.reactivex.internal.util.BackpressureHelper;
22+
import io.reactivex.rxjava3.core.Flowable;
23+
import io.reactivex.rxjava3.internal.util.BackpressureHelper;
2424
import org.jetbrains.annotations.NotNull;
2525
import org.jetbrains.annotations.Nullable;
2626
import org.reactivestreams.Subscriber;

‎src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubAckSingle.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import com.hivemq.client.internal.mqtt.message.subscribe.MqttSubscribe;
2222
import com.hivemq.client.internal.mqtt.message.subscribe.suback.MqttSubAck;
2323
import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck;
24-
import io.reactivex.Single;
25-
import io.reactivex.SingleObserver;
24+
import io.reactivex.rxjava3.core.Single;
25+
import io.reactivex.rxjava3.core.SingleObserver;
2626
import org.jetbrains.annotations.NotNull;
2727

2828
/**

‎src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttSubOrUnsubAckFlow.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import com.hivemq.client.internal.mqtt.MqttClientConfig;
2020
import com.hivemq.client.internal.mqtt.handler.util.FlowWithEventLoop;
21-
import io.reactivex.SingleObserver;
22-
import io.reactivex.disposables.Disposable;
21+
import io.reactivex.rxjava3.core.SingleObserver;
22+
import io.reactivex.rxjava3.disposables.Disposable;
2323
import org.jetbrains.annotations.NotNull;
2424

2525
/**

‎src/main/java/com/hivemq/client/internal/mqtt/handler/subscribe/MqttUnsubAckSingle.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import com.hivemq.client.internal.mqtt.message.unsubscribe.MqttUnsubscribe;
2222
import com.hivemq.client.internal.mqtt.message.unsubscribe.unsuback.MqttUnsubAck;
2323
import com.hivemq.client.mqtt.mqtt5.message.unsubscribe.unsuback.Mqtt5UnsubAck;
24-
import io.reactivex.Single;
25-
import io.reactivex.SingleObserver;
24+
import io.reactivex.rxjava3.core.Single;
25+
import io.reactivex.rxjava3.core.SingleObserver;
2626
import org.jetbrains.annotations.NotNull;
2727

2828
/**

‎src/main/java/com/hivemq/client/internal/mqtt/message/connect/connack/mqtt3/Mqtt3ConnAckView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAckReturnCode;
2525
import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck;
2626
import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAckReasonCode;
27-
import io.reactivex.functions.Function;
27+
import io.reactivex.rxjava3.functions.Function;
2828
import org.jetbrains.annotations.NotNull;
2929
import org.jetbrains.annotations.Nullable;
3030

‎src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishResultView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish;
2222
import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3PublishResult;
2323
import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult;
24-
import io.reactivex.functions.Function;
24+
import io.reactivex.rxjava3.functions.Function;
2525
import org.jetbrains.annotations.NotNull;
2626
import org.jetbrains.annotations.Nullable;
2727

‎src/main/java/com/hivemq/client/internal/mqtt/message/publish/mqtt3/Mqtt3PublishView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish;
2828
import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish;
2929
import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5WillPublish;
30-
import io.reactivex.functions.Function;
30+
import io.reactivex.rxjava3.functions.Function;
3131
import org.jetbrains.annotations.NotNull;
3232
import org.jetbrains.annotations.Nullable;
3333

‎src/main/java/com/hivemq/client/internal/mqtt/message/subscribe/suback/mqtt3/Mqtt3SubAckView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.hivemq.client.mqtt.mqtt3.message.subscribe.suback.Mqtt3SubAckReturnCode;
2525
import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck;
2626
import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAckReasonCode;
27-
import io.reactivex.functions.Function;
27+
import io.reactivex.rxjava3.functions.Function;
2828
import org.jetbrains.annotations.NotNull;
2929
import org.jetbrains.annotations.Nullable;
3030

‎src/main/java/com/hivemq/client/internal/mqtt/mqtt3/Mqtt3RxClientView.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5PublishResult;
4848
import com.hivemq.client.mqtt.mqtt5.message.subscribe.suback.Mqtt5SubAck;
4949
import com.hivemq.client.rx.FlowableWithSingle;
50-
import io.reactivex.Completable;
51-
import io.reactivex.Flowable;
52-
import io.reactivex.Single;
53-
import io.reactivex.functions.Function;
50+
import io.reactivex.rxjava3.core.Completable;
51+
import io.reactivex.rxjava3.core.Flowable;
52+
import io.reactivex.rxjava3.core.Single;
53+
import io.reactivex.rxjava3.functions.Function;
5454
import org.jetbrains.annotations.NotNull;
5555
import org.jetbrains.annotations.Nullable;
5656

‎src/main/java/com/hivemq/client/internal/rx/CompletableFlow.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package com.hivemq.client.internal.rx;
1818

19-
import io.reactivex.CompletableObserver;
20-
import io.reactivex.disposables.Disposable;
19+
import io.reactivex.rxjava3.core.CompletableObserver;
20+
import io.reactivex.rxjava3.disposables.Disposable;
2121
import org.jetbrains.annotations.NotNull;
2222

2323
/**

0 commit comments

Comments
 (0)