From 1e02b28499e585a0e157de9ea0c16dd137bf963f Mon Sep 17 00:00:00 2001 From: spencergibb Date: Thu, 17 Apr 2025 11:38:28 -0400 Subject: [PATCH] Updates for AOT See gh-3250 --- .../mvc/config/GatewayMvcAotRuntimeHintsRegistrar.java | 9 +++++---- .../server/mvc/filter/FilterAutoConfiguration.java | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/config/GatewayMvcAotRuntimeHintsRegistrar.java b/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/config/GatewayMvcAotRuntimeHintsRegistrar.java index 08a879c1..c171c240 100644 --- a/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/config/GatewayMvcAotRuntimeHintsRegistrar.java +++ b/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/config/GatewayMvcAotRuntimeHintsRegistrar.java @@ -29,6 +29,7 @@ import org.springframework.cloud.gateway.server.mvc.filter.BeforeFilterFunctions import org.springframework.cloud.gateway.server.mvc.filter.BodyFilterFunctions; import org.springframework.cloud.gateway.server.mvc.filter.Bucket4jFilterFunctions; import org.springframework.cloud.gateway.server.mvc.filter.CircuitBreakerFilterFunctions; +import org.springframework.cloud.gateway.server.mvc.filter.FilterAutoConfiguration; import org.springframework.cloud.gateway.server.mvc.filter.FilterFunctions; import org.springframework.cloud.gateway.server.mvc.filter.LoadBalancerFilterFunctions; import org.springframework.cloud.gateway.server.mvc.filter.TokenRelayFilterFunctions; @@ -47,10 +48,10 @@ public class GatewayMvcAotRuntimeHintsRegistrar implements RuntimeHintsRegistrar // TODO: fix AOT HINTS private static final Set> FUNCTION_PROVIDERS = Set.of(HandlerFunctions.class, - /* LoadBalancerHandlerSupplier.class, */ FilterFunctions.class, BeforeFilterFunctions.class, - AfterFilterFunctions.class, TokenRelayFilterFunctions.class, BodyFilterFunctions.class, - CircuitBreakerFilterFunctions.class, GatewayRouterFunctions.class, LoadBalancerFilterFunctions.class, - GatewayRequestPredicates.class, Bucket4jFilterFunctions.class); + FilterAutoConfiguration.LoadBalancerHandlerConfiguration.class, FilterFunctions.class, + BeforeFilterFunctions.class, AfterFilterFunctions.class, TokenRelayFilterFunctions.class, + BodyFilterFunctions.class, CircuitBreakerFilterFunctions.class, GatewayRouterFunctions.class, + LoadBalancerFilterFunctions.class, GatewayRequestPredicates.class, Bucket4jFilterFunctions.class); private static final Set> PROPERTIES = Set.of(FilterProperties.class, PredicateProperties.class, RouteProperties.class); diff --git a/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/FilterAutoConfiguration.java b/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/FilterAutoConfiguration.java index ad260ccb..8f4126cf 100644 --- a/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/FilterAutoConfiguration.java +++ b/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/FilterAutoConfiguration.java @@ -71,7 +71,7 @@ public class FilterAutoConfiguration { @Configuration(proxyBeanMethods = false) @ConditionalOnClass(LoadBalancerClient.class) - static class LoadBalancerHandlerConfiguration { + public static class LoadBalancerHandlerConfiguration { @Bean public Function lbHandlerFunctionDefinition() {