From d4adb8737d664bcbf9ec2ca4207358bbdbfb785c Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Fri, 7 Mar 2025 09:10:44 -0500
Subject: [PATCH] cleanup

---
 src/main/java/io/cryostat/agent/CryostatClient.java        | 7 +------
 src/main/java/io/cryostat/agent/FlightRecorderHelper.java  | 3 +--
 src/main/java/io/cryostat/agent/harvest/Harvester.java     | 2 +-
 src/main/java/io/cryostat/agent/model/ServerHealth.java    | 4 +---
 .../java/io/cryostat/agent/remote/EventTypesContext.java   | 3 ---
 5 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/main/java/io/cryostat/agent/CryostatClient.java b/src/main/java/io/cryostat/agent/CryostatClient.java
index 3b4fb043..50eae263 100644
--- a/src/main/java/io/cryostat/agent/CryostatClient.java
+++ b/src/main/java/io/cryostat/agent/CryostatClient.java
@@ -510,12 +510,7 @@ private HttpResponse assertOkStatus(HttpRequestBase req, HttpResponse res) {
         return res;
     }
 
-    @SuppressFBWarnings(
-            value = {
-                "URF_UNREAD_FIELD",
-                "UWF_UNWRITTEN_FIELD",
-                "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD"
-            })
+    @SuppressFBWarnings("UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD")
     public static class StoredCredential {
 
         public int id;
diff --git a/src/main/java/io/cryostat/agent/FlightRecorderHelper.java b/src/main/java/io/cryostat/agent/FlightRecorderHelper.java
index 374481f2..a6331922 100644
--- a/src/main/java/io/cryostat/agent/FlightRecorderHelper.java
+++ b/src/main/java/io/cryostat/agent/FlightRecorderHelper.java
@@ -128,7 +128,7 @@ public Optional<Recording> getRecording(long id) {
         return getRecordings(r -> r.getId() == id).stream().findFirst();
     }
 
-    @SuppressFBWarnings(value = {"EI_EXPOSE_REP", "EI_EXPOSE_REP2"})
+    @SuppressFBWarnings("EI_EXPOSE_REP")
     public static class TemplatedRecording {
         private final ConfigurationInfo configuration;
         private final Recording recording;
@@ -175,7 +175,6 @@ public TemplateType getType() {
         }
     }
 
-    @SuppressFBWarnings(value = "URF_UNREAD_FIELD")
     public static class RecordingInfo {
 
         public final long id;
diff --git a/src/main/java/io/cryostat/agent/harvest/Harvester.java b/src/main/java/io/cryostat/agent/harvest/Harvester.java
index 82644d75..2f60a154 100644
--- a/src/main/java/io/cryostat/agent/harvest/Harvester.java
+++ b/src/main/java/io/cryostat/agent/harvest/Harvester.java
@@ -69,7 +69,7 @@ public class Harvester implements FlightRecorderListener {
     private Future<?> task;
     private boolean running;
 
-    @SuppressFBWarnings(value = {"EI_EXPOSE_REP2", "CT_CONSTRUCTOR_THROW"})
+    @SuppressFBWarnings("EI_EXPOSE_REP2")
     public Harvester(
             ScheduledExecutorService executor,
             ScheduledExecutorService workerPool,
diff --git a/src/main/java/io/cryostat/agent/model/ServerHealth.java b/src/main/java/io/cryostat/agent/model/ServerHealth.java
index 9e7fa219..1b77c9e8 100644
--- a/src/main/java/io/cryostat/agent/model/ServerHealth.java
+++ b/src/main/java/io/cryostat/agent/model/ServerHealth.java
@@ -19,7 +19,7 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-@SuppressFBWarnings(value = {"EI_EXPOSE_REP", "EI_EXPOSE_REP2"})
+@SuppressFBWarnings("EI_EXPOSE_REP")
 public class ServerHealth {
 
     private String cryostatVersion;
@@ -52,7 +52,6 @@ public BuildInfo buildInfo() {
         return build;
     }
 
-    @SuppressFBWarnings(value = {"EI_EXPOSE_REP", "EI_EXPOSE_REP2"})
     public static class BuildInfo {
         private GitInfo git;
 
@@ -71,7 +70,6 @@ public GitInfo git() {
         }
     }
 
-    @SuppressFBWarnings(value = {"EI_EXPOSE_REP", "EI_EXPOSE_REP2"})
     public static class GitInfo {
         private String hash;
 
diff --git a/src/main/java/io/cryostat/agent/remote/EventTypesContext.java b/src/main/java/io/cryostat/agent/remote/EventTypesContext.java
index 620f5315..edc14354 100644
--- a/src/main/java/io/cryostat/agent/remote/EventTypesContext.java
+++ b/src/main/java/io/cryostat/agent/remote/EventTypesContext.java
@@ -25,7 +25,6 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sun.net.httpserver.HttpExchange;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import jdk.jfr.EventType;
 import jdk.jfr.FlightRecorder;
 import jdk.jfr.SettingDescriptor;
@@ -93,7 +92,6 @@ private List<EventInfo> getEventTypes() {
                 .collect(Collectors.toList());
     }
 
-    @SuppressFBWarnings(value = "URF_UNREAD_FIELD")
     private static class EventInfo {
 
         public final String name;
@@ -110,7 +108,6 @@ private static class EventInfo {
         }
     }
 
-    @SuppressFBWarnings(value = "URF_UNREAD_FIELD")
     private static class SettingInfo {
 
         public final String name;