From 822ca8a544be0e1cd7daa1a71a73a34d35bb34a0 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Fri, 10 Jan 2025 09:16:18 +0100 Subject: [PATCH 1/5] clean up yml-files: test only in test resources --- .../resources/application-test.yml | 0 .../src/test}/resources/application-test.yml | 0 .../src/main/resources/application-test.yml | 18 ------------------ .../src/test}/resources/application-test.yml | 0 .../src/main/resources/application-test.yml | 18 ------------------ .../src/main/resources/application-test.yml | 18 ------------------ .../src/test/resources/application-test.yml | 2 +- .../src/main/resources/application-test.yml | 18 ------------------ .../src/test}/resources/application-test.yml | 0 9 files changed, 1 insertion(+), 73 deletions(-) rename wls-admin-service/src/{main => test}/resources/application-test.yml (100%) rename {wls-briefwahl-service/src/main => wls-eai-service/src/test}/resources/application-test.yml (100%) delete mode 100644 wls-infomanagement-service/src/main/resources/application-test.yml rename {wls-broadcast-service/src/main => wls-infomanagement-service/src/test}/resources/application-test.yml (100%) delete mode 100644 wls-monitoring-service/src/main/resources/application-test.yml delete mode 100644 wls-vorfaelleundvorkommnisse-service/src/main/resources/application-test.yml delete mode 100644 wls-wahlvorbereitung-service/src/main/resources/application-test.yml rename {wls-eai-service/src/main => wls-wahlvorbereitung-service/src/test}/resources/application-test.yml (100%) diff --git a/wls-admin-service/src/main/resources/application-test.yml b/wls-admin-service/src/test/resources/application-test.yml similarity index 100% rename from wls-admin-service/src/main/resources/application-test.yml rename to wls-admin-service/src/test/resources/application-test.yml diff --git a/wls-briefwahl-service/src/main/resources/application-test.yml b/wls-eai-service/src/test/resources/application-test.yml similarity index 100% rename from wls-briefwahl-service/src/main/resources/application-test.yml rename to wls-eai-service/src/test/resources/application-test.yml diff --git a/wls-infomanagement-service/src/main/resources/application-test.yml b/wls-infomanagement-service/src/main/resources/application-test.yml deleted file mode 100644 index 562b25f44..000000000 --- a/wls-infomanagement-service/src/main/resources/application-test.yml +++ /dev/null @@ -1,18 +0,0 @@ -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 diff --git a/wls-broadcast-service/src/main/resources/application-test.yml b/wls-infomanagement-service/src/test/resources/application-test.yml similarity index 100% rename from wls-broadcast-service/src/main/resources/application-test.yml rename to wls-infomanagement-service/src/test/resources/application-test.yml diff --git a/wls-monitoring-service/src/main/resources/application-test.yml b/wls-monitoring-service/src/main/resources/application-test.yml deleted file mode 100644 index 562b25f44..000000000 --- a/wls-monitoring-service/src/main/resources/application-test.yml +++ /dev/null @@ -1,18 +0,0 @@ -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 diff --git a/wls-vorfaelleundvorkommnisse-service/src/main/resources/application-test.yml b/wls-vorfaelleundvorkommnisse-service/src/main/resources/application-test.yml deleted file mode 100644 index 19918fccd..000000000 --- a/wls-vorfaelleundvorkommnisse-service/src/main/resources/application-test.yml +++ /dev/null @@ -1,18 +0,0 @@ -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: validate - naming.physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl - # Logging for database operation - show-sql: true - properties: - hibernate: - format_sql: true diff --git a/wls-vorfaelleundvorkommnisse-service/src/test/resources/application-test.yml b/wls-vorfaelleundvorkommnisse-service/src/test/resources/application-test.yml index 562b25f44..19918fccd 100644 --- a/wls-vorfaelleundvorkommnisse-service/src/test/resources/application-test.yml +++ b/wls-vorfaelleundvorkommnisse-service/src/test/resources/application-test.yml @@ -9,7 +9,7 @@ spring: # configuration for local (development) mode. this # is also the default, that spring offers by convention. # but here explicite: - ddl-auto: create-drop + ddl-auto: validate naming.physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl # Logging for database operation show-sql: true diff --git a/wls-wahlvorbereitung-service/src/main/resources/application-test.yml b/wls-wahlvorbereitung-service/src/main/resources/application-test.yml deleted file mode 100644 index 562b25f44..000000000 --- a/wls-wahlvorbereitung-service/src/main/resources/application-test.yml +++ /dev/null @@ -1,18 +0,0 @@ -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 diff --git a/wls-eai-service/src/main/resources/application-test.yml b/wls-wahlvorbereitung-service/src/test/resources/application-test.yml similarity index 100% rename from wls-eai-service/src/main/resources/application-test.yml rename to wls-wahlvorbereitung-service/src/test/resources/application-test.yml From c2cb3a88963f9713ba4330db5e6d0757d7c32625 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Fri, 10 Jan 2025 09:16:47 +0100 Subject: [PATCH 2/5] remove yml files original created for additional environments --- .../src/main/resources/application-dev.yml | 29 ------------------- .../src/main/resources/application-kon.yml | 29 ------------------- .../src/main/resources/application-prod.yml | 29 ------------------- 3 files changed, 87 deletions(-) delete mode 100644 wls-broadcast-service/src/main/resources/application-dev.yml delete mode 100644 wls-broadcast-service/src/main/resources/application-kon.yml delete mode 100644 wls-broadcast-service/src/main/resources/application-prod.yml diff --git a/wls-broadcast-service/src/main/resources/application-dev.yml b/wls-broadcast-service/src/main/resources/application-dev.yml deleted file mode 100644 index 7b63b4453..000000000 --- a/wls-broadcast-service/src/main/resources/application-dev.yml +++ /dev/null @@ -1,29 +0,0 @@ -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 - security: - oauth2: - resourceserver: - jwt: - jwk-set-uri: - -security: - # possible values: none, all, changing (With changing, only changing requests such as POST, PUT, DELETE are logged) - logging.requests: all - oauth2: - resource.user-info-uri: diff --git a/wls-broadcast-service/src/main/resources/application-kon.yml b/wls-broadcast-service/src/main/resources/application-kon.yml deleted file mode 100644 index 7b63b4453..000000000 --- a/wls-broadcast-service/src/main/resources/application-kon.yml +++ /dev/null @@ -1,29 +0,0 @@ -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 - security: - oauth2: - resourceserver: - jwt: - jwk-set-uri: - -security: - # possible values: none, all, changing (With changing, only changing requests such as POST, PUT, DELETE are logged) - logging.requests: all - oauth2: - resource.user-info-uri: diff --git a/wls-broadcast-service/src/main/resources/application-prod.yml b/wls-broadcast-service/src/main/resources/application-prod.yml deleted file mode 100644 index 7b63b4453..000000000 --- a/wls-broadcast-service/src/main/resources/application-prod.yml +++ /dev/null @@ -1,29 +0,0 @@ -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 - security: - oauth2: - resourceserver: - jwt: - jwk-set-uri: - -security: - # possible values: none, all, changing (With changing, only changing requests such as POST, PUT, DELETE are logged) - logging.requests: all - oauth2: - resource.user-info-uri: From 66e6c35ddfcf09492873060e647a286d6411d90e Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Fri, 10 Jan 2025 09:55:36 +0100 Subject: [PATCH 3/5] remove comments that does not exist --- .../src/test/resources/application-test.yml | 4 ---- .../src/test/resources/application-test.yml | 4 ---- .../src/test/resources/application-test.yml | 6 +----- .../src/test/resources/application-test.yml | 4 ---- .../src/test/resources/application-test.yml | 4 ---- 5 files changed, 1 insertion(+), 21 deletions(-) diff --git a/wls-basisdaten-service/src/test/resources/application-test.yml b/wls-basisdaten-service/src/test/resources/application-test.yml index 25c10c3a6..caece4596 100644 --- a/wls-basisdaten-service/src/test/resources/application-test.yml +++ b/wls-basisdaten-service/src/test/resources/application-test.yml @@ -12,10 +12,6 @@ spring: 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: validate naming.physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl # Logging for database operation diff --git a/wls-briefwahl-service/src/test/resources/application-test.yml b/wls-briefwahl-service/src/test/resources/application-test.yml index 19918fccd..4aa61f68c 100644 --- a/wls-briefwahl-service/src/test/resources/application-test.yml +++ b/wls-briefwahl-service/src/test/resources/application-test.yml @@ -5,10 +5,6 @@ spring: 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: validate naming.physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl # Logging for database operation diff --git a/wls-ergebnismeldung-service/src/test/resources/application-test.yml b/wls-ergebnismeldung-service/src/test/resources/application-test.yml index 9071a0806..6fb632e45 100644 --- a/wls-ergebnismeldung-service/src/test/resources/application-test.yml +++ b/wls-ergebnismeldung-service/src/test/resources/application-test.yml @@ -13,11 +13,7 @@ spring: 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 + ddl-auto: validate naming.physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl # Logging for database operation show-sql: true diff --git a/wls-monitoring-service/src/test/resources/application-test.yml b/wls-monitoring-service/src/test/resources/application-test.yml index 7b6942275..8b833f367 100644 --- a/wls-monitoring-service/src/test/resources/application-test.yml +++ b/wls-monitoring-service/src/test/resources/application-test.yml @@ -9,10 +9,6 @@ spring: 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: validate naming.physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl # Logging for database operation diff --git a/wls-vorfaelleundvorkommnisse-service/src/test/resources/application-test.yml b/wls-vorfaelleundvorkommnisse-service/src/test/resources/application-test.yml index 19918fccd..4aa61f68c 100644 --- a/wls-vorfaelleundvorkommnisse-service/src/test/resources/application-test.yml +++ b/wls-vorfaelleundvorkommnisse-service/src/test/resources/application-test.yml @@ -5,10 +5,6 @@ spring: 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: validate naming.physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl # Logging for database operation From 1bf0aee35730c75ec7f85e8883364f32c6a86f84 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Fri, 10 Jan 2025 11:19:30 +0100 Subject: [PATCH 4/5] revert change --- .../src/test/resources/application-test.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wls-ergebnismeldung-service/src/test/resources/application-test.yml b/wls-ergebnismeldung-service/src/test/resources/application-test.yml index 6fb632e45..9071a0806 100644 --- a/wls-ergebnismeldung-service/src/test/resources/application-test.yml +++ b/wls-ergebnismeldung-service/src/test/resources/application-test.yml @@ -13,7 +13,11 @@ spring: jpa: database: H2 hibernate: - ddl-auto: validate + # 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 From d7cab00323ed47c9b6bcd6e056befd66bfe25f30 Mon Sep 17 00:00:00 2001 From: MrSebastian <13592751+MrSebastian@users.noreply.github.com> Date: Mon, 13 Jan 2025 17:07:47 +0100 Subject: [PATCH 5/5] =?UTF-8?q?=E2=8F=AA=EF=B8=8F=20unintended=20change=20?= =?UTF-8?q?of=20ddl-auto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/resources/application-test.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wls-vorfaelleundvorkommnisse-service/src/test/resources/application-test.yml b/wls-vorfaelleundvorkommnisse-service/src/test/resources/application-test.yml index 4aa61f68c..562b25f44 100644 --- a/wls-vorfaelleundvorkommnisse-service/src/test/resources/application-test.yml +++ b/wls-vorfaelleundvorkommnisse-service/src/test/resources/application-test.yml @@ -5,7 +5,11 @@ spring: jpa: database: H2 hibernate: - ddl-auto: validate + # 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