diff --git a/spring-boot-modules/spring-boot-resilience4j/pom.xml b/spring-boot-modules/spring-boot-resilience4j/pom.xml
index 609bc7fc49..355ef8f92d 100644
--- a/spring-boot-modules/spring-boot-resilience4j/pom.xml
+++ b/spring-boot-modules/spring-boot-resilience4j/pom.xml
@@ -30,12 +30,12 @@
io.github.resilience4j
resilience4j-spring-boot2
- 2.0.2
+ ${resilience4j-spring-boot2.version}
com.fasterxml.jackson.datatype
jackson-datatype-jsr310
- 2.14.2
+ ${jackson-datatype-jsr310.version}
org.springframework.boot
@@ -45,9 +45,15 @@
com.github.tomakehurst
wiremock-jre8
- 2.35.0
+ ${wiremock-jre8.version}
test
+
+ 2.35.0
+ 2.0.2
+ 2.15.2
+
+
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/ResilientAppControllerIntegrationTest.java b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/ResilientAppControllerIntegrationTest.java
index d1951218de..b4378a9248 100644
--- a/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/ResilientAppControllerIntegrationTest.java
+++ b/spring-boot-modules/spring-boot-resilience4j/src/test/java/com/baeldung/resilience4j/eventendpoints/ResilientAppControllerIntegrationTest.java
@@ -8,12 +8,12 @@ import static org.springframework.http.HttpStatus.*;
import com.baeldung.resilience4j.eventendpoints.model.*;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsr310.JSR310Module;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import com.github.tomakehurst.wiremock.client.WireMock;
import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
import java.net.URI;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
import java.util.concurrent.*;
@@ -29,8 +29,10 @@ import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.boot.test.web.server.LocalServerPort;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
+import org.springframework.test.annotation.DirtiesContext;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
class ResilientAppControllerIntegrationTest {
private final Logger LOGGER = LoggerFactory.getLogger(getClass());
@@ -40,7 +42,7 @@ class ResilientAppControllerIntegrationTest {
@LocalServerPort private Integer port;
private static final ObjectMapper objectMapper =
- new ObjectMapper().registerModule(new JSR310Module());
+ new ObjectMapper().registerModule(new JavaTimeModule());
@RegisterExtension
static WireMockExtension EXTERNAL_SERVICE =
@@ -126,8 +128,7 @@ class ResilientAppControllerIntegrationTest {
private List getCircuitBreakerEvents() throws Exception {
String jsonEventsList =
IOUtils.toString(
- new URI("http://localhost:" + port + "/actuator/circuitbreakerevents"),
- Charset.forName("UTF-8"));
+ new URI("http://localhost:" + port + "/actuator/circuitbreakerevents"), StandardCharsets.UTF_8);
CircuitBreakerEvents circuitBreakerEvents =
objectMapper.readValue(jsonEventsList, CircuitBreakerEvents.class);
return circuitBreakerEvents.getCircuitBreakerEvents();
@@ -172,8 +173,7 @@ class ResilientAppControllerIntegrationTest {
private List getRetryEvents() throws Exception {
String jsonEventsList =
IOUtils.toString(
- new URI("http://localhost:" + port + "/actuator/retryevents"),
- Charset.forName("UTF-8"));
+ new URI("http://localhost:" + port + "/actuator/retryevents"), StandardCharsets.UTF_8);
RetryEvents retryEvents = objectMapper.readValue(jsonEventsList, RetryEvents.class);
return retryEvents.getRetryEvents();
}
@@ -197,8 +197,7 @@ class ResilientAppControllerIntegrationTest {
private List getTimeLimiterEvents() throws Exception {
String jsonEventsList =
IOUtils.toString(
- new URI("http://localhost:" + port + "/actuator/timelimiterevents"),
- Charset.forName("UTF-8"));
+ new URI("http://localhost:" + port + "/actuator/timelimiterevents"), StandardCharsets.UTF_8);
TimeLimiterEvents timeLimiterEvents =
objectMapper.readValue(jsonEventsList, TimeLimiterEvents.class);
return timeLimiterEvents.getTimeLimiterEvents();
@@ -256,8 +255,7 @@ class ResilientAppControllerIntegrationTest {
private List getBulkheadEvents() throws Exception {
String jsonEventsList =
IOUtils.toString(
- new URI("http://localhost:" + port + "/actuator/bulkheadevents"),
- Charset.forName("UTF-8"));
+ new URI("http://localhost:" + port + "/actuator/bulkheadevents"), StandardCharsets.UTF_8);
BulkheadEvents bulkheadEvents = objectMapper.readValue(jsonEventsList, BulkheadEvents.class);
return bulkheadEvents.getBulkheadEvents();
}
@@ -310,8 +308,7 @@ class ResilientAppControllerIntegrationTest {
private List getRateLimiterEvents() throws Exception {
String jsonEventsList =
IOUtils.toString(
- new URI("http://localhost:" + port + "/actuator/ratelimiterevents"),
- Charset.forName("UTF-8"));
+ new URI("http://localhost:" + port + "/actuator/ratelimiterevents"), StandardCharsets.UTF_8);
RateLimiterEvents rateLimiterEvents =
objectMapper.readValue(jsonEventsList, RateLimiterEvents.class);
return rateLimiterEvents.getRateLimiterEvents();