Suggestions

PicnicSupermarket · Dec 4, 2022 · 0c9d9c3 · 0c9d9c3
1 parent 88f5bf4
commit 0c9d9c3
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 13 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
@@ -64,7 +64,7 @@ Mono<T> after(Supplier<? extends T> supplier) {
   static final class MonoEmpty<T> {
     @BeforeTemplate
     Mono<T> before() {
-      return Refaster.anyOf(Mono.just(null), Mono.justOrEmpty(null));
+      return Refaster.anyOf(Mono.justOrEmpty(null), Mono.justOrEmpty(Optional.empty()));
     }
 
     @AfterTemplate
@@ -73,16 +73,28 @@ Mono<T> after() {
     }
   }
 
-  /** Prefer {@link Mono#justOrEmpty(Optional)} over more contrived alternatives. */
-  static final class MonoJustOrEmpty<T> {
+  /** Prefer {@link Mono#just(Object)} over more contrived alternatives. */
+  static final class MonoJust<T> {
     @BeforeTemplate
-    @SuppressWarnings("NullAway")
-    Mono<T> before(@Nullable T value) {
-      return Mono.justOrEmpty(Refaster.anyOf(Optional.of(value), Optional.ofNullable(value)));
+    Mono<T> before(T value) {
+      return Mono.justOrEmpty(Optional.of(value));
     }
 
     @AfterTemplate
-    Mono<T> after(@Nullable T value) {
+    Mono<T> after(T value) {
+      return Mono.just(value);
+    }
+  }
+
+  /** Prefer {@link Mono#justOrEmpty(Object)} over more contrived alternatives. */
+  static final class MonoJustOrEmpty<@Nullable T> {
+    @BeforeTemplate
+    Mono<T> before(T value) {
+      return Mono.justOrEmpty(Optional.ofNullable(value));
+    }
+
+    @AfterTemplate
+    Mono<T> after(T value) {
       return Mono.justOrEmpty(value);
     }
   }

diff --git a/...ontrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java b/...ontrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java
@@ -35,12 +35,15 @@ ImmutableSet<Mono<?>> testMonoFromSupplier() {
   }
 
   ImmutableSet<Mono<String>> testMonoEmpty() {
-    return ImmutableSet.of(Mono.just(null), Mono.justOrEmpty(null));
+    return ImmutableSet.of(Mono.justOrEmpty(null), Mono.justOrEmpty(Optional.empty()));
   }
 
-  ImmutableSet<Mono<Integer>> testMonoJustOrEmpty() {
-    return ImmutableSet.of(
-        Mono.justOrEmpty(Optional.of(1)), Mono.justOrEmpty(Optional.ofNullable(2)));
+  Mono<Integer> testMonoJust() {
+    return Mono.justOrEmpty(Optional.of(1));
+  }
+
+  Mono<Integer> testMonoJustOrEmpty() {
+    return Mono.justOrEmpty(Optional.ofNullable(1));
   }
 
   ImmutableSet<Mono<Integer>> testMonoFromOptional() {

diff --git a/...ntrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestOutput.java b/...ntrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestOutput.java
@@ -41,8 +41,12 @@ ImmutableSet<Mono<String>> testMonoEmpty() {
     return ImmutableSet.of(Mono.empty(), Mono.empty());
   }
 
-  ImmutableSet<Mono<Integer>> testMonoJustOrEmpty() {
-    return ImmutableSet.of(Mono.justOrEmpty(1), Mono.justOrEmpty(2));
+  Mono<Integer> testMonoJust() {
+    return Mono.just(1);
+  }
+
+  Mono<Integer> testMonoJustOrEmpty() {
+    return Mono.justOrEmpty(1);
   }
 
   ImmutableSet<Mono<Integer>> testMonoFromOptional() {