diff --git a/src/main/java/io/cryostat/core/log/Logger.java b/src/main/java/io/cryostat/core/log/Logger.java deleted file mode 100644 index 09b68a9e..00000000 --- a/src/main/java/io/cryostat/core/log/Logger.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright The Cryostat Authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package io.cryostat.core.log; - -import org.slf4j.LoggerFactory; - -public enum Logger { - INSTANCE; - - private org.slf4j.Logger logger = LoggerFactory.getLogger(Logger.class); - - public void error(String message) { - logger.error(message); - } - - public void error(String message, Object a) { - logger.error(message, a); - } - - public void error(String message, Object a, Object b) { - logger.error(message, a, b); - } - - public void error(String message, Object... args) { - logger.error(message, args); - } - - public void error(Exception exception) { - logger.error("Exception thrown", exception); - } - - public void warn(String message) { - logger.warn(message); - } - - public void warn(String message, Object a) { - logger.warn(message, a); - } - - public void warn(String message, Object a, Object b) { - logger.warn(message, a, b); - } - - public void warn(String message, Object... args) { - logger.warn(message, args); - } - - public void warn(Exception exception) { - logger.warn("Exception thrown", exception); - } - - public void info(String message) { - logger.info(message); - } - - public void info(String message, Object a) { - logger.info(message, a); - } - - public void info(String message, Object a, Object b) { - logger.info(message, a, b); - } - - public void info(String message, Object... args) { - logger.info(message, args); - } - - public void info(Exception exception) { - logger.info("Exception thrown", exception); - } - - public void debug(String message) { - logger.debug(message); - } - - public void debug(String message, Object a) { - logger.debug(message, a); - } - - public void debug(String message, Object a, Object b) { - logger.debug(message, a, b); - } - - public void debug(String message, Object... args) { - logger.debug(message, args); - } - - public void debug(Exception exception) { - logger.debug("Exception thrown", exception); - } - - public void trace(String message) { - logger.trace(message); - } - - public void trace(String message, Object a) { - logger.trace(message, a); - } - - public void trace(String message, Object a, Object b) { - logger.trace(message, a, b); - } - - public void trace(String message, Object... args) { - logger.trace(message, args); - } - - public void trace(Exception exception) { - logger.trace("Exception thrown", exception); - } -} 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 bc442637..7ba3f0ab 100644 --- a/src/main/java/io/cryostat/core/net/discovery/JvmDiscoveryClient.java +++ b/src/main/java/io/cryostat/core/net/discovery/JvmDiscoveryClient.java @@ -26,7 +26,7 @@ import org.openjdk.jmc.jdp.client.DiscoveryListener; import org.openjdk.jmc.jdp.client.JDPClient; -import io.cryostat.core.log.Logger; +import org.slf4j.Logger; public class JvmDiscoveryClient { @@ -67,6 +67,7 @@ public void onDiscovery(DiscoveryEvent evt) { break; default: logger.error( + "Exception thrown", new IllegalArgumentException(evt.getKind().toString())); } } diff --git a/src/main/java/io/cryostat/core/reports/InterruptibleReportGenerator.java b/src/main/java/io/cryostat/core/reports/InterruptibleReportGenerator.java index 704687b1..aee2638e 100644 --- a/src/main/java/io/cryostat/core/reports/InterruptibleReportGenerator.java +++ b/src/main/java/io/cryostat/core/reports/InterruptibleReportGenerator.java @@ -55,10 +55,9 @@ import org.openjdk.jmc.flightrecorder.rules.TypedResult; import org.openjdk.jmc.flightrecorder.rules.util.RulesToolkit; -import io.cryostat.core.log.Logger; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.apache.commons.io.input.CountingInputStream; +import org.slf4j.Logger; /** * Re-implementation of {@link ReportGenerator} where the report generation task is represented by a @@ -219,7 +218,7 @@ private Pair, Long> generateResultHelper( f.cancel(true); } } - logger.warn(e); + logger.warn("Exception thrown", e); throw e; } } diff --git a/src/main/java/io/cryostat/core/templates/RemoteTemplateService.java b/src/main/java/io/cryostat/core/templates/RemoteTemplateService.java index 89eae234..e7271fb6 100644 --- a/src/main/java/io/cryostat/core/templates/RemoteTemplateService.java +++ b/src/main/java/io/cryostat/core/templates/RemoteTemplateService.java @@ -30,7 +30,6 @@ import org.openjdk.jmc.rjmx.services.jfr.IFlightRecorderService; import io.cryostat.core.FlightRecorderException; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.JFRConnection; import org.jsoup.Jsoup; @@ -38,9 +37,12 @@ import org.jsoup.nodes.Element; import org.jsoup.parser.Parser; import org.jsoup.select.Elements; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class RemoteTemplateService extends AbstractTemplateService { + private final Logger logger = LoggerFactory.getLogger(getClass()); private final JFRConnection conn; public RemoteTemplateService(JFRConnection conn) { @@ -129,7 +131,7 @@ protected List getTemplateModels() throws FlightRecorderException { try { return EventConfiguration.createModel(xmlText); } catch (ParseException | IOException e) { - Logger.INSTANCE.warn(e); + logger.warn("Exception thrown", e); return null; } }) 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 53be0f75..b1060d25 100644 --- a/src/test/java/io/cryostat/core/net/discovery/JvmDiscoveryClientTest.java +++ b/src/test/java/io/cryostat/core/net/discovery/JvmDiscoveryClientTest.java @@ -28,7 +28,6 @@ import org.openjdk.jmc.jdp.client.DiscoveryListener; import org.openjdk.jmc.jdp.client.JDPClient; -import io.cryostat.core.log.Logger; import io.cryostat.core.net.discovery.JvmDiscoveryClient.EventKind; import org.hamcrest.MatcherAssert; @@ -42,13 +41,15 @@ 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; + @Mock Logger logger = LoggerFactory.getLogger(getClass()); @BeforeEach void setup() { diff --git a/src/test/java/io/cryostat/core/reports/InterruptibleReportGeneratorTest.java b/src/test/java/io/cryostat/core/reports/InterruptibleReportGeneratorTest.java index 82364b1d..5c7eea0b 100644 --- a/src/test/java/io/cryostat/core/reports/InterruptibleReportGeneratorTest.java +++ b/src/test/java/io/cryostat/core/reports/InterruptibleReportGeneratorTest.java @@ -24,7 +24,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; -import io.cryostat.core.log.Logger; import io.cryostat.core.reports.InterruptibleReportGenerator.AnalysisResult; import org.hamcrest.MatcherAssert; @@ -35,12 +34,15 @@ 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; + @Mock Logger logger = LoggerFactory.getLogger(getClass()); + InterruptibleReportGenerator generator; @BeforeEach()