This is an automated email from the ASF dual-hosted git repository. Croway pushed a commit to branch ci-issue/fix-circular-dependency-spring-boot-4 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 592cab1a1a5dc1bed8d2881dee4e56ae535097f8 Author: Croway <[email protected]> AuthorDate: Mon May 4 16:33:35 2026 +0200 ci: replace @LocalServerPort with Environment in platform-http tests local.server.port is set during finishRefresh() but beans registered via @SpringBootTest(classes=...) are created during finishBeanFactoryInitialization() — before the server port is assigned. This timing issue was exposed by Spring Framework 7.0.7. Use Environment.getRequiredProperty() in @BeforeEach instead, which resolves the port at test execution time after the context is fully initialized. --- .../platform/http/springboot/PlatformHttpBinaryUploadTest.java | 9 +++++---- .../platform/http/springboot/PlatformHttpStreamingTest.java | 9 +++++---- .../springboot/SpringBootPlatformHttpBridgedEndpointTest.java | 9 +++++---- .../springboot/SpringBootPlatformHttpCamelIntegrationsTest.java | 8 ++++---- .../http/springboot/SpringBootPlatformHttpCertificationTest.java | 8 ++++---- .../http/springboot/SpringBootPlatformHttpContextPathTest.java | 8 ++++---- .../http/springboot/SpringBootPlatformHttpCookiesTest.java | 8 ++++---- .../springboot/SpringBootPlatformHttpCorsCredentialsTest.java | 9 +++++---- .../platform/http/springboot/SpringBootPlatformHttpCorsTest.java | 9 +++++---- .../http/springboot/SpringBootPlatformHttpEngineTest.java | 8 ++++---- .../SpringBootPlatformHttpHeaderFilterStrategyTest.java | 9 +++++---- .../springboot/SpringBootPlatformHttpJacksonConverterTest.java | 8 ++++---- .../http/springboot/SpringBootPlatformHttpOptionsTest.java | 9 +++++---- .../http/springboot/SpringBootPlatformHttpProxyTest.java | 8 ++++---- .../http/springboot/SpringBootPlatformHttpResponseCodeTest.java | 9 +++++---- .../SpringBootPlatformHttpServerRequestValidationFalseTest.java | 9 +++++---- .../SpringBootPlatformHttpServerRequestValidationTrueTest.java | 9 +++++---- .../http/springboot/SpringBootPlatformHttpSessionTest.java | 8 ++++---- .../http/springboot/SpringBootPlatformHttpTypeConverterTest.java | 8 ++++---- .../http/springboot/SpringBootPlatformHttpValidationTest.java | 8 ++++---- 20 files changed, 90 insertions(+), 80 deletions(-) diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpBinaryUploadTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpBinaryUploadTest.java index 40e2c612c81..41137e0f16d 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpBinaryUploadTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpBinaryUploadTest.java @@ -26,7 +26,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -57,8 +58,8 @@ public class PlatformHttpBinaryUploadTest { static final String FILE_NAME = "example.pdf"; static Path uploadDir; - @LocalServerPort - private int port; + @Autowired + private Environment env; @BeforeAll public static void createUploadDir() throws IOException { @@ -73,7 +74,7 @@ public class PlatformHttpBinaryUploadTest { @BeforeEach public void setUp() { - RestAssured.port = port; + RestAssured.port = env.getRequiredProperty("local.server.port", Integer.class); } @Test diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpStreamingTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpStreamingTest.java index 90499e70fe7..673cf6e7554 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpStreamingTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/PlatformHttpStreamingTest.java @@ -26,7 +26,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -53,12 +54,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; PlatformHttpComponentAutoConfiguration.class, SpringBootPlatformHttpAutoConfiguration.class }) public class PlatformHttpStreamingTest { - @LocalServerPort - private int port; + @Autowired + private Environment env; @BeforeEach public void setUp() { - RestAssured.port = port; + RestAssured.port = env.getRequiredProperty("local.server.port", Integer.class); } @Test diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpBridgedEndpointTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpBridgedEndpointTest.java index c2d1b71afa8..126c8d4d61e 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpBridgedEndpointTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpBridgedEndpointTest.java @@ -28,7 +28,8 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -49,8 +50,8 @@ import static org.hamcrest.Matchers.containsString; @Disabled("WireMock 3.10.6 has Jetty compatibility issues with Spring Boot 4 - requires WireMock upgrade to support Jetty 12") public class SpringBootPlatformHttpBridgedEndpointTest { - @LocalServerPort - private Integer port; + @Autowired + private Environment env; @BeforeEach void setUp() { @@ -92,7 +93,7 @@ public class SpringBootPlatformHttpBridgedEndpointTest { @Test public void bridgedEndpointTest() { - final var proxyURI = "http://localhost:%s/mock".formatted(port); + final var proxyURI = "http://localhost:%s/mock".formatted(env.getRequiredProperty("local.server.port")); given() .contentType(ContentType.JSON) diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelIntegrationsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelIntegrationsTest.java index fc22bd5a042..4f3f3991257 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelIntegrationsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCamelIntegrationsTest.java @@ -28,7 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.test.web.servlet.client.RestTestClient; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.core.env.Environment; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient; @@ -51,12 +51,12 @@ public class SpringBootPlatformHttpCamelIntegrationsTest { @Autowired CamelContext camelContext; - @LocalServerPort - private Integer port; + @Autowired + private Environment env; @BeforeEach void setUp() { - RestAssured.port = port; + RestAssured.port = env.getRequiredProperty("local.server.port", Integer.class); } @Configuration diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCertificationTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCertificationTest.java index 0ce16eb0077..4788f9d62fa 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCertificationTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCertificationTest.java @@ -55,7 +55,7 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.web.SecurityFilterChain; import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.core.env.Environment; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.web.servlet.client.EntityExchangeResult; @@ -77,12 +77,12 @@ public class SpringBootPlatformHttpCertificationTest extends PlatformHttpBase { private static final String postRouteId = "SpringBootPlatformHttpRestDSLTest_mypost"; private static final String getRouteId = "SpringBootPlatformHttpRestDSLTest_myget"; - @LocalServerPort - private Integer port; + @Autowired + private Environment env; @BeforeEach void setUp() { - RestAssured.port = port; + RestAssured.port = env.getRequiredProperty("local.server.port", Integer.class); } @Configuration diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpContextPathTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpContextPathTest.java index 9d3b87c163e..78d26d27906 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpContextPathTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpContextPathTest.java @@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.core.env.Environment; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -45,12 +45,12 @@ import static org.hamcrest.Matchers.equalTo; properties = { "server.servlet.context-path=/test", "camel.rest.context-path=/api" }) public class SpringBootPlatformHttpContextPathTest { - @LocalServerPort - private Integer port; + @Autowired + private Environment env; @BeforeEach void setUp() { - RestAssured.port = port; + RestAssured.port = env.getRequiredProperty("local.server.port", Integer.class); } @Configuration diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCookiesTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCookiesTest.java index 53228b76db5..1a385b1521b 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCookiesTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCookiesTest.java @@ -35,7 +35,7 @@ import org.springframework.security.web.SecurityFilterChain; import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient; import org.springframework.test.web.servlet.client.RestTestClient; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.core.env.Environment; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -59,12 +59,12 @@ public class SpringBootPlatformHttpCookiesTest { @Autowired CamelContext camelContext; - @LocalServerPort - private Integer port; + @Autowired + private Environment env; @BeforeEach void setUp() { - RestAssured.port = port; + RestAssured.port = env.getRequiredProperty("local.server.port", Integer.class); } @Configuration diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsCredentialsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsCredentialsTest.java index 0cfe482f0f2..70a99bb6d46 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsCredentialsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsCredentialsTest.java @@ -25,7 +25,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -41,12 +42,12 @@ import static org.hamcrest.Matchers.*; PlatformHttpComponentAutoConfiguration.class, SpringBootPlatformHttpAutoConfiguration.class, }) public class SpringBootPlatformHttpCorsCredentialsTest { - @LocalServerPort - private Integer port; + @Autowired + private Environment env; @BeforeEach void setUp() { - RestAssured.port = port; + RestAssured.port = env.getRequiredProperty("local.server.port", Integer.class); RestAssured.enableLoggingOfRequestAndResponseIfValidationFails(); } diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsTest.java index 21586af58c2..f523de0821b 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpCorsTest.java @@ -25,7 +25,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -43,12 +44,12 @@ import static org.hamcrest.Matchers.not; PlatformHttpComponentAutoConfiguration.class, SpringBootPlatformHttpAutoConfiguration.class, }) public class SpringBootPlatformHttpCorsTest { - @LocalServerPort - private Integer port; + @Autowired + private Environment env; @BeforeEach void setUp() { - RestAssured.port = port; + RestAssured.port = env.getRequiredProperty("local.server.port", Integer.class); RestAssured.enableLoggingOfRequestAndResponseIfValidationFails(); } diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngineTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngineTest.java index fbf08364a7f..04f0d4946a1 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngineTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpEngineTest.java @@ -35,7 +35,7 @@ import org.springframework.security.web.SecurityFilterChain; import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient; import org.springframework.test.web.servlet.client.RestTestClient; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.core.env.Environment; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -69,12 +69,12 @@ public class SpringBootPlatformHttpEngineTest { @Autowired CamelContext camelContext; - @LocalServerPort - private Integer port; + @Autowired + private Environment env; @BeforeEach void setUp() { - RestAssured.port = port; + RestAssured.port = env.getRequiredProperty("local.server.port", Integer.class); } private static final List<String> attachmentIds = new ArrayList<>(); diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpHeaderFilterStrategyTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpHeaderFilterStrategyTest.java index bfbe92d0d2e..a48bcfad012 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpHeaderFilterStrategyTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpHeaderFilterStrategyTest.java @@ -25,7 +25,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -42,12 +43,12 @@ import static org.hamcrest.Matchers.equalTo; PlatformHttpComponentAutoConfiguration.class, SpringBootPlatformHttpAutoConfiguration.class }) public class SpringBootPlatformHttpHeaderFilterStrategyTest { - @LocalServerPort - private Integer port; + @Autowired + private Environment env; @BeforeEach void setUp() { - RestAssured.port = port; + RestAssured.port = env.getRequiredProperty("local.server.port", Integer.class); } @Test diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpJacksonConverterTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpJacksonConverterTest.java index b6c78cd0d94..74f5cc01372 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpJacksonConverterTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpJacksonConverterTest.java @@ -31,7 +31,7 @@ import org.springframework.security.web.SecurityFilterChain; import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient; import org.springframework.test.web.servlet.client.RestTestClient; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.core.env.Environment; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -52,12 +52,12 @@ public class SpringBootPlatformHttpJacksonConverterTest { @Autowired CamelContext camelContext; - @LocalServerPort - private Integer port; + @Autowired + private Environment env; @BeforeEach void setUp() { - RestAssured.port = port; + RestAssured.port = env.getRequiredProperty("local.server.port", Integer.class); } @Configuration diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpOptionsTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpOptionsTest.java index 6205aee1c0c..d7fc40e5899 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpOptionsTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpOptionsTest.java @@ -24,7 +24,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -41,12 +42,12 @@ import static org.hamcrest.Matchers.not; PlatformHttpComponentAutoConfiguration.class, SpringBootPlatformHttpAutoConfiguration.class, }) public class SpringBootPlatformHttpOptionsTest { - @LocalServerPort - private Integer port; + @Autowired + private Environment env; @BeforeEach void setUp() { - RestAssured.port = port; + RestAssured.port = env.getRequiredProperty("local.server.port", Integer.class); RestAssured.enableLoggingOfRequestAndResponseIfValidationFails(); } diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpProxyTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpProxyTest.java index 62048aceed1..8e122c5b95c 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpProxyTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpProxyTest.java @@ -35,7 +35,7 @@ import org.springframework.security.web.SecurityFilterChain; import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient; import org.springframework.test.web.servlet.client.RestTestClient; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.core.env.Environment; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.wiremock.spring.ConfigureWireMock; @@ -66,12 +66,12 @@ public class SpringBootPlatformHttpProxyTest { @Autowired CamelContext camelContext; - @LocalServerPort - private Integer port; + @Autowired + private Environment env; @BeforeEach void setUp() { - RestAssured.port = port; + RestAssured.port = env.getRequiredProperty("local.server.port", Integer.class); WireMock.stubFor(get(urlPathEqualTo("/")) .willReturn(aResponse() .withBody( diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpResponseCodeTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpResponseCodeTest.java index 21a5ca9db6a..787f921236e 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpResponseCodeTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpResponseCodeTest.java @@ -25,7 +25,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -42,12 +43,12 @@ import static org.hamcrest.Matchers.equalTo; PlatformHttpComponentAutoConfiguration.class, SpringBootPlatformHttpAutoConfiguration.class }) public class SpringBootPlatformHttpResponseCodeTest { - @LocalServerPort - private Integer port; + @Autowired + private Environment env; @BeforeEach void setUp() { - RestAssured.port = port; + RestAssured.port = env.getRequiredProperty("local.server.port", Integer.class); } @Test diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpServerRequestValidationFalseTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpServerRequestValidationFalseTest.java index 4355d294542..8c34698fb8b 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpServerRequestValidationFalseTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpServerRequestValidationFalseTest.java @@ -26,7 +26,8 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -42,12 +43,12 @@ import static org.hamcrest.Matchers.is; PlatformHttpComponentAutoConfiguration.class, SpringBootPlatformHttpAutoConfiguration.class,}) public class SpringBootPlatformHttpServerRequestValidationFalseTest { - @LocalServerPort - private Integer port; + @Autowired + private Environment env; @BeforeEach void setUp() { - RestAssured.port = port; + RestAssured.port = env.getRequiredProperty("local.server.port", Integer.class); } // ************************************* diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpServerRequestValidationTrueTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpServerRequestValidationTrueTest.java index 9244ba9b558..c891abdb942 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpServerRequestValidationTrueTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpServerRequestValidationTrueTest.java @@ -26,7 +26,8 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -42,12 +43,12 @@ import static org.hamcrest.Matchers.is; PlatformHttpComponentAutoConfiguration.class, SpringBootPlatformHttpAutoConfiguration.class,}) public class SpringBootPlatformHttpServerRequestValidationTrueTest { - @LocalServerPort - private Integer port; + @Autowired + private Environment env; @BeforeEach void setUp() { - RestAssured.port = port; + RestAssured.port = env.getRequiredProperty("local.server.port", Integer.class); } // ************************************* diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpSessionTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpSessionTest.java index d47f233518f..d6831f254a6 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpSessionTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpSessionTest.java @@ -32,7 +32,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient; import org.springframework.test.web.servlet.client.RestTestClient; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.core.env.Environment; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.Customizer; @@ -60,12 +60,12 @@ public class SpringBootPlatformHttpSessionTest { @Autowired CamelContext camelContext; - @LocalServerPort - private Integer port; + @Autowired + private Environment env; @BeforeEach void setUp() { - RestAssured.port = port; + RestAssured.port = env.getRequiredProperty("local.server.port", Integer.class); } @Configuration diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTypeConverterTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTypeConverterTest.java index 5a02ac59a70..758f30aff5f 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTypeConverterTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpTypeConverterTest.java @@ -30,7 +30,7 @@ import org.springframework.security.web.SecurityFilterChain; import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient; import org.springframework.test.web.servlet.client.RestTestClient; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.core.env.Environment; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -57,12 +57,12 @@ public class SpringBootPlatformHttpTypeConverterTest { @Autowired CamelContext camelContext; - @LocalServerPort - private Integer port; + @Autowired + private Environment env; @BeforeEach void setUp() { - RestAssured.port = port; + RestAssured.port = env.getRequiredProperty("local.server.port", Integer.class); } @Configuration diff --git a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpValidationTest.java b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpValidationTest.java index 205576f9139..48babd8e8ba 100644 --- a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpValidationTest.java +++ b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpValidationTest.java @@ -36,7 +36,7 @@ import org.springframework.security.web.SecurityFilterChain; import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureRestTestClient; import org.springframework.test.web.servlet.client.RestTestClient; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.core.env.Environment; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -61,12 +61,12 @@ public class SpringBootPlatformHttpValidationTest { @Autowired CamelContext camelContext; - @LocalServerPort - private Integer port; + @Autowired + private Environment env; @BeforeEach void setUp() { - RestAssured.port = port; + RestAssured.port = env.getRequiredProperty("local.server.port", Integer.class); } @Configuration
