Migrates server-webflux properties to new namespace

spring-cloud-gateway-integration-tests/grpc/src/test/resources/application.yml

@@ -20,7 +20,7 @@ management:
 
 spring:
   cloud:
-    gateway:
+    gateway.server.webflux:
       httpserver:
         wiretap: true
       httpclient:

spring-cloud-gateway-integration-tests/http2/src/main/resources/application.yml

@@ -13,7 +13,7 @@ server:
 
 spring:
   cloud:
-    gateway:
+    gateway.server.webflux:
 #      httpserver:
 #        wiretap: true
       httpclient:

spring-cloud-gateway-integration-tests/http2/src/test/resources/application-nossl.yml

@@ -9,5 +9,5 @@ server:
 
 spring:
   cloud:
-    gateway:
+    gateway.server.webflux:
       enabled: false

spring-cloud-gateway-integration-tests/mvc-failure-analyzer/src/test/java/org/springframework/cloud/gateway/sample/MvcFailureAnalyzerApplicationTests.java

@@ -48,7 +48,7 @@ public void exceptionThrown(CapturedOutput output) {
 	@Test
 	public void exceptionNotThrownWhenDisabled(CapturedOutput output) {
 		assertThatCode(() -> new SpringApplication(MvcFailureAnalyzerApplication.class)
-			.run("--spring.cloud.gateway.enabled=false", "--server.port=0")).doesNotThrowAnyException();
+			.run("--spring.cloud.gateway.server.webflux.enabled=false", "--server.port=0")).doesNotThrowAnyException();
 		assertThat(output).doesNotContain(MvcFoundOnClasspathFailureAnalyzer.MESSAGE,
 				MvcFoundOnClasspathFailureAnalyzer.ACTION);
 	}

spring-cloud-gateway-sample/src/main/resources/application-secureheaders.yml

@@ -7,7 +7,7 @@ test:
 
 spring:
   cloud:
-    gateway:
+    gateway.server.webflux:
       filter:
       default-filters:
       #- PrefixPath=/httpbin

spring-cloud-gateway-sample/src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
   jmx:
     enabled: false
   cloud:
-    gateway:
+    gateway.server.webflux:
       default-filters:
       - PrefixPath=/httpbin
       - AddResponseHeader=X-Response-Default-Foo, Default-Bar

spring-cloud-gateway-server/pom.xml

@@ -192,6 +192,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-properties-migrator</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-testcontainers</artifactId>

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

@@ -196,7 +196,7 @@
  * @author FuYiNan Guo
  */
 @Configuration(proxyBeanMethods = false)
-@ConditionalOnProperty(name = "spring.cloud.gateway.enabled", matchIfMissing = true)
+@ConditionalOnProperty(name = "spring.cloud.gateway.server.webflux.enabled", matchIfMissing = true)
 @EnableConfigurationProperties
 @AutoConfigureBefore({ HttpHandlerAutoConfiguration.class, WebFluxAutoConfiguration.class })
 @AutoConfigureAfter({ GatewayReactiveLoadBalancerClientAutoConfiguration.class,
@@ -272,7 +272,7 @@ public RouteLocator cachedCompositeRouteLocator(List<RouteLocator> routeLocators
 
 	@Bean
 	@ConditionalOnClass(name = "org.springframework.cloud.client.discovery.event.HeartbeatMonitor")
-	@ConditionalOnProperty(prefix = GatewayProperties.PREFIX, name = ".route-refresh-listener.enabled",
+	@ConditionalOnProperty(prefix = GatewayProperties.PREFIX, name = "route-refresh-listener.enabled",
 			matchIfMissing = true)
 	public RouteRefreshListener routeRefreshListener(ApplicationEventPublisher publisher) {
 		return new RouteRefreshListener(publisher);
@@ -290,7 +290,7 @@ public GlobalCorsProperties globalCorsProperties() {
 	}
 
 	@Bean
-	@ConditionalOnProperty(name = "spring.cloud.gateway.globalcors.enabled", matchIfMissing = true)
+	@ConditionalOnProperty(name = "spring.cloud.gateway.server.webflux.globalcors.enabled", matchIfMissing = true)
 	public CorsGatewayFilterApplicationListener corsGatewayFilterApplicationListener(
 			GlobalCorsProperties globalCorsProperties, RoutePredicateHandlerMapping routePredicateHandlerMapping,
 			RouteLocator routeLocator) {
@@ -318,9 +318,10 @@ public SecureHeadersProperties secureHeadersProperties() {
 	}
 
 	@Bean
-	@ConditionalOnProperty(name = "spring.cloud.gateway.forwarded.enabled", matchIfMissing = true)
+	@ConditionalOnProperty(name = "spring.cloud.gateway.server.webflux.forwarded.enabled", matchIfMissing = true)
 	public ForwardedHeadersFilter forwardedHeadersFilter(Environment env, ServerProperties serverProperties) {
-		boolean forwardedByEnabled = env.getProperty("spring.cloud.gateway.forwarded.by.enabled", Boolean.class, false);
+		boolean forwardedByEnabled = env.getProperty("spring.cloud.gateway.server.webflux.forwarded.by.enabled",
+				Boolean.class, false);
 		ForwardedHeadersFilter forwardedHeadersFilter = new ForwardedHeadersFilter();
 		forwardedHeadersFilter.setForwardedByEnabled(forwardedByEnabled);
 		forwardedHeadersFilter.setServerPort(serverProperties.getPort());
@@ -335,7 +336,7 @@ public RemoveHopByHopHeadersFilter removeHopByHopHeadersFilter() {
 	}
 
 	@Bean
-	@ConditionalOnProperty(name = "spring.cloud.gateway.x-forwarded.enabled", matchIfMissing = true)
+	@ConditionalOnProperty(name = "spring.cloud.gateway.server.webflux.x-forwarded.enabled", matchIfMissing = true)
 	public XForwardedHeadersFilter xForwardedHeadersFilter() {
 		return new XForwardedHeadersFilter();
 	}
@@ -468,7 +469,8 @@ public HeaderRoutePredicateFactory headerRoutePredicateFactory() {
 	@Bean
 	@ConditionalOnEnabledPredicate
 	public HostRoutePredicateFactory hostRoutePredicateFactory(Environment env) {
-		boolean includePort = env.getProperty("spring.cloud.gateway.predicate.host.include-port", Boolean.class, true);
+		boolean includePort = env.getProperty("spring.cloud.gateway.server.webflux.predicate.host.include-port",
+				Boolean.class, true);
 		return new HostRoutePredicateFactory(includePort);
 	}
 
@@ -769,7 +771,7 @@ protected static class NettyConfiguration {
 		protected final Log logger = LogFactory.getLog(getClass());
 
 		@Bean
-		@ConditionalOnProperty(name = "spring.cloud.gateway.httpserver.wiretap")
+		@ConditionalOnProperty(name = "spring.cloud.gateway.server.webflux.httpserver.wiretap")
 		public NettyWebServerFactoryCustomizer nettyServerWiretapCustomizer(Environment environment,
 				ServerProperties serverProperties) {
 			return new NettyWebServerFactoryCustomizer(environment, serverProperties) {
@@ -853,7 +855,8 @@ public ReactorNettyRequestUpgradeStrategy reactorNettyRequestUpgradeStrategy(
 	protected static class GatewayActuatorConfiguration {
 
 		@Bean
-		@ConditionalOnProperty(name = "spring.cloud.gateway.actuator.verbose.enabled", matchIfMissing = true)
+		@ConditionalOnProperty(name = "spring.cloud.gateway.server.webflux.actuator.verbose.enabled",
+				matchIfMissing = true)
 		@ConditionalOnAvailableEndpoint
 		public GatewayControllerEndpoint gatewayControllerEndpoint(List<GlobalFilter> globalFilters,
 				List<GatewayFilterFactory> gatewayFilters, List<RoutePredicateFactory> routePredicates,
@@ -883,15 +886,16 @@ private static class OnVerboseDisabledCondition extends NoneNestedConditions {
 			super(ConfigurationPhase.REGISTER_BEAN);
 		}
 
-		@ConditionalOnProperty(name = "spring.cloud.gateway.actuator.verbose.enabled", matchIfMissing = true)
+		@ConditionalOnProperty(name = "spring.cloud.gateway.server.webflux.actuator.verbose.enabled",
+				matchIfMissing = true)
 		static class VerboseDisabled {
 
 		}
 
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnProperty(name = "spring.cloud.gateway.enabled", matchIfMissing = true)
+	@ConditionalOnProperty(name = "spring.cloud.gateway.server.webflux.enabled", matchIfMissing = true)
 	@ConditionalOnClass({ OAuth2AuthorizedClient.class, SecurityWebFilterChain.class, SecurityProperties.class })
 	@ConditionalOnEnabledFilter(TokenRelayGatewayFilterFactory.class)
 	protected static class TokenRelayConfiguration {

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

@@ -29,7 +29,7 @@
 
 @Configuration(proxyBeanMethods = false)
 @AutoConfigureBefore(GatewayAutoConfiguration.class)
-@ConditionalOnProperty(name = "spring.cloud.gateway.enabled", matchIfMissing = true)
+@ConditionalOnProperty(name = GatewayProperties.PREFIX + ".enabled", matchIfMissing = true)
 public class GatewayClassPathWarningAutoConfiguration {
 
 	private static final Log log = LogFactory.getLog(GatewayClassPathWarningAutoConfiguration.class);

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

@@ -38,7 +38,7 @@
 @AutoConfigureAfter(ContextFunctionCatalogAutoConfiguration.class)
 @AutoConfigureBefore({ HttpHandlerAutoConfiguration.class, GatewayAutoConfiguration.class })
 @ConditionalOnClass({ FunctionCatalog.class, DispatcherHandler.class })
-@ConditionalOnProperty(name = "spring.cloud.gateway.function.enabled", matchIfMissing = true)
+@ConditionalOnProperty(name = GatewayProperties.PREFIX + ".function.enabled", matchIfMissing = true)
 class GatewayFunctionAutoConfiguration {
 
 	@Bean

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

@@ -21,7 +21,7 @@
 /**
  * @author Ryan Baxter
  */
-@ConfigurationProperties("spring.cloud.gateway.loadbalancer")
+@ConfigurationProperties(GatewayProperties.PREFIX + ".loadbalancer")
 public class GatewayLoadBalancerProperties {
 
 	private boolean use404;

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

@@ -28,7 +28,7 @@
 /**
  * @author Ingyu Hwang
  */
-@ConfigurationProperties("spring.cloud.gateway.metrics")
+@ConfigurationProperties(GatewayProperties.PREFIX + ".metrics")
 @Validated
 public class GatewayMetricsProperties {
 

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

@@ -42,7 +42,7 @@ public class GatewayProperties {
 	/**
 	 * Properties prefix.
 	 */
-	public static final String PREFIX = "spring.cloud.gateway";
+	public static final String PREFIX = "spring.cloud.gateway.server.webflux";
 
 	private final Log logger = LogFactory.getLog(getClass());
 

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

@@ -50,7 +50,7 @@
 @AutoConfigureBefore(GatewayAutoConfiguration.class)
 @ConditionalOnBean(ReactiveRedisTemplate.class)
 @ConditionalOnClass({ RedisTemplate.class, DispatcherHandler.class })
-@ConditionalOnProperty(name = "spring.cloud.gateway.redis.enabled", matchIfMissing = true)
+@ConditionalOnProperty(name = GatewayProperties.PREFIX + ".redis.enabled", matchIfMissing = true)
 class GatewayRedisAutoConfiguration {
 
 	@Bean
@@ -72,7 +72,7 @@ public RedisRateLimiter redisRateLimiter(ReactiveStringRedisTemplate redisTempla
 	}
 
 	@Bean
-	@ConditionalOnProperty(value = "spring.cloud.gateway.redis-route-definition-repository.enabled",
+	@ConditionalOnProperty(value = GatewayProperties.PREFIX + ".redis-route-definition-repository.enabled",
 			havingValue = "true")
 	@ConditionalOnClass(ReactiveRedisTemplate.class)
 	public RedisRouteDefinitionRepository redisRouteDefinitionRepository(

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

@@ -36,7 +36,7 @@
  * @author Ryan Baxter
  */
 @Configuration(proxyBeanMethods = false)
-@ConditionalOnProperty(name = "spring.cloud.gateway.enabled", matchIfMissing = true)
+@ConditionalOnProperty(name = GatewayProperties.PREFIX + ".enabled", matchIfMissing = true)
 @AutoConfigureAfter({ ReactiveResilience4JAutoConfiguration.class })
 @ConditionalOnClass({ DispatcherHandler.class, ReactiveResilience4JAutoConfiguration.class,
 		ReactiveCircuitBreakerFactory.class, ReactiveResilience4JCircuitBreakerFactory.class })