Refactor: Restructure Project

- Move components that depend on the service contracts into scheme
  package.
- Move cxf related components into util package.
- Rename SameThread to SingleThreaded.

2 files changed, 8 insertions, 8 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 c2f2415..d651570 100644
--- a/src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileGenerator.java
+++ b/src/main/java/at/gv/egiz/moazs/preprocess/ConfigProfileGenerator.java
@@ -1,7 +1,7 @@
 package at.gv.egiz.moazs.preprocess;
 
 import at.gv.egiz.moazs.MoaZSException;
-import at.gv.egiz.moazs.mzs.MzsValidator;
+import at.gv.egiz.moazs.scheme.MzsDeliveryRequestValidator;
 import at.gv.egiz.moazs.util.StringUtils;
 import at.gv.zustellung.app2mzs.xsd.ConfigType;
 import org.slf4j.Logger;
@@ -30,7 +30,7 @@ public class ConfigProfileGenerator {
 
     private final SpringPropertiesFacade properties;
     private final ConfigUtil util;
-    private final MzsValidator validator;
+    private final MzsDeliveryRequestValidator validator;
     private final boolean verifyCompletenessOfDefaultConfiguration;
     private final String profilePrefix;
     private final String defaultConfigKey;
@@ -42,7 +42,7 @@ public class ConfigProfileGenerator {
     private ConfigProfileGenerator(
             SpringPropertiesFacade properties,
             ConfigUtil util,
-            MzsValidator validator, boolean verifyCompletenessOfDefaultConfiguration,
+            MzsDeliveryRequestValidator validator, boolean verifyCompletenessOfDefaultConfiguration,
             String profilePrefix,
             String defaultConfigKey) {
         this.util = util;
@@ -113,7 +113,7 @@ public class ConfigProfileGenerator {
     public static class ConfigProfileGeneratorBuilder {
         private SpringPropertiesFacade properties;
         private ConfigUtil util;
-        private MzsValidator validator;
+        private MzsDeliveryRequestValidator validator;
         private boolean verify = true;
         private String profilePrefix = "delivery-request-configuration-profiles";
         private String defaultConfigKey = "default";
@@ -128,7 +128,7 @@ public class ConfigProfileGenerator {
             return this;
         }
 
-        public ConfigProfileGeneratorBuilder withValidator(MzsValidator validator) {
+        public ConfigProfileGeneratorBuilder withValidator(MzsDeliveryRequestValidator validator) {
             this.validator = validator;
             return this;
         }
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 37dbdc5..783536c 100644
--- a/src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java
+++ b/src/main/java/at/gv/egiz/moazs/preprocess/DeliveryRequestAugmenter.java
@@ -1,6 +1,6 @@
 package at.gv.egiz.moazs.preprocess;
 
-import at.gv.egiz.moazs.mzs.MzsValidator;
+import at.gv.egiz.moazs.scheme.MzsDeliveryRequestValidator;
 import at.gv.zustellung.app2mzs.xsd.ConfigType;
 import at.gv.zustellung.app2mzs.xsd.DeliveryRequestType;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +16,7 @@ public class DeliveryRequestAugmenter {
 
     private final ConfigUtil util;
     private final Map<String, ConfigType> configs;
-    private final MzsValidator validator;
+    private final MzsDeliveryRequestValidator validator;
 
     private static final String INCOMPLETE_TNVZ_ERROR_MESSAGE = "mzs:DeliveryRequest is incomplete because mandatory " +
             "fields for sending a tnvz:QueryPersonRequest are missing.";
@@ -27,7 +27,7 @@ public class DeliveryRequestAugmenter {
             "configuration is incomplete.";
 
     @Autowired
-    public DeliveryRequestAugmenter(Map<String, ConfigType> deliveryRequestConfigs, ConfigUtil util, MzsValidator validator) {
+    public DeliveryRequestAugmenter(Map<String, ConfigType> deliveryRequestConfigs, ConfigUtil util, MzsDeliveryRequestValidator validator) {
         this.configs = deliveryRequestConfigs;
         this.util = util;
         this.validator = validator;