diff options
author | Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at> | 2019-07-03 10:32:10 +0200 |
---|---|---|
committer | Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at> | 2019-07-03 10:32:10 +0200 |
commit | 7c95141343a3157ee94a5306d9567beb6af10c90 (patch) | |
tree | 5a4cbdb2175a07ebd470e7bf90dbe70c62b907fa /src/main/java/at/gv/egiz/moazs/tnvz | |
parent | 4b6ce58f339d69c70ef746ceecae78bf7ed0f0ba (diff) | |
download | moa-zs-7c95141343a3157ee94a5306d9567beb6af10c90.tar.gz moa-zs-7c95141343a3157ee94a5306d9567beb6af10c90.tar.bz2 moa-zs-7c95141343a3157ee94a5306d9567beb6af10c90.zip |
TnvzHelper: Handle Edge Case and Add Test Cases
- TnvzHelper: Handle edge case where
Mzs/DeliveryRequest/Sender/CorporateBody is missing (Reason: This
field is in a <choice> with msg:SenderProfile, so if CorporateBody
is missing the request still passes the schema validation). Handle
case by rejecting missing CorporateBody and TnvzQuery activated.
- Add test cases for TnvzHelper.
Diffstat (limited to 'src/main/java/at/gv/egiz/moazs/tnvz')
-rw-r--r-- | src/main/java/at/gv/egiz/moazs/tnvz/TnvzHelper.java | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/main/java/at/gv/egiz/moazs/tnvz/TnvzHelper.java b/src/main/java/at/gv/egiz/moazs/tnvz/TnvzHelper.java index 3599362..f71b992 100644 --- a/src/main/java/at/gv/egiz/moazs/tnvz/TnvzHelper.java +++ b/src/main/java/at/gv/egiz/moazs/tnvz/TnvzHelper.java @@ -115,11 +115,6 @@ public class TnvzHelper { private Sender extractSender(DeliveryRequestType.Sender sender) { var corporateBody = sender.getCorporateBody(); - if (corporateBody == null) { - //todo! implement this case - throw MoaZSException.moaZSException("Not Implemented."); - } - var mzsIdentification = corporateBody.getIdentification().get(0); var msgIdentification = converter.convert(mzsIdentification); @@ -135,9 +130,7 @@ public class TnvzHelper { var builder = receiverBuilder(); - if (receiver.getIdentification() != null) { - builder.withIdentification(converter.convert(receiver.getIdentification())); - } else { + if (receiver.getIdentification() == null) { builder .withPerson(converter.convert(receiver.getPerson())) .withAustrianAddressesOnly(receiver.getAustrianAddressesOnly()); @@ -149,6 +142,8 @@ public class TnvzHelper { if (receiver.getPreAdviceNote() != null) { builder.withNotificationAddressList(receiver.getPreAdviceNote().getNotificationAddressList()); } + } else { + builder.withIdentification(converter.convert(receiver.getIdentification())); } return builder.build(); |