From 37fd7c008e31830a777d68cd2a3be03087fa0657 Mon Sep 17 00:00:00 2001 From: CGantert345 <57003061+CGantert345@users.noreply.github.com> Date: Wed, 18 May 2022 14:12:58 +0200 Subject: extending the valid until to 500 days --- .../uic/barcode/ticket/api/asn/omv3/CarCarriageReservationData.java | 2 +- .../java/org/uic/barcode/ticket/api/asn/omv3/CountermarkData.java | 2 +- .../java/org/uic/barcode/ticket/api/asn/omv3/CustomerCardData.java | 4 ++-- src/main/java/org/uic/barcode/ticket/api/asn/omv3/FIPTicketData.java | 2 +- .../org/uic/barcode/ticket/api/asn/omv3/IncludedOpenTicketType.java | 2 +- src/main/java/org/uic/barcode/ticket/api/asn/omv3/OpenTicketData.java | 2 +- .../java/org/uic/barcode/ticket/api/asn/omv3/ParkingGroundData.java | 2 +- src/main/java/org/uic/barcode/ticket/api/asn/omv3/PassData.java | 4 ++-- .../java/org/uic/barcode/ticket/api/asn/omv3/ReservationData.java | 2 +- .../org/uic/barcode/ticket/api/asn/omv3/SequenceOfActivatedDays.java | 2 +- .../java/org/uic/barcode/ticket/api/asn/omv3/StationPassageData.java | 2 +- src/main/java/org/uic/barcode/ticket/api/asn/omv3/TrainLinkType.java | 2 +- .../java/org/uic/barcode/ticket/api/asn/omv3/TrainValidityType.java | 2 +- .../java/org/uic/barcode/ticket/api/asn/omv3/ValidityPeriodType.java | 2 +- src/main/java/org/uic/barcode/ticket/api/asn/omv3/VoucherData.java | 4 ++-- .../java/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV3.java | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) (limited to 'src/main/java/org/uic') diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/CarCarriageReservationData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/CarCarriageReservationData.java index 9b4ce84..97625e4 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/CarCarriageReservationData.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/CarCarriageReservationData.java @@ -51,7 +51,7 @@ public class CarCarriageReservationData extends Object { @Asn1Optional public String trainIA5; @FieldOrder(order = 2) - @IntRange(minValue=-1,maxValue=370) + @IntRange(minValue=-1,maxValue=500) @Asn1Default(value="0") @Asn1Optional public Long beginLoadingDate; diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/CountermarkData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/CountermarkData.java index b469e55..797f003 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/CountermarkData.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/CountermarkData.java @@ -137,7 +137,7 @@ public class CountermarkData extends Object { @Asn1Optional public Long validFromUTCOffset; @FieldOrder(order = 25) - @IntRange(minValue=-1,maxValue=370) + @IntRange(minValue=-1,maxValue=500) @Asn1Default(value = "0") @Asn1Optional public Long validUntilDay; diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/CustomerCardData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/CustomerCardData.java index 3685a9a..a7e7cfd 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/CustomerCardData.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/CustomerCardData.java @@ -54,7 +54,7 @@ public class CustomerCardData extends Object { public Long validFromYear; @FieldOrder(order = 4) - @IntRange(minValue=0,maxValue=370) + @IntRange(minValue=0,maxValue=500) @Asn1Optional public Long validFromDay; @FieldOrder(order = 5) @@ -63,7 +63,7 @@ public class CustomerCardData extends Object { @Asn1Optional public Long validUntilYear; @FieldOrder(order = 6) - @IntRange(minValue=0,maxValue=370) + @IntRange(minValue=0,maxValue=500) @Asn1Optional public Long validUntilDay; @FieldOrder(order = 7) diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/FIPTicketData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/FIPTicketData.java index 37d80a2..2b223c3 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/FIPTicketData.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/FIPTicketData.java @@ -71,7 +71,7 @@ public class FIPTicketData extends Object { @Asn1Optional public Long validFromDay; @FieldOrder(order = 7) - @IntRange(minValue=-1,maxValue=370) + @IntRange(minValue=-1,maxValue=500) @Asn1Default("0") @Asn1Optional public Long validUntilDay; diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/IncludedOpenTicketType.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/IncludedOpenTicketType.java index 5989cef..72a4132 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/IncludedOpenTicketType.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/IncludedOpenTicketType.java @@ -84,7 +84,7 @@ public class IncludedOpenTicketType extends Object { @Asn1Optional public Long validFromUTCOffset; @FieldOrder(order = 11) - @IntRange(minValue=-1,maxValue=370) + @IntRange(minValue=-1,maxValue=500) @Asn1Default(value = "0") @Asn1Optional public Long validUntilDay; diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/OpenTicketData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/OpenTicketData.java index 00baee8..30bc918 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/OpenTicketData.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/OpenTicketData.java @@ -129,7 +129,7 @@ public class OpenTicketData extends Object { @FieldOrder(order = 22) @Asn1Default(value = "0") - @IntRange(minValue=-1,maxValue=370) + @IntRange(minValue=-1,maxValue=500) @Asn1Optional public Long validUntilDay; @FieldOrder(order = 23) diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/ParkingGroundData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/ParkingGroundData.java index 90a3568..c28eaea 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/ParkingGroundData.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/ParkingGroundData.java @@ -54,7 +54,7 @@ public class ParkingGroundData extends Object { public Long fromParkingDate; @FieldOrder(order = 4) - @IntRange(minValue=0,maxValue=370) + @IntRange(minValue=0,maxValue=500) @Asn1Default(value="0") @Asn1Optional public Long toParkingDate; diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/PassData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/PassData.java index 13521d9..d84f868 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/PassData.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/PassData.java @@ -92,7 +92,7 @@ public class PassData extends Object { @Asn1Optional public Long validFromUTCOffset; @FieldOrder(order = 12) - @IntRange(minValue=-1,maxValue=370) + @IntRange(minValue=-1,maxValue=500) @Asn1Default(value = "0") @Asn1Optional public Long validUntilDay; @@ -108,7 +108,7 @@ public class PassData extends Object { @Asn1Optional public ValidityPeriodDetailType validityPeriodDetails; @FieldOrder(order = 16) - @IntRange(minValue=0,maxValue=370) + @IntRange(minValue=0,maxValue=500) @Asn1Optional public Long numberOfValidityDays; @FieldOrder(order = 17) diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/ReservationData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/ReservationData.java index 2844c08..f841f91 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/ReservationData.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/ReservationData.java @@ -50,7 +50,7 @@ public class ReservationData extends Object { @FieldOrder(order = 2) @Asn1Default(value="0") - @IntRange(minValue=-1,maxValue=370) + @IntRange(minValue=-1,maxValue=500) @Asn1Optional public Long departureDate; @FieldOrder(order = 3) diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/SequenceOfActivatedDays.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/SequenceOfActivatedDays.java index f2c7835..1166a20 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/SequenceOfActivatedDays.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/SequenceOfActivatedDays.java @@ -6,7 +6,7 @@ import java.util.List; import org.uic.barcode.asn1.datatypes.Asn1SequenceOf; import org.uic.barcode.asn1.datatypes.IntRange; -@IntRange(minValue=0,maxValue=370) +@IntRange(minValue=0,maxValue=500) public class SequenceOfActivatedDays extends Asn1SequenceOf { public SequenceOfActivatedDays() { super(); } public SequenceOfActivatedDays(Collection coll) { super(coll); } diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/StationPassageData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/StationPassageData.java index d734342..88f390a 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/StationPassageData.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/StationPassageData.java @@ -105,7 +105,7 @@ public class StationPassageData extends Object { @FieldOrder(order = 17) @Asn1Default(value="0") - @IntRange(minValue=-1,maxValue=370) + @IntRange(minValue=-1,maxValue=500) @Asn1Optional public Long validUntilDay; @FieldOrder(order = 18) diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/TrainLinkType.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/TrainLinkType.java index 5221926..1f0d188 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/TrainLinkType.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/TrainLinkType.java @@ -43,7 +43,7 @@ public class TrainLinkType extends Object { @Asn1Optional public String trainIA5; @FieldOrder(order = 2) - @IntRange(minValue=-1,maxValue=370) + @IntRange(minValue=-1,maxValue=500) public Long travelDate; @FieldOrder(order = 3) diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/TrainValidityType.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/TrainValidityType.java index 88e5614..e4060da 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/TrainValidityType.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/TrainValidityType.java @@ -51,7 +51,7 @@ public class TrainValidityType extends Object { @Asn1Optional public Long validFromUTCOffset; @FieldOrder(order = 3) - @IntRange(minValue=-1,maxValue=370) + @IntRange(minValue=-1,maxValue=500) @Asn1Default(value="0") @Asn1Optional public Long validUntilDay; diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/ValidityPeriodType.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/ValidityPeriodType.java index 4c421eb..2b9a459 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/ValidityPeriodType.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/ValidityPeriodType.java @@ -47,7 +47,7 @@ public class ValidityPeriodType extends Object { @Asn1Optional public Long validFromUTCOffset; @FieldOrder(order = 3) - @IntRange(minValue=-1,maxValue=370) + @IntRange(minValue=-1,maxValue=500) @Asn1Default(value="0") @Asn1Optional public Long validUntilDay; diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/VoucherData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/VoucherData.java index 761ed6b..e139832 100644 --- a/src/main/java/org/uic/barcode/ticket/api/asn/omv3/VoucherData.java +++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv3/VoucherData.java @@ -67,7 +67,7 @@ public class VoucherData extends Object { public Long validFromYear; @FieldOrder(order = 7) - @IntRange(minValue=0,maxValue=370) + @IntRange(minValue=0,maxValue=500) public Long validFromDay; @FieldOrder(order = 8) @@ -75,7 +75,7 @@ public class VoucherData extends Object { public Long validUntilYear; @FieldOrder(order = 9) - @IntRange(minValue=0,maxValue=370) + @IntRange(minValue=0,maxValue=500) public Long validUntilDay; @FieldOrder(order = 10) 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 e3a6430..01bc209 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 @@ -1660,7 +1660,7 @@ public class Api2OpenAsnEncoderV3 implements Api2AsnEncoder { asnData.setNumberOfDaysOfTravel(UicEncoderUtils.getRestrictedInt(document.getNumberOfDaysOfTravel(), 1, 250)); asnData.setNumberOfPossibleTrips(UicEncoderUtils.getRestrictedInt(document.getNumberOfPossibleTrips(), 1, 250)); - asnData.setNumberOfValidityDays(UicEncoderUtils.getRestrictedInt(document.getNumberOfValidityDays(), 1, 370)); + asnData.setNumberOfValidityDays(UicEncoderUtils.getRestrictedInt(document.getNumberOfValidityDays(), 1, 500)); asnData.setPassDescription(document.getPassDescription()); if (document.getPassType() > 0 ){ asnData.setPassType(new Long(document.getPassType())); -- cgit v1.2.3