♻️ s3 mv rest to submodule

it-at-m · Aug 14, 2024 · b110f02 · b110f02
1 parent 9982561
commit b110f02
Show file tree

Hide file tree

Showing 57 changed files with 32 additions and 10 deletions.
diff --git a/refarch-integrations/refarch-s3-integration/pom.xml b/refarch-integrations/refarch-s3-integration/pom.xml
@@ -21,10 +21,6 @@
         <module>refarch-s3-integration-starter</module>
         <module>refarch-s3-integration-client-core</module>
         <!-- REST -->
-        <module>refarch-s3-integration-rest-core</module>
-        <module>refarch-s3-integration-rest-starter</module>
-        <module>refarch-s3-integration-rest-service</module>
-        <module>refarch-s3-integration-rest-client</module>
-        <module>refarch-s3-integration-rest-client-starter</module>
+        <module>refarch-s3-integration-rest</module>
     </modules>
 </project>
diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/pom.xml b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>de.muenchen.refarch</groupId>
+        <artifactId>refarch-s3-integration</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+    </parent>
+
+
+    <artifactId>refarch-s3-integration-rest</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>refarch-s3-integration-rest-core</module>
+        <module>refarch-s3-integration-rest-starter</module>
+        <module>refarch-s3-integration-rest-service</module>
+
+        <module>refarch-s3-integration-rest-client</module>
+        <module>refarch-s3-integration-rest-client-starter</module>
+    </modules>
+</project>
diff --git a/...3-integration-rest-client-starter/pom.xml → ...3-integration-rest-client-starter/pom.xml b/...3-integration-rest-client-starter/pom.xml → ...3-integration-rest-client-starter/pom.xml
@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>de.muenchen.refarch</groupId>
-        <artifactId>refarch-s3-integration</artifactId>
+        <artifactId>refarch-s3-integration-rest</artifactId>
         <version>1.1.0-SNAPSHOT</version>
     </parent>
 

diff --git a/...S3IntegrationClientAutoConfiguration.java → ...S3IntegrationClientAutoConfiguration.java b/...S3IntegrationClientAutoConfiguration.java → ...S3IntegrationClientAutoConfiguration.java
diff --git a/...erties/S3IntegrationClientProperties.java → ...erties/S3IntegrationClientProperties.java b/...erties/S3IntegrationClientProperties.java → ...erties/S3IntegrationClientProperties.java
diff --git a/...t.autoconfigure.AutoConfiguration.imports → ...t.autoconfigure.AutoConfiguration.imports b/...t.autoconfigure.AutoConfiguration.imports → ...t.autoconfigure.AutoConfiguration.imports
diff --git a/...efarch-s3-integration-rest-client/pom.xml → ...efarch-s3-integration-rest-client/pom.xml b/...efarch-s3-integration-rest-client/pom.xml → ...efarch-s3-integration-rest-client/pom.xml
@@ -5,7 +5,7 @@
 
     <parent>
         <groupId>de.muenchen.refarch</groupId>
-        <artifactId>refarch-s3-integration</artifactId>
+        <artifactId>refarch-s3-integration-rest</artifactId>
         <version>1.1.0-SNAPSHOT</version>
     </parent>
 

diff --git a/...on-rest-client/src/main/api/api-docs.json → ...on-rest-client/src/main/api/api-docs.json b/...on-rest-client/src/main/api/api-docs.json → ...on-rest-client/src/main/api/api-docs.json
diff --git a/...ry/DocumentStorageFileRestRepository.java → ...ry/DocumentStorageFileRestRepository.java b/...ry/DocumentStorageFileRestRepository.java → ...ry/DocumentStorageFileRestRepository.java
diff --git a/.../DocumentStorageFolderRestRepository.java → .../DocumentStorageFolderRestRepository.java b/.../DocumentStorageFolderRestRepository.java → .../DocumentStorageFolderRestRepository.java
diff --git a/...signedurl/PresignedUrlRestRepository.java → ...signedurl/PresignedUrlRestRepository.java b/...signedurl/PresignedUrlRestRepository.java → ...signedurl/PresignedUrlRestRepository.java
diff --git a/...ocumentStorageFileRestRepositoryTest.java → ...ocumentStorageFileRestRepositoryTest.java b/...ocumentStorageFileRestRepositoryTest.java → ...ocumentStorageFileRestRepositoryTest.java
diff --git a/...umentStorageFolderRestRepositoryTest.java → ...umentStorageFolderRestRepositoryTest.java b/...umentStorageFolderRestRepositoryTest.java → ...umentStorageFolderRestRepositoryTest.java
diff --git a/...edurl/PresignedUrlRestRepositoryTest.java → ...edurl/PresignedUrlRestRepositoryTest.java b/...edurl/PresignedUrlRestRepositoryTest.java → ...edurl/PresignedUrlRestRepositoryTest.java
diff --git a/...lient/src/test/resources/logback-test.xml → ...lient/src/test/resources/logback-test.xml b/...lient/src/test/resources/logback-test.xml → ...lient/src/test/resources/logback-test.xml
diff --git a/.../refarch-s3-integration-rest-core/pom.xml → .../refarch-s3-integration-rest-core/pom.xml b/.../refarch-s3-integration-rest-core/pom.xml → .../refarch-s3-integration-rest-core/pom.xml
@@ -5,7 +5,7 @@
 
     <parent>
         <groupId>de.muenchen.refarch</groupId>
-        <artifactId>refarch-s3-integration</artifactId>
+        <artifactId>refarch-s3-integration-rest</artifactId>
         <version>1.1.0-SNAPSHOT</version>
     </parent>
 

diff --git a/...on/s3/adapter/in/rest/FileController.java → ...on/s3/adapter/in/rest/FileController.java b/...on/s3/adapter/in/rest/FileController.java → ...on/s3/adapter/in/rest/FileController.java
diff --git a/.../s3/adapter/in/rest/FolderController.java → .../s3/adapter/in/rest/FolderController.java b/.../s3/adapter/in/rest/FolderController.java → .../s3/adapter/in/rest/FolderController.java
diff --git a/...adapter/in/rest/RestExceptionMapping.java → ...adapter/in/rest/RestExceptionMapping.java b/...adapter/in/rest/RestExceptionMapping.java → ...adapter/in/rest/RestExceptionMapping.java
diff --git a/...n/s3/adapter/in/rest/dto/FileDataDto.java → ...n/s3/adapter/in/rest/dto/FileDataDto.java b/...n/s3/adapter/in/rest/dto/FileDataDto.java → ...n/s3/adapter/in/rest/dto/FileDataDto.java
diff --git a/...n/s3/adapter/in/rest/dto/FileSizeDto.java → ...n/s3/adapter/in/rest/dto/FileSizeDto.java b/...n/s3/adapter/in/rest/dto/FileSizeDto.java → ...n/s3/adapter/in/rest/dto/FileSizeDto.java
diff --git a/...ter/in/rest/dto/FileSizesInFolderDto.java → ...ter/in/rest/dto/FileSizesInFolderDto.java b/...ter/in/rest/dto/FileSizesInFolderDto.java → ...ter/in/rest/dto/FileSizesInFolderDto.java
diff --git a/...adapter/in/rest/dto/FilesInFolderDto.java → ...adapter/in/rest/dto/FilesInFolderDto.java b/...adapter/in/rest/dto/FilesInFolderDto.java → ...adapter/in/rest/dto/FilesInFolderDto.java
diff --git a/.../adapter/in/rest/dto/PresignedUrlDto.java → .../adapter/in/rest/dto/PresignedUrlDto.java b/.../adapter/in/rest/dto/PresignedUrlDto.java → .../adapter/in/rest/dto/PresignedUrlDto.java
diff --git a/...dapter/in/rest/mapper/FileDataMapper.java → ...dapter/in/rest/mapper/FileDataMapper.java b/...dapter/in/rest/mapper/FileDataMapper.java → ...dapter/in/rest/mapper/FileDataMapper.java
diff --git a/...dapter/in/rest/mapper/FileSizeMapper.java → ...dapter/in/rest/mapper/FileSizeMapper.java b/...dapter/in/rest/mapper/FileSizeMapper.java → ...dapter/in/rest/mapper/FileSizeMapper.java
diff --git a/.../rest/mapper/FileSizesInFolderMapper.java → .../rest/mapper/FileSizesInFolderMapper.java b/.../rest/mapper/FileSizesInFolderMapper.java → .../rest/mapper/FileSizesInFolderMapper.java
diff --git a/...r/in/rest/mapper/FilesInFolderMapper.java → ...r/in/rest/mapper/FilesInFolderMapper.java b/...r/in/rest/mapper/FilesInFolderMapper.java → ...r/in/rest/mapper/FilesInFolderMapper.java
diff --git a/...er/in/rest/mapper/PresignedUrlMapper.java → ...er/in/rest/mapper/PresignedUrlMapper.java b/...er/in/rest/mapper/PresignedUrlMapper.java → ...er/in/rest/mapper/PresignedUrlMapper.java
diff --git a/...n/rest/FolderInFilePathValidatorTest.java → ...n/rest/FolderInFilePathValidatorTest.java b/...n/rest/FolderInFilePathValidatorTest.java → ...n/rest/FolderInFilePathValidatorTest.java
diff --git a/...ch-s3-integration-rest-service/Dockerfile → ...ch-s3-integration-rest-service/Dockerfile b/...ch-s3-integration-rest-service/Dockerfile → ...ch-s3-integration-rest-service/Dockerfile
diff --git a/...farch-s3-integration-rest-service/pom.xml → ...farch-s3-integration-rest-service/pom.xml b/...farch-s3-integration-rest-service/pom.xml → ...farch-s3-integration-rest-service/pom.xml
@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>de.muenchen.refarch</groupId>
-        <artifactId>refarch-s3-integration</artifactId>
+        <artifactId>refarch-s3-integration-rest</artifactId>
         <version>1.1.0-SNAPSHOT</version>
     </parent>
 

diff --git a/...egration/s3/S3IntegrationApplication.java → ...egration/s3/S3IntegrationApplication.java b/...egration/s3/S3IntegrationApplication.java → ...egration/s3/S3IntegrationApplication.java
diff --git a/...figuration/CacheControlConfiguration.java → ...figuration/CacheControlConfiguration.java b/...figuration/CacheControlConfiguration.java → ...figuration/CacheControlConfiguration.java
diff --git a/...uration/ForwardedHeaderConfiguration.java → ...uration/ForwardedHeaderConfiguration.java b/...uration/ForwardedHeaderConfiguration.java → ...uration/ForwardedHeaderConfiguration.java
diff --git a/...n/JwtUserInfoAuthenticationConverter.java → ...n/JwtUserInfoAuthenticationConverter.java b/...n/JwtUserInfoAuthenticationConverter.java → ...n/JwtUserInfoAuthenticationConverter.java
diff --git a/...onfiguration/NoSecurityConfiguration.java → ...onfiguration/NoSecurityConfiguration.java b/...onfiguration/NoSecurityConfiguration.java → ...onfiguration/NoSecurityConfiguration.java
diff --git a/.../configuration/SecurityConfiguration.java → .../configuration/SecurityConfiguration.java b/.../configuration/SecurityConfiguration.java → .../configuration/SecurityConfiguration.java
diff --git a/...3/configuration/UnicodeConfiguration.java → ...3/configuration/UnicodeConfiguration.java b/...3/configuration/UnicodeConfiguration.java → ...3/configuration/UnicodeConfiguration.java
diff --git a/...iguration/UserInfoAuthoritiesService.java → ...iguration/UserInfoAuthoritiesService.java b/...iguration/UserInfoAuthoritiesService.java → ...iguration/UserInfoAuthoritiesService.java
diff --git a/...configuration/nfcconverter/NfcHelper.java → ...configuration/nfcconverter/NfcHelper.java b/...configuration/nfcconverter/NfcHelper.java → ...configuration/nfcconverter/NfcHelper.java
diff --git a/...configuration/nfcconverter/NfcReader.java → ...configuration/nfcconverter/NfcReader.java b/...configuration/nfcconverter/NfcReader.java → ...configuration/nfcconverter/NfcReader.java
diff --git a/...onfiguration/nfcconverter/NfcRequest.java → ...onfiguration/nfcconverter/NfcRequest.java b/...onfiguration/nfcconverter/NfcRequest.java → ...onfiguration/nfcconverter/NfcRequest.java
diff --git a/...ration/nfcconverter/NfcRequestFilter.java → ...ration/nfcconverter/NfcRequestFilter.java b/...ration/nfcconverter/NfcRequestFilter.java → ...ration/nfcconverter/NfcRequestFilter.java
diff --git a/...n/nfcconverter/NfcServletInputStream.java → ...n/nfcconverter/NfcServletInputStream.java b/...n/nfcconverter/NfcServletInputStream.java → ...n/nfcconverter/NfcServletInputStream.java
diff --git a/...ch/integration/s3/security/AuthUtils.java → ...ch/integration/s3/security/AuthUtils.java b/...ch/integration/s3/security/AuthUtils.java → ...ch/integration/s3/security/AuthUtils.java
diff --git a/...ecurity/RequestResponseLoggingFilter.java → ...ecurity/RequestResponseLoggingFilter.java b/...ecurity/RequestResponseLoggingFilter.java → ...ecurity/RequestResponseLoggingFilter.java
diff --git a/.../src/main/resources/application-local.yml → .../src/main/resources/application-local.yml b/.../src/main/resources/application-local.yml → .../src/main/resources/application-local.yml
diff --git a/...ervice/src/main/resources/application.yml → ...ervice/src/main/resources/application.yml b/...ervice/src/main/resources/application.yml → ...ervice/src/main/resources/application.yml
diff --git a/...est-service/src/main/resources/banner.txt → ...est-service/src/main/resources/banner.txt b/...est-service/src/main/resources/banner.txt → ...est-service/src/main/resources/banner.txt
diff --git a/...ice/src/main/resources/logback-spring.xml → ...ice/src/main/resources/logback-spring.xml b/...ice/src/main/resources/logback-spring.xml → ...ice/src/main/resources/logback-spring.xml
diff --git a/...ration/nfcconverter/NfcConverterTest.java → ...ration/nfcconverter/NfcConverterTest.java b/...ration/nfcconverter/NfcConverterTest.java → ...ration/nfcconverter/NfcConverterTest.java
diff --git a/...iguration/nfcconverter/NfcHelperTest.java → ...iguration/nfcconverter/NfcHelperTest.java b/...iguration/nfcconverter/NfcHelperTest.java → ...iguration/nfcconverter/NfcHelperTest.java
diff --git a/...rvice/src/test/resources/logback-test.xml → ...rvice/src/test/resources/logback-test.xml b/...rvice/src/test/resources/logback-test.xml → ...rvice/src/test/resources/logback-test.xml
diff --git a/...farch-s3-integration-rest-starter/pom.xml → ...farch-s3-integration-rest-starter/pom.xml b/...farch-s3-integration-rest-starter/pom.xml → ...farch-s3-integration-rest-starter/pom.xml
@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>de.muenchen.refarch</groupId>
-        <artifactId>refarch-s3-integration</artifactId>
+        <artifactId>refarch-s3-integration-rest</artifactId>
         <version>1.1.0-SNAPSHOT</version>
     </parent>
 

diff --git a/...n/S3IntegrationRestAutoConfiguration.java → ...n/S3IntegrationRestAutoConfiguration.java b/...n/S3IntegrationRestAutoConfiguration.java → ...n/S3IntegrationRestAutoConfiguration.java
diff --git a/...t.autoconfigure.AutoConfiguration.imports → ...t.autoconfigure.AutoConfiguration.imports b/...t.autoconfigure.AutoConfiguration.imports → ...t.autoconfigure.AutoConfiguration.imports