From 0f5990c820c3628d236329cee40434b99911fd43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Nov 2025 22:01:16 +0000 Subject: [PATCH 1/4] build(deps): bump org.springframework.boot:spring-boot-starter-parent Bumps [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 3.5.7 to 4.0.0. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.5.7...v4.0.0) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-parent dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- opbeans/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opbeans/pom.xml b/opbeans/pom.xml index 111b80a..12d4913 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 From fe2e868981d61ecc5d48f2c06d1b7b469352ff41 Mon Sep 17 00:00:00 2001 From: Jack Shirazi Date: Mon, 24 Nov 2025 19:23:59 +0000 Subject: [PATCH 2/4] fix signature --- .../co/elastic/apm/opbeans/controllers/DTInterceptor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 5db86fa..9d69e65 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; @@ -100,7 +102,7 @@ public boolean hasError(ClientHttpResponse httpResponse) throws IOException { } @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()); } } From fd118fdd3c2fe0ccfe81f6f0fd47b83a383a54d9 Mon Sep 17 00:00:00 2001 From: Jack Shirazi Date: Mon, 24 Nov 2025 19:37:05 +0000 Subject: [PATCH 3/4] fix signature again --- .../java/co/elastic/apm/opbeans/controllers/DTInterceptor.java | 1 - 1 file changed, 1 deletion(-) 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 9d69e65..6cd2810 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 @@ -101,7 +101,6 @@ public boolean hasError(ClientHttpResponse httpResponse) throws IOException { || httpResponse.getStatusCode().is5xxServerError()); } - @Override public void handleError(HttpMethod method, URI url, ClientHttpResponse httpResponse) throws IOException { throw new RestCallException(httpResponse.getStatusCode().value(), httpResponse.getStatusText()); } From 0ce8cd043ee1ce817e98191e6e7e32f796451662 Mon Sep 17 00:00:00 2001 From: Jack Shirazi Date: Mon, 24 Nov 2025 20:16:28 +0000 Subject: [PATCH 4/4] fix signature again again --- opbeans/pom.xml | 9 +++++++-- .../co/elastic/apm/opbeans/OpbeansApplicationTests.java | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/opbeans/pom.xml b/opbeans/pom.xml index 12d4913..d06541d 100644 --- a/opbeans/pom.xml +++ b/opbeans/pom.xml @@ -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/test/java/co/elastic/apm/opbeans/OpbeansApplicationTests.java b/opbeans/src/test/java/co/elastic/apm/opbeans/OpbeansApplicationTests.java index 91b9c94..c762fa0 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;