Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Spring Framework 6.1.0-M1

Browse Source 
Closes gh-35977
Closes gh-35980
This commit is contained in:
Andy Wilkinson
2023-06-19 09:57:27 +01:00
parent 4dc0b26eea
commit ca5bd37e81
20 changed files with 78 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java
View File

@@ -1021,9 +1021,6 @@ public class TestRestTemplate {
if (settings.connectTimeout() != null) {
setConnectTimeout((int) settings.connectTimeout().toMillis());
}
if (settings.bufferRequestBody() != null) {
setBufferRequestBody(settings.bufferRequestBody());
}
}
private HttpClient createHttpClient(Duration readTimeout, boolean ssl) {

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootContextLoaderTests.java
View File

@@ -255,7 +255,7 @@ class SpringBootContextLoaderTests {
private Map<String, Object> getMergedContextConfigurationProperties(Class<?> testClass) {
TestContext context = new ExposedTestContextManager(testClass).getExposedTestContext();
MergedContextConfiguration config = (MergedContextConfiguration) ReflectionTestUtils.getField(context,
"mergedContextConfiguration");
"mergedConfig");
return TestPropertySourceUtils.convertInlinedPropertiesToMap(config.getPropertySourceProperties());
}

2
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/bootstrap/SpringBootTestContextBootstrapperTests.java
View File

@@ -110,7 +110,7 @@ class SpringBootTestContextBootstrapperTests {
}
private MergedContextConfiguration getMergedContextConfiguration(TestContext context) {
return (MergedContextConfiguration) ReflectionTestUtils.getField(context, "mergedContextConfiguration");
return (MergedContextConfiguration) ReflectionTestUtils.getField(context, "mergedConfig");
}
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)