From 9ac22eb70e6b6ce9e09e2bfe64c9d42da8e0c07e Mon Sep 17 00:00:00 2001 From: CGantert345 <57003061+CGantert345@users.noreply.github.com> Date: Thu, 2 Dec 2021 14:55:33 +0100 Subject: Unit Test for all barcode elements - fixes on - openTicket -> Servicelevel - includedOpenTicket -> ServiceLevel - Voucher - CustomerCard -> CustomerStatusDescription - Zone - Line - ValidityPeriodDetail - CardReference --- .../uic/barcode/ticket/api/asn/omv2/CustomerCardData.java | 1 + .../ticket/api/asn/omv2/IncludedOpenTicketType.java | 1 + .../uic/barcode/ticket/api/asn/omv2/OpenTicketData.java | 1 + .../uic/barcode/ticket/api/asn/omv2/ReservationData.java | 1 + .../ticket/api/asn/omv2/SequenceOfTimeRangeType.java | 10 ++++++++++ .../ticket/api/asn/omv2/SequenceOfValidityPeriodType.java | 10 ++++++++++ .../ticket/api/asn/omv2/ValidityPeriodDetailType.java | 14 -------------- .../java/org/uic/barcode/ticket/api/asn/omv2/ZoneType.java | 1 + 8 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 src/main/java/org/uic/barcode/ticket/api/asn/omv2/SequenceOfTimeRangeType.java create mode 100644 src/main/java/org/uic/barcode/ticket/api/asn/omv2/SequenceOfValidityPeriodType.java (limited to 'src/main/java/org/uic/barcode/ticket/api/asn/omv2') diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/CustomerCardData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/CustomerCardData.java index e9dbf85..5d8603f 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/CustomerCardData.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/CustomerCardData.java @@ -79,6 +79,7 @@ public class CustomerCardData extends Object { @Asn1Optional public Asn1BigInteger customerStatus; @FieldOrder(order = 11) + @RestrictedString(CharacterRestriction.IA5String) @Asn1Optional public String customerStatusDescr; @FieldOrder(order = 12) diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/IncludedOpenTicketType.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/IncludedOpenTicketType.java index 35a9c73..e0465d9 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/IncludedOpenTicketType.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/IncludedOpenTicketType.java @@ -101,6 +101,7 @@ public class IncludedOpenTicketType extends Object { @FieldOrder(order = 15) @SizeRange(minValue = 1, maxValue = 2) + @RestrictedString(CharacterRestriction.IA5String) @Asn1Optional public String serviceLevel; @FieldOrder(order = 16) diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/OpenTicketData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/OpenTicketData.java index 44a7188..f44d604 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/OpenTicketData.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/OpenTicketData.java @@ -149,6 +149,7 @@ public class OpenTicketData extends Object { @FieldOrder(order = 27) @SizeRange(minValue = 1, maxValue = 2) + @RestrictedString(CharacterRestriction.IA5String) @Asn1Optional public String serviceLevel; @FieldOrder(order = 28) diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/ReservationData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/ReservationData.java index 31b3fa8..a42a3e1 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/ReservationData.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/ReservationData.java @@ -153,6 +153,7 @@ public class ReservationData extends Object { @FieldOrder(order = 28) @SizeRange(minValue = 1, maxValue = 2) + @RestrictedString(CharacterRestriction.IA5String) @Asn1Optional public String serviceLevel; @FieldOrder(order = 29) diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/SequenceOfTimeRangeType.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/SequenceOfTimeRangeType.java new file mode 100644 index 0000000..a97f145 --- /dev/null +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/SequenceOfTimeRangeType.java @@ -0,0 +1,10 @@ +package org.uic.barcode.ticket.api.asn.omv2; + +import java.util.Collection; + +import org.uic.barcode.asn1.datatypes.Asn1SequenceOf; + +public class SequenceOfTimeRangeType extends Asn1SequenceOf { + public SequenceOfTimeRangeType() { super(); } + public SequenceOfTimeRangeType(Collection coll) { super(coll); } +} diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/SequenceOfValidityPeriodType.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/SequenceOfValidityPeriodType.java new file mode 100644 index 0000000..5139340 --- /dev/null +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/SequenceOfValidityPeriodType.java @@ -0,0 +1,10 @@ +package org.uic.barcode.ticket.api.asn.omv2; + +import java.util.Collection; + +import org.uic.barcode.asn1.datatypes.Asn1SequenceOf; + +public class SequenceOfValidityPeriodType extends Asn1SequenceOf { + public SequenceOfValidityPeriodType() { super(); } + public SequenceOfValidityPeriodType(Collection coll) { super(coll); } +} diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/ValidityPeriodDetailType.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/ValidityPeriodDetailType.java index dd9935b..cd7d1f5 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/ValidityPeriodDetailType.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/ValidityPeriodDetailType.java @@ -19,10 +19,7 @@ */ package org.uic.barcode.ticket.api.asn.omv2; -import java.util.Collection; - import org.uic.barcode.asn1.datatypes.Asn1Optional; -import org.uic.barcode.asn1.datatypes.Asn1SequenceOf; import org.uic.barcode.asn1.datatypes.FieldOrder; import org.uic.barcode.asn1.datatypes.Sequence; @@ -38,17 +35,6 @@ public class ValidityPeriodDetailType extends Object { @Asn1Optional public SequenceOfTimeRangeType excludedTimeRange; - public class SequenceOfTimeRangeType extends Asn1SequenceOf { - public SequenceOfTimeRangeType() { super(); } - public SequenceOfTimeRangeType(Collection coll) { super(coll); } - } - - - public class SequenceOfValidityPeriodType extends Asn1SequenceOf { - public SequenceOfValidityPeriodType() { super(); } - public SequenceOfValidityPeriodType(Collection coll) { super(coll); } - } - public SequenceOfValidityPeriodType getValidityPeriod() { return this.validityPeriod; diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/ZoneType.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/ZoneType.java index db008e5..5fa7a8b 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/ZoneType.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/ZoneType.java @@ -76,6 +76,7 @@ public class ZoneType extends Object { @Asn1Optional public OctetString binaryZoneId; @FieldOrder(order = 10) + @RestrictedString(CharacterRestriction.IA5String) @Asn1Optional public String nutsCode; -- cgit v1.2.3