Skip to content

Commit 09917fa

Browse files
committed
Fix bean name for ApiVersionStrategy in WebFlux config
1 parent 279bce7 commit 09917fa

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public WebExceptionHandler responseStatusExceptionHandler() {
136136
@Bean
137137
public RequestMappingHandlerMapping requestMappingHandlerMapping(
138138
@Qualifier("webFluxContentTypeResolver") RequestedContentTypeResolver contentTypeResolver,
139-
@Qualifier("mvcApiVersionStrategy") @Nullable ApiVersionStrategy apiVersionStrategy) {
139+
@Qualifier("webFluxApiVersionStrategy") @Nullable ApiVersionStrategy apiVersionStrategy) {
140140

141141
RequestMappingHandlerMapping mapping = createRequestMappingHandlerMapping();
142142
mapping.setOrder(0);
@@ -188,7 +188,7 @@ protected void configureContentTypeResolver(RequestedContentTypeResolverBuilder
188188
* @since 7.0
189189
*/
190190
@Bean
191-
public @Nullable ApiVersionStrategy mvcApiVersionStrategy() {
191+
public @Nullable ApiVersionStrategy webFluxApiVersionStrategy() {
192192
if (this.apiVersionStrategy == null) {
193193
ApiVersionConfigurer configurer = new ApiVersionConfigurer();
194194
configureApiVersioning(configurer);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ void setup() {
8787
void requestMappingHandlerMapping() {
8888
delegatingConfig.setConfigurers(Collections.singletonList(webFluxConfigurer));
8989
delegatingConfig.requestMappingHandlerMapping(
90-
delegatingConfig.webFluxContentTypeResolver(), delegatingConfig.mvcApiVersionStrategy());
90+
delegatingConfig.webFluxContentTypeResolver(), delegatingConfig.webFluxApiVersionStrategy());
9191

9292
verify(webFluxConfigurer).configureContentTypeResolver(any(RequestedContentTypeResolverBuilder.class));
9393
verify(webFluxConfigurer).addCorsMappings(any(CorsRegistry.class));

0 commit comments

Comments
 (0)