From af334b7924f33ee3f4a3cc28a81e7f19be6e9dbe Mon Sep 17 00:00:00 2001
From: evermind <evermind@tuxfamily.org>
Date: Mon, 28 Nov 2022 13:33:50 +0100
Subject: [PATCH 1/2] checkstyle: declare org.jetbrains and javax.annotation
 Nullable's and NotNull/Nonnull as illegal imports

---
 checkstyle/checkstyle.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
index ce378a65f..3214a2b0b 100644
--- a/checkstyle/checkstyle.xml
+++ b/checkstyle/checkstyle.xml
@@ -95,7 +95,9 @@
         <!-- Checks for imports                              -->
         <!-- See https://checkstyle.org/config_import.html -->
         <module name="AvoidStarImport"/>
-        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+        <module name="IllegalImport"> <!-- defaults to sun.* packages -->
+            <property name="illegalClasses" value="org.jetbrains.annotations.Nullable, org.jetbrains.annotations.NotNull, javax.annotation.Nullable, javax.annotation.Nonnull" />
+        </module>
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>
 

From a0af7d424eb19d49f021252249a155e6ea0706da Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Mon, 28 Nov 2022 14:28:08 +0100
Subject: [PATCH 2/2] Block rxjava3 nullable/nonnull imports in checkstyle

---
 checkstyle/checkstyle.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
index 3214a2b0b..e8c9d94ca 100644
--- a/checkstyle/checkstyle.xml
+++ b/checkstyle/checkstyle.xml
@@ -96,7 +96,13 @@
         <!-- See https://checkstyle.org/config_import.html -->
         <module name="AvoidStarImport"/>
         <module name="IllegalImport"> <!-- defaults to sun.* packages -->
-            <property name="illegalClasses" value="org.jetbrains.annotations.Nullable, org.jetbrains.annotations.NotNull, javax.annotation.Nullable, javax.annotation.Nonnull" />
+            <property name="illegalClasses" value="
+                org.jetbrains.annotations.Nullable,
+                org.jetbrains.annotations.NotNull,
+                javax.annotation.Nullable,
+                javax.annotation.Nonnull,
+                io.reactivex.rxjava3.annotations.NonNull,
+                io.reactivex.rxjava3.annotations.Nullable" />
         </module>
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>