spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 20:19:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.5.x'

Browse Source 
Closes gh-48500
This commit is contained in:
Andy Wilkinson
2025-12-11 14:57:29 +00:00
parent 192efca36e 5400539ba8
commit 3873f25eee
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-test/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/web/server/test/AbstractSpringBootTestEmbeddedReactiveWebEnvironmentTests.java
-2
View File
@@ -33,7 +33,6 @@ import org.springframework.boot.web.server.reactive.ReactiveWebServerFactory;
import org.springframework.boot.webtestclient.autoconfigure.AutoConfigureWebTestClient;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.http.server.reactive.HttpHandler;
import org.springframework.test.web.reactive.server.WebTestClient;
@@ -101,7 +100,6 @@ abstract class AbstractSpringBootTestEmbeddedReactiveWebEnvironmentTests {
assertThat(this.value).isEqualTo(123);
}
@Configuration(proxyBeanMethods = false)
static class AbstractConfig {
@Value("${server.port:8080}")
integration-test/spring-boot-test-integration-tests/src/test/java/org/springframework/boot/web/server/test/AbstractSpringBootTestWebServerWebEnvironmentTests.java
-2
View File
@@ -29,7 +29,6 @@ import org.springframework.boot.test.web.server.LocalServerPort;
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
import org.springframework.boot.web.server.servlet.ServletWebServerFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.test.web.servlet.client.RestTestClient;
import org.springframework.test.web.servlet.client.RestTestClient.ResponseSpec;
@@ -108,7 +107,6 @@ abstract class AbstractSpringBootTestWebServerWebEnvironmentTests {
assertThat(this.context).isSameAs(WebApplicationContextUtils.getWebApplicationContext(this.servletContext));
}
@Configuration(proxyBeanMethods = false)
static class AbstractConfig {
@Value("${server.port:8080}")