From c195059c3dacfd803e8ee9bb58dbc736a1c69522 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 10 Sep 2021 13:35:34 -0400 Subject: [PATCH] formatting --- .../AbstractGatewayControllerEndpoint.java | 33 ++++++++----------- 1 file changed, 13 insertions(+), 20 deletions(-) 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 fe96739a..6b818633 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 @@ -136,8 +136,7 @@ public class AbstractGatewayControllerEndpoint implements ApplicationEventPublis public Mono> save(@PathVariable String id, @RequestBody RouteDefinition route) { return Mono.just(route).doOnNext(this::validateRouteDefinition) - .flatMap(routeDefinition -> this.routeDefinitionWriter - .save(Mono.just(routeDefinition).map(r -> { + .flatMap(routeDefinition -> this.routeDefinitionWriter.save(Mono.just(routeDefinition).map(r -> { r.setId(id); log.debug("Saving route: " + route); return r; @@ -146,39 +145,33 @@ public class AbstractGatewayControllerEndpoint implements ApplicationEventPublis } private void validateRouteDefinition(RouteDefinition routeDefinition) { - Set unavailableFilterDefinitions = routeDefinition.getFilters().stream() - .filter(rd -> !isAvailable(rd)).map(FilterDefinition::getName) - .collect(Collectors.toSet()); + Set unavailableFilterDefinitions = routeDefinition.getFilters().stream().filter(rd -> !isAvailable(rd)) + .map(FilterDefinition::getName).collect(Collectors.toSet()); - Set unavailablePredicatesDefinitions = routeDefinition.getPredicates() - .stream().filter(rd -> !isAvailable(rd)).map(PredicateDefinition::getName) - .collect(Collectors.toSet()); + Set unavailablePredicatesDefinitions = routeDefinition.getPredicates().stream() + .filter(rd -> !isAvailable(rd)).map(PredicateDefinition::getName).collect(Collectors.toSet()); if (!unavailableFilterDefinitions.isEmpty()) { - handleUnavailableDefinition(FilterDefinition.class.getSimpleName(), - unavailableFilterDefinitions); + handleUnavailableDefinition(FilterDefinition.class.getSimpleName(), unavailableFilterDefinitions); } else if (!unavailablePredicatesDefinitions.isEmpty()) { - handleUnavailableDefinition(PredicateDefinition.class.getSimpleName(), - unavailablePredicatesDefinitions); + handleUnavailableDefinition(PredicateDefinition.class.getSimpleName(), unavailablePredicatesDefinitions); } } - private void handleUnavailableDefinition(String simpleName, - Set unavailableDefinitions) { - final String errorMessage = String.format("Invalid %s: %s", simpleName, - unavailableDefinitions); + private void handleUnavailableDefinition(String simpleName, Set unavailableDefinitions) { + final String errorMessage = String.format("Invalid %s: %s", simpleName, unavailableDefinitions); log.debug(errorMessage); throw new ResponseStatusException(HttpStatus.BAD_REQUEST, errorMessage); } private boolean isAvailable(FilterDefinition filterDefinition) { - return GatewayFilters.stream().anyMatch(gatewayFilterFactory -> filterDefinition - .getName().equals(gatewayFilterFactory.name())); + return GatewayFilters.stream() + .anyMatch(gatewayFilterFactory -> filterDefinition.getName().equals(gatewayFilterFactory.name())); } private boolean isAvailable(PredicateDefinition predicateDefinition) { - return routePredicates.stream().anyMatch(routePredicate -> predicateDefinition - .getName().equals(routePredicate.name())); + return routePredicates.stream() + .anyMatch(routePredicate -> predicateDefinition.getName().equals(routePredicate.name())); } @DeleteMapping("/routes/{id}")