Commit a4fe5de7 authored by Simon Reis's avatar Simon Reis
Browse files

Merge branch 'master' into 'master'

Changes Cloud

See merge request !2
parents 2c6fc9b1 73561174
This diff is collapsed.
......@@ -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:}")
......
......@@ -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
......@@ -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:}")
......
......@@ -34,6 +34,9 @@ security.endpoint:
user: ${GFI_MANUAL_ENDPOINTS_USERNAME}
password: ${GFI_MANUAL_ENDPOINTS_PASSWORD}
swagger:
enabled: true
---
spring:
......
......@@ -46,6 +46,9 @@ security.endpoint:
user: ${GFI_MANUAL_ENDPOINTS_USERNAME}
password: ${GFI_MANUAL_ENDPOINTS_PASSWORD}
swagger:
enabled: true
---
spring:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment