SI-1345 SwaggerConfig angepasst & Profile Branch unterschiedliche Queues konfiguriert
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/SwaggerConfig.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/SwaggerConfig.java
index 71ee60d..fa4d1d0 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/SwaggerConfig.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/SwaggerConfig.java
@@ -15,7 +15,7 @@
@Log4j2
@Configuration
@EnableSwagger2
-@Profile("!prod")
+@Profile({"!test","!prod"})
public class SwaggerConfig {
@Value("${swagger.baseUrl:}")
diff --git a/gfsBackendService/src/main/resources/application.yml b/gfsBackendService/src/main/resources/application.yml
index 6f7fd2a..6ebc693 100644
--- a/gfsBackendService/src/main/resources/application.yml
+++ b/gfsBackendService/src/main/resources/application.yml
@@ -208,6 +208,22 @@
spring:
profiles: devserver-branch
+ rabbitmq:
+ # Importkanal
+ importExchange: sitImportExchange_branch
+ importQueue: sitImportQueue_branch
+ importkey: sitImportExchange.failureImportKey
+
+ # Exportkanäle
+ exportExchange: sitExportExchange_branch
+ channels:
+ - name: Mail
+ exportQueue: sit_mail_export_queue_branch
+ exportKey: sit_mail_export_key
+ isMailType: true
+ - name: Störungsauskunft.de
+ exportQueue: sit_stoerungsauskunft_export_queue_branch
+ exportKey: sit_stoerungsauskunft_export_key
logging:
level:
diff --git a/mailExport/src/main/java/org/eclipse/openk/gridfailureinformation/mailexport/config/SwaggerConfig.java b/mailExport/src/main/java/org/eclipse/openk/gridfailureinformation/mailexport/config/SwaggerConfig.java
index 37a467a..ee6b295 100644
--- a/mailExport/src/main/java/org/eclipse/openk/gridfailureinformation/mailexport/config/SwaggerConfig.java
+++ b/mailExport/src/main/java/org/eclipse/openk/gridfailureinformation/mailexport/config/SwaggerConfig.java
@@ -15,7 +15,7 @@
@Log4j2
@Configuration
@EnableSwagger2
-@Profile("!prod")
+@Profile({"!test","!prod"})
public class SwaggerConfig {
@Value("${swagger.baseUrl}")
diff --git a/stoerungsauskunftInterface/Dockerfile_DevServer b/stoerungsauskunftInterface/Dockerfile_DevServer
index 9667714..66c3eaa 100644
--- a/stoerungsauskunftInterface/Dockerfile_DevServer
+++ b/stoerungsauskunftInterface/Dockerfile_DevServer
@@ -10,4 +10,4 @@
COPY /target/grid-failure-information.backend.stoerungsauskunft-interface.jar /usr/src/cbd/
WORKDIR usr/src/cbd
-CMD ["java", "-jar", "-Dspring.profiles.active=devserver,swagger", "grid-failure-information.backend.stoerungsauskunft-interface.jar"]
\ No newline at end of file
+CMD ["java", "-jar", "-Dspring.profiles.active=devserver", "grid-failure-information.backend.stoerungsauskunft-interface.jar"]
\ No newline at end of file
diff --git a/stoerungsauskunftInterface/Dockerfile_DevServerUnsecure b/stoerungsauskunftInterface/Dockerfile_DevServerUnsecure
index 4ad36c6..dc10133 100644
--- a/stoerungsauskunftInterface/Dockerfile_DevServerUnsecure
+++ b/stoerungsauskunftInterface/Dockerfile_DevServerUnsecure
@@ -10,4 +10,4 @@
COPY /target/grid-failure-information.backend.stoerungsauskunft-interface.jar /usr/src/cbd/
WORKDIR usr/src/cbd
-CMD ["java", "-jar", "-Dspring.profiles.active=devserver-unsecure,swagger", "grid-failure-information.backend.stoerungsauskunft-interface.jar"]
\ No newline at end of file
+CMD ["java", "-jar", "-Dspring.profiles.active=devserver-unsecure", "grid-failure-information.backend.stoerungsauskunft-interface.jar"]
\ No newline at end of file
diff --git a/stoerungsauskunftInterface/src/main/java/org/eclipse/openk/gridfailureinformation/stoerauskunftinterface/config/SwaggerConfig.java b/stoerungsauskunftInterface/src/main/java/org/eclipse/openk/gridfailureinformation/stoerauskunftinterface/config/SwaggerConfig.java
index 49f1250..7792780 100644
--- a/stoerungsauskunftInterface/src/main/java/org/eclipse/openk/gridfailureinformation/stoerauskunftinterface/config/SwaggerConfig.java
+++ b/stoerungsauskunftInterface/src/main/java/org/eclipse/openk/gridfailureinformation/stoerauskunftinterface/config/SwaggerConfig.java
@@ -15,7 +15,7 @@
@Log4j2
@Configuration
@EnableSwagger2
-@Profile("swagger")
+@Profile({"!test","!prod"})
public class SwaggerConfig {
@Value("${swagger.baseUrl:}")
diff --git a/stoerungsauskunftInterface/src/main/resources/application.yml b/stoerungsauskunftInterface/src/main/resources/application.yml
index 249988a..2ab88a7 100644
--- a/stoerungsauskunftInterface/src/main/resources/application.yml
+++ b/stoerungsauskunftInterface/src/main/resources/application.yml
@@ -132,6 +132,27 @@
---
spring:
+ profiles: devserver-branch
+ rabbitmq:
+ # Importkanal
+ importExchange: sitImportExchange_branch
+ importQueue: sitImportQueue_branch
+ importkey: sitImportExchange.failureImportKey
+
+ # Exportkanäle
+ exportExchange: sitExportExchange_branch
+ channels:
+ - name: Mail
+ exportQueue: sit_mail_export_queue_branch
+ exportKey: sit_mail_export_key
+ isMailType: true
+ - name: Störungsauskunft.de
+ exportQueue: sit_stoerungsauskunft_export_queue_branch
+ exportKey: sit_stoerungsauskunft_export_key
+
+---
+
+spring:
profiles: qserver
rabbitmq:
host: entdockergss
diff --git a/testImportGridFailures/src/main/java/org/eclipse/openk/gridfailureinformation/jobs/importgridfailures/config/SwaggerConfig.java b/testImportGridFailures/src/main/java/org/eclipse/openk/gridfailureinformation/jobs/importgridfailures/config/SwaggerConfig.java
index 0cd28b0..66eb015 100644
--- a/testImportGridFailures/src/main/java/org/eclipse/openk/gridfailureinformation/jobs/importgridfailures/config/SwaggerConfig.java
+++ b/testImportGridFailures/src/main/java/org/eclipse/openk/gridfailureinformation/jobs/importgridfailures/config/SwaggerConfig.java
@@ -16,7 +16,7 @@
@Log4j2
@Configuration
@EnableSwagger2
-@Profile("!prod")
+@Profile({"!test","!prod"})
public class SwaggerConfig {
@Value("${swagger.baseUrl}")
