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

---
 .../ticket/api/asn/omv1/DelayConfirmation.java     | 27 ++++++----------------
 .../ticket/api/asn/omv1/ParkingGroundData.java     |  6 ++---
 .../ticket/api/asn/omv1/TicketDetailData.java      |  8 ++++---
 .../uic/barcode/ticket/api/asn/omv1/ZoneType.java  |  4 ++++
 4 files changed, 19 insertions(+), 26 deletions(-)

(limited to 'src/main/java/org/uic/barcode/ticket/api/asn/omv1')

diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/DelayConfirmation.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/DelayConfirmation.java
index 4f61ff3..a3df48b 100644
--- a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/DelayConfirmation.java
+++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/DelayConfirmation.java
@@ -84,28 +84,24 @@ public class DelayConfirmation extends Object {
 	@Asn1Optional public String stationIA5;
 
 	@FieldOrder(order = 11)
-	@RestrictedString(CharacterRestriction.UTF8String)
-	@Asn1Optional public String stationNameUTF8;
+	@IntRange(minValue=1, maxValue=999)
+	public Long delay;
 
 	@FieldOrder(order = 12)
-	@IntRange(minValue=0, maxValue=999, hasExtensionMarker=false)
-	@Asn1Optional public Long delay;
+	public Boolean trainCancelled = false;
 
 	@FieldOrder(order = 13)
-	@Asn1Optional public Boolean trainCancelled = false;
-
-	@FieldOrder(order = 14)
 	@Asn1Default(value="travelerDelayConfirmation")
 	@Asn1Optional public ConfirmationTypeType confirmationType;
 
-	@FieldOrder(order = 15)
+	@FieldOrder(order = 14)
 	@Asn1Optional public SequenceOfTicketLinkType affectedTickets;
 
-	@FieldOrder(order = 16)
+	@FieldOrder(order = 15)
 	@RestrictedString(CharacterRestriction.UTF8String)
 	@Asn1Optional public String infoText;
 
-	@FieldOrder(order = 17)
+	@FieldOrder(order = 16)
 	@Asn1Optional public ExtensionData extension;
 	
 
@@ -163,11 +159,7 @@ public class DelayConfirmation extends Object {
 		return this.stationIA5;
 	}
 	
-	public String getStationNameUTF8() {
-		
-		return this.stationNameUTF8;
-	}
-	
+
 	public Long getDelay() {
 		
 		return this.delay;
@@ -255,11 +247,6 @@ public class DelayConfirmation extends Object {
 		this.stationIA5 = stationIA5;
 	}
 
-	public void setStationNameUTF8(String stationNameUTF8) {
-		
-		this.stationNameUTF8 = stationNameUTF8;
-	}
-
 	public void setDelay(Long delay) {
 		
 		this.delay = delay;
diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/ParkingGroundData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/ParkingGroundData.java
index d88d4dd..53cb4c0 100644
--- a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/ParkingGroundData.java
+++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/ParkingGroundData.java
@@ -51,10 +51,11 @@ public class ParkingGroundData extends Object {
 
 	@FieldOrder(order = 3)
 	@IntRange(minValue=0,maxValue=370)
-	@Asn1Optional public Long fromParkingDate;
+	public Long fromParkingDate;
 
 	@FieldOrder(order = 4)
 	@IntRange(minValue=-1,maxValue=370)
+	@Asn1Default(value = "0")
 	@Asn1Optional public Long toParkingDate;
 
 	@FieldOrder(order = 5)
@@ -86,11 +87,10 @@ public class ParkingGroundData extends Object {
 	@Asn1Optional public CodeTableType stationCodeTable;
 
 	@FieldOrder(order = 12)
-	@IntRange(minValue=1,maxValue=9999999)
 	@Asn1Optional public Long stationNum;
 
 	@FieldOrder(order = 13)
-	@RestrictedString(CharacterRestriction.IA5String)
+	@RestrictedString(CharacterRestriction.UTF8String)
 	@Asn1Optional public String stationIA5;
 
 	@FieldOrder(order = 14)
diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/TicketDetailData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/TicketDetailData.java
index e32bb98..7a86d56 100644
--- a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/TicketDetailData.java
+++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/TicketDetailData.java
@@ -24,6 +24,8 @@ package org.uic.barcode.ticket.api.asn.omv1;
 import org.uic.barcode.asn1.datatypes.Choice;
 import org.uic.barcode.asn1.datatypes.FieldOrder;
 import org.uic.barcode.asn1.datatypes.HasExtensionMarker;
+import org.uic.barcode.ticket.api.asn.omv1.DelayConfirmation;
+import org.uic.barcode.ticket.api.asn.omv1.ExtensionData;
 
 @Choice
 @HasExtensionMarker
@@ -62,10 +64,10 @@ public class TicketDetailData extends Object {
 	public StationPassageData stationPassage;
 
 	@FieldOrder(order = 10)
-	public DelayConfirmation delayConfirmation;
-
+	public ExtensionData extension;	
+	
 	@FieldOrder(order = 11)
-	public ExtensionData extension;
+	public DelayConfirmation delayConfirmation;
 
 	public ReservationData getReservation() {
 		
diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/ZoneType.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/ZoneType.java
index a22e002..efe55f7 100644
--- a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/ZoneType.java
+++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/ZoneType.java
@@ -124,6 +124,10 @@ public class ZoneType extends Object {
 
 	public byte[] getBinaryZoneId() {
 		
+		if (binaryZoneId == null) {
+			return null;
+		}
+		
 		return binaryZoneId.toByteArray();
 		
 	}
-- 
cgit v1.2.3