Even better 👀

PicnicSupermarket · Dec 31, 2024 · 5821073 · 5821073
1 parent 1403f75
commit 5821073
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 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
@@ -896,9 +896,7 @@ abstract static class FluxMapNotNullMapOptional<T, S> {
 
     @BeforeTemplate
     Flux<S> before(Flux<T> flux) {
-      return flux.map(x -> transformation(x))
-          .filter(Optional::isPresent)
-          .map(Optional::orElseThrow);
+      return flux.map(x -> transformation(x)).mapNotNull(x -> x.orElse(null));
     }
 
     @AfterTemplate

diff --git a/...ontrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java b/...ontrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java
@@ -326,10 +326,7 @@ ImmutableSet<Flux<Integer>> testFluxMapNotNull() {
   }
 
   Flux<String> testFluxMapNotNullMapOptional() {
-    return Flux.just(1)
-        .map(x -> Optional.of(x.toString()))
-        .filter(Optional::isPresent)
-        .map(Optional::orElseThrow);
+    return Flux.just(1).map(x -> Optional.of(x.toString())).mapNotNull(x -> x.orElse(null));
   }
 
   Flux<Integer> testFluxMapNotNullOptional() {