Adds new ApiVersionCustomizer

This allows users to create beans to customize ApiVersionConfigurer.

Author: spencergibb

module/spring-boot-webflux/src/main/java/org/springframework/boot/webflux/autoconfigure/ApiVersionCustomizer.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2012-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.webflux.autoconfigure;
+
+import org.springframework.web.reactive.config.ApiVersionConfigurer;
+
+/**
+ * Customizer that can be used to modify the auto-configured
+ * {@link ApiVersionConfigurer}
+ *
+ * @author Spencer Gibb
+ * @since 4.0.0
+ */
+public interface ApiVersionCustomizer {
+
+	/**
+	 * Customize the given configurer.
+	 * @param apiVersionConfigurer the configurer to customize
+	 */
+	void customize(ApiVersionConfigurer apiVersionConfigurer);
+}

module/spring-boot-webflux/src/main/java/org/springframework/boot/webflux/autoconfigure/WebFluxAutoConfiguration.java

@@ -184,13 +184,16 @@ static class WebFluxConfig implements WebFluxConfigurer {
 
 		private final ObjectProvider<ApiVersionDeprecationHandler> apiVersionDeprecationHandler;
 
+		private final ObjectProvider<ApiVersionCustomizer> apiVersionCustomizers;
+
 		WebFluxConfig(Environment environment, WebProperties webProperties, WebFluxProperties webFluxProperties,
 				ListableBeanFactory beanFactory, ObjectProvider<HandlerMethodArgumentResolver> resolvers,
 				ObjectProvider<CodecCustomizer> codecCustomizers,
 				ObjectProvider<ResourceHandlerRegistrationCustomizer> resourceHandlerRegistrationCustomizers,
 				ObjectProvider<ViewResolver> viewResolvers, ObjectProvider<ApiVersionResolver> apiVersionResolvers,
 				ObjectProvider<ApiVersionParser<?>> apiVersionParser,
-				ObjectProvider<ApiVersionDeprecationHandler> apiVersionDeprecationHandler) {
+				ObjectProvider<ApiVersionDeprecationHandler> apiVersionDeprecationHandler,
+				ObjectProvider<ApiVersionCustomizer> apiVersionCustomizers) {
 			this.environment = environment;
 			this.resourceProperties = webProperties.getResources();
 			this.webFluxProperties = webFluxProperties;
@@ -202,6 +205,7 @@ static class WebFluxConfig implements WebFluxConfigurer {
 			this.apiVersionResolvers = apiVersionResolvers;
 			this.apiVersionParser = apiVersionParser;
 			this.apiVersionDeprecationHandler = apiVersionDeprecationHandler;
+			this.apiVersionCustomizers = apiVersionCustomizers;
 		}
 
 		@Override
@@ -284,6 +288,7 @@ public void configureApiVersioning(ApiVersionConfigurer configurer) {
 			this.apiVersionResolvers.orderedStream().forEach(configurer::useVersionResolver);
 			this.apiVersionParser.ifAvailable(configurer::setVersionParser);
 			this.apiVersionDeprecationHandler.ifAvailable(configurer::setDeprecationHandler);
+			this.apiVersionCustomizers.orderedStream().forEach(customizer -> customizer.customize(configurer));
 		}
 
 		private void configureApiVersioningUse(ApiVersionConfigurer configurer, Use use) {

module/spring-boot-webflux/src/test/java/org/springframework/boot/webflux/autoconfigure/WebFluxAutoConfigurationTests.java

@@ -896,6 +896,7 @@ void apiVersionBeansAreInjected() {
 			assertThat(versionStrategy).extracting("deprecationHandler")
 				.isEqualTo(context.getBean(ApiVersionDeprecationHandler.class));
 			assertThat(versionStrategy).extracting("versionParser").isEqualTo(context.getBean(ApiVersionParser.class));
+			assertThat(versionStrategy).extracting("supportedVersionPredicate").isEqualTo(context.getBean(ApiVersionCustomizer.class));
 		});
 	}
 
@@ -1312,6 +1313,11 @@ ApiVersionParser<String> apiVersionParser() {
 			return (version) -> String.valueOf(version);
 		}
 
+		@Bean
+		ApiVersionCustomizer apiVersionCustomizer() {
+			return configurer -> configurer.setSupportedVersionPredicate(comparable -> true);
+		}
+
 	}
 
 }

module/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/autoconfigure/ApiVersionCustomizer.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2012-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.webmvc.autoconfigure;
+
+
+import org.springframework.web.servlet.config.annotation.ApiVersionConfigurer;
+
+/**
+ * Customizer that can be used to modify the auto-configured
+ * {@link ApiVersionConfigurer}
+ *
+ * @author Spencer Gibb
+ * @since 4.0.0
+ */
+public interface ApiVersionCustomizer {
+
+	/**
+	 * Customize the given configurer.
+	 * @param apiVersionConfigurer the configurer to customize
+	 */
+	void customize(ApiVersionConfigurer apiVersionConfigurer);
+}

module/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/autoconfigure/WebMvcAutoConfiguration.java

@@ -211,14 +211,17 @@ static class WebMvcAutoConfigurationAdapter implements WebMvcConfigurer, Servlet
 
 		private final ObjectProvider<ApiVersionDeprecationHandler> apiVersionDeprecationHandler;
 
+		private final ObjectProvider<ApiVersionCustomizer> apiVersionCustomizers;
+
 		WebMvcAutoConfigurationAdapter(WebProperties webProperties, WebMvcProperties mvcProperties,
 				ListableBeanFactory beanFactory, ObjectProvider<HttpMessageConverters> messageConvertersProvider,
 				ObjectProvider<ResourceHandlerRegistrationCustomizer> resourceHandlerRegistrationCustomizerProvider,
 				ObjectProvider<DispatcherServletPath> dispatcherServletPath,
 				ObjectProvider<ServletRegistrationBean<?>> servletRegistrations,
 				ObjectProvider<ApiVersionResolver> apiVersionResolvers,
 				ObjectProvider<ApiVersionParser<?>> apiVersionParser,
-				ObjectProvider<ApiVersionDeprecationHandler> apiVersionDeprecationHandler) {
+				ObjectProvider<ApiVersionDeprecationHandler> apiVersionDeprecationHandler,
+				ObjectProvider<ApiVersionCustomizer> apiVersionCustomizers) {
 			this.resourceProperties = webProperties.getResources();
 			this.mvcProperties = mvcProperties;
 			this.beanFactory = beanFactory;
@@ -229,6 +232,7 @@ static class WebMvcAutoConfigurationAdapter implements WebMvcConfigurer, Servlet
 			this.apiVersionResolvers = apiVersionResolvers;
 			this.apiVersionParser = apiVersionParser;
 			this.apiVersionDeprecationHandler = apiVersionDeprecationHandler;
+			this.apiVersionCustomizers = apiVersionCustomizers;
 		}
 
 		@Override
@@ -398,6 +402,7 @@ public void configureApiVersioning(ApiVersionConfigurer configurer) {
 			this.apiVersionResolvers.orderedStream().forEach(configurer::useVersionResolver);
 			this.apiVersionParser.ifAvailable(configurer::setVersionParser);
 			this.apiVersionDeprecationHandler.ifAvailable(configurer::setDeprecationHandler);
+			this.apiVersionCustomizers.orderedStream().forEach(customizer -> customizer.customize(configurer));
 		}
 
 		private void configureApiVersioningUse(ApiVersionConfigurer configurer, Use use) {

module/spring-boot-webmvc/src/test/java/org/springframework/boot/webmvc/autoconfigure/WebMvcAutoConfigurationTests.java

@@ -1101,6 +1101,7 @@ void apiVersionBeansAreInjected() {
 			assertThat(versionStrategy).extracting("deprecationHandler")
 				.isEqualTo(context.getBean(ApiVersionDeprecationHandler.class));
 			assertThat(versionStrategy).extracting("versionParser").isEqualTo(context.getBean(ApiVersionParser.class));
+			assertThat(versionStrategy).extracting("supportedVersionPredicate").isEqualTo(context.getBean(ApiVersionCustomizer.class));
 		});
 	}
 
@@ -1683,6 +1684,10 @@ ApiVersionParser<String> apiVersionParser() {
 			return (version) -> String.valueOf(version);
 		}
 
+		@Bean
+		ApiVersionCustomizer apiVersionCustomizer() {
+			return configurer -> configurer.setSupportedVersionPredicate(comparable -> true);
+		}
 	}
 
 }