Finish GH-5

lex-em · Mar 26, 2019 · 1a97014 · 1a97014
2 parents 6adf23a + 911880f
commit 1a97014
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 14 deletions.
diff --git a/src/main/java/ru/reliabletech/zuul/swagger/ZuulSpringfoxSwaggerConfiguration.java b/src/main/java/ru/reliabletech/zuul/swagger/ZuulSpringfoxSwaggerConfiguration.java
@@ -31,10 +31,14 @@ public class ZuulSpringfoxSwaggerConfiguration {
     @EnableSwagger2
     public static final class EnableSwagger2Config {}
 
-    @ConditionalOnMissingBean(RestTemplate.class)
     @LoadBalanced
     @Bean
-    public RestTemplate restTemplate() {
+    public RestTemplate loadBalancedRestTemplate() {
+        return new RestTemplate();
+    }
+
+    @Bean
+    public RestTemplate pureRestTemplate() {
         return new RestTemplate();
     }
 

diff --git a/src/main/java/ru/reliabletech/zuul/swagger/exception/NotFoundException.java b/src/main/java/ru/reliabletech/zuul/swagger/exception/NotFoundException.java
@@ -10,4 +10,10 @@
 @ResponseStatus(HttpStatus.NOT_FOUND)
 public class NotFoundException extends RuntimeException {
 
+    public NotFoundException() {
+    }
+
+    public NotFoundException(Throwable cause) {
+        super(cause);
+    }
 }
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,10 @@ class ServiceInfo {
 
     private String swaggerUri;
 
+    private String directSwaggerBaseUrl;
+
+    private String directSwaggerPath;
+
     private String swaggerResourcesUri;
 
     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
@@ -60,14 +60,30 @@ 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("/\\*\\*", ""));
     }
 
+    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);
+    }
+
     public boolean groupAllowed(String route, String group) {
         return Optional.ofNullable(routes.get(route))
                 .map(serviceInfo -> serviceInfo.groupAllowed(group))
                 .orElse(true);
+
     }
 }
diff --git a/src/main/java/ru/reliabletech/zuul/swagger/service/GenericSwaggerService.java b/src/main/java/ru/reliabletech/zuul/swagger/service/GenericSwaggerService.java
@@ -2,7 +2,9 @@
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.TextNode;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
@@ -15,17 +17,24 @@
 
 import java.util.List;
 
+import java.util.Optional;
+
 /**
  * General implementation
  *
  * @author Alexandr Emelyanov <mr.lex91@gmail.com>
  * on 27.11.2017.
  */
 @Component
+@Slf4j
 public class GenericSwaggerService implements SwaggerService {
 
     @Autowired
-    private RestTemplate restTemplate;
+    @Qualifier("pureRestTemplate")
+    private RestTemplate pureRestTemplate;
+    @Autowired
+    @Qualifier("loadBalancedRestTemplate")
+    private RestTemplate loadBalancedRestTemplate;
     @Autowired
     private ServicesSwaggerInfo servicesSwaggerInfo;
     @Autowired
@@ -46,27 +55,29 @@ public ObjectNode getSwaggerDoc(String route, String group) {
 
     @Override
     public List<SwaggerResource> getSwaggerResources(String route) {
-        String serviceUrl = servicesSwaggerInfo.getServiceUrl(route)
-                .orElseGet(() -> servicesSwaggerInfo.getDefaultProtocol() + route);
-        UriComponentsBuilder uriBuilder = UriComponentsBuilder.fromHttpUrl(serviceUrl)
-                .path(servicesSwaggerInfo.getSwaggerResourcesUrl(route));
-        String url =  uriBuilder.build().toUriString();
+        Optional<String> serviceUrlOpt = servicesSwaggerInfo.getServiceUrl(route);
+        RestTemplate restTemplate = getRestTemplate(serviceUrlOpt.isPresent());
+        String url = getServiceUrlBuilder(route, serviceUrlOpt)
+                .path(servicesSwaggerInfo.getSwaggerResourcesUrl(route))
+                .build()
+                .toUriString();
         try {
             return restTemplate.exchange(url, HttpMethod.GET, HttpEntity.EMPTY, new ParameterizedTypeReference<List<SwaggerResource>>(){})
                     .getBody();
         } catch (IllegalStateException e) {
+            log.error("Some unexpected error while requesting swagger resources from: {}", url);
             if (e.getMessage() == null || !e.getMessage().startsWith("No instances available for")) {
                 throw e;
             }
-            throw new NotFoundException();
+            throw new NotFoundException(e);
         }
     }
 
     @Override
     public ObjectNode getOriginalSwaggerDoc(String route, String group) {
-        String serviceUrl = servicesSwaggerInfo.getServiceUrl(route)
-                .orElseGet(() -> servicesSwaggerInfo.getDefaultProtocol() + route);
-        UriComponentsBuilder uriBuilder = UriComponentsBuilder.fromHttpUrl(serviceUrl)
+        Optional<String> serviceUrlOpt = servicesSwaggerInfo.getServiceUrl(route);
+        RestTemplate restTemplate = getRestTemplate(serviceUrlOpt.isPresent());
+        UriComponentsBuilder uriBuilder = getServiceUrlBuilder(route, serviceUrlOpt)
                 .path(servicesSwaggerInfo.getSwaggerUrl(route));
         if (group != null) {
             uriBuilder.queryParam("group", group);
@@ -75,10 +86,24 @@ public ObjectNode getOriginalSwaggerDoc(String route, String group) {
         try {
             return restTemplate.getForObject(url, ObjectNode.class);
         } catch (IllegalStateException e) {
+            log.error("Some unexpected error while requesting swagger docs from: {}", url);
             if (e.getMessage() == null || !e.getMessage().startsWith("No instances available for")) {
                 throw e;
             }
-            throw new NotFoundException();
+            throw new NotFoundException(e);
+        }
+    }
+
+    private RestTemplate getRestTemplate(boolean isUrlBased) {
+        if (isUrlBased) {
+            return pureRestTemplate;
         }
+        return loadBalancedRestTemplate;
+    }
+
+    private UriComponentsBuilder getServiceUrlBuilder(String route, Optional<String> serviceUrlOpt) {
+        String serviceUrl = servicesSwaggerInfo.getDirectSwaggerBaseUrl(route)
+                .orElseGet(() -> serviceUrlOpt.orElseGet(() -> servicesSwaggerInfo.getDefaultProtocol() + route));
+        return UriComponentsBuilder.fromHttpUrl(serviceUrl);
     }
 }
diff --git a/src/main/java/ru/reliabletech/zuul/swagger/swagger/ZuulSwaggerResourceProvider.java b/src/main/java/ru/reliabletech/zuul/swagger/swagger/ZuulSwaggerResourceProvider.java
@@ -74,7 +74,7 @@ private Stream<SwaggerResource> generateSwaggerDocumentationResource(String rout
                     })
                     .filter(Objects::nonNull);
         } catch (Exception e) {
-            log.error(String.format("Some error during obtain swagger documentation for route %s", route), e);
+            log.error(String.format("Some error during obtain swagger documentation for route '%s'", route), e);
             return Stream.empty();
         }
     }