From ff9ce6edad248e25df5bd9064551673fb4e1d5da Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Thu, 22 Feb 2024 14:25:29 -0500
Subject: [PATCH] chore(logger): do not pass logger instances into constructors

---
 .../core/net/discovery/JvmDiscoveryClient.java         | 10 +++++-----
 .../core/reports/InterruptibleReportGenerator.java     |  6 +++---
 .../core/net/discovery/JvmDiscoveryClientTest.java     |  5 +----
 .../core/reports/InterruptibleReportGeneratorTest.java |  5 +----
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/main/java/io/cryostat/core/net/discovery/JvmDiscoveryClient.java b/src/main/java/io/cryostat/core/net/discovery/JvmDiscoveryClient.java
index 7ba3f0ab..7297ccd2 100644
--- a/src/main/java/io/cryostat/core/net/discovery/JvmDiscoveryClient.java
+++ b/src/main/java/io/cryostat/core/net/discovery/JvmDiscoveryClient.java
@@ -27,18 +27,18 @@
 import org.openjdk.jmc.jdp.client.JDPClient;
 
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JvmDiscoveryClient {
 
-    private final Logger logger;
+    private final Logger logger = LoggerFactory.getLogger(getClass());
     private final JDPClient jdp;
     private final Set<Consumer<JvmDiscoveryEvent>> eventListeners;
     private final DiscoveryListener listener;
 
     // package-private for testing
-    JvmDiscoveryClient(JDPClient jdp, Logger logger) {
+    JvmDiscoveryClient(JDPClient jdp) {
         this.jdp = jdp;
-        this.logger = logger;
         this.eventListeners = new HashSet<>();
         this.listener =
                 new DiscoveryListener() {
@@ -74,8 +74,8 @@ public void onDiscovery(DiscoveryEvent evt) {
                 };
     }
 
-    public JvmDiscoveryClient(Logger logger) {
-        this(new JDPClient(), logger);
+    public JvmDiscoveryClient() {
+        this(new JDPClient());
     }
 
     public void start() throws IOException {
diff --git a/src/main/java/io/cryostat/core/reports/InterruptibleReportGenerator.java b/src/main/java/io/cryostat/core/reports/InterruptibleReportGenerator.java
index aee2638e..42f56351 100644
--- a/src/main/java/io/cryostat/core/reports/InterruptibleReportGenerator.java
+++ b/src/main/java/io/cryostat/core/reports/InterruptibleReportGenerator.java
@@ -58,6 +58,7 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.commons.io.input.CountingInputStream;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Re-implementation of {@link ReportGenerator} where the report generation task is represented by a
@@ -72,14 +73,13 @@ public class InterruptibleReportGenerator {
 
     private final ExecutorService qThread = Executors.newCachedThreadPool();
     private final ExecutorService executor;
-    private final Logger logger;
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
     @SuppressFBWarnings(
             value = "EI_EXPOSE_REP2",
             justification = "fields are not exposed since there are no getters")
-    public InterruptibleReportGenerator(ExecutorService executor, Logger logger) {
+    public InterruptibleReportGenerator(ExecutorService executor) {
         this.executor = executor;
-        this.logger = logger;
     }
 
     public Future<Map<String, AnalysisResult>> generateEvalMapInterruptibly(
diff --git a/src/test/java/io/cryostat/core/net/discovery/JvmDiscoveryClientTest.java b/src/test/java/io/cryostat/core/net/discovery/JvmDiscoveryClientTest.java
index b1060d25..c5c58aab 100644
--- a/src/test/java/io/cryostat/core/net/discovery/JvmDiscoveryClientTest.java
+++ b/src/test/java/io/cryostat/core/net/discovery/JvmDiscoveryClientTest.java
@@ -41,19 +41,16 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 @ExtendWith(MockitoExtension.class)
 class JvmDiscoveryClientTest {
 
     JvmDiscoveryClient client;
     @Mock JDPClient jdp;
-    @Mock Logger logger = LoggerFactory.getLogger(getClass());
 
     @BeforeEach
     void setup() {
-        this.client = new JvmDiscoveryClient(jdp, logger);
+        this.client = new JvmDiscoveryClient(jdp);
     }
 
     @Test
diff --git a/src/test/java/io/cryostat/core/reports/InterruptibleReportGeneratorTest.java b/src/test/java/io/cryostat/core/reports/InterruptibleReportGeneratorTest.java
index 5c7eea0b..485fe747 100644
--- a/src/test/java/io/cryostat/core/reports/InterruptibleReportGeneratorTest.java
+++ b/src/test/java/io/cryostat/core/reports/InterruptibleReportGeneratorTest.java
@@ -34,20 +34,17 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 @ExtendWith(MockitoExtension.class)
 class InterruptibleReportGeneratorTest {
 
     @Mock InputStream recording;
-    @Mock Logger logger = LoggerFactory.getLogger(getClass());
 
     InterruptibleReportGenerator generator;
 
     @BeforeEach()
     void setup() throws Exception {
-        generator = new InterruptibleReportGenerator(Executors.newWorkStealingPool(1), logger);
+        generator = new InterruptibleReportGenerator(Executors.newWorkStealingPool(1));
     }
 
     @Test