Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitca8bcc1

Browse files
committed
Change the disposable wrapper to not depend on RxJava 3 internals
1 parentbb66cdd commitca8bcc1

File tree

5 files changed

+11
-17
lines changed

5 files changed

+11
-17
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RxJava 3: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.
1313
```groovy
1414
1515
dependencies {
16-
implementation "com.github.akarnokd:rxjava3-bridge:3.0.1"
16+
implementation "com.github.akarnokd:rxjava3-bridge:3.0.2"
1717
}
1818
```
1919

‎gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GROUP=com.github.akarnokd
2-
VERSION_NAME=3.0.1
3-
version=3.0.1
2+
VERSION_NAME=3.0.2
3+
version=3.0.2
44

55
POM_ARTIFACT_ID=rxjava3-bridge
66
POM_NAME=RxJava 3 Bridge to/from RxJava 2

‎src/main/java/hu/akarnokd/rxjava3/bridge/DisposableV2toV3.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,8 @@ public void dispose() {
3535
}
3636

3737
staticio.reactivex.rxjava3.disposables.Disposablewrap(io.reactivex.disposables.Disposabledisposable) {
38-
if (disposable ==io.reactivex.internal.disposables.DisposableHelper.DISPOSED) {
39-
returnio.reactivex.rxjava3.internal.disposables.DisposableHelper.DISPOSED;
40-
}
41-
if (disposable ==io.reactivex.internal.disposables.EmptyDisposable.INSTANCE) {
42-
returnio.reactivex.rxjava3.internal.disposables.EmptyDisposable.INSTANCE;
38+
if (disposable.isDisposed()) {
39+
returnio.reactivex.rxjava3.disposables.Disposable.disposed();
4340
}
4441
returnnewDisposableV2toV3(disposable);
4542
}

‎src/main/java/hu/akarnokd/rxjava3/bridge/DisposableV3toV2.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,8 @@ public void dispose() {
3535
}
3636

3737
staticio.reactivex.disposables.Disposablewrap(io.reactivex.rxjava3.disposables.Disposabledisposable) {
38-
if (disposable ==io.reactivex.rxjava3.internal.disposables.DisposableHelper.DISPOSED) {
39-
returnio.reactivex.internal.disposables.DisposableHelper.DISPOSED;
40-
}
41-
if (disposable ==io.reactivex.rxjava3.internal.disposables.EmptyDisposable.INSTANCE) {
42-
returnio.reactivex.internal.disposables.EmptyDisposable.INSTANCE;
38+
if (disposable.isDisposed()) {
39+
returnio.reactivex.disposables.Disposables.disposed();
4340
}
4441
returnnewDisposableV3toV2(disposable);
4542
}

‎src/test/java/hu/akarnokd/rxjava3/bridge/RxJavaBridgeTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -501,15 +501,15 @@ public void disposableV2toV3InternalDisposed() {
501501
io.reactivex.disposables.Disposableempty =io.reactivex.internal.disposables.DisposableHelper.DISPOSED;
502502
io.reactivex.rxjava3.disposables.Disposabledisposable =RxJavaBridge.toV3Disposable(empty);
503503

504-
assertSame(disposable,io.reactivex.rxjava3.internal.disposables.DisposableHelper.DISPOSED);
504+
assertSame(disposable,io.reactivex.rxjava3.disposables.Disposable.disposed());
505505
}
506506

507507
@Test
508508
publicvoiddisposableV2toV3InternalEmpty() {
509509
io.reactivex.disposables.Disposableempty =io.reactivex.internal.disposables.EmptyDisposable.INSTANCE;
510510
io.reactivex.rxjava3.disposables.Disposabledisposable =RxJavaBridge.toV3Disposable(empty);
511511

512-
assertSame(disposable,io.reactivex.rxjava3.internal.disposables.EmptyDisposable.INSTANCE);
512+
assertSame(disposable,io.reactivex.rxjava3.disposables.Disposable.disposed());
513513
}
514514

515515
@Test
@@ -531,15 +531,15 @@ public void disposableV3toV2InternalDisposed() {
531531
io.reactivex.rxjava3.disposables.Disposableempty =io.reactivex.rxjava3.internal.disposables.DisposableHelper.DISPOSED;
532532
io.reactivex.disposables.Disposabledisposable =RxJavaBridge.toV2Disposable(empty);
533533

534-
assertSame(disposable,io.reactivex.internal.disposables.DisposableHelper.DISPOSED);
534+
assertSame(disposable,io.reactivex.disposables.Disposables.disposed());
535535
}
536536

537537
@Test
538538
publicvoiddisposableV3toV2InternalEmpty() {
539539
io.reactivex.rxjava3.disposables.Disposableempty =io.reactivex.rxjava3.internal.disposables.EmptyDisposable.INSTANCE;
540540
io.reactivex.disposables.Disposabledisposable =RxJavaBridge.toV2Disposable(empty);
541541

542-
assertSame(disposable,io.reactivex.internal.disposables.EmptyDisposable.INSTANCE);
542+
assertSame(disposable,io.reactivex.disposables.Disposables.disposed());
543543
}
544544

545545
// -----------------------------------------------------------

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp