From 8ef2b419d2ee7ec1f0b81a2caaa3b457d3cd7d98 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Wed, 9 Oct 2019 12:13:18 -0500 Subject: [PATCH 1/2] Fixing variable typo. Fixes #1331 --- .../gateway/actuate/AbstractGatewayControllerEndpoint.java | 5 +++-- .../cloud/gateway/config/GatewayAutoConfiguration.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/actuate/AbstractGatewayControllerEndpoint.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/actuate/AbstractGatewayControllerEndpoint.java index dcda3e57..cb837416 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/actuate/AbstractGatewayControllerEndpoint.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/actuate/AbstractGatewayControllerEndpoint.java @@ -55,6 +55,7 @@ public class AbstractGatewayControllerEndpoint implements ApplicationEventPublis protected List globalFilters; + //TODO change casing in next major release protected List GatewayFilters; protected List routePredicates; @@ -67,12 +68,12 @@ public class AbstractGatewayControllerEndpoint implements ApplicationEventPublis public AbstractGatewayControllerEndpoint( RouteDefinitionLocator routeDefinitionLocator, - List globalFilters, List GatewayFilters, + List globalFilters, List gatewayFilters, List routePredicates, RouteDefinitionWriter routeDefinitionWriter, RouteLocator routeLocator) { this.routeDefinitionLocator = routeDefinitionLocator; this.globalFilters = globalFilters; - this.GatewayFilters = GatewayFilters; + this.GatewayFilters = gatewayFilters; this.routePredicates = routePredicates; this.routeDefinitionWriter = routeDefinitionWriter; this.routeLocator = routeLocator; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java index 3013e3a0..9f19af0c 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java @@ -192,12 +192,12 @@ public class GatewayAutoConfiguration { @Bean public RouteLocator routeDefinitionRouteLocator(GatewayProperties properties, - List GatewayFilters, + List gatewayFilters, List predicates, RouteDefinitionLocator routeDefinitionLocator, @Qualifier("webFluxConversionService") ConversionService conversionService) { return new RouteDefinitionRouteLocator(routeDefinitionLocator, predicates, - GatewayFilters, properties, conversionService); + gatewayFilters, properties, conversionService); } @Bean From 9c152d57630d7ba3d9b0dad337e8d49b85b6a1e7 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Wed, 9 Oct 2019 12:18:34 -0500 Subject: [PATCH 2/2] Formatting changes --- .../gateway/actuate/AbstractGatewayControllerEndpoint.java | 2 +- .../cloud/gateway/config/GatewayAutoConfiguration.java | 7 ++++--- .../gateway/actuate/GatewayControllerEndpointTests.java | 7 ++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/actuate/AbstractGatewayControllerEndpoint.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/actuate/AbstractGatewayControllerEndpoint.java index cb837416..ccc52c03 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/actuate/AbstractGatewayControllerEndpoint.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/actuate/AbstractGatewayControllerEndpoint.java @@ -55,7 +55,7 @@ public class AbstractGatewayControllerEndpoint implements ApplicationEventPublis protected List globalFilters; - //TODO change casing in next major release + // TODO change casing in next major release protected List GatewayFilters; protected List routePredicates; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java index 9f19af0c..2351873c 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java @@ -690,8 +690,8 @@ public class GatewayAutoConfiguration { List gatewayFilters, List routePredicates, RouteDefinitionWriter routeDefinitionWriter, RouteLocator routeLocator) { - return new GatewayControllerEndpoint(globalFilters, gatewayFilters, routePredicates, - routeDefinitionWriter, routeLocator); + return new GatewayControllerEndpoint(globalFilters, gatewayFilters, + routePredicates, routeDefinitionWriter, routeLocator); } @Bean @@ -704,7 +704,8 @@ public class GatewayAutoConfiguration { List routePredicates, RouteDefinitionWriter routeDefinitionWriter, RouteLocator routeLocator) { return new GatewayLegacyControllerEndpoint(routeDefinitionLocator, - globalFilters, gatewayFilters, routePredicates, routeDefinitionWriter, routeLocator); + globalFilters, gatewayFilters, routePredicates, routeDefinitionWriter, + routeLocator); } } diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/actuate/GatewayControllerEndpointTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/actuate/GatewayControllerEndpointTests.java index 9d263b79..c474b7bd 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/actuate/GatewayControllerEndpointTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/actuate/GatewayControllerEndpointTests.java @@ -53,8 +53,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; @RunWith(SpringRunner.class) -@SpringBootTest(properties = {"management.endpoints.web.exposure.include=*", - "spring.cloud.gateway.actuator.verbose.enabled=true"}, webEnvironment = RANDOM_PORT) +@SpringBootTest(properties = { "management.endpoints.web.exposure.include=*", + "spring.cloud.gateway.actuator.verbose.enabled=true" }, webEnvironment = RANDOM_PORT) public class GatewayControllerEndpointTests { @Autowired @@ -186,7 +186,8 @@ public class GatewayControllerEndpointTests { @Bean RouteLocator testRouteLocator(RouteLocatorBuilder routeLocatorBuilder) { return routeLocatorBuilder.routes() - .route("test-service", r -> r.path("/test-service/**").uri("lb://test-service")) + .route("test-service", + r -> r.path("/test-service/**").uri("lb://test-service")) .build(); }