Refactor: Merge Converter, Validator, and Merger into Util

- Reason: All three classes opertate with the same data type, have
  the same clients, and have the same reasons for change.
- Makes code in client more readable as it reduces number of
  dependencies.

1 files changed, 6 insertions, 9 deletions

diff --git a/src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java b/src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java
index 0b49347..f3a05d1 100644
--- a/src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java
+++ b/src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java
@@ -13,9 +13,8 @@ import static at.gv.zustellung.app2mzs.xsd.DeliveryRequestType.deliveryRequestTy
 @Component
 public class DeliveryRequestAugmenter {
 
-    private final ConfigProfileMerger merger;
+    private final ConfigUtil util;
     private final Map<String, ConfigType> configs;
-    private final ConfigProfileValidator validator;
 
     private static final String INCOMPLETE_CONFIG_ERROR_MESSAGE = "Could not find a profile for " +
             "the delivery request configuration, and the configuration attached to mzs:DeliveryRequest is incomplete.";
@@ -24,11 +23,9 @@ public class DeliveryRequestAugmenter {
             "configuration is incomplete.";
 
     @Autowired
-    public DeliveryRequestAugmenter(Map<String, ConfigType> deliveryRequestConfigs, ConfigProfileMerger merger,
-                                    ConfigProfileValidator validator) {
+    public DeliveryRequestAugmenter(Map<String, ConfigType> deliveryRequestConfigs, ConfigUtil util) {
         this.configs = deliveryRequestConfigs;
-        this.merger = merger;
-        this.validator = validator;
+        this.util = util;
     }
 
     /**
@@ -45,16 +42,16 @@ public class DeliveryRequestAugmenter {
 
         if (fallbackConfig == null) {
 
-            if (validator.isComplete(requestConfig))
+            if (util.isComplete(requestConfig))
                 return request;
             else
                 throw moaZSException(INCOMPLETE_CONFIG_ERROR_MESSAGE);
 
         } else {
 
-            var mergedConfig = merger.merge(requestConfig, fallbackConfig);
+            var mergedConfig = util.merge(requestConfig, fallbackConfig);
 
-            if (validator.isComplete(mergedConfig)) {
+            if (util.isComplete(mergedConfig)) {
                 return deliveryRequestTypeBuilder(request)
                         .withConfig(mergedConfig)
                         .build();