GH-5 NotFoundException: null

reimplement direct link
lex-em · Mar 22, 2019 · e39f3e4 · e39f3e4
1 parent e5ef0a2
commit e39f3e4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/src/main/java/ru/reliabletech/zuul/swagger/props/ServiceInfo.java b/src/main/java/ru/reliabletech/zuul/swagger/props/ServiceInfo.java
@@ -19,7 +19,7 @@ class ServiceInfo {
 
     private String swaggerUri;
 
-    private String directSwaggerDocUrl;
+    private String directSwaggerBaseUrl;
 
     private String protocol = "";
 

diff --git a/src/main/java/ru/reliabletech/zuul/swagger/props/ServicesSwaggerInfo.java b/src/main/java/ru/reliabletech/zuul/swagger/props/ServicesSwaggerInfo.java
@@ -57,8 +57,8 @@ public Optional<String> getServicePath(String route) {
                 .map(path -> path.replaceAll("^/", "").replaceAll("/\\*\\*", ""));
     }
 
-    public Optional<String> getDirectSwaggerDocUrl(String route) {
+    public Optional<String> getDirectSwaggerBaseUrl(String route) {
         return Optional.ofNullable(routes.get(route))
-                .map(ServiceInfo::getDirectSwaggerDocUrl);
+                .map(ServiceInfo::getDirectSwaggerBaseUrl);
     }
 }
diff --git a/src/main/java/ru/reliabletech/zuul/swagger/service/GenericSwaggerService.java b/src/main/java/ru/reliabletech/zuul/swagger/service/GenericSwaggerService.java
@@ -52,14 +52,11 @@ public ObjectNode getOriginalSwaggerDoc(String route) {
         RestTemplate restTemplate = serviceUrlOpt
                 .map(x -> pureRestTemplate)
                 .orElse(loadBalancedRestTemplate);
-        String url = servicesSwaggerInfo.getDirectSwaggerDocUrl(route)
-                .orElseGet(() -> {
-                    String serviceUrl = serviceUrlOpt
-                            .orElseGet(() -> servicesSwaggerInfo.getDefaultProtocol() + route);
-                    return String.format("%s/%s",
-                            serviceUrl,
-                            servicesSwaggerInfo.getSwaggerUrl(route));
-                });
+        String serviceUrl = servicesSwaggerInfo.getDirectSwaggerBaseUrl(route)
+                .orElseGet(() -> serviceUrlOpt.orElseGet(() -> servicesSwaggerInfo.getDefaultProtocol() + route));
+        String url = String.format("%s/%s",
+                serviceUrl,
+                servicesSwaggerInfo.getSwaggerUrl(route));
         try {
             return restTemplate.getForObject(url, ObjectNode.class);
         } catch (IllegalStateException e) {