Updated library to use RxJava 3 artifact. Fixed library errors.

Co-authored-by: Luca Weiss <luca@z3ntu.xyz>
NRB-Tech · Mar 29, 2022 · 840aad4 · 840aad4
1 parent 95d9e30
commit 840aad4
Show file tree

Hide file tree

Showing 72 changed files with 245 additions and 242 deletions.
diff --git a/mockrxandroidble/src/main/java/io/nrbtech/rxandroidble/mockrxandroidble/RxBleClientMock.java b/mockrxandroidble/src/main/java/io/nrbtech/rxandroidble/mockrxandroidble/RxBleClientMock.java
@@ -24,9 +24,9 @@
 import java.util.Set;
 import java.util.UUID;
 
-import io.reactivex.Observable;
-import io.reactivex.functions.Function;
-import io.reactivex.functions.Predicate;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.functions.Predicate;
 import io.reactivex.subjects.ReplaySubject;
 
 /**

diff --git a/...ndroidble/src/main/java/io/nrbtech/rxandroidble/mockrxandroidble/RxBleConnectionMock.java b/...ndroidble/src/main/java/io/nrbtech/rxandroidble/mockrxandroidble/RxBleConnectionMock.java
@@ -36,17 +36,17 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.Completable;
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Single;
-import io.reactivex.SingleSource;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Consumer;
-import io.reactivex.functions.Function;
-import io.reactivex.functions.Predicate;
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableSource;
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.core.SingleSource;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.functions.Predicate;
+import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.subjects.CompletableSubject;
 import io.reactivex.subjects.SingleSubject;
 

diff --git a/mockrxandroidble/src/main/java/io/nrbtech/rxandroidble/mockrxandroidble/RxBleDeviceMock.java b/mockrxandroidble/src/main/java/io/nrbtech/rxandroidble/mockrxandroidble/RxBleDeviceMock.java
@@ -26,11 +26,11 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import io.reactivex.Observable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Consumer;
-import io.reactivex.subjects.BehaviorSubject;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
 import io.reactivex.subjects.ReplaySubject;
 
 import static io.nrbtech.rxandroidble.RxBleConnection.RxBleConnectionState.CONNECTED;

diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/ClientComponent.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/ClientComponent.java
@@ -52,11 +52,11 @@
 import bleshadow.dagger.Provides;
 import bleshadow.javax.inject.Named;
 import bleshadow.javax.inject.Provider;
-import io.reactivex.Observable;
-import io.reactivex.Scheduler;
-import io.reactivex.functions.Function;
-import io.reactivex.plugins.RxJavaPlugins;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 @ClientScope
 @Component(modules = {ClientComponent.ClientModule.class})

diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleClient.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleClient.java
@@ -13,7 +13,7 @@
 import java.util.Set;
 import java.util.UUID;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 
 public abstract class RxBleClient {

diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleConnection.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleConnection.java
@@ -24,11 +24,11 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.Completable;
-import io.reactivex.Observable;
-import io.reactivex.ObservableTransformer;
-import io.reactivex.Scheduler;
-import io.reactivex.Single;
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableTransformer;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.core.Single;
 
 /**
  * The BLE connection handle, supporting GATT operations. Operations are enqueued and the library makes sure that they are not

diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleCustomOperation.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleCustomOperation.java
@@ -6,9 +6,9 @@
 import io.nrbtech.rxandroidble.internal.connection.RxBleGattCallback;
 import io.nrbtech.rxandroidble.internal.serialization.ConnectionOperationQueue;
 
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.core.Scheduler;
 
 /**
  * Represents a custom operation that will be enqueued for future execution within the client instance.

diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleDevice.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleDevice.java
@@ -11,7 +11,7 @@
 import io.nrbtech.rxandroidble.exceptions.BleGattCallbackTimeoutException;
 import io.nrbtech.rxandroidble.exceptions.BleGattException;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 
 public interface RxBleDevice {

diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleDeviceServices.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleDeviceServices.java
@@ -13,10 +13,10 @@
 import java.util.UUID;
 import java.util.concurrent.Callable;
 
-import io.reactivex.Observable;
-import io.reactivex.Single;
-import io.reactivex.functions.Function;
-import io.reactivex.functions.Predicate;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.functions.Predicate;
 
 /**
  * Service discovery result containing list of services and characteristics within the services.

diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleRadioOperationCustom.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/RxBleRadioOperationCustom.java
@@ -6,9 +6,9 @@
 import io.nrbtech.rxandroidble.internal.connection.RxBleGattCallback;
 import io.nrbtech.rxandroidble.internal.serialization.ConnectionOperationQueue;
 
-import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.core.Scheduler;
 
 /**
  * @inheritDoc

diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/helpers/ByteArrayBatchObservable.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/helpers/ByteArrayBatchObservable.java
@@ -7,9 +7,9 @@
 
 import java.nio.ByteBuffer;
 
-import io.reactivex.Emitter;
-import io.reactivex.Flowable;
-import io.reactivex.functions.Consumer;
+import io.reactivex.rxjava3.core.Emitter;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.Consumer;
 
 /**
  * TODO It may be possible to introduce backpressure here.

diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/helpers/LocationServicesOkObservable.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/helpers/LocationServicesOkObservable.java
@@ -10,8 +10,8 @@
 
 import bleshadow.javax.inject.Inject;
 import bleshadow.javax.inject.Named;
-import io.reactivex.Observable;
-import io.reactivex.Observer;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
 
 /**
  * An Observable that emits false if an attempt to scan with {@link io.nrbtech.rxandroidble.RxBleClient#scanBleDevices(UUID...)}

diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/QueueOperation.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/QueueOperation.java
@@ -8,9 +8,9 @@
 import io.nrbtech.rxandroidble.internal.serialization.QueueReleaseInterface;
 import io.nrbtech.rxandroidble.internal.util.QueueReleasingEmitterWrapper;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.ObservableOnSubscribe;
 
 /**
  * The base class for all operations that are executed on the Bluetooth Queue.

diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/SingleResponseOperation.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/SingleResponseOperation.java
@@ -16,10 +16,10 @@
 
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.Scheduler;
-import io.reactivex.Single;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.core.Single;
 
 /**
  * A convenience class intended to use with {@link BluetoothGatt} functions that fire one-time actions.

diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/ConnectionModule.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/ConnectionModule.java
@@ -19,7 +19,7 @@
 import bleshadow.dagger.multibindings.IntoSet;
 import bleshadow.javax.inject.Named;
 import bleshadow.javax.inject.Provider;
-import io.reactivex.Scheduler;
+import io.reactivex.rxjava3.core.Scheduler;
 
 import static io.nrbtech.rxandroidble.internal.connection.ConnectionComponent.NamedBooleans.SUPPRESS_OPERATION_CHECKS;
 import static io.nrbtech.rxandroidble.internal.connection.ConnectionComponent.NamedInts.GATT_MTU_MINIMUM;

diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/ConnectorImpl.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/ConnectorImpl.java
@@ -12,12 +12,13 @@
 
 import bleshadow.javax.inject.Inject;
 import bleshadow.javax.inject.Named;
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.Scheduler;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Consumer;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableSource;
+import io.reactivex.rxjava3.core.Scheduler;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.functions.Supplier;
 
 public class ConnectorImpl implements Connector {
 
@@ -37,9 +38,9 @@ public ConnectorImpl(
 
     @Override
     public Observable<RxBleConnection> prepareConnection(final ConnectionSetup options) {
-        return Observable.defer(new Callable<ObservableSource<RxBleConnection>>() {
+        return Observable.defer(new Supplier<ObservableSource<? extends RxBleConnection>>() {
             @Override
-            public ObservableSource<RxBleConnection> call() {
+            public ObservableSource<RxBleConnection> get() {
                 final ConnectionComponent connectionComponent = connectionComponentBuilder
                         .autoConnect(options.autoConnect)
                         .suppressOperationChecks(options.suppressOperationCheck)

diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/DescriptorWriter.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/DescriptorWriter.java
@@ -7,7 +7,7 @@
 import io.nrbtech.rxandroidble.internal.serialization.ConnectionOperationQueue;
 
 import bleshadow.javax.inject.Inject;
-import io.reactivex.Completable;
+import io.reactivex.rxjava3.core.Completable;
 
 @ConnectionScope
 class DescriptorWriter {

diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/DisconnectAction.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/DisconnectAction.java
@@ -5,7 +5,7 @@
 
 import bleshadow.javax.inject.Inject;
 
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 @ConnectionScope
 class DisconnectAction implements ConnectionSubscriptionWatcher {

diff --git a/.../src/main/java/io/nrbtech/rxandroidble/internal/connection/DisconnectionRouterOutput.java b/.../src/main/java/io/nrbtech/rxandroidble/internal/connection/DisconnectionRouterOutput.java
@@ -3,7 +3,7 @@
 
 import io.nrbtech.rxandroidble.exceptions.BleException;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 /**
  * Interface to output disconnection error causes. It is used for instance to notify when the

diff --git a/...le/src/main/java/io/nrbtech/rxandroidble/internal/connection/IllegalOperationChecker.java b/...le/src/main/java/io/nrbtech/rxandroidble/internal/connection/IllegalOperationChecker.java
@@ -7,8 +7,8 @@
 
 import bleshadow.javax.inject.Inject;
 
-import io.reactivex.Completable;
-import io.reactivex.functions.Action;
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.functions.Action;
 
 /**
  * Class for checking whether the requested operation is legal on chosen characteristic.

diff --git a/...java/io/nrbtech/rxandroidble/internal/connection/ImmediateSerializedBatchAckStrategy.java b/...java/io/nrbtech/rxandroidble/internal/connection/ImmediateSerializedBatchAckStrategy.java
@@ -2,7 +2,7 @@
 
 import io.nrbtech.rxandroidble.RxBleConnection;
 
-import io.reactivex.Observable;
+import io.reactivex.rxjava3.core.Observable;
 
 public class ImmediateSerializedBatchAckStrategy implements RxBleConnection.WriteOperationAckStrategy {
 

diff --git a/.../main/java/io/nrbtech/rxandroidble/internal/connection/LongWriteOperationBuilderImpl.java b/.../main/java/io/nrbtech/rxandroidble/internal/connection/LongWriteOperationBuilderImpl.java
@@ -11,10 +11,10 @@
 import java.util.UUID;
 
 import bleshadow.javax.inject.Inject;
-import io.reactivex.Observable;
-import io.reactivex.Single;
-import io.reactivex.SingleSource;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.core.SingleSource;
+import io.reactivex.rxjava3.functions.Function;
 
 public final class LongWriteOperationBuilderImpl implements RxBleConnection.LongWriteOperationBuilder {
 

diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/MtuWatcher.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/MtuWatcher.java
@@ -6,11 +6,11 @@
 
 import bleshadow.javax.inject.Inject;
 import bleshadow.javax.inject.Named;
-import io.reactivex.Observable;
-import io.reactivex.disposables.SerialDisposable;
-import io.reactivex.functions.Consumer;
-import io.reactivex.functions.Predicate;
-import io.reactivex.internal.functions.Functions;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.disposables.SerialDisposable;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.functions.Predicate;
+import io.reactivex.rxjava3.internal.functions.Functions;
 
 @ConnectionScope
 class MtuWatcher implements ConnectionSubscriptionWatcher, MtuProvider, Consumer<Integer> {

diff --git a/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/NoRetryStrategy.java b/rxandroidble/src/main/java/io/nrbtech/rxandroidble/internal/connection/NoRetryStrategy.java
@@ -2,8 +2,8 @@
 
 import io.nrbtech.rxandroidble.RxBleConnection;
 
-import io.reactivex.Observable;
-import io.reactivex.functions.Function;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.functions.Function;
 
 public class NoRetryStrategy implements RxBleConnection.WriteOperationRetryStrategy {
 

diff --git a/...in/java/io/nrbtech/rxandroidble/internal/connection/NotificationAndIndicationManager.java b/...in/java/io/nrbtech/rxandroidble/internal/connection/NotificationAndIndicationManager.java
@@ -16,26 +16,26 @@
 import io.nrbtech.rxandroidble.internal.util.CharacteristicNotificationId;
 import io.nrbtech.rxandroidble.internal.util.ObservableUtil;
 
+import io.reactivex.rxjava3.functions.Supplier;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
-import java.util.concurrent.Callable;
 
 import bleshadow.javax.inject.Inject;
 import bleshadow.javax.inject.Named;
 
-import io.reactivex.Completable;
-import io.reactivex.CompletableSource;
-import io.reactivex.CompletableTransformer;
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.ObservableTransformer;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Function;
-import io.reactivex.functions.Predicate;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.subjects.PublishSubject;
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.core.CompletableSource;
+import io.reactivex.rxjava3.core.CompletableTransformer;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableSource;
+import io.reactivex.rxjava3.core.ObservableTransformer;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.functions.Predicate;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.subjects.PublishSubject;
 
 @ConnectionScope
 class NotificationAndIndicationManager {
@@ -71,9 +71,9 @@ class NotificationAndIndicationManager {
     Observable<Observable<byte[]>> setupServerInitiatedCharacteristicRead(
             @NonNull final BluetoothGattCharacteristic characteristic, final NotificationSetupMode setupMode, final boolean isIndication
     ) {
-        return Observable.defer(new Callable<ObservableSource<Observable<byte[]>>>() {
+        return Observable.defer(new Supplier<ObservableSource<? extends Observable<byte[]>>>() {
             @Override
-            public ObservableSource<Observable<byte[]>> call() {
+            public ObservableSource<Observable<byte[]>> get() {
                 synchronized (activeNotificationObservableMap) {
                     final CharacteristicNotificationId id
                             = new CharacteristicNotificationId(characteristic.getUuid(), characteristic.getInstanceId());