From a002299c3e9e0313c4a7a0ce77df607884c2fac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A6=82=E6=A2=A6=E6=8A=80=E6=9C=AF?= <596392912@qq.com> Date: Wed, 19 Jun 2019 16:37:00 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E5=87=8F=E5=B0=91=20sonar=20=E9=97=AE=E9=A2=98.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/gateway/config/SwaggerProvider.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SwaggerProvider.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SwaggerProvider.java index f564a8348..159ab0420 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SwaggerProvider.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SwaggerProvider.java @@ -39,28 +39,24 @@ import java.util.stream.Collectors; @Primary @AllArgsConstructor public class SwaggerProvider implements SwaggerResourcesProvider { - public static final String API_URI = "/v2/api-docs"; + private static final String API_URI = "/v2/api-docs"; private final RouteDefinitionRepository routeDefinitionRepository; private final FilterIgnorePropertiesConfig filterIgnorePropertiesConfig; - @Override public List get() { - List resources = new ArrayList<>(); List routes = new ArrayList<>(); - routeDefinitionRepository.getRouteDefinitions().subscribe(route -> routes.add(route)); - routes.forEach(routeDefinition -> routeDefinition.getPredicates().stream() + routeDefinitionRepository.getRouteDefinitions().subscribe(routes::add); + return routes.stream().flatMap(routeDefinition -> routeDefinition.getPredicates().stream() .filter(predicateDefinition -> "Path".equalsIgnoreCase(predicateDefinition.getName())) .filter(predicateDefinition -> !filterIgnorePropertiesConfig.getSwaggerProviders().contains(routeDefinition.getId())) - .forEach(predicateDefinition -> resources.add(swaggerResource(routeDefinition.getId(), - predicateDefinition.getArgs().get(NameUtils.GENERATED_NAME_PREFIX + "0") - .replace("/**", API_URI))))); - - return resources.stream().sorted(Comparator.comparing(SwaggerResource::getName)) + .map(predicateDefinition -> + swaggerResource(routeDefinition.getId(), predicateDefinition.getArgs().get(NameUtils.GENERATED_NAME_PREFIX + "0").replace("/**", API_URI)) + )).sorted(Comparator.comparing(SwaggerResource::getName)) .collect(Collectors.toList()); } - private SwaggerResource swaggerResource(String name, String location) { + private static SwaggerResource swaggerResource(String name, String location) { SwaggerResource swaggerResource = new SwaggerResource(); swaggerResource.setName(name); swaggerResource.setLocation(location);