Browse Source

Fix bean name for ApiVersionStrategy in WebFlux config

pull/35258/head
rstoyanchev 5 months ago
parent
commit
09917fad7b
  1. 4
      spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurationSupport.java
  2. 2
      spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebFluxConfigurationTests.java

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

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

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

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

Loading…
Cancel
Save