GH-5 NotFoundException: null

Adding support for direct swagger document link
lex-em · Mar 22, 2019 · e5ef0a2 · e5ef0a2
1 parent 5d2e900
commit e5ef0a2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 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,6 +19,8 @@ class ServiceInfo {
 
     private String swaggerUri;
 
+    private String directSwaggerDocUrl;
+
     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
@@ -56,4 +56,9 @@ public Optional<String> getServicePath(String route) {
                 .map(ServiceInfo::getPath)
                 .map(path -> path.replaceAll("^/", "").replaceAll("/\\*\\*", ""));
     }
+
+    public Optional<String> getDirectSwaggerDocUrl(String route) {
+        return Optional.ofNullable(routes.get(route))
+                .map(ServiceInfo::getDirectSwaggerDocUrl);
+    }
 }
diff --git a/src/main/java/ru/reliabletech/zuul/swagger/service/GenericSwaggerService.java b/src/main/java/ru/reliabletech/zuul/swagger/service/GenericSwaggerService.java
@@ -49,11 +49,17 @@ public ObjectNode getSwaggerDoc(String route) {
     @Override
     public ObjectNode getOriginalSwaggerDoc(String route) {
         Optional<String> serviceUrlOpt = servicesSwaggerInfo.getServiceUrl(route);
-        String serviceUrl = serviceUrlOpt.orElseGet(() -> servicesSwaggerInfo.getDefaultProtocol() + route);
-        RestTemplate restTemplate = serviceUrlOpt.map(x -> pureRestTemplate).orElse(loadBalancedRestTemplate);
-        String url = String.format("%s/%s",
-                serviceUrl,
-                servicesSwaggerInfo.getSwaggerUrl(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));
+                });
         try {
             return restTemplate.getForObject(url, ObjectNode.class);
         } catch (IllegalStateException e) {