Skip to content

Commit 1a4236d

Browse files
committed
remove logger abstraction
1 parent aba4702 commit 1a4236d

File tree

6 files changed

+15
-134
lines changed

6 files changed

+15
-134
lines changed

src/main/java/io/cryostat/core/log/Logger.java

Lines changed: 0 additions & 124 deletions
This file was deleted.

src/main/java/io/cryostat/core/net/discovery/JvmDiscoveryClient.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.openjdk.jmc.jdp.client.DiscoveryListener;
2727
import org.openjdk.jmc.jdp.client.JDPClient;
2828

29-
import io.cryostat.core.log.Logger;
29+
import org.slf4j.Logger;
3030

3131
public class JvmDiscoveryClient {
3232

@@ -67,6 +67,7 @@ public void onDiscovery(DiscoveryEvent evt) {
6767
break;
6868
default:
6969
logger.error(
70+
"Exception thrown",
7071
new IllegalArgumentException(evt.getKind().toString()));
7172
}
7273
}

src/main/java/io/cryostat/core/reports/InterruptibleReportGenerator.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,9 @@
5555
import org.openjdk.jmc.flightrecorder.rules.TypedResult;
5656
import org.openjdk.jmc.flightrecorder.rules.util.RulesToolkit;
5757

58-
import io.cryostat.core.log.Logger;
59-
6058
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
6159
import org.apache.commons.io.input.CountingInputStream;
60+
import org.slf4j.Logger;
6261

6362
/**
6463
* Re-implementation of {@link ReportGenerator} where the report generation task is represented by a
@@ -219,7 +218,7 @@ private Pair<Collection<IResult>, Long> generateResultHelper(
219218
f.cancel(true);
220219
}
221220
}
222-
logger.warn(e);
221+
logger.warn("Exception thrown", e);
223222
throw e;
224223
}
225224
}

src/main/java/io/cryostat/core/templates/RemoteTemplateService.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,19 @@
3030
import org.openjdk.jmc.rjmx.services.jfr.IFlightRecorderService;
3131

3232
import io.cryostat.core.FlightRecorderException;
33-
import io.cryostat.core.log.Logger;
3433
import io.cryostat.core.net.JFRConnection;
3534

3635
import org.jsoup.Jsoup;
3736
import org.jsoup.nodes.Document;
3837
import org.jsoup.nodes.Element;
3938
import org.jsoup.parser.Parser;
4039
import org.jsoup.select.Elements;
40+
import org.slf4j.Logger;
41+
import org.slf4j.LoggerFactory;
4142

4243
public class RemoteTemplateService extends AbstractTemplateService {
4344

45+
private final Logger logger = LoggerFactory.getLogger(getClass());
4446
private final JFRConnection conn;
4547

4648
public RemoteTemplateService(JFRConnection conn) {
@@ -129,7 +131,7 @@ protected List<XMLModel> getTemplateModels() throws FlightRecorderException {
129131
try {
130132
return EventConfiguration.createModel(xmlText);
131133
} catch (ParseException | IOException e) {
132-
Logger.INSTANCE.warn(e);
134+
logger.warn("Exception thrown", e);
133135
return null;
134136
}
135137
})

src/test/java/io/cryostat/core/net/discovery/JvmDiscoveryClientTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.openjdk.jmc.jdp.client.DiscoveryListener;
2929
import org.openjdk.jmc.jdp.client.JDPClient;
3030

31-
import io.cryostat.core.log.Logger;
3231
import io.cryostat.core.net.discovery.JvmDiscoveryClient.EventKind;
3332

3433
import org.hamcrest.MatcherAssert;
@@ -42,13 +41,15 @@
4241
import org.mockito.Mock;
4342
import org.mockito.Mockito;
4443
import org.mockito.junit.jupiter.MockitoExtension;
44+
import org.slf4j.Logger;
45+
import org.slf4j.LoggerFactory;
4546

4647
@ExtendWith(MockitoExtension.class)
4748
class JvmDiscoveryClientTest {
4849

4950
JvmDiscoveryClient client;
5051
@Mock JDPClient jdp;
51-
@Mock Logger logger;
52+
@Mock Logger logger = LoggerFactory.getLogger(getClass());
5253

5354
@BeforeEach
5455
void setup() {

src/test/java/io/cryostat/core/reports/InterruptibleReportGeneratorTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.concurrent.Executors;
2525
import java.util.concurrent.Future;
2626

27-
import io.cryostat.core.log.Logger;
2827
import io.cryostat.core.reports.InterruptibleReportGenerator.AnalysisResult;
2928

3029
import org.hamcrest.MatcherAssert;
@@ -35,12 +34,15 @@
3534
import org.junit.jupiter.api.extension.ExtendWith;
3635
import org.mockito.Mock;
3736
import org.mockito.junit.jupiter.MockitoExtension;
37+
import org.slf4j.Logger;
38+
import org.slf4j.LoggerFactory;
3839

3940
@ExtendWith(MockitoExtension.class)
4041
class InterruptibleReportGeneratorTest {
4142

4243
@Mock InputStream recording;
43-
@Mock Logger logger;
44+
@Mock Logger logger = LoggerFactory.getLogger(getClass());
45+
4446
InterruptibleReportGenerator generator;
4547

4648
@BeforeEach()

0 commit comments

Comments
 (0)