Test Flow of DeliveryRequest from "End-To-End" & Fix Bugs

Schema Changes:
- Remove mzs:DeliveryRequest/TnvzMetaData because all metadata fields
  can be collected from DeliveryRequest and redundancy is not needed.

Fixes and Refactoring in preprocess:
- MzsDeliveryRequestValidator: Instead of returning false, throw an
  exception when a condition is not met, and explain which condition
  is not met / why it is not met in the exception's message.
- Integrate interface change in ConfigProfileGenerator and
  DeliveryRequestAugmenter.
- Rewrite and simplify DeliveryRequestAugmenter's augmentation.
- ConfigUtil Fixes: Ensure that we do not override the wrong
  parameters while merging. This error appeared in tnvz / msg client,
  connection / receive timeout, key / trust store, and lax hostname
  verification / trust all.

Fix Bugs in Interceptor / SoapUtils:
- Problem: DOM access and information extraction was implemented
  somewhat sloppy.
- SolutioN: Change DOM access interface to access DOM more
  efficiently. Add boundary checks and handle edge cases while
  extracting information from SOAP Messages.
- Test those changes properly.

Testing:
- Implement Delivery Request Flow in ITEndToEndTest.
- Start application on random port instead of fixed port when running
  integration tests.
- Add assertions to tests in ITMzsServiceTest suite.

Others Bug Fixes:
- ServicesConfig: Ensure that mzs service and msg service run on
  different endpoint addresses (/msg and /mzs).
- DeliveryRequestBackend: Throw exception when binary message is
  missing. Don't wrap the exception.
- SaveResponseToFileSink: Wrap Response in JAXB Element (otherwise,
  marshaller does not recognize it)

1 files changed, 5 insertions, 4 deletions

diff --git a/src/main/java/at/gv/egiz/moazs/preprocess/ConfigUtil.java b/src/main/java/at/gv/egiz/moazs/preprocess/ConfigUtil.java
index 056f6dc..f49132f 100644
--- a/src/main/java/at/gv/egiz/moazs/preprocess/ConfigUtil.java
+++ b/src/main/java/at/gv/egiz/moazs/preprocess/ConfigUtil.java
@@ -205,7 +205,7 @@ public class ConfigUtil {
         }
 
         if (primary.getTNVZClient() != null) {
-            builder.withMSGClient(merge(primary.getTNVZClient(), fallback.getTNVZClient()));
+            builder.withTNVZClient(merge(primary.getTNVZClient(), fallback.getTNVZClient()));
         }
 
         if (primary.getMsgResponseSinks() != null) {
@@ -240,7 +240,7 @@ public class ConfigUtil {
         }
 
         if (primary.getReceiveTimeout() != null) {
-            builder.withConnectionTimeout(primary.getReceiveTimeout());
+            builder.withReceiveTimeout(primary.getReceiveTimeout());
         }
 
         return builder.build();
@@ -259,7 +259,7 @@ public class ConfigUtil {
         }
 
         if (primary.getTrustStore() != null) {
-            builder.withKeyStore(merge(primary.getTrustStore(), fallback.getTrustStore()));
+            builder.withTrustStore(merge(primary.getTrustStore(), fallback.getTrustStore()));
         }
 
         if (primary.isLaxHostNameVerification() != null) {
@@ -267,8 +267,9 @@ public class ConfigUtil {
         }
 
         if (primary.isTrustAll() != null) {
-            builder.withLaxHostNameVerification(primary.isTrustAll());
+            builder.withTrustAll(primary.isTrustAll());
         }
+
         return builder.build();
     }