s3-integration rm db dependencies

it-at-m · Jul 2, 2024 · db28862 · db28862
1 parent 1435fb3
commit db28862
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 67 deletions.
diff --git a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-core/pom.xml b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-core/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,10 +28,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>

diff --git a/...service/src/main/java/de/muenchen/oss/digiwf/s3/integration/S3IntegrationApplication.java b/...service/src/main/java/de/muenchen/oss/digiwf/s3/integration/S3IntegrationApplication.java
@@ -6,20 +6,18 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 
 /**
  * Application class for starting the micro-service.
  */
 @SpringBootApplication
-@EnableJpaAuditing
 @EnableScheduling
 public class S3IntegrationApplication {
 
-  public static void main(String[] args) {
-    SpringApplication.run(S3IntegrationApplication.class, args);
-  }
+    public static void main(String[] args) {
+        SpringApplication.run(S3IntegrationApplication.class, args);
+    }
 
 }
diff --git a/...ns/digiwf-s3-integration/digiwf-s3-integration-service/src/main/resources/application.yml b/...ns/digiwf-s3-integration/digiwf-s3-integration-service/src/main/resources/application.yml
@@ -3,27 +3,9 @@ info:
     name: '@project.artifactId@'
     version: '@project.version@'
 
-
 spring:
   application:
     name: ${info.application.name}
-  # Spring JPA
-  datasource:
-    url: '${S3INTEGRATION_DATASOURCE_URL}'
-    username: '${S3INTEGRATION_DATASOURCE_USER}'
-    password: '${S3INTEGRATION_DATASOURCE_PASSWORD}'
-    driver-class-name: '${S3INTEGRATION_DATASOURCE_DRIVERCLASSNAME}'
-  flyway:
-    enabled: true
-    locations: "classpath:db/migration/{vendor}"
-  jpa:
-    database-platform: '${S3INTEGRATION_DATABASE_PLATFORM}'
-    hibernate:
-      naming:
-        physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-      ddl-auto: validate
-    open-in-view: true
-
   cloud:
     stream:
       bindings:

diff --git a/...iwf-s3-integration/digiwf-s3-integration-service/src/test/resources/application-itest.yml b/...iwf-s3-integration/digiwf-s3-integration-service/src/test/resources/application-itest.yml
@@ -1,21 +1,6 @@
-refarch.gracefulshutdown.pre-wait-seconds: 0
-
 DIGIWF_ENV: itest
 
 spring:
-  datasource:
-    url: jdbc:h2:mem:testdb;mode=postgresql
-    username: sa
-    password:
-    driver-class-name: org.h2.Driver
-  flyway:
-    locations: "classpath:db/migration/postgresql"
-  jpa:
-    database: H2
-    show-sql: false
-    properties:
-      hibernate:
-        format_sql: true
   cloud:
     stream:
       kafka:
@@ -27,9 +12,7 @@ spring:
         sendMessage-out-0:
           destination: dwf-connector-itest
 
-
 io.muenchendigital.digiwf.s3:
-  cleanupcronjob: "0 15 10 15 * ?"
   url: s3k.muenchen.de
   bucketName: int-dwfk-documentstoragelocal
   accessKey: itest-dummy-access

diff --git a/...giwf-s3-integration/digiwf-s3-integration-service/src/test/resources/application-test.yml b/...giwf-s3-integration/digiwf-s3-integration-service/src/test/resources/application-test.yml
@@ -1,24 +1,4 @@
-spring:
-
-  # Spring JPA
-  h2.console.enabled: true
-  jpa:
-    database: H2
-    hibernate:
-      # always drop and create the db should be the best
-      # configuration for local (development) mode. this
-      # is also the default, that spring offers by convention.
-      # but here explicite:
-      ddl-auto: create-drop
-      naming.physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-    # Logging for database operation
-    show-sql: true
-    properties:
-      hibernate:
-        format_sql: true
-
 io.muenchendigital.digiwf.s3:
-  cleanupcronjob: "0 15 10 15 * ?"
   url: s3k.muenchen.de
   bucketName: int-dwfk-documentstoragelocal
   accessKey:

diff --git a/...a/de/muenchen/oss/digiwf/s3/integration/configuration/S3IntegrationAutoConfiguration.java b/...a/de/muenchen/oss/digiwf/s3/integration/configuration/S3IntegrationAutoConfiguration.java
@@ -24,15 +24,13 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.messaging.Message;
 
 import java.util.Optional;
 import java.util.function.Consumer;
 
 @Configuration
 @RequiredArgsConstructor
-@EnableJpaRepositories(basePackages = "de.muenchen.oss.digiwf.s3.integration")
 @EntityScan(basePackages = "de.muenchen.oss.digiwf.s3.integration")
 @ComponentScan(basePackages = "de.muenchen.oss.digiwf.s3.integration")
 @EnableConfigurationProperties(S3IntegrationProperties.class)