From 2b8a7df25878f546ace25373f44baeb026cf6d2b Mon Sep 17 00:00:00 2001
From: Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>
Date: Tue, 20 Aug 2019 11:13:28 +0200
Subject: Add Custom Http Headers to HTTP Clients

- Change app2mzs schema: Add Custom Headers to ClientType Element.
- Set custom headers in ClientFactory.
- Parse custom headers from spring environment.
- Merge custom headers from two different profiles.
- Add example to application.yaml.
- Test conversion of custom headers from spring profile
- Test merging and overriding custom headers.
---
 src/main/resources/application.yaml | 10 +++++++---
 src/main/resources/mzs/app2mzs.xsd  |  9 +++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'src/main/resources')

diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index ce4d892..0380cf5 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -61,11 +61,15 @@ delivery-request-configuration-profiles:
 
       # Mandatory
       url: http://localhost:8082/tnvz/
+      connection-timeout: 0
+      receive-timeout: 0
 
       # Optional
-      # ssl: ...
-      # connection-timeout: ...
-      # receive-timeout: ...
+      #ssl: ...
+      #custom-http-headers:
+      #  X-PVP-NAME-1: VALUE-X
+      #  X-PVP-NAME-2: VALUE-Y
+      #  ...
 
     # Mandatory
     # Parameters for the connection to msg.
diff --git a/src/main/resources/mzs/app2mzs.xsd b/src/main/resources/mzs/app2mzs.xsd
index d19ff3b..7ae243b 100644
--- a/src/main/resources/mzs/app2mzs.xsd
+++ b/src/main/resources/mzs/app2mzs.xsd
@@ -3,6 +3,7 @@
 	<xs:import namespace="http://reference.e-government.gv.at/namespace/zustellung/mzs/persondata#" schemaLocation="mzs_mypersondata_en.xsd"/>
 	<xs:import namespace="http://reference.e-government.gv.at/namespace/zustellung/msg/phase2/20181206#" schemaLocation="../zusemsg/zuse_p2.xsd"/>
 	<xs:import namespace="http://reference.e-government.gv.at/namespace/zustellung/tnvz/phase2/20181206#" schemaLocation="../zusetnvz/zusetnvz_p2.xsd"/>
+
 	<xs:element name="DeliveryRequest" type="DeliveryRequestType"/>
 	<xs:complexType name="DeliveryRequestType">
 		<xs:sequence>
@@ -98,6 +99,7 @@
 			<xs:element ref="SSL" minOccurs="0"/>
 			<xs:element name="ConnectionTimeout" minOccurs="0" type="xs:nonNegativeInteger" />
 			<xs:element name="ReceiveTimeout" minOccurs="0" type="xs:nonNegativeInteger" />
+			<xs:element ref="CustomHTTPHeader" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:element name="SSL" type="SSLType" />
@@ -118,6 +120,13 @@
 			<xs:element name="FileType" type="xs:string" minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
+	<xs:element name="CustomHTTPHeader" type="CustomHTTPHeaderType"/>
+	<xs:complexType name="CustomHTTPHeaderType">
+		<xs:sequence>
+			<xs:element name="Name" type="xs:string" />
+			<xs:element name="Value" type="xs:string" />
+		</xs:sequence>
+	</xs:complexType>
 	<xs:element name="MsgResponseSinks" type="MsgResponseSinksType"/>
 	<xs:complexType name="MsgResponseSinksType">
 		<xs:sequence>
-- 
cgit v1.2.3