[Branch-4.15] Fix the CI spotbugs failure in the branch-4.15 (#4150)

### Motivation Fix the CI spotbugs failure in the branch-4.15
apache · Dec 12, 2023 · 9f3be1c · 9f3be1c
1 parent 827293c
commit 9f3be1c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/...eper-server/src/main/java/org/apache/bookkeeper/server/http/service/TriggerGCService.java b/...eper-server/src/main/java/org/apache/bookkeeper/server/http/service/TriggerGCService.java
@@ -66,7 +66,7 @@ public HttpServiceResponse handle(HttpServiceRequest request) throws Exception {
         try {
             if (HttpServer.Method.PUT == request.getMethod()) {
                 String requestBody = request.getBody();
-                if (StringUtils.isBlank(requestBody)) {
+                if (requestBody == null || StringUtils.isEmpty(requestBody.trim())) {
                     bookieServer.getBookie().getLedgerStorage().forceGC();
                 } else {
                     @SuppressWarnings("unchecked")

diff --git a/...-server/src/test/java/org/apache/bookkeeper/server/http/service/TriggerGCServiceTest.java b/...-server/src/test/java/org/apache/bookkeeper/server/http/service/TriggerGCServiceTest.java
@@ -81,7 +81,7 @@ public void testHandleRequest() throws Exception {
         request.setMethod(HttpServer.Method.PUT);
         request.setBody("{\"test\":1}");
         resp = service.handle(request);
-        verify(mockLedgerStorage, times(1)).forceGC(eq(true), eq(true));
+        verify(mockLedgerStorage, times(1)).forceGC(eq(false), eq(false));
         assertEquals(HttpServer.StatusCode.OK.getValue(), resp.getStatusCode());
         assertEquals("\"Triggered GC on BookieServer: " + mockBookieServer.getBookieId() + "\"",
             resp.getBody());
@@ -91,7 +91,7 @@ public void testHandleRequest() throws Exception {
         request.setMethod(HttpServer.Method.PUT);
         request.setBody("{\"test\":1,\"forceMajor\":true}");
         resp = service.handle(request);
-        verify(mockLedgerStorage, times(2)).forceGC(eq(true), eq(true));
+        verify(mockLedgerStorage, times(1)).forceGC(eq(true), eq(false));
         assertEquals(HttpServer.StatusCode.OK.getValue(), resp.getStatusCode());
         assertEquals("\"Triggered GC on BookieServer: " + mockBookieServer.getBookieId() + "\"",
             resp.getBody());
@@ -101,7 +101,7 @@ public void testHandleRequest() throws Exception {
         request.setMethod(HttpServer.Method.PUT);
         request.setBody("{\"test\":1,\"forceMajor\":\"true\"}");
         resp = service.handle(request);
-        verify(mockLedgerStorage, times(3)).forceGC(eq(true), eq(true));
+        verify(mockLedgerStorage, times(2)).forceGC(eq(true), eq(false));
         assertEquals(HttpServer.StatusCode.OK.getValue(), resp.getStatusCode());
         assertEquals("\"Triggered GC on BookieServer: " + mockBookieServer.getBookieId() + "\"",
             resp.getBody());
@@ -111,7 +111,7 @@ public void testHandleRequest() throws Exception {
         request.setMethod(HttpServer.Method.PUT);
         request.setBody("{\"test\":1,\"forceMajor\":false}");
         resp = service.handle(request);
-        verify(mockLedgerStorage, times(1)).forceGC(eq(false), eq(true));
+        verify(mockLedgerStorage, times(2)).forceGC(eq(false), eq(false));
         assertEquals(HttpServer.StatusCode.OK.getValue(), resp.getStatusCode());
         assertEquals("\"Triggered GC on BookieServer: " + mockBookieServer.getBookieId() + "\"",
             resp.getBody());
@@ -121,7 +121,7 @@ public void testHandleRequest() throws Exception {
         request.setMethod(HttpServer.Method.PUT);
         request.setBody("{\"test\":1,\"forceMinor\":true}");
         resp = service.handle(request);
-        verify(mockLedgerStorage, times(4)).forceGC(eq(true), eq(true));
+        verify(mockLedgerStorage, times(1)).forceGC(eq(false), eq(true));
         assertEquals(HttpServer.StatusCode.OK.getValue(), resp.getStatusCode());
         assertEquals("\"Triggered GC on BookieServer: " + mockBookieServer.getBookieId() + "\"",
             resp.getBody());

diff --git a/buildtools/src/main/resources/bookkeeper/findbugsExclude.xml b/buildtools/src/main/resources/bookkeeper/findbugsExclude.xml
@@ -327,4 +327,13 @@
     <Class name="org.apache.distributedlog.messaging.RRMultiWriter" />
     <Bug pattern="EI_EXPOSE_REP2" />
   </Match>
+
+  <Match>
+    <!-- generated code, we can't be held responsible for findbugs in it //-->
+    <Class name="~org\.apache\.bookkeeper\.bookie\.generated.*" />
+  </Match>
+  <Match>
+    <Class name="org.apache.bookkeeper.bookie.GroupSortBenchmark$TestState" />
+    <Bug pattern="DMI_RANDOM_USED_ONLY_ONCE" />
+  </Match>
 </FindBugsFilter>