From 87f4be0b8834e6090137f2db2154bf50bcfcf646 Mon Sep 17 00:00:00 2001
From: Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>
Date: Wed, 15 May 2019 09:16:04 +0200
Subject: Integrate Config Profiles + Refactoring

Config Profile Integration:
- Merge generated Configs from ConfigProfileGenerator with the default
  Config; Reason: Merging profile Configs with default Config asap
  ensures that profile Configs are "as complete as possible" while
  allowing profile Configs to "on-demand"-override values from the
  default Config.
- Adapt Augmenter to work with Config profiles: Select a Config on the
  basis of on msg:DeliveryRequest/Config/ProfileId, fall back to 'default'
  Config.
- Schema change: Make ProfileID optional.

Refactoring:
- Move Config-merging code from Augmenter into dedicated
  'ConfigProfileMerger' class.
- ConfigProfileGenerator: Clarify stream pipeline and comply with
  coding standard w.r.t. constant members.
- Add Augmenter test cases for profile selection.
---
 src/main/resources/mzs/app2mzs.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/resources/mzs')

diff --git a/src/main/resources/mzs/app2mzs.xsd b/src/main/resources/mzs/app2mzs.xsd
index 91e52c8..74a63db 100644
--- a/src/main/resources/mzs/app2mzs.xsd
+++ b/src/main/resources/mzs/app2mzs.xsd
@@ -80,7 +80,7 @@
 	<xs:element name="Config" type="ConfigType"/>
 	<xs:complexType name="ConfigType">
 		<xs:sequence>
-			<xs:element name="ProfileID" type="xs:token"></xs:element>
+			<xs:element name="ProfileID" type="xs:token" minOccurs="0"></xs:element>
 			<xs:element ref="Server" minOccurs="0"></xs:element>
 			<xs:element name="PerformQueryPersonRequest" type="xs:boolean" minOccurs="0" />
 		</xs:sequence>
-- 
cgit v1.2.3