From e10588931164ad78e236f072de870780ae6703c5 Mon Sep 17 00:00:00 2001 From: CGantert345 <57003061+CGantert345@users.noreply.github.com> Date: Mon, 29 Nov 2021 17:09:46 +0100 Subject: additional tests bug fixes on: - voucher - delay confirmation - parking --- .../java/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java | 8 ++++---- .../org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java | 6 +++--- .../org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV3.java | 4 +++- .../java/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java | 4 +--- .../org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoderV2.java | 4 +--- .../org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoderV3.java | 4 +--- 6 files changed, 13 insertions(+), 17 deletions(-) (limited to 'src/main/java/org/uic/barcode/ticket/api/utils') diff --git a/src/main/java/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java b/src/main/java/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java index cab9b53..f4b9569 100644 --- a/src/main/java/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java +++ b/src/main/java/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java @@ -319,9 +319,7 @@ public class Api2OpenAsnEncoder implements Api2AsnEncoder { asnData.setInfoText(document.getInfoText()); - - asnData.setStationNameUTF8(document.getStationName()); - + asnData.setExtension(encodeExtension(document.getExtension())); return asnDocument; @@ -977,7 +975,9 @@ public class Api2OpenAsnEncoder implements Api2AsnEncoder { } } - + asnData.setGroupName(document.getGroupName()); + asnData.setNumberOfCountermark(new Long(document.getNumberOfCountermark())); + asnData.setTotalOfCountermarks(new Long(document.getTotalOfCountermarks())); asnData.setReferenceNum(UicEncoderUtils.getNum(document.getReference())); asnData.setReferenceIA5(UicEncoderUtils.getIA5NonNum(document.getReference())); diff --git a/src/main/java/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java b/src/main/java/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java index 184dfd7..6bffddc 100644 --- a/src/main/java/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java +++ b/src/main/java/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java @@ -317,8 +317,6 @@ public class Api2OpenAsnEncoderV2 implements Api2AsnEncoder { asnData.setInfoText(document.getInfoText()); - asnData.setStationNameUTF8(document.getStationName()); - asnData.setExtension(encodeExtension(document.getExtension())); return asnDocument; @@ -981,7 +979,9 @@ public class Api2OpenAsnEncoderV2 implements Api2AsnEncoder { } } - + asnData.setGroupName(document.getGroupName()); + asnData.setNumberOfCountermark(new Long(document.getNumberOfCountermark())); + asnData.setTotalOfCountermarks(new Long(document.getTotalOfCountermarks())); asnData.setReferenceNum(UicEncoderUtils.getNum(document.getReference())); asnData.setReferenceIA5(UicEncoderUtils.getIA5NonNum(document.getReference())); diff --git a/src/main/java/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV3.java b/src/main/java/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV3.java index 9084d7a..6766f59 100644 --- a/src/main/java/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV3.java +++ b/src/main/java/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV3.java @@ -320,7 +320,6 @@ public class Api2OpenAsnEncoderV3 implements Api2AsnEncoder { asnData.setInfoText(document.getInfoText()); - asnData.setStationNameUTF8(document.getStationName()); asnData.setExtension(encodeExtension(document.getExtension())); @@ -984,6 +983,9 @@ public class Api2OpenAsnEncoderV3 implements Api2AsnEncoder { } } + asnData.setGroupName(document.getGroupName()); + asnData.setNumberOfCountermark(new Long(document.getNumberOfCountermark())); + asnData.setTotalOfCountermarks(new Long(document.getTotalOfCountermarks())); asnData.setReferenceNum(UicEncoderUtils.getNum(document.getReference())); diff --git a/src/main/java/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java b/src/main/java/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java index bf3918c..031d5b3 100644 --- a/src/main/java/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java +++ b/src/main/java/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java @@ -366,9 +366,7 @@ public class OpenAsn2ApiDecoder implements Asn2ApiDecoder { document.setStationCodeTable(IStationCodeTable.valueOf(asnDocument.getStationCodeTable().name())); } document.setStation(UicEncoderUtils.mapToString(asnDocument.getStationNum(),asnDocument.getStationIA5())); - - document.setStationName(asnDocument.getStationNameUTF8()); - + document.setArrivalDate(asnDocument.getPlannedArrivalDate()); document.setArrivalUTCoffset(asnDocument.getDepartureUTCOffset()); diff --git a/src/main/java/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoderV2.java b/src/main/java/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoderV2.java index fc68f91..1d50cb8 100644 --- a/src/main/java/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoderV2.java +++ b/src/main/java/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoderV2.java @@ -368,9 +368,7 @@ public class OpenAsn2ApiDecoderV2 implements Asn2ApiDecoder { document.setStationCodeTable(IStationCodeTable.valueOf(asnDocument.getStationCodeTable().toString())); } document.setStation(UicEncoderUtils.mapToString(asnDocument.getStationNum(),asnDocument.getStationIA5())); - - document.setStationName(asnDocument.getStationNameUTF8()); - + document.setArrivalDate(asnDocument.getPlannedArrivalDate()); document.setArrivalUTCoffset(asnDocument.getDepartureUTCOffset()); diff --git a/src/main/java/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoderV3.java b/src/main/java/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoderV3.java index 56efcb1..73971c9 100644 --- a/src/main/java/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoderV3.java +++ b/src/main/java/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoderV3.java @@ -371,9 +371,7 @@ public class OpenAsn2ApiDecoderV3 implements Asn2ApiDecoder { document.setStationCodeTable(IStationCodeTable.valueOf(asnDocument.getStationCodeTable().toString())); } document.setStation(UicEncoderUtils.mapToString(asnDocument.getStationNum(),asnDocument.getStationIA5())); - - document.setStationName(asnDocument.getStationNameUTF8()); - + document.setArrivalDate(asnDocument.getPlannedArrivalDate()); document.setArrivalUTCoffset(asnDocument.getDepartureUTCOffset()); -- cgit v1.2.3