Skip to content
Snippets Groups Projects
Commit ba64478c authored by Felix Reichenbach's avatar Felix Reichenbach
Browse files

OZG-7609 load configurations from config server

parent 21422f77
Branches
Tags
1 merge request!12OZG-7609 load configurations from config server
...@@ -26,14 +26,18 @@ package de.ozgcloud.aggregation; ...@@ -26,14 +26,18 @@ package de.ozgcloud.aggregation;
import java.util.List; import java.util.List;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
import de.ozgcloud.aggregation.transformation.AggregationMapping; import de.ozgcloud.aggregation.transformation.AggregationMapping;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.extern.log4j.Log4j2;
@ConfigurationProperties(prefix = "ozgcloud.aggregation") @ConfigurationProperties(prefix = "ozgcloud.aggregation")
@Configuration
@Getter @Getter
@Setter @Setter
@Log4j2
public class TransformationProperties { public class TransformationProperties {
/* /*
......
...@@ -23,31 +23,32 @@ ...@@ -23,31 +23,32 @@
*/ */
package de.ozgcloud.aggregation.transformation; package de.ozgcloud.aggregation.transformation;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.Builder;
import lombok.Getter; import lombok.Getter;
import lombok.Singular; import lombok.Setter;
import lombok.ToString;
@Builder
@Getter @Getter
@Setter
@ToString
public class AggregationMapping { public class AggregationMapping {
private FormIdentifier formIdentifier; private FormIdentifier formIdentifier;
@Singular private List<FieldMapping> fieldMappings = new ArrayList<>();
private List<FieldMapping> mappings;
@Builder
@Getter @Getter
static class FormIdentifier { @Setter
public static class FormIdentifier {
private String formEngineName; private String formEngineName;
private String formId; private String formId;
} }
@Builder
@Getter @Getter
static class FieldMapping { @Setter
public static class FieldMapping {
private String sourcePath; private String sourcePath;
private String targetPath; private String targetPath;
} }
......
...@@ -72,7 +72,7 @@ public class JSLTransformationService implements TransformationService { ...@@ -72,7 +72,7 @@ public class JSLTransformationService implements TransformationService {
} }
private List<FieldMapping> getFieldMappings(AggregationMapping mapping) { 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) { Map<String, String> transformToMap(List<FieldMapping> mappings) {
......
logging: logging:
level: level:
ROOT: WARN ROOT: WARN
'[de.ozgcloud]': DEBUG, '[de.ozgcloud]': DEBUG
'[org.springframework.cloud.config]': DEBUG
'[org.springframework.security]': WARN '[org.springframework.security]': WARN
config: classpath:log4j2-local.xml config: classpath:log4j2-local.xml
...@@ -19,3 +20,4 @@ ozgcloud: ...@@ -19,3 +20,4 @@ ozgcloud:
aggregation-manager: aggregation-manager:
fetching-batch-size: 5 fetching-batch-size: 5
...@@ -36,6 +36,8 @@ grpc: ...@@ -36,6 +36,8 @@ grpc:
spring: spring:
config: config:
import: optional:configserver:${ozgcloud_administration_address}/configserver/ import: optional:configserver:${ozgcloud_administration_address}/configserver/
application:
name: OzgCloud_AggregationManager
aggregation-manager: aggregation-manager:
fetching-batch-size: 100 fetching-batch-size: 100
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment