Merge branch 'main' into feature/init-mail-integration

it-at-m · Aug 14, 2024 · 54e47a3 · 54e47a3
2 parents e5e3f3e + 4d5d148
commit 54e47a3
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 13 deletions.
diff --git a/...hen/refarch/integration/s3/client/configuration/S3IntegrationClientAutoConfiguration.java b/...hen/refarch/integration/s3/client/configuration/S3IntegrationClientAutoConfiguration.java
@@ -80,7 +80,7 @@ public DocumentStorageFileRepository documentStorageFileRepository(
     }
 
     @Bean
-    @ConditionalOnBean
+    @ConditionalOnMissingBean
     public DocumentStorageFolderRepository documentStorageFolderRepository(
             final FolderOperationsInPort folderOperationsInPort) {
         return new DocumentStorageFolderJavaRepository(folderOperationsInPort);

diff --git a/...ntegration/refarch-s3-integration-rest/refarch-s3-integration-rest-client-starter/pom.xml b/...ntegration/refarch-s3-integration-rest/refarch-s3-integration-rest-client-starter/pom.xml
@@ -30,6 +30,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-oauth2-client</artifactId>
@@ -43,10 +47,6 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.httpcomponents.client5</groupId>

diff --git a/...hen/refarch/integration/s3/client/configuration/S3IntegrationClientAutoConfiguration.java b/...hen/refarch/integration/s3/client/configuration/S3IntegrationClientAutoConfiguration.java
@@ -6,6 +6,13 @@
 import de.muenchen.refarch.integration.s3.client.domain.model.SupportedFileExtensions;
 import de.muenchen.refarch.integration.s3.client.factory.YamlPropertySourceFactory;
 import de.muenchen.refarch.integration.s3.client.properties.S3IntegrationClientProperties;
+import de.muenchen.refarch.integration.s3.client.repository.DocumentStorageFileRepository;
+import de.muenchen.refarch.integration.s3.client.repository.DocumentStorageFileRestRepository;
+import de.muenchen.refarch.integration.s3.client.repository.DocumentStorageFolderRepository;
+import de.muenchen.refarch.integration.s3.client.repository.DocumentStorageFolderRestRepository;
+import de.muenchen.refarch.integration.s3.client.repository.presignedurl.PresignedUrlRepository;
+import de.muenchen.refarch.integration.s3.client.repository.presignedurl.PresignedUrlRestRepository;
+import de.muenchen.refarch.integration.s3.client.repository.transfer.S3FileTransferRepository;
 import de.muenchen.refarch.integration.s3.client.service.FileValidationService;
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
@@ -33,15 +40,15 @@
 )
 @RequiredArgsConstructor
 @EnableConfigurationProperties(S3IntegrationClientProperties.class)
-@PropertySource(value = ResourceUtils.CLASSPATH_URL_PREFIX + "application.yml", factory = YamlPropertySourceFactory.class)
+@PropertySource(value = "classpath:application-s3-client.yml", factory = YamlPropertySourceFactory.class)
 @Slf4j
 public class S3IntegrationClientAutoConfiguration {
 
     public final S3IntegrationClientProperties s3IntegrationClientProperties;
 
     @PostConstruct
     public void init() {
-        log.info("[REFARCH-S3-INTEGRATION-CLIENT]: Staring integration client, security is {}.",
+        log.info("s3 rest client security is {}.",
                 s3IntegrationClientProperties.isEnableSecurity() ? "enabled" : "disabled");
     }
 
@@ -110,4 +117,28 @@ public FileApiApi fileApiApi(final ApiClient apiClient) {
     public FolderApiApi folderApiApi(final ApiClient apiClient) {
         return new FolderApiApi(apiClient);
     }
+
+    @Bean
+    @ConditionalOnMissingBean
+    public PresignedUrlRepository presignedUrlRepository(
+            final FileApiApi fileApi) {
+        return new PresignedUrlRestRepository(fileApi);
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    public DocumentStorageFileRepository documentStorageFileRepository(
+            final PresignedUrlRepository presignedUrlRepository,
+            final S3FileTransferRepository s3FileTransferRepository,
+            final FileApiApi fileApi) {
+        return new DocumentStorageFileRestRepository(presignedUrlRepository,
+                s3FileTransferRepository, fileApi);
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    public DocumentStorageFolderRepository documentStorageFolderRepository(
+            final FolderApiApi folderApi) {
+        return new DocumentStorageFolderRestRepository(folderApi);
+    }
 }
diff --git a/...tarter/src/main/resources/application.yml → .../main/resources/application-s3-client.yml b/...tarter/src/main/resources/application.yml → .../main/resources/application-s3-client.yml
diff --git a/.../muenchen/refarch/integration/s3/client/repository/DocumentStorageFileRestRepository.java b/.../muenchen/refarch/integration/s3/client/repository/DocumentStorageFileRestRepository.java
@@ -7,13 +7,11 @@
 import de.muenchen.refarch.integration.s3.client.repository.presignedurl.PresignedUrlRepository;
 import de.muenchen.refarch.integration.s3.client.repository.transfer.S3FileTransferRepository;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Repository;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.HttpServerErrorException;
 import org.springframework.web.client.RestClientException;
 
 @Slf4j
-@Repository
 public class DocumentStorageFileRestRepository extends DocumentStorageFileRepository {
     private final FileApiApi fileApi;
 

diff --git a/...uenchen/refarch/integration/s3/client/repository/DocumentStorageFolderRestRepository.java b/...uenchen/refarch/integration/s3/client/repository/DocumentStorageFolderRestRepository.java
@@ -10,14 +10,12 @@
 import java.util.Set;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Repository;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.HttpServerErrorException;
 import org.springframework.web.client.RestClientException;
 import reactor.core.publisher.Mono;
 
 @Slf4j
-@Repository
 @RequiredArgsConstructor
 public class DocumentStorageFolderRestRepository implements DocumentStorageFolderRepository {
     private final FolderApiApi folderApi;

diff --git a/...hen/refarch/integration/s3/client/repository/presignedurl/PresignedUrlRestRepository.java b/...hen/refarch/integration/s3/client/repository/presignedurl/PresignedUrlRestRepository.java
@@ -8,14 +8,12 @@
 import de.muenchen.refarch.integration.s3.client.model.PresignedUrlDto;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Repository;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.HttpServerErrorException;
 import org.springframework.web.client.RestClientException;
 import reactor.core.publisher.Mono;
 
 @Slf4j
-@Repository
 @RequiredArgsConstructor
 public class PresignedUrlRestRepository implements PresignedUrlRepository {
 

diff --git a/...java/de/muenchen/refarch/integration/s3/configuration/S3IntegrationAutoConfiguration.java b/...java/de/muenchen/refarch/integration/s3/configuration/S3IntegrationAutoConfiguration.java
@@ -3,9 +3,12 @@
 import de.muenchen.refarch.integration.s3.adapter.out.s3.S3Adapter;
 import de.muenchen.refarch.integration.s3.application.port.in.CreatePresignedUrlsInPort;
 import de.muenchen.refarch.integration.s3.application.port.in.FileOperationsInPort;
+import de.muenchen.refarch.integration.s3.application.port.in.FolderOperationsInPort;
+import de.muenchen.refarch.integration.s3.application.port.out.S3OutPort;
 import de.muenchen.refarch.integration.s3.application.usecase.CreatePresignedUrlsUseCase;
 import de.muenchen.refarch.integration.s3.application.usecase.FileOperationsPresignedUrlUseCase;
 import de.muenchen.refarch.integration.s3.application.usecase.FileOperationsUseCase;
+import de.muenchen.refarch.integration.s3.application.usecase.FolderOperationsUseCase;
 import de.muenchen.refarch.integration.s3.domain.exception.FileSystemAccessException;
 import de.muenchen.refarch.integration.s3.properties.S3IntegrationProperties;
 import io.minio.MinioClient;
@@ -55,4 +58,10 @@ public FileOperationsInPort fileOperationsInPort(S3Adapter s3Adapter) {
     public FileOperationsPresignedUrlUseCase fileOperationsPresignedUrlUseCase(S3Adapter s3Adapter) {
         return new FileOperationsPresignedUrlUseCase(s3Adapter);
     }
+
+    @ConditionalOnMissingBean
+    @Bean
+    public FolderOperationsInPort folderOperationsInPort(final S3OutPort s3OutPort) {
+        return new FolderOperationsUseCase(s3OutPort);
+    }
 }