From 26d62a3db0b248d0595d3ce2313e9de829198097 Mon Sep 17 00:00:00 2001 From: CGantert345 <57003061+CGantert345@users.noreply.github.com> Date: Mon, 12 Apr 2021 11:43:04 +0200 Subject: fix for included open ticket, vatDetails and route section --- pom.xml | 2 +- .../org/uic/barcode/ticket/api/asn/omv1/IncludedOpenTicketType.java | 4 ++++ .../java/org/uic/barcode/ticket/api/asn/omv1/RouteSectionType.java | 2 ++ src/main/java/org/uic/barcode/ticket/api/asn/omv1/VatDetailType.java | 4 ++++ .../org/uic/barcode/ticket/api/asn/omv2/IncludedOpenTicketType.java | 4 ++++ .../java/org/uic/barcode/ticket/api/asn/omv2/RouteSectionType.java | 2 ++ src/main/java/org/uic/barcode/ticket/api/asn/omv2/VatDetailType.java | 1 - 7 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 24157be..5a6212f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.uic.barcode org.uic.barcode - 1.2.3-SNAPSHOT + 1.2.4-SNAPSHOT jar UIC barcode encoding and decoding of bar code content according to UIC IRS 90918-9 diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/IncludedOpenTicketType.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/IncludedOpenTicketType.java index a4b4049..7ab0334 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/IncludedOpenTicketType.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/IncludedOpenTicketType.java @@ -27,12 +27,16 @@ import org.uic.barcode.asn1.datatypes.Asn1Default; import org.uic.barcode.asn1.datatypes.Asn1Optional; import org.uic.barcode.asn1.datatypes.CharacterRestriction; import org.uic.barcode.asn1.datatypes.FieldOrder; +import org.uic.barcode.asn1.datatypes.HasExtensionMarker; import org.uic.barcode.asn1.datatypes.IntRange; import org.uic.barcode.asn1.datatypes.RestrictedString; +import org.uic.barcode.asn1.datatypes.Sequence; import org.uic.barcode.asn1.datatypes.SizeRange; import org.uic.barcode.asn1.datatypesimpl.SequenceOfStringIA5; import org.uic.barcode.ticket.api.utils.DateTimeUtils; +@Sequence +@HasExtensionMarker public class IncludedOpenTicketType extends Object { public IncludedOpenTicketType() { } diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/RouteSectionType.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/RouteSectionType.java index ead3098..de86d66 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/RouteSectionType.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/RouteSectionType.java @@ -25,7 +25,9 @@ import org.uic.barcode.asn1.datatypes.CharacterRestriction; import org.uic.barcode.asn1.datatypes.FieldOrder; import org.uic.barcode.asn1.datatypes.IntRange; import org.uic.barcode.asn1.datatypes.RestrictedString; +import org.uic.barcode.asn1.datatypes.Sequence; +@Sequence public class RouteSectionType extends Object { public RouteSectionType() { } diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/VatDetailType.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/VatDetailType.java index 9ebb869..82d8950 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/VatDetailType.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/VatDetailType.java @@ -23,6 +23,7 @@ import org.uic.barcode.asn1.datatypes.Asn1BigInteger; import org.uic.barcode.asn1.datatypes.Asn1Optional; import org.uic.barcode.asn1.datatypes.CharacterRestriction; import org.uic.barcode.asn1.datatypes.FieldOrder; +import org.uic.barcode.asn1.datatypes.HasExtensionMarker; import org.uic.barcode.asn1.datatypes.IntRange; import org.uic.barcode.asn1.datatypes.RestrictedString; import org.uic.barcode.asn1.datatypes.Sequence; @@ -30,6 +31,9 @@ import org.uic.barcode.asn1.datatypes.Sequence; @Sequence public class VatDetailType extends Object { + + + @Sequence public VatDetailType() { } 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 cef0b02..3b13d66 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 @@ -27,12 +27,16 @@ import org.uic.barcode.asn1.datatypes.Asn1Default; import org.uic.barcode.asn1.datatypes.Asn1Optional; import org.uic.barcode.asn1.datatypes.CharacterRestriction; import org.uic.barcode.asn1.datatypes.FieldOrder; +import org.uic.barcode.asn1.datatypes.HasExtensionMarker; import org.uic.barcode.asn1.datatypes.IntRange; import org.uic.barcode.asn1.datatypes.RestrictedString; +import org.uic.barcode.asn1.datatypes.Sequence; import org.uic.barcode.asn1.datatypes.SizeRange; import org.uic.barcode.asn1.datatypesimpl.SequenceOfStringIA5; import org.uic.barcode.ticket.api.utils.DateTimeUtils; +@Sequence +@HasExtensionMarker public class IncludedOpenTicketType extends Object { public IncludedOpenTicketType() { } diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/RouteSectionType.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/RouteSectionType.java index e0f9c46..4d94ee8 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/RouteSectionType.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/RouteSectionType.java @@ -25,7 +25,9 @@ import org.uic.barcode.asn1.datatypes.CharacterRestriction; import org.uic.barcode.asn1.datatypes.FieldOrder; import org.uic.barcode.asn1.datatypes.IntRange; import org.uic.barcode.asn1.datatypes.RestrictedString; +import org.uic.barcode.asn1.datatypes.Sequence; +@Sequence public class RouteSectionType extends Object { public RouteSectionType() { } diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/VatDetailType.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/VatDetailType.java index adfb4e8..e39c22e 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/VatDetailType.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/VatDetailType.java @@ -27,7 +27,6 @@ import org.uic.barcode.asn1.datatypes.IntRange; import org.uic.barcode.asn1.datatypes.RestrictedString; import org.uic.barcode.asn1.datatypes.Sequence; - @Sequence public class VatDetailType extends Object { public VatDetailType() { -- cgit v1.2.3