diff --git a/config/checkstyle/checkstyle-suppressions.xml b/config/checkstyle/checkstyle-suppressions.xml
index d725f42f00..195bc4a363 100644
--- a/config/checkstyle/checkstyle-suppressions.xml
+++ b/config/checkstyle/checkstyle-suppressions.xml
@@ -8,8 +8,6 @@
-
+
-
-
diff --git a/dependencies.gradle b/dependencies.gradle
index ca06ed6ea8..db7f510edb 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -41,7 +41,6 @@ def VERSIONS = [
'javax.cache:cache-api:latest.release',
'javax.inject:javax.inject:1',
'javax.xml.bind:jaxb-api:2.3.+',
- 'junit:junit:4.12',
'net.sf.ehcache:ehcache:latest.release',
'org.apache.httpcomponents:httpasyncclient:latest.release',
'org.apache.httpcomponents:httpclient:latest.release',
@@ -65,7 +64,6 @@ def VERSIONS = [
'org.jsr107.ri:cache-ri-impl:1.0.0',
'org.junit.jupiter:junit-jupiter:5.8.+',
'org.junit.platform:junit-platform-launcher:1.8.+',
- 'org.junit.vintage:junit-vintage-engine:5.8.+',
'org.latencyutils:LatencyUtils:latest.release',
'org.mockito:mockito-core:latest.release',
'org.mockito:mockito-inline:latest.release',
diff --git a/micrometer-core/build.gradle b/micrometer-core/build.gradle
index 8538e7a2c8..643ca983e0 100644
--- a/micrometer-core/build.gradle
+++ b/micrometer-core/build.gradle
@@ -58,9 +58,6 @@ dependencies {
// JUnit 5
testImplementation 'org.junit.jupiter:junit-jupiter'
- // See https://github.com/eclipse-ee4j/jersey/issues/3662
- testImplementation 'junit:junit'
- testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
testImplementation 'com.tngtech.archunit:archunit-junit5'
// Eclipse still needs this (as of 4.7.1a)
diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/DefaultJerseyTagsProviderTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/DefaultJerseyTagsProviderTest.java
index 2339224144..d5071949dc 100644
--- a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/DefaultJerseyTagsProviderTest.java
+++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/DefaultJerseyTagsProviderTest.java
@@ -24,7 +24,7 @@
import org.glassfish.jersey.server.monitoring.RequestEvent;
import org.glassfish.jersey.server.monitoring.RequestEvent.Type;
import org.glassfish.jersey.uri.UriTemplate;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import javax.ws.rs.NotAcceptableException;
import java.net.URI;
@@ -44,36 +44,36 @@
* @author Michael Weirauch
* @author Johnny Lim
*/
-public class DefaultJerseyTagsProviderTest {
+class DefaultJerseyTagsProviderTest {
private final DefaultJerseyTagsProvider tagsProvider = new DefaultJerseyTagsProvider();
@Test
- public void testRootPath() {
+ void testRootPath() {
assertThat(tagsProvider.httpRequestTags(event(200, null, "/", (String[]) null)))
.containsExactlyInAnyOrder(tagsFrom("root", 200, null, "SUCCESS"));
}
@Test
- public void templatedPathsAreReturned() {
+ void templatedPathsAreReturned() {
assertThat(tagsProvider.httpRequestTags(event(200, null, "/", "/", "/hello/{name}")))
.containsExactlyInAnyOrder(tagsFrom("/hello/{name}", 200, null, "SUCCESS"));
}
@Test
- public void applicationPathIsPresent() {
+ void applicationPathIsPresent() {
assertThat(tagsProvider.httpRequestTags(event(200, null, "/app", "/", "/hello")))
.containsExactlyInAnyOrder(tagsFrom("/app/hello", 200, null, "SUCCESS"));
}
@Test
- public void notFoundsAreShunted() {
+ void notFoundsAreShunted() {
assertThat(tagsProvider.httpRequestTags(event(404, null, "/app", "/", "/not-found")))
.containsExactlyInAnyOrder(tagsFrom("NOT_FOUND", 404, null, "CLIENT_ERROR"));
}
@Test
- public void redirectsAreShunted() {
+ void redirectsAreShunted() {
assertThat(tagsProvider.httpRequestTags(event(301, null, "/app", "/", "/redirect301")))
.containsExactlyInAnyOrder(tagsFrom("REDIRECTION", 301, null, "REDIRECTION"));
assertThat(tagsProvider.httpRequestTags(event(302, null, "/app", "/", "/redirect302")))
@@ -84,7 +84,7 @@ public void redirectsAreShunted() {
@Test
@SuppressWarnings("serial")
- public void exceptionsAreMappedCorrectly() {
+ void exceptionsAreMappedCorrectly() {
assertThat(tagsProvider.httpRequestTags(
event(500, new IllegalArgumentException(), "/app", (String[]) null)))
.containsExactlyInAnyOrder(tagsFrom("/app", 500, "IllegalArgumentException", "SERVER_ERROR"));
@@ -100,7 +100,7 @@ public void exceptionsAreMappedCorrectly() {
}
@Test
- public void longRequestTags() {
+ void longRequestTags() {
assertThat(tagsProvider.httpLongRequestTags(event(0, null, "/app", (String[]) null)))
.containsExactlyInAnyOrder(Tag.of("method", "GET"), Tag.of("uri", "/app"));
}
diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/MetricsRequestEventListenerTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/MetricsRequestEventListenerTest.java
index 8ecfb165aa..6d72f11952 100644
--- a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/MetricsRequestEventListenerTest.java
+++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/MetricsRequestEventListenerTest.java
@@ -23,7 +23,7 @@
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.core.Application;
@@ -38,7 +38,7 @@
* @author Michael Weirauch
* @author Johnny Lim
*/
-public class MetricsRequestEventListenerTest extends JerseyTest {
+class MetricsRequestEventListenerTest extends JerseyTest {
static {
Logger.getLogger("org.glassfish.jersey").setLevel(Level.OFF);
@@ -64,7 +64,7 @@ protected Application configure() {
}
@Test
- public void resourcesAreTimed() {
+ void resourcesAreTimed() {
target("/").request().get();
target("hello").request().get();
target("hello/").request().get();
@@ -92,7 +92,7 @@ public void resourcesAreTimed() {
}
@Test
- public void notFoundIsAccumulatedUnderSameUri() {
+ void notFoundIsAccumulatedUnderSameUri() {
try {
target("not-found").request().get();
} catch (NotFoundException ignored) {
@@ -104,7 +104,7 @@ public void notFoundIsAccumulatedUnderSameUri() {
}
@Test
- public void notFoundIsReportedWithUriOfMatchedResource() {
+ void notFoundIsReportedWithUriOfMatchedResource() {
try {
target("throws-not-found-exception").request().get();
} catch (NotFoundException ignored) {
@@ -116,7 +116,7 @@ public void notFoundIsReportedWithUriOfMatchedResource() {
}
@Test
- public void redirectsAreAccumulatedUnderSameUri() {
+ void redirectsAreAccumulatedUnderSameUri() {
target("redirect/302").request().get();
target("redirect/307").request().get();
@@ -130,7 +130,7 @@ public void redirectsAreAccumulatedUnderSameUri() {
}
@Test
- public void exceptionsAreMappedCorrectly() {
+ void exceptionsAreMappedCorrectly() {
try {
target("throws-exception").request().get();
} catch (Exception ignored) {
diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/MetricsRequestEventListenerTimedTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/MetricsRequestEventListenerTimedTest.java
index e215eb531b..5474d0a309 100644
--- a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/MetricsRequestEventListenerTimedTest.java
+++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jersey/server/MetricsRequestEventListenerTimedTest.java
@@ -23,7 +23,7 @@
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import javax.ws.rs.ProcessingException;
import javax.ws.rs.core.Application;
@@ -40,7 +40,7 @@
/**
* @author Michael Weirauch
*/
-public class MetricsRequestEventListenerTimedTest extends JerseyTest {
+class MetricsRequestEventListenerTimedTest extends JerseyTest {
static {
Logger.getLogger("org.glassfish.jersey").setLevel(Level.OFF);
@@ -73,7 +73,7 @@ protected Application configure() {
}
@Test
- public void resourcesAndNotFoundsAreNotAutoTimed() {
+ void resourcesAndNotFoundsAreNotAutoTimed() {
target("not-timed").request().get();
target("not-found").request().get();
@@ -85,7 +85,7 @@ public void resourcesAndNotFoundsAreNotAutoTimed() {
}
@Test
- public void resourcesWithAnnotationAreTimed() {
+ void resourcesWithAnnotationAreTimed() {
target("timed").request().get();
target("multi-timed").request().get();
@@ -103,7 +103,7 @@ public void resourcesWithAnnotationAreTimed() {
}
@Test
- public void longTaskTimerSupported() throws InterruptedException, ExecutionException {
+ void longTaskTimerSupported() throws InterruptedException, ExecutionException {
final Future future = target("long-timed").request().async().get();
/*
@@ -136,14 +136,14 @@ public void longTaskTimerSupported() throws InterruptedException, ExecutionExcep
}
@Test
- public void unnamedLongTaskTimerIsNotSupported() {
+ void unnamedLongTaskTimerIsNotSupported() {
assertThatExceptionOfType(ProcessingException.class)
.isThrownBy(() -> target("long-timed-unnamed").request().get())
.withCauseInstanceOf(IllegalArgumentException.class);
}
@Test
- public void classLevelAnnotationIsInherited() {
+ void classLevelAnnotationIsInherited() {
target("/class/inherited").request().get();
assertThat(registry.get(METRIC_NAME)
@@ -154,7 +154,7 @@ public void classLevelAnnotationIsInherited() {
}
@Test
- public void methodLevelAnnotationOverridesClassLevel() {
+ void methodLevelAnnotationOverridesClassLevel() {
target("/class/on-method").request().get();
assertThat(registry.get(METRIC_NAME)
diff --git a/micrometer-jersey2/build.gradle b/micrometer-jersey2/build.gradle
index 7b00d1b0c7..0da0b73dc8 100644
--- a/micrometer-jersey2/build.gradle
+++ b/micrometer-jersey2/build.gradle
@@ -4,15 +4,9 @@ dependencies {
api 'org.glassfish.jersey.core:jersey-server'
testRuntimeOnly 'org.glassfish.jersey.inject:jersey-hk2'
+ testImplementation project(':micrometer-test')
testImplementation 'org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-inmemory'
// required by jdk 9
testRuntimeOnly 'javax.xml.bind:jaxb-api'
-
- testImplementation 'org.assertj:assertj-core'
-
- // See https://github.com/eclipse-ee4j/jersey/issues/3662
- testImplementation 'junit:junit'
- testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
- testImplementation 'org.mockito:mockito-core'
}
diff --git a/micrometer-jersey2/src/test/java/io/micrometer/jersey2/server/DefaultJerseyTagsProviderTest.java b/micrometer-jersey2/src/test/java/io/micrometer/jersey2/server/DefaultJerseyTagsProviderTest.java
index c4228a07b8..c024ed01c5 100644
--- a/micrometer-jersey2/src/test/java/io/micrometer/jersey2/server/DefaultJerseyTagsProviderTest.java
+++ b/micrometer-jersey2/src/test/java/io/micrometer/jersey2/server/DefaultJerseyTagsProviderTest.java
@@ -25,7 +25,7 @@
import org.glassfish.jersey.server.monitoring.RequestEvent;
import org.glassfish.jersey.server.monitoring.RequestEvent.Type;
import org.glassfish.jersey.uri.UriTemplate;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import javax.ws.rs.NotAcceptableException;
import java.net.URI;
@@ -45,36 +45,36 @@
* @author Michael Weirauch
* @author Johnny Lim
*/
-public class DefaultJerseyTagsProviderTest {
+class DefaultJerseyTagsProviderTest {
private final DefaultJerseyTagsProvider tagsProvider = new DefaultJerseyTagsProvider();
@Test
- public void testRootPath() {
+ void testRootPath() {
assertThat(tagsProvider.httpRequestTags(event(200, null, "/", (String[]) null)))
.containsExactlyInAnyOrder(tagsFrom("root", 200, null, "SUCCESS"));
}
@Test
- public void templatedPathsAreReturned() {
+ void templatedPathsAreReturned() {
assertThat(tagsProvider.httpRequestTags(event(200, null, "/", "/", "/hello/{name}")))
.containsExactlyInAnyOrder(tagsFrom("/hello/{name}", 200, null, "SUCCESS"));
}
@Test
- public void applicationPathIsPresent() {
+ void applicationPathIsPresent() {
assertThat(tagsProvider.httpRequestTags(event(200, null, "/app", "/", "/hello")))
.containsExactlyInAnyOrder(tagsFrom("/app/hello", 200, null, "SUCCESS"));
}
@Test
- public void notFoundsAreShunted() {
+ void notFoundsAreShunted() {
assertThat(tagsProvider.httpRequestTags(event(404, null, "/app", "/", "/not-found")))
.containsExactlyInAnyOrder(tagsFrom("NOT_FOUND", 404, null, "CLIENT_ERROR"));
}
@Test
- public void redirectsAreShunted() {
+ void redirectsAreShunted() {
assertThat(tagsProvider.httpRequestTags(event(301, null, "/app", "/", "/redirect301")))
.containsExactlyInAnyOrder(tagsFrom("REDIRECTION", 301, null, "REDIRECTION"));
assertThat(tagsProvider.httpRequestTags(event(302, null, "/app", "/", "/redirect302")))
@@ -85,7 +85,7 @@ public void redirectsAreShunted() {
@Test
@SuppressWarnings("serial")
- public void exceptionsAreMappedCorrectly() {
+ void exceptionsAreMappedCorrectly() {
assertThat(tagsProvider.httpRequestTags(
event(500, new IllegalArgumentException(), "/app", (String[]) null)))
.containsExactlyInAnyOrder(tagsFrom("/app", 500, "IllegalArgumentException", "SERVER_ERROR"));
@@ -101,7 +101,7 @@ public void exceptionsAreMappedCorrectly() {
}
@Test
- public void longRequestTags() {
+ void longRequestTags() {
assertThat(tagsProvider.httpLongRequestTags(event(0, null, "/app", (String[]) null)))
.containsExactlyInAnyOrder(Tag.of("method", "GET"), Tag.of("uri", "/app"));
}
diff --git a/micrometer-jersey2/src/test/java/io/micrometer/jersey2/server/MetricsRequestEventListenerTest.java b/micrometer-jersey2/src/test/java/io/micrometer/jersey2/server/MetricsRequestEventListenerTest.java
index 59c8798fbc..1ccb7c2146 100644
--- a/micrometer-jersey2/src/test/java/io/micrometer/jersey2/server/MetricsRequestEventListenerTest.java
+++ b/micrometer-jersey2/src/test/java/io/micrometer/jersey2/server/MetricsRequestEventListenerTest.java
@@ -23,7 +23,7 @@
import io.micrometer.jersey2.server.resources.TestResource;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.core.Application;
@@ -38,7 +38,7 @@
* @author Michael Weirauch
* @author Johnny Lim
*/
-public class MetricsRequestEventListenerTest extends JerseyTest {
+class MetricsRequestEventListenerTest extends JerseyTest {
static {
Logger.getLogger("org.glassfish.jersey").setLevel(Level.OFF);
@@ -64,7 +64,7 @@ protected Application configure() {
}
@Test
- public void resourcesAreTimed() {
+ void resourcesAreTimed() {
target("/").request().get();
target("hello").request().get();
target("hello/").request().get();
@@ -92,7 +92,7 @@ public void resourcesAreTimed() {
}
@Test
- public void notFoundIsAccumulatedUnderSameUriIfFromUnmatchedResource() {
+ void notFoundIsAccumulatedUnderSameUriIfFromUnmatchedResource() {
try {
target("not-found").request().get();
} catch (NotFoundException ignored) {
@@ -104,7 +104,7 @@ public void notFoundIsAccumulatedUnderSameUriIfFromUnmatchedResource() {
}
@Test
- public void notFoundIsReportedWithUriOfMatchedResource() {
+ void notFoundIsReportedWithUriOfMatchedResource() {
try {
target("throws-not-found-exception").request().get();
} catch (NotFoundException ignored) {
@@ -116,7 +116,7 @@ public void notFoundIsReportedWithUriOfMatchedResource() {
}
@Test
- public void redirectsAreAccumulatedUnderSameUri() {
+ void redirectsAreAccumulatedUnderSameUri() {
target("redirect/302").request().get();
target("redirect/307").request().get();
@@ -130,7 +130,7 @@ public void redirectsAreAccumulatedUnderSameUri() {
}
@Test
- public void exceptionsAreMappedCorrectly() {
+ void exceptionsAreMappedCorrectly() {
try {
target("throws-exception").request().get();
} catch (Exception ignored) {
diff --git a/micrometer-jersey2/src/test/java/io/micrometer/jersey2/server/MetricsRequestEventListenerTimedTest.java b/micrometer-jersey2/src/test/java/io/micrometer/jersey2/server/MetricsRequestEventListenerTimedTest.java
index 502fc31ec7..546e2ea8c9 100644
--- a/micrometer-jersey2/src/test/java/io/micrometer/jersey2/server/MetricsRequestEventListenerTimedTest.java
+++ b/micrometer-jersey2/src/test/java/io/micrometer/jersey2/server/MetricsRequestEventListenerTimedTest.java
@@ -23,7 +23,7 @@
import io.micrometer.jersey2.server.resources.TimedResource;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import javax.ws.rs.ProcessingException;
import javax.ws.rs.core.Application;
@@ -40,7 +40,7 @@
/**
* @author Michael Weirauch
*/
-public class MetricsRequestEventListenerTimedTest extends JerseyTest {
+class MetricsRequestEventListenerTimedTest extends JerseyTest {
static {
Logger.getLogger("org.glassfish.jersey").setLevel(Level.OFF);
@@ -73,7 +73,7 @@ protected Application configure() {
}
@Test
- public void resourcesAndNotFoundsAreNotAutoTimed() {
+ void resourcesAndNotFoundsAreNotAutoTimed() {
target("not-timed").request().get();
target("not-found").request().get();
@@ -85,7 +85,7 @@ public void resourcesAndNotFoundsAreNotAutoTimed() {
}
@Test
- public void resourcesWithAnnotationAreTimed() {
+ void resourcesWithAnnotationAreTimed() {
target("timed").request().get();
target("multi-timed").request().get();
@@ -103,7 +103,7 @@ public void resourcesWithAnnotationAreTimed() {
}
@Test
- public void longTaskTimerSupported() throws InterruptedException, ExecutionException {
+ void longTaskTimerSupported() throws InterruptedException, ExecutionException {
final Future future = target("long-timed").request().async().get();
/*
@@ -136,14 +136,14 @@ public void longTaskTimerSupported() throws InterruptedException, ExecutionExcep
}
@Test
- public void unnamedLongTaskTimerIsNotSupported() {
+ void unnamedLongTaskTimerIsNotSupported() {
assertThatExceptionOfType(ProcessingException.class)
.isThrownBy(() -> target("long-timed-unnamed").request().get())
.withCauseInstanceOf(IllegalArgumentException.class);
}
@Test
- public void classLevelAnnotationIsInherited() {
+ void classLevelAnnotationIsInherited() {
target("/class/inherited").request().get();
assertThat(registry.get(METRIC_NAME)
@@ -154,7 +154,7 @@ public void classLevelAnnotationIsInherited() {
}
@Test
- public void methodLevelAnnotationOverridesClassLevel() {
+ void methodLevelAnnotationOverridesClassLevel() {
target("/class/on-method").request().get();
assertThat(registry.get(METRIC_NAME)
diff --git a/samples/micrometer-samples-jersey3/build.gradle b/samples/micrometer-samples-jersey3/build.gradle
index 27be0de671..53d9e2ade0 100644
--- a/samples/micrometer-samples-jersey3/build.gradle
+++ b/samples/micrometer-samples-jersey3/build.gradle
@@ -8,9 +8,6 @@ dependencies {
implementation 'org.glassfish.jersey.containers:jersey-container-jdk-http:3.+'
runtimeOnly 'org.glassfish.jersey.inject:jersey-hk2:3.+'
+ testImplementation project(':micrometer-test')
testImplementation 'org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jdk-http:3.+'
- testImplementation 'org.junit.jupiter:junit-jupiter'
- // See https://github.com/eclipse-ee4j/jersey/issues/3662
- testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
- testImplementation 'org.assertj:assertj-core'
}
diff --git a/samples/micrometer-samples-jersey3/src/test/java/io/micrometer/samples/jersey3/Jersey3Test.java b/samples/micrometer-samples-jersey3/src/test/java/io/micrometer/samples/jersey3/Jersey3Test.java
index 05f3c6b18f..569a674033 100644
--- a/samples/micrometer-samples-jersey3/src/test/java/io/micrometer/samples/jersey3/Jersey3Test.java
+++ b/samples/micrometer-samples-jersey3/src/test/java/io/micrometer/samples/jersey3/Jersey3Test.java
@@ -23,13 +23,13 @@
import jakarta.ws.rs.core.Application;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.concurrent.TimeUnit;
import static org.assertj.core.api.Assertions.assertThat;
-public class Jersey3Test extends JerseyTest {
+class Jersey3Test extends JerseyTest {
static final String TIMER_METRIC_NAME = "http.server.requests";
MeterRegistry registry;
@@ -43,7 +43,7 @@ protected Application configure() {
}
@Test
- public void helloResourceIsTimed() {
+ void helloResourceIsTimed() {
String response = target("hello/Jersey").request().get(String.class);
assertThat(response).isEqualTo("Hello, Jersey");
Timer timer = registry.get(TIMER_METRIC_NAME)