From ba64478c25858c253bbccaf5f5d65dd8336262bd Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Wed, 26 Mar 2025 10:03:40 +0100
Subject: [PATCH] OZG-7609 load configurations from config server

---
 .../aggregation/TransformationProperties.java |  4 ++++
 .../transformation/AggregationMapping.java    | 19 ++++++++++---------
 .../JSLTransformationService.java             |  2 +-
 src/main/resources/application-local.yml      | 14 ++++++++------
 src/main/resources/application.yml            |  2 ++
 5 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/main/java/de/ozgcloud/aggregation/TransformationProperties.java b/src/main/java/de/ozgcloud/aggregation/TransformationProperties.java
index e5f01dc..b639b4b 100644
--- a/src/main/java/de/ozgcloud/aggregation/TransformationProperties.java
+++ b/src/main/java/de/ozgcloud/aggregation/TransformationProperties.java
@@ -26,14 +26,18 @@ package de.ozgcloud.aggregation;
 import java.util.List;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
 
 import de.ozgcloud.aggregation.transformation.AggregationMapping;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.extern.log4j.Log4j2;
 
 @ConfigurationProperties(prefix = "ozgcloud.aggregation")
+@Configuration
 @Getter
 @Setter
+@Log4j2
 public class TransformationProperties {
 
 	/*
diff --git a/src/main/java/de/ozgcloud/aggregation/transformation/AggregationMapping.java b/src/main/java/de/ozgcloud/aggregation/transformation/AggregationMapping.java
index 74a0c54..9e6548d 100644
--- a/src/main/java/de/ozgcloud/aggregation/transformation/AggregationMapping.java
+++ b/src/main/java/de/ozgcloud/aggregation/transformation/AggregationMapping.java
@@ -23,31 +23,32 @@
  */
 package de.ozgcloud.aggregation.transformation;
 
+import java.util.ArrayList;
 import java.util.List;
 
-import lombok.Builder;
 import lombok.Getter;
-import lombok.Singular;
+import lombok.Setter;
+import lombok.ToString;
 
-@Builder
 @Getter
+@Setter
+@ToString
 public class AggregationMapping {
 
 	private FormIdentifier formIdentifier;
 
-	@Singular
-	private List<FieldMapping> mappings;
+	private List<FieldMapping> fieldMappings = new ArrayList<>();
 
-	@Builder
 	@Getter
-	static class FormIdentifier {
+	@Setter
+	public static class FormIdentifier {
 		private String formEngineName;
 		private String formId;
 	}
 
-	@Builder
 	@Getter
-	static class FieldMapping {
+	@Setter
+	public static class FieldMapping {
 		private String sourcePath;
 		private String targetPath;
 	}
diff --git a/src/main/java/de/ozgcloud/aggregation/transformation/JSLTransformationService.java b/src/main/java/de/ozgcloud/aggregation/transformation/JSLTransformationService.java
index 51a81b9..f5254de 100644
--- a/src/main/java/de/ozgcloud/aggregation/transformation/JSLTransformationService.java
+++ b/src/main/java/de/ozgcloud/aggregation/transformation/JSLTransformationService.java
@@ -72,7 +72,7 @@ public class JSLTransformationService implements TransformationService {
 	}
 
 	private List<FieldMapping> getFieldMappings(AggregationMapping mapping) {
-		return Optional.ofNullable(mapping).map(AggregationMapping::getMappings).orElse(Collections.emptyList());
+		return Optional.ofNullable(mapping).map(AggregationMapping::getFieldMappings).orElse(Collections.emptyList());
 	}
 
 	Map<String, String> transformToMap(List<FieldMapping> mappings) {
diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
index 28eabe2..5757dad 100644
--- a/src/main/resources/application-local.yml
+++ b/src/main/resources/application-local.yml
@@ -1,16 +1,17 @@
 logging:
   level:
     ROOT: WARN
-    '[de.ozgcloud]': DEBUG,
+    '[de.ozgcloud]': DEBUG
+    '[org.springframework.cloud.config]': DEBUG
     '[org.springframework.security]': WARN
   config: classpath:log4j2-local.xml
 
 spring:
-   data:
-      mongodb:
-         host: localhost
-         port: 27017
-         database: aggregation-manager
+  data:
+    mongodb:
+      host: localhost
+      port: 27017
+      database: aggregation-manager
 
 ozgcloud:
   vorgang-manager:
@@ -19,3 +20,4 @@ ozgcloud:
 
 aggregation-manager:
    fetching-batch-size: 5
+
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a3b81b4..10ba491 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -36,6 +36,8 @@ grpc:
 spring:
   config:
     import: optional:configserver:${ozgcloud_administration_address}/configserver/
+  application:
+    name: OzgCloud_AggregationManager
 
 aggregation-manager:
   fetching-batch-size: 100
-- 
GitLab