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

[yong]

This is an automated email from the ASF dual-hosted git repository.

yong pushed a commit to branch branch-4.15
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/branch-4.15 by this push:
     new 9f3be1c308 [Branch-4.15] Fix the CI spotbugs failure in the 
branch-4.15 (#4150)
9f3be1c308 is described below

commit 9f3be1c3087ca0100cc7576c9897c31a30b89ab7
Author: Yong Zhang <zhangyong1025...@gmail.com>
AuthorDate: Tue Dec 12 10:36:48 2023 +0800

    [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
---
 .../bookkeeper/server/http/service/TriggerGCService.java       |  2 +-
 .../bookkeeper/server/http/service/TriggerGCServiceTest.java   | 10 +++++-----
 buildtools/src/main/resources/bookkeeper/findbugsExclude.xml   |  9 +++++++++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git 
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/TriggerGCService.java
 
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/TriggerGCService.java
index c1e25f5554..d702d545c2 100644
--- 
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/TriggerGCService.java
+++ 
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/TriggerGCService.java
@@ -66,7 +66,7 @@ public class TriggerGCService implements HttpEndpointService {
         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/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/service/TriggerGCServiceTest.java
 
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/service/TriggerGCServiceTest.java
index 7a07ed59e2..0cef60209e 100644
--- 
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/service/TriggerGCServiceTest.java
+++ 
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/http/service/TriggerGCServiceTest.java
@@ -81,7 +81,7 @@ public class TriggerGCServiceTest {
         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 class TriggerGCServiceTest {
         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 class TriggerGCServiceTest {
         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 class TriggerGCServiceTest {
         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 class TriggerGCServiceTest {
         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
index 09daf19656..e3e9dfb085 100644
--- 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>