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

Fix bean name for ApiVersionStrategy in WebFlux config
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
Deploy Docs / Dispatch docs deployment (push) Waiting to run Details

This commit is contained in:
rstoyanchev 2025-07-30 13:55:00 +01:00
parent 279bce7124
commit 09917fad7b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurationSupport.java
View File

@ -136,7 +136,7 @@ public class WebFluxConfigurationSupport implements ApplicationContextAware {
@Bean @Bean
public RequestMappingHandlerMapping requestMappingHandlerMapping( public RequestMappingHandlerMapping requestMappingHandlerMapping(
@Qualifier("webFluxContentTypeResolver") RequestedContentTypeResolver contentTypeResolver, @Qualifier("webFluxContentTypeResolver") RequestedContentTypeResolver contentTypeResolver,
@Qualifier("mvcApiVersionStrategy") @Nullable ApiVersionStrategy apiVersionStrategy) { @Qualifier("webFluxApiVersionStrategy") @Nullable ApiVersionStrategy apiVersionStrategy) {
RequestMappingHandlerMapping mapping = createRequestMappingHandlerMapping(); RequestMappingHandlerMapping mapping = createRequestMappingHandlerMapping();
mapping.setOrder(0); mapping.setOrder(0);
@ -188,7 +188,7 @@ public class WebFluxConfigurationSupport implements ApplicationContextAware {
* @since 7.0 * @since 7.0
*/ */
@Bean @Bean
public @Nullable ApiVersionStrategy mvcApiVersionStrategy() { public @Nullable ApiVersionStrategy webFluxApiVersionStrategy() {
if (this.apiVersionStrategy == null) { if (this.apiVersionStrategy == null) {
ApiVersionConfigurer configurer = new ApiVersionConfigurer(); ApiVersionConfigurer configurer = new ApiVersionConfigurer();
configureApiVersioning(configurer); configureApiVersioning(configurer);

2
spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebFluxConfigurationTests.java
View File

@ -87,7 +87,7 @@ public class DelegatingWebFluxConfigurationTests {
void requestMappingHandlerMapping() { void requestMappingHandlerMapping() {
delegatingConfig.setConfigurers(Collections.singletonList(webFluxConfigurer)); delegatingConfig.setConfigurers(Collections.singletonList(webFluxConfigurer));
delegatingConfig.requestMappingHandlerMapping( delegatingConfig.requestMappingHandlerMapping(
delegatingConfig.webFluxContentTypeResolver(), delegatingConfig.mvcApiVersionStrategy()); delegatingConfig.webFluxContentTypeResolver(), delegatingConfig.webFluxApiVersionStrategy());
verify(webFluxConfigurer).configureContentTypeResolver(any(RequestedContentTypeResolverBuilder.class)); verify(webFluxConfigurer).configureContentTypeResolver(any(RequestedContentTypeResolverBuilder.class));
verify(webFluxConfigurer).addCorsMappings(any(CorsRegistry.class)); verify(webFluxConfigurer).addCorsMappings(any(CorsRegistry.class));