1 files changed, 11 insertions, 30 deletions

diff --git a/src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileGenerator.java b/src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileGenerator.java
index 0b4bc19..6337ff2 100644
--- a/src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileGenerator.java
+++ b/src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileGenerator.java
@@ -28,9 +28,7 @@ public class ConfigProfileGenerator {
             "availability.";
 
     private final SpringPropertiesFacade properties;
-    private final MapToConfigConverter converter;
-    private final ConfigProfileValidator validator;
-    private final ConfigProfileMerger merger;
+    private final ConfigUtil util;
     private final boolean verifyCompletenessOfDefaultConfiguration;
     private final String profilePrefix;
     private final String defaultConfigKey;
@@ -41,16 +39,12 @@ public class ConfigProfileGenerator {
 
     private ConfigProfileGenerator(
             SpringPropertiesFacade properties,
-            MapToConfigConverter converter,
-            ConfigProfileValidator validator,
-            ConfigProfileMerger merger,
+            ConfigUtil util,
             boolean verifyCompletenessOfDefaultConfiguration,
             String profilePrefix,
             String defaultConfigKey) {
-        this.merger = merger;
-        this.validator = validator;
+        this.util = util;
         this.properties = properties;
-        this.converter = converter;
         this.verifyCompletenessOfDefaultConfiguration = verifyCompletenessOfDefaultConfiguration;
         this.profilePrefix = profilePrefix;
         this.defaultConfigKey = defaultConfigKey;
@@ -70,7 +64,7 @@ public class ConfigProfileGenerator {
 
         var defaultProfile = profiles.get(defaultConfigKey);
 
-        if (!validator.isComplete(defaultProfile)) {
+        if (!util.isComplete(defaultProfile)) {
             if (verifyCompletenessOfDefaultConfiguration)
                 throw MoaZSException.moaZSException(PROFILE_NOT_COMPLETE_ERROR_MESSAGE);
             else {
@@ -110,7 +104,7 @@ public class ConfigProfileGenerator {
                     values.put(key, value);
                 });
 
-        return converter.convert(values);
+        return util.convert(values);
 
     }
 
@@ -118,36 +112,23 @@ public class ConfigProfileGenerator {
         return profiles.entrySet().stream()
                 .collect(toUnmodifiableMap(
                         Entry::getKey,
-                        e -> merger.merge(e.getValue(), defaultProfile)));
+                        e -> util.merge(e.getValue(), defaultProfile)));
     }
 
     public static class ConfigProfileGeneratorBuilder {
         private SpringPropertiesFacade properties;
-        private MapToConfigConverter converter;
-        private ConfigProfileValidator validator;
-        private ConfigProfileMerger merger;
+        private ConfigUtil util;
         private boolean verifyCompletenessOfDefaultConfiguration = true;
         private String profilePrefix = "delivery-request-configuration-profiles";
         private String defaultConfigKey = "default";
 
-
         public ConfigProfileGeneratorBuilder withProperties(SpringPropertiesFacade properties) {
             this.properties = properties;
             return this;
         }
 
-        public ConfigProfileGeneratorBuilder withConverter(MapToConfigConverter converter) {
-            this.converter = converter;
-            return this;
-        }
-
-        public ConfigProfileGeneratorBuilder withValidator(ConfigProfileValidator validator) {
-            this.validator = validator;
-            return this;
-        }
-
-        public ConfigProfileGeneratorBuilder withMerger(ConfigProfileMerger merger) {
-            this.merger = merger;
+        public ConfigProfileGeneratorBuilder withConfigUtil(ConfigUtil util) {
+            this.util = util;
             return this;
         }
 
@@ -167,9 +148,9 @@ public class ConfigProfileGenerator {
         }
 
         public ConfigProfileGenerator build() {
-            if(properties == null || converter == null || validator == null || merger == null || profilePrefix == null || defaultConfigKey == null)
+            if(properties == null || util == null || profilePrefix == null || defaultConfigKey == null)
                 throw new IllegalArgumentException("Cannot build ConfigProfileGenerator: One or more arguments are null.");
-            return new ConfigProfileGenerator(properties, converter, validator, merger, verifyCompletenessOfDefaultConfiguration, profilePrefix, defaultConfigKey);
+            return new ConfigProfileGenerator(properties, util, verifyCompletenessOfDefaultConfiguration, profilePrefix, defaultConfigKey);
         }
     }
 }