diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/actuate/AbstractGatewayControllerEndpoint.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/actuate/AbstractGatewayControllerEndpoint.java index 47214e00..b6855992 100644 --- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/actuate/AbstractGatewayControllerEndpoint.java +++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/actuate/AbstractGatewayControllerEndpoint.java @@ -96,8 +96,8 @@ public class AbstractGatewayControllerEndpoint implements ApplicationEventPublis List globalFilters, List gatewayFilters, List routePredicates, RouteDefinitionWriter routeDefinitionWriter, RouteLocator routeLocator) { - this(routeDefinitionLocator, globalFilters, gatewayFilters, routePredicates, - routeDefinitionWriter, routeLocator, new WebEndpointProperties()); + this(routeDefinitionLocator, globalFilters, gatewayFilters, routePredicates, routeDefinitionWriter, + routeLocator, new WebEndpointProperties()); } public AbstractGatewayControllerEndpoint(RouteDefinitionLocator routeDefinitionLocator, @@ -126,8 +126,7 @@ public class AbstractGatewayControllerEndpoint implements ApplicationEventPublis .collectList(); } - private List mergeEndpoints(List listA, - List listB) { + private List mergeEndpoints(List listA, List listB) { Map> mergedMap = new HashMap<>(); Stream.concat(listA.stream(), listB.stream()).forEach(e -> mergedMap diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/actuate/GatewayControllerEndpoint.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/actuate/GatewayControllerEndpoint.java index 34553f86..08cd3b68 100644 --- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/actuate/GatewayControllerEndpoint.java +++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/actuate/GatewayControllerEndpoint.java @@ -50,8 +50,8 @@ public class GatewayControllerEndpoint extends AbstractGatewayControllerEndpoint List routePredicates, RouteDefinitionWriter routeDefinitionWriter, RouteLocator routeLocator, RouteDefinitionLocator routeDefinitionLocator, WebEndpointProperties webEndpointProperties) { - super(routeDefinitionLocator, globalFilters, gatewayFilters, routePredicates, - routeDefinitionWriter, routeLocator, webEndpointProperties); + super(routeDefinitionLocator, globalFilters, gatewayFilters, routePredicates, routeDefinitionWriter, + routeLocator, webEndpointProperties); } @GetMapping("/routedefinitions") diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/actuate/GatewayControllerEndpointTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/actuate/GatewayControllerEndpointTests.java index 05878ff5..eb555f88 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/actuate/GatewayControllerEndpointTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/actuate/GatewayControllerEndpointTests.java @@ -70,29 +70,21 @@ public class GatewayControllerEndpointTests { @Test public void testEndpoints() { - testClient.get().uri("http://localhost:" + port + "/actuator/gateway").exchange() - .expectStatus().isOk().expectBodyList(Map.class).consumeWith(result -> { + testClient.get().uri("http://localhost:" + port + "/actuator/gateway").exchange().expectStatus().isOk() + .expectBodyList(Map.class).consumeWith(result -> { List responseBody = result.getResponseBody(); assertThat(responseBody).isNotEmpty(); - assertThat(responseBody).contains( - Map.of("href", "/actuator/gateway/", "methods", - List.of("GET")), - Map.of("href", "/actuator/gateway/globalfilters", "methods", - List.of("GET")), - Map.of("href", "/actuator/gateway/refresh", "methods", - List.of("POST")), - Map.of("href", "/actuator/gateway/routedefinitions", - "methods", List.of("GET")), - Map.of("href", "/actuator/gateway/routefilters", "methods", - List.of("GET")), - Map.of("href", "/actuator/gateway/routepredicates", "methods", - List.of("GET")), - Map.of("href", "/actuator/gateway/routes", "methods", - List.of("POST", "GET")), - Map.of("href", "/actuator/gateway/routes/test-service", - "methods", List.of("POST", "DELETE", "GET")), - Map.of("href", "/actuator/gateway/routes/route_with_metadata", - "methods", List.of("POST", "DELETE", "GET"))); + assertThat(responseBody).contains(Map.of("href", "/actuator/gateway/", "methods", List.of("GET")), + Map.of("href", "/actuator/gateway/globalfilters", "methods", List.of("GET")), + Map.of("href", "/actuator/gateway/refresh", "methods", List.of("POST")), + Map.of("href", "/actuator/gateway/routedefinitions", "methods", List.of("GET")), + Map.of("href", "/actuator/gateway/routefilters", "methods", List.of("GET")), + Map.of("href", "/actuator/gateway/routepredicates", "methods", List.of("GET")), + Map.of("href", "/actuator/gateway/routes", "methods", List.of("POST", "GET")), + Map.of("href", "/actuator/gateway/routes/test-service", "methods", + List.of("POST", "DELETE", "GET")), + Map.of("href", "/actuator/gateway/routes/route_with_metadata", "methods", + List.of("POST", "DELETE", "GET"))); }); }