Fix/1442 domain specific s3 in engine (#1769)

* 1442 fix usage of domain specific s3 in engine

* Revert "1442 fix usage of domain specific s3 in engine"

This reverts commit b3a504a.

* 1442 fix order of configurations

* 1442 remove redundant configuration

* 1442 remove redundant import

digiwf-engine/digiwf-engine-service/src/main/java/de/muenchen/oss/digiwf/shared/file/S3Configuration.java

@@ -6,7 +6,6 @@
 import de.muenchen.oss.digiwf.s3.integration.client.service.S3DomainProvider;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
@@ -17,8 +16,8 @@
  * @author martin.dietrich
  */
 @Configuration
-@ComponentScan(basePackages = { "de.muenchen.oss.digiwf.s3.integration.client" })
 public class S3Configuration {
+
     /**
      * Provides the {@link RestTemplate} which is used in {@link ApiClient}.
      *

digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-client-starter/src/main/java/de/muenchen/oss/digiwf/s3/integration/client/configuration/S3IntegrationClientAutoConfiguration.java

@@ -116,17 +116,22 @@ public FileExtensionService fileExtensionValidationFromS3IntegrationClientProper
     }
 
     /**
-     * Instance of an {@link S3StorageUrlProvider} containing an externally created {@link S3DomainProvider} for retrieving S
+     * Instance of an {@link S3StorageUrlProvider} containing an externally created {@link S3DomainProvider} for retrieving the S3 storage URL.
      *
-     * @param s3DomainProvider
-     * @return
+     * @param s3DomainProvider Provider of domain specific S3 storages configured in process configurations.
+     * @return Provider of the S3 storage URL.
      */
     @Bean
     @ConditionalOnBean(S3DomainProvider.class)
     public S3StorageUrlProvider s3StorageUrlProvider(final S3DomainProvider s3DomainProvider) {
         return new S3StorageUrlProvider(s3DomainProvider, this.s3IntegrationClientProperties.getDocumentStorageUrl());
     }
 
+    /**
+     * Instance of an {@link S3StorageUrlProvider} containing a default {@link S3DomainProvider}. The instance will only return the default S3 URL.
+     *
+     * @return Provider of the S3 storage URL.
+     */
     @Bean
     @ConditionalOnMissingBean(S3DomainProvider.class)
     public S3StorageUrlProvider s3StorageUrlProviderWithoutDomainProvider() {

digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/src/main/resources/application.yml

@@ -32,15 +32,6 @@ spring:
         sendMessage-out-0:
           destination: dwf-connector-${DIGIWF_ENV}
 
-de:
-  muenchen:
-    oss:
-      digiwf:
-        s3:
-          client:
-            document-storage-url: "${DOCUMENT_STORAGE_HOST:http://localhost}:${DOCUMENT_STORAGE_PORT:8080}"
-            enable-security: false
-
 io:
   muenchendigital:
     digiwf: