PSM-1627 Create refaster template to rewrite `.onErrorResume(e -> Mon…

…o.empty())` to `.onErrorComplete()` Add a new refaster template rule that rewrites `.onErrorResume(e -> Mono.empty())` to `.onErrorComplete()`. This is applied to `.onErrorResume(e -> Flux.empty())` as well.
PicnicSupermarket · Oct 6, 2022 · ffa4c51 · ffa4c51
1 parent 9af50d7
commit ffa4c51
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 0 deletions.
diff --git a/...rone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/ReactorTemplates.java b/...rone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/ReactorTemplates.java
@@ -271,6 +271,32 @@ Flux<S> after(Flux<T> flux) {
     }
   }
 
+  /** Prefer {@link Flux#onErrorComplete()} over more contrived alternatives */
+  static final class FluxOnErrorComplete<T> {
+    @BeforeTemplate
+    Flux<T> before(Flux<T> flux) {
+      return flux.onErrorResume(e -> Flux.empty());
+    }
+
+    @AfterTemplate
+    Flux<T> after(Flux<T> flux) {
+      return flux.onErrorComplete();
+    }
+  }
+
+  /** Prefer {@link Mono#onErrorComplete()} over more contrived alternatives */
+  static final class MonoOnErrorComplete<T> {
+    @BeforeTemplate
+    Mono<T> before(Mono<T> mono) {
+      return mono.onErrorResume(e -> Mono.empty());
+    }
+
+    @AfterTemplate
+    Mono<T> after(Mono<T> mono) {
+      return mono.onErrorComplete();
+    }
+  }
+
   /** Prefer {@link PublisherProbe#empty()}} over more verbose alternatives. */
   static final class PublisherProbeEmpty<T> {
     @BeforeTemplate

diff --git a/...rc/test/resources/tech/picnic/errorprone/refastertemplates/ReactorTemplatesTestInput.java b/...rc/test/resources/tech/picnic/errorprone/refastertemplates/ReactorTemplatesTestInput.java
@@ -95,6 +95,14 @@ Flux<Number> testFluxCast() {
     return Flux.just(1).map(Number.class::cast);
   }
 
+  Flux<Object> testFluxOnErrorComplete() {
+    return Flux.error(new IllegalStateException()).onErrorResume(e -> Flux.empty());
+  }
+
+  Mono<Object> testMonoOnErrorComplete() {
+    return Mono.error(new IllegalStateException()).onErrorResume(e -> Mono.empty());
+  }
+
   ImmutableSet<PublisherProbe<Void>> testPublisherProbeEmpty() {
     return ImmutableSet.of(PublisherProbe.of(Mono.empty()), PublisherProbe.of(Flux.empty()));
   }

diff --git a/...c/test/resources/tech/picnic/errorprone/refastertemplates/ReactorTemplatesTestOutput.java b/...c/test/resources/tech/picnic/errorprone/refastertemplates/ReactorTemplatesTestOutput.java
@@ -94,6 +94,14 @@ Flux<Number> testFluxCast() {
     return Flux.just(1).cast(Number.class);
   }
 
+  Flux<Object> testFluxOnErrorComplete() {
+    return Flux.error(new IllegalStateException()).onErrorComplete();
+  }
+
+  Mono<Object> testMonoOnErrorComplete() {
+    return Mono.error(new IllegalStateException()).onErrorComplete();
+  }
+
   ImmutableSet<PublisherProbe<Void>> testPublisherProbeEmpty() {
     return ImmutableSet.of(PublisherProbe.empty(), PublisherProbe.empty());
   }