Updates for new API Version validation predicate

Author: spencergibb

spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java

@@ -171,7 +171,6 @@
 import org.springframework.cloud.gateway.route.RouteRefreshListener;
 import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder;
 import org.springframework.cloud.gateway.support.ConfigurationService;
-import org.springframework.cloud.gateway.support.GatewayApiVersionStrategy;
 import org.springframework.cloud.gateway.support.StringToZonedDateTimeConverter;
 import org.springframework.cloud.gateway.support.config.KeyValueConverter;
 import org.springframework.context.ApplicationEventPublisher;
@@ -198,6 +197,7 @@
 import org.springframework.web.reactive.accept.ApiVersionDeprecationHandler;
 import org.springframework.web.reactive.accept.ApiVersionResolver;
 import org.springframework.web.reactive.accept.ApiVersionStrategy;
+import org.springframework.web.reactive.accept.DefaultApiVersionStrategy;
 import org.springframework.web.reactive.accept.MediaTypeParamApiVersionResolver;
 import org.springframework.web.reactive.accept.PathApiVersionResolver;
 import org.springframework.web.reactive.socket.client.ReactorNettyWebSocketClient;
@@ -775,11 +775,13 @@ public GzipMessageBodyResolver gzipMessageBodyResolver() {
 	}
 
 	@Bean
-	public GatewayServerWebfluxBeanPostProcessor gatewayServerWebfluxBeanPostProcessor(ObjectProvider<WebFluxProperties> properties,
+	public GatewayServerWebfluxBeanPostProcessor gatewayServerWebfluxBeanPostProcessor(
+			ObjectProvider<WebFluxProperties> properties,
 			ObjectProvider<ApiVersionDeprecationHandler> deprecationHandlerProvider,
 			ObjectProvider<ApiVersionParser<?>> versionParserProvider,
 			ObjectProvider<ApiVersionResolver> versionResolvers) {
-		return new GatewayServerWebfluxBeanPostProcessor(properties.getIfAvailable(WebFluxProperties::new).getApiversion(),
+		return new GatewayServerWebfluxBeanPostProcessor(
+				properties.getIfAvailable(WebFluxProperties::new).getApiversion(),
 				deprecationHandlerProvider.getIfAvailable(), versionParserProvider.getIfAvailable(),
 				versionResolvers.orderedStream().toList());
 	}
@@ -1022,8 +1024,9 @@ public GatewayServerWebfluxBeanPostProcessor(Apiversion versionProperties,
 				if (detectSupported == null) {
 					detectSupported = true;
 				}
-				GatewayApiVersionStrategy strategy = new GatewayApiVersionStrategy(versionResolvers, versionParser,
-						required, versionProperties.getDefaultVersion(), detectSupported, deprecationHandler);
+				DefaultApiVersionStrategy strategy = new DefaultApiVersionStrategy(versionResolvers, versionParser,
+						required, versionProperties.getDefaultVersion(), detectSupported, comparable -> true,
+						deprecationHandler);
 				if (!CollectionUtils.isEmpty(versionProperties.getSupported())) {
 					strategy.addSupportedVersion(versionProperties.getSupported().toArray(new String[0]));
 				}

spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/support/GatewayApiVersionStrategy.java

@@ -55,7 +55,7 @@ private static ServerWebExchange exchange(String version) {
 
 	static DefaultApiVersionStrategy apiVersionStrategy() {
 		return new DefaultApiVersionStrategy(List.of(exchange -> null), new SemanticApiVersionParser(), true, null,
-				false, null);
+				false, null, null);
 	}
 
 }

spring-cloud-gateway-server-webflux/src/test/java/org/springframework/cloud/gateway/handler/predicate/VersionRoutePredicateFactoryTests.java

@@ -20,7 +20,6 @@
 import java.util.List;
 import java.util.Map;
 
-import jakarta.servlet.http.HttpServletRequest;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.beans.BeansException;
@@ -83,9 +82,7 @@
 import org.springframework.web.accept.ApiVersionResolver;
 import org.springframework.web.accept.ApiVersionStrategy;
 import org.springframework.web.accept.DefaultApiVersionStrategy;
-import org.springframework.web.accept.InvalidApiVersionException;
 import org.springframework.web.accept.MediaTypeParamApiVersionResolver;
-import org.springframework.web.accept.MissingApiVersionException;
 import org.springframework.web.accept.PathApiVersionResolver;
 import org.springframework.web.accept.QueryApiVersionResolver;
 import org.springframework.web.accept.SemanticApiVersionParser;
@@ -365,29 +362,7 @@ public GatewayApiVersionStrategy(List<ApiVersionResolver> versionResolvers, ApiV
 				boolean versionRequired, @Nullable String defaultVersion, boolean detectSupportedVersions,
 				@Nullable ApiVersionDeprecationHandler deprecationHandler) {
 			super(versionResolvers, versionParser, versionRequired, defaultVersion, detectSupportedVersions,
-					deprecationHandler);
-		}
-
-		@Override
-		public @Nullable Comparable<?> resolveParseAndValidateVersion(HttpServletRequest request) {
-			try {
-				return super.resolveParseAndValidateVersion(request);
-			}
-			catch (InvalidApiVersionException e) {
-				// ignore, so gateway will 404, not 400
-				return null;
-			}
-		}
-
-		@Override
-		public void validateVersion(@Nullable Comparable<?> requestVersion, HttpServletRequest request)
-				throws MissingApiVersionException, InvalidApiVersionException {
-			try {
-				super.validateVersion(requestVersion, request);
-			}
-			catch (InvalidApiVersionException e) {
-				// ignore, so gateway will 404, not 400
-			}
+					comparable -> true, deprecationHandler);
 		}
 
 	}