From 7acd8cf9b3bd0aacea61fff3a07e17b9b57ad8cc Mon Sep 17 00:00:00 2001 From: Christof Rabensteiner Date: Fri, 22 Nov 2019 13:57:41 +0100 Subject: Fix Msg Schema Error: Honor Mutual Exclusiveness of MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Problem: When activating the QueryPersonRequest, the TNVZ returns an Identification element that needs to be integrated into the msg:DeliveryRequest as a child of Receiver. The Identification child is mutually exclusive to another sequence consisting of (Person, AustrianAddressesOnly, Address). I forget to delete the sequence when adding the Identifcation element and violate the the msg schema. - Solution: Delete sequence when adding Identification. - Test the fix in test case. Thanks to Johannes Hörtnagl for pointing out the problem. --- src/main/java/at/gv/egiz/moazs/scheme/Mzs2MsgConverter.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/main') diff --git a/src/main/java/at/gv/egiz/moazs/scheme/Mzs2MsgConverter.java b/src/main/java/at/gv/egiz/moazs/scheme/Mzs2MsgConverter.java index 522bb1d..b3ad044 100644 --- a/src/main/java/at/gv/egiz/moazs/scheme/Mzs2MsgConverter.java +++ b/src/main/java/at/gv/egiz/moazs/scheme/Mzs2MsgConverter.java @@ -71,7 +71,7 @@ public class Mzs2MsgConverter { public DeliveryRequestType convert(at.gv.zustellung.app2mzs.xsd.DeliveryRequestType mzsRequest, IdentificationType identification) { return setupBuilder(mzsRequest) - .withReceiver(convert(mzsRequest.getReceiver(), identification)) + .withReceiver(convertAndRepaceCombinationSequenceWithIdentification(mzsRequest.getReceiver(), identification)) .build(); } @@ -147,10 +147,13 @@ public class Mzs2MsgConverter { return setupReceiverBuilder(receiver).build(); } - private at.gv.zustellung.msg.xsd.Receiver convert(at.gv.zustellung.app2mzs.xsd.DeliveryRequestType.Receiver receiver, - IdentificationType identificationType) { + private at.gv.zustellung.msg.xsd.Receiver convertAndRepaceCombinationSequenceWithIdentification(at.gv.zustellung.app2mzs.xsd.DeliveryRequestType.Receiver receiver, + IdentificationType identificationType) { return setupReceiverBuilder(receiver) .withIdentification(identificationType) + .withPerson(null) + .withAustrianAddressesOnly(null) + .withAddress(null) .build(); } -- cgit v1.2.3