Extend MonoIdentity Refaster rule (#470)

By flagging expressions of the form `mono.flux().singleOrEmpty()`.
PicnicSupermarket · Jan 19, 2023 · 81ffd04 · 81ffd04
1 parent b2f514f
commit 81ffd04
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/ReactorRules.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/ReactorRules.java
@@ -369,7 +369,8 @@ Flux<T> after(Flux<T> flux, T object) {
   static final class MonoIdentity<T> {
     @BeforeTemplate
     Mono<T> before(Mono<T> mono) {
-      return Refaster.anyOf(mono.switchIfEmpty(Mono.empty()), mono.flux().next());
+      return Refaster.anyOf(
+          mono.switchIfEmpty(Mono.empty()), mono.flux().next(), mono.flux().singleOrEmpty());
     }
 
     @BeforeTemplate

diff --git a/...ontrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java b/...ontrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java
@@ -119,6 +119,7 @@ ImmutableSet<Mono<?>> testMonoIdentity() {
     return ImmutableSet.of(
         Mono.just(1).switchIfEmpty(Mono.empty()),
         Mono.just(2).flux().next(),
+        Mono.just(3).flux().singleOrEmpty(),
         Mono.<Void>empty().then());
   }
 

diff --git a/...ntrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestOutput.java b/...ntrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestOutput.java
@@ -121,7 +121,7 @@ ImmutableSet<Flux<String>> testFluxDefaultIfEmpty() {
   }
 
   ImmutableSet<Mono<?>> testMonoIdentity() {
-    return ImmutableSet.of(Mono.just(1), Mono.just(2), Mono.<Void>empty());
+    return ImmutableSet.of(Mono.just(1), Mono.just(2), Mono.just(3), Mono.<Void>empty());
   }
 
   ImmutableSet<Flux<Integer>> testFluxSwitchIfEmptyOfEmptyPublisher() {