Introduce Mono{JustOr}Empty Refaster rules

PicnicSupermarket · Dec 4, 2022 · c46aaeb · c46aaeb
1 parent 5afa7e1
commit c46aaeb
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 0 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
@@ -26,6 +26,7 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import org.jspecify.nullness.Nullable;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -59,6 +60,33 @@ Mono<T> after(Supplier<? extends T> supplier) {
     }
   }
 
+  /** Prefer {@link Mono#empty()} over more contrived alternatives. */
+  static final class MonoEmpty<T> {
+    @BeforeTemplate
+    Mono<T> before() {
+      return Mono.justOrEmpty(null);
+    }
+
+    @AfterTemplate
+    Mono<T> after() {
+      return Mono.empty();
+    }
+  }
+
+  /** Prefer {@link Mono#justOrEmpty(Optional)} over more contrived alternatives. */
+  static final class MonoJustOrEmpty<T> {
+    @BeforeTemplate
+    @SuppressWarnings("NullAway")
+    Mono<T> before(@Nullable T value) {
+      return Mono.justOrEmpty(Refaster.anyOf(Optional.of(value), Optional.ofNullable(value)));
+    }
+
+    @AfterTemplate
+    Mono<T> after(@Nullable T value) {
+      return Mono.justOrEmpty(value);
+    }
+  }
+
   /** Prefer {@link Mono#justOrEmpty(Optional)} over more verbose alternatives. */
   // XXX: If `optional` is a constant and effectively-final expression then the `Mono.defer` can be
   // dropped. Should look into Refaster support for identifying this.

diff --git a/...ontrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java b/...ontrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java
@@ -34,6 +34,15 @@ ImmutableSet<Mono<?>> testMonoFromSupplier() {
         Mono.fromCallable(this::toString));
   }
 
+  Mono<String> testMonoEmpty() {
+    return Mono.justOrEmpty(null);
+  }
+
+  ImmutableSet<Mono<Integer>> testMonoJustOrEmpty() {
+    return ImmutableSet.of(
+        Mono.justOrEmpty(Optional.of(1)), Mono.justOrEmpty(Optional.ofNullable(2)));
+  }
+
   ImmutableSet<Mono<Integer>> testMonoFromOptional() {
     return ImmutableSet.of(
         Mono.fromCallable(() -> Optional.of(1).orElse(null)),

diff --git a/...ntrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestOutput.java b/...ntrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestOutput.java
@@ -37,6 +37,14 @@ ImmutableSet<Mono<?>> testMonoFromSupplier() {
         Mono.fromSupplier(this::toString));
   }
 
+  Mono<String> testMonoEmpty() {
+    return Mono.empty();
+  }
+
+  ImmutableSet<Mono<Integer>> testMonoJustOrEmpty() {
+    return ImmutableSet.of(Mono.justOrEmpty(1), Mono.justOrEmpty(2));
+  }
+
   ImmutableSet<Mono<Integer>> testMonoFromOptional() {
     return ImmutableSet.of(
         Mono.defer(() -> Mono.justOrEmpty(Optional.of(1))),