spotbug corrections

grahambrown11 · grahambrown11 · commit 136b3edb1624 · 2026-01-26T17:03:50.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id "jacoco"
     id "maven-publish"
     id "signing"
-    id "com.github.spotbugs" version "5.0.0"
+    id "com.github.spotbugs" version "6.4.8"
     id "org.sonarqube" version "2.7.1"
 }
 
@@ -177,6 +177,7 @@ signing {
 }
 
 spotbugsMain {
+    excludeFilter = file("spotbugs-exclude.xml")
     reports {
         xml.required.set(true)
         html.required.set(true)
diff --git a/spotbugs-exclude.xml b/spotbugs-exclude.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FindBugsFilter>
+    <Match>
+        <Bug code="EI,EI2" />
+    </Match>
+    <Match>
+        <Class name="ch.loway.oss.ari4java.tools.http.NettyHttpClient" />
+        <Or>
+            <Method name="setAutoReconnect" />
+            <Method name="setMaxReconnectCount" />
+        </Or>
+        <Bug code="AT" />
+    </Match>
+</FindBugsFilter>
diff --git a/src/main/java/ch/loway/oss/ari4java/ARI.java b/src/main/java/ch/loway/oss/ari4java/ARI.java
@@ -30,9 +30,10 @@ public class ARI {
     private HttpClient httpClient;
     private WsClient wsClient;
     private ActionEvents liveActionEvent = null;
-    private AriSubscriber subscriptions = new AriSubscriber();
+    private final AriSubscriber subscriptions = new AriSubscriber();
     private final CopyOnWriteArrayList<BaseAriAction> liveActionList = new CopyOnWriteArrayList<>();
-    private static Logger logger = LoggerFactory.getLogger(ARI.class);
+    private static final Logger logger = LoggerFactory.getLogger(ARI.class);
+    private static final SecureRandom random = new SecureRandom();
 
     /**
      * Sets the client
@@ -469,7 +470,6 @@ public static void sleep(long ms) {
     public static String getUID() {
         StringBuilder sb = new StringBuilder(20);
         sb.append("a4j");
-        SecureRandom random = new SecureRandom();
         for (int n = 0; n < 15; n++) {
             if ((n % 5) == 0) {
                 sb.append(".");
diff --git a/src/main/java/ch/loway/oss/ari4java/tools/http/HTTPLogger.java b/src/main/java/ch/loway/oss/ari4java/tools/http/HTTPLogger.java
@@ -9,7 +9,7 @@
 import java.util.Arrays;
 import java.util.Map;
 
-public class HTTPLogger {
+public final class HTTPLogger {
 
     private HTTPLogger() {
         throw new IllegalStateException("Utility class");
diff --git a/src/main/java/ch/loway/oss/ari4java/tools/http/NettyHttpClient.java b/src/main/java/ch/loway/oss/ari4java/tools/http/NettyHttpClient.java
@@ -35,6 +35,7 @@
 import java.net.URISyntaxException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * HTTP and WebSocket client implementation based on netty.io.
@@ -71,7 +72,7 @@ public class NettyHttpClient implements HttpClient, WsClient {
     private String wsEventsUrl;
     private List<HttpParam> wsEventsParamQuery;
     private WsClientConnection wsClientConnection;
-    private int reconnectCount = 0;
+    private final AtomicInteger reconnectCount = new AtomicInteger(0);
     private int maxReconnectCount = 10; // -1 = infinite reconnect attempts
     private ChannelFuture wsChannelFuture;
     private ScheduledFuture<?> wsPingTimer = null;
@@ -481,7 +482,7 @@ public void operationComplete(ChannelFuture future) throws Exception {
                                 logger.debug("WS connected...");
                                 // start a ping and reset reconnect counter
                                 startPing();
-                                reconnectCount = 0;
+                                reconnectCount.set(0);
                                 if (!group.isShuttingDown()) {
                                     group.execute(callback::onChReadyToWrite);
                                 }
@@ -612,7 +613,7 @@ public void reconnectWs(Throwable cause) {
             wsPingTimer = null;
         }
 
-        if (!autoReconnect || (maxReconnectCount > -1 && reconnectCount >= maxReconnectCount)) {
+        if (!autoReconnect || (maxReconnectCount > -1 && reconnectCount.get() >= maxReconnectCount)) {
             logger.warn("Cannot connect: {} - executing failure callback", cause.getMessage());
             if (!group.isShuttingDown()) {
                 group.execute(() -> wsCallback.onFailure(cause));
@@ -624,9 +625,9 @@ public void reconnectWs(Throwable cause) {
         if (!group.isShuttingDown()) {
             // schedule reconnect after a 2,5,10 seconds
             long[] timeouts = {2L, 5L, 10L};
-            long timeout = reconnectCount >= timeouts.length ? timeouts[timeouts.length - 1] : timeouts[reconnectCount];
-            reconnectCount++;
-            logger.error("WS Connect Error: {}, reconnecting in {} seconds... try: {}", cause.getMessage(), timeout, reconnectCount);
+            long timeout = reconnectCount.get() >= timeouts.length ? timeouts[timeouts.length - 1] : timeouts[reconnectCount.get()];
+            reconnectCount.incrementAndGet();
+            logger.error("WS Connect Error: {}, reconnecting in {} seconds... try: {}", cause.getMessage(), timeout, reconnectCount.get());
             shutDownGroup.schedule(() -> {
                 try {
                     // 1st close up

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ plugins {`
`3`	`3`	`id "jacoco"`
`4`	`4`	`id "maven-publish"`
`5`	`5`	`id "signing"`
`6`		`- id "com.github.spotbugs" version "5.0.0"`
	`6`	`+ id "com.github.spotbugs" version "6.4.8"`
`7`	`7`	`id "org.sonarqube" version "2.7.1"`
`8`	`8`	`}`
`9`	`9`
`@@ -177,6 +177,7 @@ signing {`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`spotbugsMain {`
	`180`	`+ excludeFilter = file("spotbugs-exclude.xml")`
`180`	`181`	`reports {`
`181`	`182`	`xml.required.set(true)`
`182`	`183`	`html.required.set(true)`