root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '3.4.x' into 3.5.x 

Closes gh-46174
This commit is contained in:
Moritz Halbritter 2025-06-23 15:08:33 +02:00
parent a0f22e3043 e2571a41bf
commit 250027d93e
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfiguration.java
View File

@ -18,10 +18,12 @@ package org.springframework.boot.autoconfigure.reactor;
import reactor.core.publisher.Hooks;
import org.springframework.boot.LazyInitializationExcludeFilter;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
/**
* {@link EnableAutoConfiguration Auto-configuration} for Reactor.
@ -40,4 +42,9 @@ public class ReactorAutoConfiguration {
}
}
@Bean
static LazyInitializationExcludeFilter reactorAutoConfigurationLazyInitializationExcludeFilter() {
return LazyInitializationExcludeFilter.forBeanTypes(ReactorAutoConfiguration.class);
}
}

28
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfigurationTests.java
View File

@ -28,6 +28,7 @@ import reactor.core.publisher.Hooks;
import reactor.core.publisher.Mono;
import reactor.util.context.Context;
import org.springframework.boot.LazyInitializationBeanFactoryPostProcessor;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@ -81,13 +82,26 @@ class ReactorAutoConfigurationTests {
@Test
void shouldConfigurePropagationIfSetToAuto() {
AtomicReference<String> threadLocalValue = new AtomicReference<>();
this.contextRunner.withPropertyValues("spring.reactor.context-propagation=auto").run((applicationContext) -> {
Mono.just("test")
.doOnNext((element) -> threadLocalValue.set(THREADLOCAL_VALUE.get()))
.contextWrite(Context.of(THREADLOCAL_KEY, "updated"))
.block();
assertThat(threadLocalValue.get()).isEqualTo("updated");
});
this.contextRunner.withPropertyValues("spring.reactor.context-propagation=auto")
.run((applicationContext) -> assertThatPropagationIsWorking(threadLocalValue));
}
@Test
void shouldConfigurePropagationIfSetToAutoAndLazyInitializationIsEnabled() {
AtomicReference<String> threadLocalValue = new AtomicReference<>();
this.contextRunner
.withInitializer(
(context) -> context.addBeanFactoryPostProcessor(new LazyInitializationBeanFactoryPostProcessor()))
.withPropertyValues("spring.reactor.context-propagation=auto")
.run((context) -> assertThatPropagationIsWorking(threadLocalValue));
}
private void assertThatPropagationIsWorking(AtomicReference<String> threadLocalValue) {
Mono.just("test")
.doOnNext((element) -> threadLocalValue.set(THREADLOCAL_VALUE.get()))
.contextWrite(Context.of(THREADLOCAL_KEY, "updated"))
.block();
assertThat(threadLocalValue.get()).isEqualTo("updated");
}
}