1 files changed, 69 insertions, 0 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
new file mode 100644
index 0000000..623af38
--- /dev/null
+++ b/src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java
@@ -0,0 +1,69 @@
+package at.gv.egiz.moazs.preprocess;
+
+import at.gv.zustellung.app2mzs.xsd.ConfigType;
+import at.gv.zustellung.app2mzs.xsd.DeliveryRequestType;
+import at.gv.zustellung.app2mzs.xsd.DeliveryRequestType.DeliveryRequestTypeBuilder;
+import at.gv.zustellung.app2mzs.xsd.ServerType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+import static at.gv.zustellung.app2mzs.xsd.ConfigType.configTypeBuilder;
+import static at.gv.zustellung.app2mzs.xsd.ServerType.serverTypeBuilder;
+
+@Component
+public class DeliveryRequestAugmenter {
+
+    private final ConfigType defaultMzsConfig;
+
+    @Autowired
+    public DeliveryRequestAugmenter(Map<String, ConfigType> deliveryRequestConfigs) {
+        this.defaultMzsConfig = deliveryRequestConfigs.get("default");
+    }
+
+    /**
+     * Augments an incoming {@code request} by filling gaps with config- or default parameters.
+     *
+     * @param request
+     * @return augmented request
+     */
+    public DeliveryRequestType augment(DeliveryRequestType request) {
+
+        var config = merge(request.getConfig(), defaultMzsConfig);
+
+        return new DeliveryRequestTypeBuilder(request)
+                .withConfig(config)
+                .build();
+    }
+
+    private ConfigType merge(ConfigType primary, ConfigType fallback) {
+
+        var builder = configTypeBuilder(fallback);
+
+        if(primary != null) {
+
+            if(primary.getServer() != null) {
+               builder.withServer(merge(primary.getServer(), fallback.getServer()));
+            }
+
+            if(primary.isPerformQueryPersonRequest() != null) {
+               builder.withPerformQueryPersonRequest(primary.isPerformQueryPersonRequest());
+            }
+
+        }
+
+        return builder.build();
+
+    }
+
+    private ServerType merge(ServerType primary, ServerType fallback) {
+
+        var builder = serverTypeBuilder(fallback);
+
+        if (primary.getX509()      != null) builder.withX509     (primary.getX509()     );
+        if (primary.getZUSEUrlID() != null) builder.withZUSEUrlID(primary.getZUSEUrlID());
+
+        return builder.build();
+    }
+}