Changes Cloud

addressImport/src/main/java/org/eclipse/openk/gridfailureinformation/importadresses/config/SwaggerConfig.java

@@ -16,6 +16,7 @@ package org.eclipse.openk.gridfailureinformation.importadresses.config;
 
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
@@ -30,6 +31,7 @@ import javax.servlet.ServletContext;
 @Configuration
 @EnableSwagger2
 @Profile("!prod")
+@ConditionalOnProperty(prefix = "swagger", name = "enabled", havingValue = "true", matchIfMissing = false)
 public class SwaggerConfig {
 
     @Value("${swagger.baseUrl:}")

addressImport/src/main/resources/application.yml

@@ -83,6 +83,9 @@ security.endpoint:
   user: ${GFI_MANUAL_ENDPOINTS_USERNAME}
   password: ${GFI_MANUAL_ENDPOINTS_PASSWORD}
 
+swagger:
+  enabled: true
+
 ---
 
 spring:
@@ -266,5 +269,6 @@ logging:
     org.hibernate: ERROR
 
 swagger:
+  enabled: true
   baseUrl: /addressImporter
 

mailExport/src/main/java/org/eclipse/openk/gridfailureinformation/mailexport/config/SwaggerConfig.java

@@ -16,6 +16,7 @@ package org.eclipse.openk.gridfailureinformation.mailexport.config;
 
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
@@ -30,6 +31,7 @@ import javax.servlet.ServletContext;
 @Configuration
 @EnableSwagger2
 @Profile({"!test","!prod"})
+@ConditionalOnProperty(prefix = "swagger", name = "enabled", havingValue = "true", matchIfMissing = false)
 public class SwaggerConfig {
 
     @Value("${swagger.baseUrl:}")

mailExport/src/main/resources/application.yml

@@ -34,6 +34,9 @@ security.endpoint:
   user: ${GFI_MANUAL_ENDPOINTS_USERNAME}
   password: ${GFI_MANUAL_ENDPOINTS_PASSWORD}
 
+swagger:
+  enabled: true
+
 ---
 
 spring:

mailExport/src/main/resources/application_localdev.yml

@@ -46,6 +46,9 @@ security.endpoint:
   user: ${GFI_MANUAL_ENDPOINTS_USERNAME}
   password: ${GFI_MANUAL_ENDPOINTS_PASSWORD}
 
+swagger:
+  enabled: true
+
 ---
 
 spring: