diff --git a/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-service/src/main/resources/application.yml b/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-service/src/main/resources/application.yml index bddca4ecc4..5b68dbd2b5 100644 --- a/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-service/src/main/resources/application.yml +++ b/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-service/src/main/resources/application.yml @@ -1,3 +1,7 @@ +spring: + application: + name: @project.artifactId@ + io: muenchendigital: digiwf: diff --git a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-core/src/main/java/de/muenchen/oss/digiwf/s3/integration/adapter/in/streaming/MessageProcessor.java b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-core/src/main/java/de/muenchen/oss/digiwf/s3/integration/adapter/in/streaming/MessageProcessor.java index c8a53561d2..bea0716dc5 100644 --- a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-core/src/main/java/de/muenchen/oss/digiwf/s3/integration/adapter/in/streaming/MessageProcessor.java +++ b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-core/src/main/java/de/muenchen/oss/digiwf/s3/integration/adapter/in/streaming/MessageProcessor.java @@ -10,12 +10,14 @@ import lombok.RequiredArgsConstructor; import lombok.val; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.messaging.Message; import javax.validation.ConstraintViolationException; import java.util.Map; import java.util.function.Consumer; +@Configuration @RequiredArgsConstructor public class MessageProcessor { /** diff --git a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/src/main/resources/application.yml b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/src/main/resources/application.yml index c242326bf8..585f89c5fc 100644 --- a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/src/main/resources/application.yml +++ b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/src/main/resources/application.yml @@ -90,6 +90,12 @@ io: unused-files: 0 15 10 16 * ? expired-files: 0 15 10 15 * ? proxyEnabled: 'false' + message: + incidentDestination: "dwf-connector-incident-${DIGIWF_ENV}" + bpmnErrorDestination: "dwf-connector-bpmnerror-${DIGIWF_ENV}" + correlateMessageDestination: "dwf-connector-${DIGIWF_ENV}" + typeMappings: + createPresignedUrl: "createPresignedUrl" server: port: "${S3_INTEGRATION_SERVER_PORT:8086}" diff --git a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/src/test/java/de/muenchen/oss/digiwf/s3/integration/ServiceIntegrationTest.java b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/src/test/java/de/muenchen/oss/digiwf/s3/integration/ServiceIntegrationTest.java index 795e1a5c9c..7190f0ae46 100644 --- a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/src/test/java/de/muenchen/oss/digiwf/s3/integration/ServiceIntegrationTest.java +++ b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/src/test/java/de/muenchen/oss/digiwf/s3/integration/ServiceIntegrationTest.java @@ -1,5 +1,6 @@ package de.muenchen.oss.digiwf.s3.integration; +import de.muenchen.oss.digiwf.s3.integration.adapter.in.streaming.CreatePresignedUrlEvent; import de.muenchen.oss.digiwf.s3.integration.application.port.in.CreatePresignedUrlsInPort; import de.muenchen.oss.digiwf.spring.security.authentication.UserAuthenticationProvider; import de.muenchen.oss.digiwf.spring.security.autoconfiguration.SpringSecurityAutoConfiguration; @@ -10,8 +11,11 @@ import org.springframework.boot.autoconfigure.security.oauth2.resource.servlet.OAuth2ResourceServerAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.messaging.Message; import org.springframework.test.context.ActiveProfiles; +import java.util.function.Consumer; + import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest( @@ -33,9 +37,12 @@ public class ServiceIntegrationTest { @Autowired(required = false) private CreatePresignedUrlsInPort port; + @Autowired(required = false) + private Consumer> createPresignedUrl; + @Test void starts_service() { assertThat(port).isNotNull(); + assertThat(createPresignedUrl).isNotNull(); } - }