One RetryTemplate be route.

If not, it causes an IllegalArgumentException

Author: spencergibb

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

@@ -53,23 +53,21 @@ public static HandlerFilterFunction<ServerResponse, ServerResponse> retry(Consum
 		RetryConfig config = new RetryConfig();
 		configConsumer.accept(config);
 		RetryTemplateBuilder retryTemplateBuilder = RetryTemplate.builder();
-		return (request, next) -> {
-			CompositeRetryPolicy compositeRetryPolicy = new CompositeRetryPolicy();
-			Map<Class<? extends Throwable>, Boolean> retryableExceptions = new HashMap<>();
-			config.getExceptions().forEach(exception -> retryableExceptions.put(exception, true));
-			SimpleRetryPolicy simpleRetryPolicy = new SimpleRetryPolicy(config.getRetries(), retryableExceptions);
-			compositeRetryPolicy.setPolicies(
-					Arrays.asList(simpleRetryPolicy, new HttpStatusRetryPolicy(config)).toArray(new RetryPolicy[0]));
-			RetryTemplate retryTemplate = retryTemplateBuilder.customPolicy(compositeRetryPolicy).build();
-			return retryTemplate.execute(context -> {
-				ServerResponse serverResponse = next.handle(request);
-
-				if (isRetryableStatusCode(serverResponse.statusCode(), config)) {
-					throw new HttpServerErrorException(serverResponse.statusCode());
-				}
-				return serverResponse;
-			});
-		};
+		CompositeRetryPolicy compositeRetryPolicy = new CompositeRetryPolicy();
+		Map<Class<? extends Throwable>, Boolean> retryableExceptions = new HashMap<>();
+		config.getExceptions().forEach(exception -> retryableExceptions.put(exception, true));
+		SimpleRetryPolicy simpleRetryPolicy = new SimpleRetryPolicy(config.getRetries(), retryableExceptions);
+		compositeRetryPolicy.setPolicies(
+				Arrays.asList(simpleRetryPolicy, new HttpStatusRetryPolicy(config)).toArray(new RetryPolicy[0]));
+		RetryTemplate retryTemplate = retryTemplateBuilder.customPolicy(compositeRetryPolicy).build();
+		return (request, next) -> retryTemplate.execute(context -> {
+			ServerResponse serverResponse = next.handle(request);
+
+			if (isRetryableStatusCode(serverResponse.statusCode(), config)) {
+				throw new HttpServerErrorException(serverResponse.statusCode());
+			}
+			return serverResponse;
+		});
 	}
 
 	private static boolean isRetryableStatusCode(HttpStatusCode httpStatus, RetryConfig config) {

spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/ServerMvcIntegrationTests.java

@@ -270,6 +270,10 @@ public void circuitBreakerNoFallbackWorks() {
 	@Test
 	public void retryWorks() {
 		restClient.get().uri("/retry?key=get").exchange().expectStatus().isOk().expectBody(String.class).isEqualTo("3");
+		// test for: java.lang.IllegalArgumentException: You have already selected another
+		// retry policy
+		restClient.get().uri("/retry?key=get2").exchange().expectStatus().isOk().expectBody(String.class)
+				.isEqualTo("3");
 	}
 
 	@Test