From 5ca4114934e55bb9351fd77933283aaecdd8331e Mon Sep 17 00:00:00 2001
From: Matthias Lindinger <matthias.lindinger@bsb-muenchen.de>
Date: Thu, 29 Feb 2024 08:00:14 +0100
Subject: [PATCH] Fix config naming

---
 .../{CudamiServerConfig.java => ApplicationConfig.java}     | 6 +++---
 .../github/dbmdz/metadata/server/config/SpringConfig.java   | 2 +-
 .../src/main/resources/application-typedeclarations.yml     | 2 +-
 metasvc-server/webapp/src/main/resources/application.yml    | 4 ++--
 metasvc-server/webapp/src/test/resources/application.yml    | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename metasvc-server/webapp/src/main/java/io/github/dbmdz/metadata/server/config/{CudamiServerConfig.java => ApplicationConfig.java} (82%)

diff --git a/metasvc-server/webapp/src/main/java/io/github/dbmdz/metadata/server/config/CudamiServerConfig.java b/metasvc-server/webapp/src/main/java/io/github/dbmdz/metadata/server/config/ApplicationConfig.java
similarity index 82%
rename from metasvc-server/webapp/src/main/java/io/github/dbmdz/metadata/server/config/CudamiServerConfig.java
rename to metasvc-server/webapp/src/main/java/io/github/dbmdz/metadata/server/config/ApplicationConfig.java
index a8a9602d7..fdeb80b48 100644
--- a/metasvc-server/webapp/src/main/java/io/github/dbmdz/metadata/server/config/CudamiServerConfig.java
+++ b/metasvc-server/webapp/src/main/java/io/github/dbmdz/metadata/server/config/ApplicationConfig.java
@@ -5,11 +5,11 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.ConstructorBinding;
 
-@ConfigurationProperties(prefix = "cudami")
+@ConfigurationProperties(prefix = "application")
 @ConstructorBinding
-public class CudamiServerConfig extends CudamiConfig {
+public class ApplicationConfig extends CudamiConfig {
 
-  public CudamiServerConfig(
+  public ApplicationConfig(
       Defaults defaults,
       int offsetForAlternativePaging,
       String repositoryFolderPath,
diff --git a/metasvc-server/webapp/src/main/java/io/github/dbmdz/metadata/server/config/SpringConfig.java b/metasvc-server/webapp/src/main/java/io/github/dbmdz/metadata/server/config/SpringConfig.java
index 304da7ba1..968e27065 100644
--- a/metasvc-server/webapp/src/main/java/io/github/dbmdz/metadata/server/config/SpringConfig.java
+++ b/metasvc-server/webapp/src/main/java/io/github/dbmdz/metadata/server/config/SpringConfig.java
@@ -11,5 +11,5 @@
       "de.digitalcollections.commons.springboot.contributor",
       "de.digitalcollections.commons.springboot.monitoring"
     })
-@EnableConfigurationProperties(CudamiServerConfig.class)
+@EnableConfigurationProperties(ApplicationConfig.class)
 public class SpringConfig {}
diff --git a/metasvc-server/webapp/src/main/resources/application-typedeclarations.yml b/metasvc-server/webapp/src/main/resources/application-typedeclarations.yml
index 4a65d466b..83b43328a 100644
--- a/metasvc-server/webapp/src/main/resources/application-typedeclarations.yml
+++ b/metasvc-server/webapp/src/main/resources/application-typedeclarations.yml
@@ -1,4 +1,4 @@
-cudami:
+application:
   typeDeclarations:
 
     manufacturingTypes:
diff --git a/metasvc-server/webapp/src/main/resources/application.yml b/metasvc-server/webapp/src/main/resources/application.yml
index 48c3ca836..fee1578d6 100644
--- a/metasvc-server/webapp/src/main/resources/application.yml
+++ b/metasvc-server/webapp/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 # local/default
 
-cudami:
+application:
   defaults:
     language: en
     locale: en_US
@@ -102,7 +102,7 @@ springdoc:
 ---
 
 # PROD
-cudami:
+application:
   repositoryFolderPath: '/local/cudami/fileResources'
 
 custom:
diff --git a/metasvc-server/webapp/src/test/resources/application.yml b/metasvc-server/webapp/src/test/resources/application.yml
index 355a8c71e..125c82b9b 100644
--- a/metasvc-server/webapp/src/test/resources/application.yml
+++ b/metasvc-server/webapp/src/test/resources/application.yml
@@ -1,4 +1,4 @@
-cudami:
+application:
   defaults:
     language: en
     locale: en_US