polishing

Author: spencergibb

spring-cloud-gateway-server-webmvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/Bucket4jFilterFunctions.java

@@ -65,15 +65,14 @@ public static HandlerFilterFunction<ServerResponse, ServerResponse> rateLimit(
 			Consumer<RateLimitConfig> configConsumer) {
 		RateLimitConfig config = new RateLimitConfig();
 		configConsumer.accept(config);
-		BucketConfiguration bucketConfiguration = config.getConfigurationBuilder().apply(config);
 		return (request, next) -> {
 			AsyncProxyManager proxyManager = MvcUtils.getApplicationContext(request).getBean(AsyncProxyManager.class);
 			String key = config.getKeyResolver().apply(request);
 			if (!StringUtils.hasText(key)) {
 				// TODO: configurable empty key status code
 				return ServerResponse.status(HttpStatus.FORBIDDEN).build();
 			}
-			AsyncBucketProxy bucket = proxyManager.builder().build(key, bucketConfiguration);
+			AsyncBucketProxy bucket = proxyManager.builder().build(key, () -> config.configurationBuilder.apply(config));
 			CompletableFuture<ConsumptionProbe> bucketFuture = bucket.tryConsumeAndReturnRemaining(config.getTokens());
 			ConsumptionProbe consumptionProbe;
 			if (config.getTimeout() != null) {

spring-cloud-gateway-server-webmvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/RetryFilterFunctions.java

@@ -51,18 +51,21 @@ private RetryFilterFunctions() {
 	}
 
 	@Shortcut
+	@SuppressWarnings("deprecation")
 	public static HandlerFilterFunction<ServerResponse, ServerResponse> retry(int retries) {
 		return useSpringRetry() ? GatewayRetryFilterFunctions.retry(retries)
 				: FrameworkRetryFilterFunctions.frameworkRetry(retries);
 	}
 
+	@SuppressWarnings("deprecation")
 	public static HandlerFilterFunction<ServerResponse, ServerResponse> retry(Consumer<RetryConfig> configConsumer) {
 		return useSpringRetry() ? GatewayRetryFilterFunctions.retry(configConsumer)
 				: FrameworkRetryFilterFunctions.frameworkRetry(configConsumer);
 	}
 
 	@Shortcut({ "retries", "series", "methods" })
 	@Configurable
+	@SuppressWarnings("deprecation")
 	public static HandlerFilterFunction<ServerResponse, ServerResponse> retry(RetryConfig config) {
 		return useSpringRetry() ? GatewayRetryFilterFunctions.retry(config)
 				: FrameworkRetryFilterFunctions.frameworkRetry(config);