From 418fc050d5c66a048ae48de2c6015ce3bda7d26e Mon Sep 17 00:00:00 2001
From: mohamedsamehsalah <mohamed.sameh@teampicnic.com>
Date: Thu, 20 Feb 2025 09:38:43 +0100
Subject: [PATCH] Refaster redundant `Mono#when` statements

---
 .../tech/picnic/errorprone/refasterrules/ReactorRules.java   | 2 +-
 .../errorprone/refasterrules/ReactorRulesTestInput.java      | 5 ++++-
 .../errorprone/refasterrules/ReactorRulesTestOutput.java     | 3 ++-
 3 files changed, 7 insertions(+), 3 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
index 6ed728f2c5..a2352bb9cf 100644
--- 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
@@ -939,7 +939,7 @@ Flux<T> after(Mono<T> mono) {
   static final class MonoThen<T> {
     @BeforeTemplate
     Mono<@Nullable Void> before(Mono<T> mono) {
-      return Refaster.anyOf(mono.ignoreElement().then(), mono.flux().then());
+      return Refaster.anyOf(mono.ignoreElement().then(), mono.flux().then(), Mono.when(mono));
     }
 
     @AfterTemplate
diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java
index 1129f1c5c1..2e60061194 100644
--- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java
+++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java
@@ -342,7 +342,10 @@ ImmutableSet<Flux<String>> testMonoFlux() {
   }
 
   ImmutableSet<Mono<Void>> testMonoThen() {
-    return ImmutableSet.of(Mono.just("foo").ignoreElement().then(), Mono.just("bar").flux().then());
+    return ImmutableSet.of(
+        Mono.just("foo").ignoreElement().then(),
+        Mono.just("bar").flux().then(),
+        Mono.when(Mono.just("baz")));
   }
 
   ImmutableSet<Mono<Void>> testFluxThen() {
diff --git a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestOutput.java b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestOutput.java
index b8739b6443..c85629cef4 100644
--- a/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestOutput.java
+++ b/error-prone-contrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestOutput.java
@@ -340,7 +340,8 @@ ImmutableSet<Flux<String>> testMonoFlux() {
   }
 
   ImmutableSet<Mono<Void>> testMonoThen() {
-    return ImmutableSet.of(Mono.just("foo").then(), Mono.just("bar").then());
+    return ImmutableSet.of(
+        Mono.just("foo").then(), Mono.just("bar").then(), Mono.just("baz").then());
   }
 
   ImmutableSet<Mono<Void>> testFluxThen() {