From b6dd5735631f43a8e465fce018c9f086e42efc0e Mon Sep 17 00:00:00 2001
From: Kaijie Chen <ckj@apache.org>
Date: Mon, 30 Jan 2023 16:21:28 +0800
Subject: [PATCH 1/3] [SpotBugs] Ignore URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD in
 Checker

---
 pom.xml                                              | 12 ++++++++++++
 .../main/java/org/apache/uniffle/server/Checker.java |  3 +++
 spotbugs-exclude.xml                                 |  2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 50b6a67569..df2153c377 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,6 +128,11 @@
       <artifactId>error_prone_annotations</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>com.github.spotbugs</groupId>
+      <artifactId>spotbugs-annotations</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>
@@ -614,6 +619,13 @@
         <version>${zstd-jni.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-annotations</artifactId>
+        <version>${spotbugs.version}</version>
+        <scope>provided</scope>
+      </dependency>
+
       <dependency>
         <groupId>org.xerial.snappy</groupId>
         <artifactId>snappy-java</artifactId>
diff --git a/server/src/main/java/org/apache/uniffle/server/Checker.java b/server/src/main/java/org/apache/uniffle/server/Checker.java
index 2be1b30f8b..a6fc61b3b1 100644
--- a/server/src/main/java/org/apache/uniffle/server/Checker.java
+++ b/server/src/main/java/org/apache/uniffle/server/Checker.java
@@ -17,8 +17,11 @@
 
 package org.apache.uniffle.server;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 public abstract class Checker {
 
+  @SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
   protected ShuffleServerConf conf;
 
   Checker(ShuffleServerConf conf) {
diff --git a/spotbugs-exclude.xml b/spotbugs-exclude.xml
index bead73be13..f7b5d80aa8 100644
--- a/spotbugs-exclude.xml
+++ b/spotbugs-exclude.xml
@@ -20,6 +20,6 @@
     <Package name="~org\.apache\.uniffle\.proto.*"/>
   </Match>
   <Match>
-    <Bug pattern="MS_EXPOSE_REP,EI_EXPOSE_REP,EI_EXPOSE_REP2,EI_EXPOSE_STATIC_REP2,THROWS_METHOD_THROWS_RUNTIMEEXCEPTION,THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION,REC_CATCH_EXCEPTION,THROWS_METHOD_THROWS_CLAUSE_THROWABLE,MS_PKGPROTECT,MS_CANNOT_BE_FINAL,UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD,SE_BAD_FIELD,URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD,SC_START_IN_CTOR,SWL_SLEEP_WITH_LOCK_HELD,IS2_INCONSISTENT_SYNC" />
+    <Bug pattern="MS_EXPOSE_REP,EI_EXPOSE_REP,EI_EXPOSE_REP2,EI_EXPOSE_STATIC_REP2,THROWS_METHOD_THROWS_RUNTIMEEXCEPTION,THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION,REC_CATCH_EXCEPTION,THROWS_METHOD_THROWS_CLAUSE_THROWABLE,MS_PKGPROTECT,MS_CANNOT_BE_FINAL,UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD,SE_BAD_FIELD,SC_START_IN_CTOR,SWL_SLEEP_WITH_LOCK_HELD,IS2_INCONSISTENT_SYNC" />
   </Match>
 </FindBugsFilter>

From 6973e2b11e5a5165f6e209cc4fa13412a3341832 Mon Sep 17 00:00:00 2001
From: Kaijie Chen <ckj@apache.org>
Date: Mon, 30 Jan 2023 19:34:42 +0800
Subject: [PATCH 2/3] Revert "[SpotBugs] Ignore
 URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD in Checker"

This reverts commit b6dd5735631f43a8e465fce018c9f086e42efc0e.
---
 pom.xml                                              | 12 ------------
 .../main/java/org/apache/uniffle/server/Checker.java |  3 ---
 spotbugs-exclude.xml                                 |  2 +-
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index df2153c377..50b6a67569 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,11 +128,6 @@
       <artifactId>error_prone_annotations</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.github.spotbugs</groupId>
-      <artifactId>spotbugs-annotations</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>
@@ -619,13 +614,6 @@
         <version>${zstd-jni.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>com.github.spotbugs</groupId>
-        <artifactId>spotbugs-annotations</artifactId>
-        <version>${spotbugs.version}</version>
-        <scope>provided</scope>
-      </dependency>
-
       <dependency>
         <groupId>org.xerial.snappy</groupId>
         <artifactId>snappy-java</artifactId>
diff --git a/server/src/main/java/org/apache/uniffle/server/Checker.java b/server/src/main/java/org/apache/uniffle/server/Checker.java
index a6fc61b3b1..2be1b30f8b 100644
--- a/server/src/main/java/org/apache/uniffle/server/Checker.java
+++ b/server/src/main/java/org/apache/uniffle/server/Checker.java
@@ -17,11 +17,8 @@
 
 package org.apache.uniffle.server;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 public abstract class Checker {
 
-  @SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
   protected ShuffleServerConf conf;
 
   Checker(ShuffleServerConf conf) {
diff --git a/spotbugs-exclude.xml b/spotbugs-exclude.xml
index f7b5d80aa8..bead73be13 100644
--- a/spotbugs-exclude.xml
+++ b/spotbugs-exclude.xml
@@ -20,6 +20,6 @@
     <Package name="~org\.apache\.uniffle\.proto.*"/>
   </Match>
   <Match>
-    <Bug pattern="MS_EXPOSE_REP,EI_EXPOSE_REP,EI_EXPOSE_REP2,EI_EXPOSE_STATIC_REP2,THROWS_METHOD_THROWS_RUNTIMEEXCEPTION,THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION,REC_CATCH_EXCEPTION,THROWS_METHOD_THROWS_CLAUSE_THROWABLE,MS_PKGPROTECT,MS_CANNOT_BE_FINAL,UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD,SE_BAD_FIELD,SC_START_IN_CTOR,SWL_SLEEP_WITH_LOCK_HELD,IS2_INCONSISTENT_SYNC" />
+    <Bug pattern="MS_EXPOSE_REP,EI_EXPOSE_REP,EI_EXPOSE_REP2,EI_EXPOSE_STATIC_REP2,THROWS_METHOD_THROWS_RUNTIMEEXCEPTION,THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION,REC_CATCH_EXCEPTION,THROWS_METHOD_THROWS_CLAUSE_THROWABLE,MS_PKGPROTECT,MS_CANNOT_BE_FINAL,UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD,SE_BAD_FIELD,URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD,SC_START_IN_CTOR,SWL_SLEEP_WITH_LOCK_HELD,IS2_INCONSISTENT_SYNC" />
   </Match>
 </FindBugsFilter>

From 85d451d0cf7d50a9c6b4a78480de924ced0fc11c Mon Sep 17 00:00:00 2001
From: Kaijie Chen <ckj@apache.org>
Date: Mon, 30 Jan 2023 19:37:52 +0800
Subject: [PATCH 3/3] Remove unread protected field in Checker

---
 server/src/main/java/org/apache/uniffle/server/Checker.java | 3 ---
 spotbugs-exclude.xml                                        | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/server/src/main/java/org/apache/uniffle/server/Checker.java b/server/src/main/java/org/apache/uniffle/server/Checker.java
index 2be1b30f8b..e61719606e 100644
--- a/server/src/main/java/org/apache/uniffle/server/Checker.java
+++ b/server/src/main/java/org/apache/uniffle/server/Checker.java
@@ -19,10 +19,7 @@
 
 public abstract class Checker {
 
-  protected ShuffleServerConf conf;
-
   Checker(ShuffleServerConf conf) {
-    this.conf = conf;
   }
 
   abstract boolean checkIsHealthy();
diff --git a/spotbugs-exclude.xml b/spotbugs-exclude.xml
index bead73be13..f7b5d80aa8 100644
--- a/spotbugs-exclude.xml
+++ b/spotbugs-exclude.xml
@@ -20,6 +20,6 @@
     <Package name="~org\.apache\.uniffle\.proto.*"/>
   </Match>
   <Match>
-    <Bug pattern="MS_EXPOSE_REP,EI_EXPOSE_REP,EI_EXPOSE_REP2,EI_EXPOSE_STATIC_REP2,THROWS_METHOD_THROWS_RUNTIMEEXCEPTION,THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION,REC_CATCH_EXCEPTION,THROWS_METHOD_THROWS_CLAUSE_THROWABLE,MS_PKGPROTECT,MS_CANNOT_BE_FINAL,UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD,SE_BAD_FIELD,URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD,SC_START_IN_CTOR,SWL_SLEEP_WITH_LOCK_HELD,IS2_INCONSISTENT_SYNC" />
+    <Bug pattern="MS_EXPOSE_REP,EI_EXPOSE_REP,EI_EXPOSE_REP2,EI_EXPOSE_STATIC_REP2,THROWS_METHOD_THROWS_RUNTIMEEXCEPTION,THROWS_METHOD_THROWS_CLAUSE_BASIC_EXCEPTION,REC_CATCH_EXCEPTION,THROWS_METHOD_THROWS_CLAUSE_THROWABLE,MS_PKGPROTECT,MS_CANNOT_BE_FINAL,UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD,SE_BAD_FIELD,SC_START_IN_CTOR,SWL_SLEEP_WITH_LOCK_HELD,IS2_INCONSISTENT_SYNC" />
   </Match>
 </FindBugsFilter>