Merge branch '4.3.x'

Author: ryanjbaxter

spring-cloud-gateway-server-webflux/src/main/java/org/springframework/cloud/gateway/filter/factory/SetRequestUriGatewayFilterFactory.java

@@ -45,13 +45,18 @@ public class SetRequestUriGatewayFilterFactory
 
 	private static final Logger log = LoggerFactory.getLogger(SetRequestUriGatewayFilterFactory.class);
 
+	/**
+	 * Template key for shortcut configuration.
+	 */
+	public static final String TEMPLATE_KEY = "template";
+
 	public SetRequestUriGatewayFilterFactory() {
 		super(Config.class);
 	}
 
 	@Override
 	public List<String> shortcutFieldOrder() {
-		return Arrays.asList(NAME_KEY);
+		return Arrays.asList(TEMPLATE_KEY);
 	}
 
 	@Override

spring-cloud-gateway-server-webflux/src/test/java/org/springframework/cloud/gateway/filter/factory/SetRequestUriGatewayFilterFactoryTests.java

@@ -80,4 +80,10 @@ public void toStringFormat() {
 		assertThat(filter.toString()).contains("http://localhost:8080");
 	}
 
+	@Test
+	public void shortcutFieldOrderUsesTemplateSoShortcutConfigWorks() {
+		SetRequestUriGatewayFilterFactory factory = new SetRequestUriGatewayFilterFactory();
+		assertThat(factory.shortcutFieldOrder()).containsExactly("template");
+	}
+
 }