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

Merge branch '3.4.x'

Browse Source
This commit is contained in:
Phillip Webb
2025-04-11 09:42:20 -07:00
parent 0d4b1dc9a4 35dc8e6f88
commit 75824bb9c7
25 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunner.java
View File

@@ -509,9 +509,9 @@ public abstract class AbstractApplicationContextRunner<SELF extends AbstractAppl
private final Class<?>[] additionalContextInterfaces;
private boolean allowBeanDefinitionOverriding = false;
private boolean allowBeanDefinitionOverriding;
private boolean allowCircularReferences = false;
private boolean allowCircularReferences;
private List<ApplicationContextInitializer<? super C>> initializers = Collections.emptyList();

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

@@ -68,7 +68,7 @@ public class MockServerRestClientCustomizer implements RestClientCustomizer {
private final Supplier<? extends RequestExpectationManager> expectationManagerSupplier;
private boolean bufferContent = false;
private boolean bufferContent;
public MockServerRestClientCustomizer() {
this(SimpleRequestExpectationManager::new);

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

@@ -70,7 +70,7 @@ public class MockServerRestTemplateCustomizer implements RestTemplateCustomizer
private boolean detectRootUri = true;
private boolean bufferContent = false;
private boolean bufferContent;
public MockServerRestTemplateCustomizer() {
this(SimpleRequestExpectationManager::new);