diff --git a/opbeans/pom.xml b/opbeans/pom.xml index 111b80ae..d06541d2 100644 --- a/opbeans/pom.xml +++ b/opbeans/pom.xml @@ -19,7 +19,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.7 + 4.0.0 @@ -107,8 +107,8 @@ spring-boot-starter-jersey - org.springframework.boot - spring-boot-starter-web + org.springframework.boot + spring-boot-starter-webmvc org.postgresql @@ -127,6 +127,11 @@ spring-boot-starter-test test + + org.springframework.boot + spring-boot-starter-webmvc-test + test + org.javassist javassist diff --git a/opbeans/src/main/java/co/elastic/apm/opbeans/controllers/DTInterceptor.java b/opbeans/src/main/java/co/elastic/apm/opbeans/controllers/DTInterceptor.java index 5db86fa9..6cd28104 100644 --- a/opbeans/src/main/java/co/elastic/apm/opbeans/controllers/DTInterceptor.java +++ b/opbeans/src/main/java/co/elastic/apm/opbeans/controllers/DTInterceptor.java @@ -1,6 +1,7 @@ package co.elastic.apm.opbeans.controllers; import java.io.IOException; +import java.net.URI; import java.util.Arrays; import java.util.Random; @@ -10,6 +11,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.env.Environment; +import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.ResponseErrorHandler; @@ -99,8 +101,7 @@ public boolean hasError(ClientHttpResponse httpResponse) throws IOException { || httpResponse.getStatusCode().is5xxServerError()); } - @Override - public void handleError(ClientHttpResponse httpResponse) throws IOException { + public void handleError(HttpMethod method, URI url, ClientHttpResponse httpResponse) throws IOException { throw new RestCallException(httpResponse.getStatusCode().value(), httpResponse.getStatusText()); } } diff --git a/opbeans/src/test/java/co/elastic/apm/opbeans/OpbeansApplicationTests.java b/opbeans/src/test/java/co/elastic/apm/opbeans/OpbeansApplicationTests.java index 91b9c947..c762fa02 100644 --- a/opbeans/src/test/java/co/elastic/apm/opbeans/OpbeansApplicationTests.java +++ b/opbeans/src/test/java/co/elastic/apm/opbeans/OpbeansApplicationTests.java @@ -2,7 +2,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.web.servlet.MockMvc; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;