Merge branch '4.1.x'

Author: spencergibb

spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/config/NormalizedOperationMethod.java

@@ -28,6 +28,8 @@
 import org.springframework.cloud.gateway.server.mvc.invoke.OperationParameters;
 import org.springframework.cloud.gateway.server.mvc.invoke.reflect.DefaultOperationMethod;
 import org.springframework.cloud.gateway.server.mvc.invoke.reflect.OperationMethod;
+import org.springframework.core.annotation.MergedAnnotation;
+import org.springframework.core.annotation.MergedAnnotations;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -52,8 +54,9 @@ public Method getMethod() {
 	}
 
 	public boolean isConfigurable() {
-		Configurable annotation = delegate.getMethod().getAnnotation(Configurable.class);
-		return annotation != null && delegate.getParameters().getParameterCount() == 1;
+		MergedAnnotation<Configurable> configurable = MergedAnnotations.from(delegate.getMethod())
+			.get(Configurable.class);
+		return configurable.isPresent() && delegate.getParameters().getParameterCount() == 1;
 	}
 
 	@Override
@@ -72,8 +75,10 @@ public String toString() {
 
 	private Map<String, Object> normalizeArgs(Map<String, Object> operationArgs) {
 		if (hasGeneratedKey(operationArgs)) {
-			Shortcut shortcut = getMethod().getAnnotation(Shortcut.class);
-			if (shortcut != null) {
+			MergedAnnotation<Shortcut> shortcutMergedAnnotation = MergedAnnotations.from(delegate.getMethod())
+				.get(Shortcut.class);
+			if (shortcutMergedAnnotation.isPresent()) {
+				Shortcut shortcut = shortcutMergedAnnotation.synthesize();
 				String[] fieldOrder = getFieldOrder(shortcut);
 				return switch (shortcut.type()) {
 					case DEFAULT -> {

spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/config/RouterFunctionHolderFactory.java

@@ -16,7 +16,9 @@
 
 package org.springframework.cloud.gateway.server.mvc.config;
 
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -233,6 +235,11 @@ private <T> void translate(MultiValueMap<String, OperationMethod> operations, St
 			if (handlerFilterFunction != null) {
 				operationHandler.accept(handlerFilterFunction);
 			}
+			if (log.isDebugEnabled()) {
+				log.debug(LogMessage.format("Yaml Properties matched Operations name: %s, args: %s, params: %s",
+						normalizedName, opMethod.getNormalizedArgs().toString(),
+						Arrays.toString(opMethod.getParameters().stream().toArray())));
+			}
 		}
 		else {
 			throw new IllegalArgumentException(String.format("Unable to find operation %s for %s with args %s",
@@ -244,6 +251,7 @@ private Optional<NormalizedOperationMethod> findOperation(MultiValueMap<String,
 			String operationName, Map<String, Object> operationArgs) {
 		return operations.getOrDefault(operationName, Collections.emptyList())
 			.stream()
+			.sorted(Comparator.comparing(OperationMethod::isConfigurable))
 			.map(operationMethod -> new NormalizedOperationMethod(operationMethod, operationArgs))
 			.filter(opeMethod -> matchOperation(opeMethod, operationArgs))
 			.findFirst();
@@ -272,7 +280,7 @@ private <T> T invokeOperation(OperationMethod operationMethod, Map<String, Objec
 		Map<String, Object> args = new HashMap<>();
 		if (operationMethod.isConfigurable()) {
 			OperationParameter operationParameter = operationMethod.getParameters().get(0);
-			Object config = bindConfigurable(operationMethod, args, operationParameter);
+			Object config = bindConfigurable(operationMethod, operationArgs, operationParameter);
 			args.put(operationParameter.getName(), config);
 		}
 		else {

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

@@ -68,7 +68,7 @@ public static HandlerFilterFunction<ServerResponse, ServerResponse> circuitBreak
 		return circuitBreaker(config);
 	}
 
-	@Shortcut
+	@Shortcut("id")
 	@Configurable
 	public static HandlerFilterFunction<ServerResponse, ServerResponse> circuitBreaker(CircuitBreakerConfig config) {
 		Set<HttpStatusCode> failureStatuses = config.getStatusCodes()

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

@@ -48,6 +48,7 @@ public abstract class RetryFilterFunctions {
 	private RetryFilterFunctions() {
 	}
 
+	@Shortcut
 	public static HandlerFilterFunction<ServerResponse, ServerResponse> retry(int retries) {
 		return retry(config -> config.setRetries(retries));
 	}
@@ -58,7 +59,7 @@ public static HandlerFilterFunction<ServerResponse, ServerResponse> retry(Consum
 		return retry(config);
 	}
 
-	@Shortcut
+	@Shortcut({ "retries", "series", "methods" })
 	@Configurable
 	public static HandlerFilterFunction<ServerResponse, ServerResponse> retry(RetryConfig config) {
 		RetryTemplateBuilder retryTemplateBuilder = RetryTemplate.builder();

spring-cloud-gateway-server-mvc/src/test/resources/application-propertiesbeandefinitionregistrartests.yml

@@ -34,6 +34,7 @@ spring.cloud.gateway.mvc:
         - HttpbinUriResolver=
         - TokenRelay
         - AddRequestHeader=X-Test,listRoute2
+        - Retry=3,SERVER_ERROR
     - id: listRoute3
       uri: lb://httpbin
       predicates: