Merge #288 into 3.5.0

reactor · Nov 8, 2022 · 26b7abb · 26b7abb
2 parents f73cb77 + 2b13a2d
commit 26b7abb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 44 deletions.
diff --git a/reactor-adapter/src/main/java/reactor/adapter/rxjava/RxJava3Adapter.java b/reactor-adapter/src/main/java/reactor/adapter/rxjava/RxJava3Adapter.java
@@ -776,6 +776,7 @@ public void subscribe(CoreSubscriber<? super T> s) {
  source.subscribe(new MaybeAsMonoObserver<>(s));
  }
 
+ //FIXME this and all other MonoSubscriber-extending classes are fake-fuseable: requestFusion will always reply NONE unless overridden
  static final class MaybeAsMonoObserver<T> extends MonoSubscriber<T, T> implements MaybeObserver<T> {
 
  io.reactivex.rxjava3.disposables.Disposable d;

diff --git a/reactor-adapter/src/test/java/reactor/adapter/rxjava/RxJava2AdapterTest.java b/reactor-adapter/src/test/java/reactor/adapter/rxjava/RxJava2AdapterTest.java
@@ -117,19 +117,8 @@ public void singleToMono() {
  .expectComplete()
  .verify();
  }
+ //NB: MonoSubscribers like SingleToMonoSubscriber are not fuseable anymore
 
- @Test
- public void singleToMonoFused() {
- Mono<Integer> m = Single.just(1)
- .to(RxJava2Adapter::singleToMono);
-
- StepVerifier.create(m)
- .expectFusion(Fuseable.ANY, Fuseable.ASYNC)
- .expectNext(1)
- .expectComplete()
- .verify();
- }
-
  @Test
  public void monoToSingle() {
  Mono.just(1)
@@ -233,14 +222,6 @@ public void maybeToMonoError() {
  .expectErrorMessage("Forced failure")
  .verify();
  }
+ //NB: MonoSubscribers like MaybeToMonoSubscriber are not fuseable anymore
 
- @Test
- public void maybeToMonoEmptyFused() {
- Mono<Void> m = Maybe.<Void>empty().to(RxJava2Adapter::maybeToMono);
-
- StepVerifier.create(m)
- .expectFusion(Fuseable.ANY, Fuseable.ASYNC)
- .expectComplete()
- .verify();
- }
 }
diff --git a/reactor-adapter/src/test/java/reactor/adapter/rxjava/RxJava3AdapterTest.java b/reactor-adapter/src/test/java/reactor/adapter/rxjava/RxJava3AdapterTest.java
@@ -204,16 +204,7 @@ public void maybeToMonoEmpty() {
  .expectComplete()
  .verify();
  }
-
- @Test
- public void maybeToMonoEmptyFused() {
- Mono<Void> m = Maybe.<Void>empty().to(RxJava3Adapter::maybeToMono);
-
- StepVerifier.create(m)
- .expectFusion(Fuseable.ANY, Fuseable.ASYNC)
- .expectComplete()
- .verify();
- }
+ //NB: MonoSubscribers like MaybeToMonoSubscriber are not fuseable anymore
 
  @Test
  public void maybeToMonoError() {
@@ -312,19 +303,7 @@ public void singleToMono() {
  .expectComplete()
  .verify();
  }
-
- @Test
- public void singleToMonoFused() {
- Mono<Integer> m = Single.just(1)
- .to(RxJava3Adapter::singleToMono);
-
- StepVerifier.create(m)
- .expectFusion(Fuseable.ANY, Fuseable.ASYNC)
- .expectNext(1)
- .expectComplete()
- .verify();
- }
-
+ //NB: MonoSubscribers like SingleToMonoSubscriber are not fuseable anymore
 
  @Test
  public void scheduler() {