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)

3 files changed, 7 insertions, 17 deletions

diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index a7b7524..ce4d892 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -51,7 +51,9 @@ delivery-request-configuration-profiles:
     # addressable. Requires setting up the tvnz-client.
     perform-query-person-request: false
 
-    # Optional (Mandatory if perform-query-person-request is true)
+    # TODO: Move tnvz-client into perform-query-person-request to make relationship clearer (also
+    # TODO: add active)
+    # Mandatory (if perform-query-person-request is true)
     # Parameters for the connection to tvnz. Specify url,
     # connection-timeout, receive-timeout and ssl here. See msg-client
     # for an exhaustive description of all parameters.
@@ -166,12 +168,12 @@ moa.spss:
     # Select, which trust-profile moa spss uses to verify a signature.
     default-trustprofile: test-trustprofile
 
-# Optional
-# Redis Setup (Cluster Mode)
 spring:
+  # Redis Setup (Cluster Mode)
   redis:
     host: 172.17.0.2
     port: 6379
+  main.allow-bean-definition-overriding: true
 
 # Mandatory
 repository:
diff --git a/src/main/resources/mzs/app2mzs.wsdl b/src/main/resources/mzs/app2mzs.wsdl
index b3f0f4b..8c0547b 100644
--- a/src/main/resources/mzs/app2mzs.wsdl
+++ b/src/main/resources/mzs/app2mzs.wsdl
@@ -45,7 +45,7 @@
     </binding>
     <service name="app2mzs">
         <port binding="tns:app2mzsBinding" name="app2mzsPort">
-            <soap:address location="http://localhost:8080/moazs/services/DeliveryRequest"/>
+            <soap:address location="http://localhost:8080/moazs/services/mzs/DeliveryRequest"/>
         </port>
     </service>
 </definitions>
diff --git a/src/main/resources/mzs/app2mzs.xsd b/src/main/resources/mzs/app2mzs.xsd
index 7e70092..d19ff3b 100644
--- a/src/main/resources/mzs/app2mzs.xsd
+++ b/src/main/resources/mzs/app2mzs.xsd
@@ -56,7 +56,6 @@
 					</xs:sequence>
 				</xs:complexType>
 			</xs:element>
-			<xs:element ref="TnvzMetaData" minOccurs="0"/>
 			<xs:element ref="msg:MetaData" />
 			<xs:element name="Payload" maxOccurs="unbounded">
 				<xs:complexType>
@@ -80,21 +79,10 @@
 			<xs:element ref="Config" minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
-	<xs:element name="TnvzMetaData" type="TnvzMetaDataType" />
-	<xs:complexType name="TnvzMetaDataType">
-		<xs:sequence>
-			<xs:element ref="msg:Origin" />
-			<xs:choice>
-				<xs:element ref="msg:DeliveryQuality"/>
-				<xs:element ref="msg:PrivateMessageQuality"/>
-			</xs:choice>
-			<xs:element ref="msg:IgnorePostRedirectionOrder" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
 	<xs:element name="Config" type="ConfigType"/>
 	<xs:complexType name="ConfigType">
 		<xs:sequence>
-			<xs:element name="ProfileID" type="xs:token" minOccurs="0"></xs:element>
+			<xs:element name="ProfileID" type="xs:token" minOccurs="0" />
 			<xs:element name="ServiceTimeout" type="xs:nonNegativeInteger" minOccurs="0"/>
 			<xs:element name="PerformQueryPersonRequest" type="xs:boolean" minOccurs="0" />
 			<xs:element ref="MSGClient" minOccurs="0" />