From ccbe3fd236943dc815ee73cf85eda9479612e4b6 Mon Sep 17 00:00:00 2001
From: Stephan Schroevers <stephan.schroevers@teampicnic.com>
Date: Fri, 30 Dec 2022 06:50:39 +0100
Subject: [PATCH] Drop redundant suppressions

---
 .../picnic/errorprone/refasterrules/AssertJOptionalRules.java  | 1 -
 .../tech/picnic/errorprone/refasterrules/ReactorRules.java     | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssertJOptionalRules.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssertJOptionalRules.java
index 2cab238072..2b22542a23 100644
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssertJOptionalRules.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssertJOptionalRules.java
@@ -22,7 +22,6 @@ private AssertJOptionalRules() {}
 
   static final class AssertThatOptional<T> {
     @BeforeTemplate
-    @SuppressWarnings("NullAway")
     ObjectAssert<T> before(Optional<T> optional) {
       return assertThat(optional.orElseThrow());
     }
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 40faa052f8..fa8b50cb97 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
@@ -372,10 +372,7 @@ Mono<T> before(Mono<T> mono) {
       return mono.switchIfEmpty(Mono.empty());
     }
 
-    // XXX: Review the suppression once NullAway has better support for generics. Keep an eye on
-    // https://github.com/uber/NullAway/issues?q=is%3Aopen+generics.
     @BeforeTemplate
-    @SuppressWarnings("NullAway" /* False positive. */)
     Mono<@Nullable Void> before2(Mono<@Nullable Void> mono) {
       return mono.then();
     }