Skip to content

Commit ac03cb8

Browse files
artem-vartem-v
authored
Merge pull request #398 from scalecube/bring-back-slf4j
Set back slf4j, + added LoggingExtension
2 parents b31e47e + 8cbd4fe commit ac03cb8

File tree

28 files changed

+406
-616
lines changed

28 files changed

+406
-616
lines changed

‎cluster-testlib/pom.xml‎

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
35
<parent>
46
<artifactId>scalecube-cluster-parent</artifactId>
57
<groupId>io.scalecube</groupId>
@@ -21,6 +23,55 @@
2123
<artifactId>scalecube-cluster-api</artifactId>
2224
<version>${project.version}</version>
2325
</dependency>
26+
27+
<dependency>
28+
<groupId>org.slf4j</groupId>
29+
<artifactId>slf4j-api</artifactId>
30+
</dependency>
31+
<dependency>
32+
<groupId>org.apache.logging.log4j</groupId>
33+
<artifactId>log4j-slf4j-impl</artifactId>
34+
</dependency>
35+
<dependency>
36+
<groupId>org.apache.logging.log4j</groupId>
37+
<artifactId>log4j-core</artifactId>
38+
</dependency>
39+
40+
<dependency>
41+
<groupId>org.junit.jupiter</groupId>
42+
<artifactId>junit-jupiter-api</artifactId>
43+
<version>${junit-jupiter.version}</version>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.junit.jupiter</groupId>
47+
<artifactId>junit-jupiter-engine</artifactId>
48+
<version>${junit-jupiter.version}</version>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.junit.jupiter</groupId>
52+
<artifactId>junit-jupiter-params</artifactId>
53+
<version>${junit-jupiter.version}</version>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.mockito</groupId>
57+
<artifactId>mockito-junit-jupiter</artifactId>
58+
<version>${mockito-junit.version}</version>
59+
<exclusions>
60+
<exclusion>
61+
<groupId>org.junit.jupiter</groupId>
62+
<artifactId>junit-jupiter-api</artifactId>
63+
</exclusion>
64+
</exclusions>
65+
</dependency>
66+
<dependency>
67+
<groupId>org.hamcrest</groupId>
68+
<artifactId>hamcrest-all</artifactId>
69+
<version>${hamcrest.version}</version>
70+
</dependency>
71+
<dependency>
72+
<groupId>io.projectreactor</groupId>
73+
<artifactId>reactor-test</artifactId>
74+
</dependency>
2475
</dependencies>
2576

2677
</project>

‎cluster-testlib/src/main/java/io/scalecube/cluster/utils/LoggingExtension.java‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
package io.scalecube.cluster.utils;
2+
3+
import java.lang.reflect.Method;
4+
import org.junit.jupiter.api.extension.AfterAllCallback;
5+
import org.junit.jupiter.api.extension.AfterEachCallback;
6+
import org.junit.jupiter.api.extension.BeforeAllCallback;
7+
import org.junit.jupiter.api.extension.BeforeEachCallback;
8+
import org.junit.jupiter.api.extension.ExtensionContext;
9+
import org.slf4j.Logger;
10+
import org.slf4j.LoggerFactory;
11+
12+
public class LoggingExtension
13+
implements AfterEachCallback, BeforeEachCallback, AfterAllCallback, BeforeAllCallback {
14+
15+
private static final Logger LOGGER = LoggerFactory.getLogger(LoggingExtension.class);
16+
17+
@Override
18+
public void beforeAll(ExtensionContext context) {
19+
LOGGER.info(
20+
"***** Setup: " + context.getTestClass().map(Class::getSimpleName).orElse("") + " *****");
21+
}
22+
23+
@Override
24+
public void afterEach(ExtensionContext context) {
25+
LOGGER.info(
26+
"***** Test finished: "
27+
+ context.getTestClass().map(Class::getSimpleName).orElse("")
28+
+ "."
29+
+ context.getTestMethod().map(Method::getName).orElse("")
30+
+ "."
31+
+ context.getDisplayName()
32+
+ " *****");
33+
}
34+
35+
@Override
36+
public void beforeEach(ExtensionContext context) {
37+
LOGGER.info(
38+
"***** Test started: "
39+
+ context.getTestClass().map(Class::getSimpleName).orElse("")
40+
+ "."
41+
+ context.getTestMethod().map(Method::getName).orElse("")
42+
+ "."
43+
+ context.getDisplayName()
44+
+ " *****");
45+
}
46+
47+
@Override
48+
public void afterAll(ExtensionContext context) {
49+
LOGGER.info(
50+
"***** TearDown: "
51+
+ context.getTestClass().map(Class::getSimpleName).orElse("")
52+
+ " *****");
53+
}
54+
}

‎cluster-testlib/src/main/java/io/scalecube/cluster/utils/NetworkEmulator.java‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package io.scalecube.cluster.utils;
22

33
import io.scalecube.cluster.transport.api.Message;
4-
import java.lang.System.Logger;
5-
import java.lang.System.Logger.Level;
64
import java.time.Duration;
75
import java.util.Arrays;
86
import java.util.Collection;
@@ -11,6 +9,8 @@
119
import java.util.concurrent.ConcurrentHashMap;
1210
import java.util.concurrent.ThreadLocalRandom;
1311
import java.util.concurrent.atomic.AtomicLong;
12+
import org.slf4j.Logger;
13+
import org.slf4j.LoggerFactory;
1414
import reactor.core.publisher.Mono;
1515

1616
/**
@@ -24,7 +24,7 @@
2424
*/
2525
public final class NetworkEmulator {
2626

27-
private static final Logger LOGGER = System.getLogger(NetworkEmulator.class.getName());
27+
private static final Logger LOGGER = LoggerFactory.getLogger(NetworkEmulator.class);
2828

2929
private volatile OutboundSettings defaultOutboundSettings = new OutboundSettings(0, 0);
3030
private volatile InboundSettings defaultInboundSettings = new InboundSettings(true);
@@ -69,8 +69,7 @@ public OutboundSettings outboundSettings(String destination) {
6969
public void outboundSettings(String destination, int lossPercent, int meanDelay) {
7070
OutboundSettings settings = new OutboundSettings(lossPercent, meanDelay);
7171
outboundSettings.put(destination, settings);
72-
LOGGER.log(
73-
Level.DEBUG, "[{0}] Set outbound settings {1} to {2}", address, settings, destination);
72+
LOGGER.debug("[{}] Set outbound settings {} to {}", address, settings, destination);
7473
}
7574

7675
/**
@@ -81,22 +80,21 @@ public void outboundSettings(String destination, int lossPercent, int meanDelay)
8180
*/
8281
public void setDefaultOutboundSettings(int lossPercent, int meanDelay) {
8382
defaultOutboundSettings = new OutboundSettings(lossPercent, meanDelay);
84-
LOGGER.log(
85-
Level.DEBUG, "[{0}] Set default outbound settings {1}", address, defaultOutboundSettings);
83+
LOGGER.debug("[{}] Set default outbound settings {}", address, defaultOutboundSettings);
8684
}
8785

8886
/** Blocks outbound messages to all destinations. */
8987
public void blockAllOutbound() {
9088
outboundSettings.clear();
9189
setDefaultOutboundSettings(100, 0);
92-
LOGGER.log(Level.DEBUG, "[{0}] Blocked outbound to all destinations", address);
90+
LOGGER.debug("[{}] Blocked outbound to all destinations", address);
9391
}
9492

9593
/** Unblocks outbound messages to all destinations. */
9694
public void unblockAllOutbound() {
9795
outboundSettings.clear();
9896
setDefaultOutboundSettings(0, 0);
99-
LOGGER.log(Level.DEBUG, "[{0}] Unblocked outbound to all destinations", address);
97+
LOGGER.debug("[{}] Unblocked outbound to all destinations", address);
10098
}
10199

102100
/**
@@ -117,7 +115,7 @@ public void blockOutbound(Collection<String> destinations) {
117115
for (String destination : destinations) {
118116
outboundSettings.put(destination, new OutboundSettings(100, 0));
119117
}
120-
LOGGER.log(Level.DEBUG, "[{0}] Blocked outbound to {1}", address, destinations);
118+
LOGGER.debug("[{}] Blocked outbound to {}", address, destinations);
121119
}
122120

123121
/**
@@ -136,7 +134,7 @@ public void unblockOutbound(String... destinations) {
136134
*/
137135
public void unblockOutbound(Collection<String> destinations) {
138136
destinations.forEach(outboundSettings::remove);
139-
LOGGER.log(Level.DEBUG, "[{0}] Unblocked outbound {1}", address, destinations);
137+
LOGGER.debug("[{}] Unblocked outbound {}", address, destinations);
140138
}
141139

142140
/**
@@ -222,8 +220,7 @@ public InboundSettings inboundSettings(String destination) {
222220
public void inboundSettings(String destination, boolean shallPass) {
223221
InboundSettings settings = new InboundSettings(shallPass);
224222
inboundSettings.put(destination, settings);
225-
LOGGER.log(
226-
Level.DEBUG, "[{0}] Set inbound settings {1} to {2}", address, settings, destination);
223+
LOGGER.debug("[{}] Set inbound settings {} to {}", address, settings, destination);
227224
}
228225

229226
/**
@@ -233,22 +230,21 @@ public void inboundSettings(String destination, boolean shallPass) {
233230
*/
234231
public void setDefaultInboundSettings(boolean shallPass) {
235232
defaultInboundSettings = new InboundSettings(shallPass);
236-
LOGGER.log(
237-
Level.DEBUG, "[{0}] Set default inbound settings {1}", address, defaultInboundSettings);
233+
LOGGER.debug("[{}] Set default inbound settings {}", address, defaultInboundSettings);
238234
}
239235

240236
/** Blocks inbound messages from all destinations. */
241237
public void blockAllInbound() {
242238
inboundSettings.clear();
243239
setDefaultInboundSettings(false);
244-
LOGGER.log(Level.DEBUG, "[{0}] Blocked inbound from all destinations", address);
240+
LOGGER.debug("[{}] Blocked inbound from all destinations", address);
245241
}
246242

247243
/** Unblocks inbound messages to all destinations. */
248244
public void unblockAllInbound() {
249245
inboundSettings.clear();
250246
setDefaultInboundSettings(true);
251-
LOGGER.log(Level.DEBUG, "[{0}] Unblocked inbound from all destinations", address);
247+
LOGGER.debug("[{}] Unblocked inbound from all destinations", address);
252248
}
253249

254250
/**
@@ -269,7 +265,7 @@ public void blockInbound(Collection<String> destinations) {
269265
for (String destination : destinations) {
270266
inboundSettings.put(destination, new InboundSettings(false));
271267
}
272-
LOGGER.log(Level.DEBUG, "[{0}] Blocked inbound from {1}", address, destinations);
268+
LOGGER.debug("[{}] Blocked inbound from {}", address, destinations);
273269
}
274270

275271
/**
@@ -288,7 +284,7 @@ public void unblockInbound(String... destinations) {
288284
*/
289285
public void unblockInbound(Collection<String> destinations) {
290286
destinations.forEach(inboundSettings::remove);
291-
LOGGER.log(Level.DEBUG, "[{0}] Unblocked inbound from {1}", address, destinations);
287+
LOGGER.debug("[{}] Unblocked inbound from {}", address, destinations);
292288
}
293289

294290
/**

‎cluster-testlib/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
io.scalecube.cluster.utils.LoggingExtension

‎cluster-testlib/src/main/resources/junit-platform.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
junit.jupiter.extensions.autodetection.enabled=true

‎cluster/src/test/resources/log4j2-test.xml‎ renamed to ‎cluster-testlib/src/main/resources/log4j2.xml‎

File renamed without changes.

‎cluster-testlib/src/test/java/io/scalecube/cluster/utils/BaseTest.java‎

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

‎cluster-testlib/src/test/java/io/scalecube/cluster/utils/NetworkEmulatorTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.junit.jupiter.api.Assertions;
55
import org.junit.jupiter.api.Test;
66

7-
public class NetworkEmulatorTest extends BaseTest {
7+
public class NetworkEmulatorTest {
88

99
@Test
1010
public void testResolveLinkSettingsBySocketAddress() {

‎cluster/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
<artifactId>scalecube-cluster-api</artifactId>
2525
<version>${project.version}</version>
2626
</dependency>
27+
<dependency>
28+
<groupId>org.slf4j</groupId>
29+
<artifactId>slf4j-api</artifactId>
30+
</dependency>
2731

2832
<!-- Test dependencies -->
2933
<dependency>

0 commit comments

Comments
 (0)