GH-5 NotFoundException: null

adding direct path. issue fixed
lex-em · Mar 22, 2019 · 3ee9677 · 3ee9677
1 parent e39f3e4
commit 3ee9677
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 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
@@ -21,6 +21,8 @@ class ServiceInfo {
 
     private String directSwaggerBaseUrl;
 
+    private String directSwaggerPath;
+
     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
@@ -52,6 +52,11 @@ public Optional<String> getServiceUrl(String route) {
     }
 
     public Optional<String> getServicePath(String route) {
+        Optional<String> directPath = getDirectSwaggerBaseUrl(route)
+                .flatMap(x -> getDirectSwaggerPath(route));
+        if (directPath.isPresent()) {
+            return directPath;
+        }
         return Optional.ofNullable(routes.get(route))
                 .map(ServiceInfo::getPath)
                 .map(path -> path.replaceAll("^/", "").replaceAll("/\\*\\*", ""));
@@ -61,4 +66,9 @@ public Optional<String> getDirectSwaggerBaseUrl(String route) {
         return Optional.ofNullable(routes.get(route))
                 .map(ServiceInfo::getDirectSwaggerBaseUrl);
     }
+
+    public Optional<String> getDirectSwaggerPath(String route) {
+        return Optional.ofNullable(routes.get(route))
+                .map(ServiceInfo::getDirectSwaggerPath);
+    }
 }