Merge pull request #72 from UnionInternationalCheminsdeFer/1.4.4

1.4.4
UnionInternationalCheminsdeFer · Aug 11, 2023 · 91c78a9 · 91c78a9
2 parents 69ff8d0 + 7743ad4
commit 91c78a9
Show file tree

Hide file tree

Showing 19 changed files with 83 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.uic.barcode</groupId>
   <artifactId>org.uic.barcode</artifactId>
-  <version>1.4.3</version>
+  <version>1.4.4</version>
   <packaging>jar</packaging>
   <name>UIC barcode</name>
   <description>encoding and decoding of Aztec barcode content according to UIC IRS 90918-9</description>

diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/CountermarkData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/CountermarkData.java
@@ -550,6 +550,10 @@ public Date getValidUntilDate(Date issuingDate){
 			return null;
 		}		
 
+		//set to 23:59
+		if (this.getValidUntilTime() == null) {
+			this.setValidUntilTime(1439L);
+		}		
 
 		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);
 

diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/OpenTicketData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/OpenTicketData.java
@@ -599,6 +599,12 @@ public Date getValidUntilDate(Date issuingDate){
 		if (this.validUntilDay == null) {
 			return null;
 		}		
+
+		//set to 23:59
+		if (this.getValidUntilTime() == null) {
+			this.setValidUntilTime(1439L);
+		}
+
 		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);
 
 	}

diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/PassData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/PassData.java
@@ -889,7 +889,11 @@ public Date getValidUntilDate(Date issuingDate){
 			return null;
 		}		
 
-
+		//set to 23:59
+		if (this.getValidUntilTime() == null) {
+			this.setValidUntilTime(1439L);
+		}
+
 		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);
 
 	}

diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/StationPassageData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/StationPassageData.java
@@ -359,6 +359,10 @@ public Date getValidUntilDate(Date issuingDate){
 			return null;
 		}		
 
+		//set to 23:59
+		if (this.getValidUntilTime() == null) {
+			this.setValidUntilTime(1439L);
+		}
 
 		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);
 

diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv1/ValidityPeriodType.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv1/ValidityPeriodType.java
@@ -139,6 +139,10 @@ public Date getValidUntilDate(Date issuingDate){
 			return null;
 		}		
 
+		//set to 23:59
+		if (this.getValidUntilTime() == null) {
+			this.setValidUntilTime(1439L);
+		}
 
 		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);
 

diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/CountermarkData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/CountermarkData.java
@@ -552,6 +552,10 @@ public Date getValidUntilDate(Date issuingDate){
 			return null;
 		}		
 
+		//set to 23:59
+		if (this.getValidUntilTime() == null) {
+			this.setValidUntilTime(1439L);
+		}		
 
 		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);
 

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
@@ -417,6 +417,11 @@ public Date getValidUntilDate(Date issuingDate){
 			return null;
 		}		
 
+		//set to 23:59
+		if (this.getValidUntilTime() == null) {
+			this.setValidUntilTime(1439L);
+		}
+
 		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);
 
 	}
@@ -426,10 +431,11 @@ public Date getUTCValidFromDate(Date issuingDate){
 	}	
 
 	public Date getUTCValidUntilDate(Date issuingDate){
+		this.getValidUntilDate(issuingDate);
 		if (this.validUntilUTCOffset == null) {
-			return DateTimeUtils.getUTCDate(issuingDate, this.validFromDay, this.validFromTime, this.validFromUTCOffset);
+			return DateTimeUtils.getUTCDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime, this.validUntilUTCOffset);
 		} else {
-			return DateTimeUtils.getUTCDate(issuingDate, this.validFromDay, this.validUntilTime, this.validFromUTCOffset);
+			return DateTimeUtils.getUTCDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime, this.validFromUTCOffset);
 		}
 	}
 

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
@@ -598,6 +598,10 @@ public Date getValidUntilDate(Date issuingDate){
 			return null;
 		}		
 
+		//set to 23:59
+		if (this.getValidUntilTime() == null) {
+			this.setValidUntilTime(1439L);
+		}
 
 		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);
 

diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/PassData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/PassData.java
@@ -513,6 +513,10 @@ public Date getValidUntilDate(Date issuingDate){
 			return null;
 		}		
 
+		//set to 23:59
+		if (this.getValidUntilTime() == null) {
+			this.setValidUntilTime(1439L);
+		}
 
 		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);
 

diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/StationPassageData.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/StationPassageData.java
@@ -359,6 +359,10 @@ public Date getValidUntilDate(Date issuingDate){
 			return null;
 		}		
 
+		//set to 23:59
+		if (this.getValidUntilTime() == null) {
+			this.setValidUntilTime(1439L);
+		}		
 
 		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);
 

diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/ValidityPeriodType.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/ValidityPeriodType.java
@@ -139,6 +139,10 @@ public Date getValidUntilDate(Date issuingDate){
 			return null;
 		}		
 
+		//set to 23:59
+		if (this.getValidUntilTime() == null) {
+			this.setValidUntilTime(1439L);
+		}
 
 		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);
 

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
@@ -554,6 +554,10 @@ public Date getValidUntilDate(Date issuingDate){
 			return null;
 		}		
 
+		if (this.getValidUntilTime() == null) {
+			this.validUntilTime = 1439L;
+		}
+
 
 		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);
 

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
@@ -417,6 +417,10 @@ public Date getValidUntilDate(Date issuingDate){
 			return null;
 		}		
 
+		if (this.getValidUntilTime() == null) {
+			this.validUntilTime = 1439L;
+		}
+
 		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);
 
 	}
@@ -426,10 +430,11 @@ public Date getUTCValidFromDate(Date issuingDate){
 	}	
 
 	public Date getUTCValidUntilDate(Date issuingDate){
+		this.getValidUntilDate(issuingDate);
 		if (this.validUntilUTCOffset == null) {
-			return DateTimeUtils.getUTCDate(issuingDate, this.validFromDay, this.validFromTime, this.validFromUTCOffset);
+			return DateTimeUtils.getUTCDate(issuingDate, this.validFromDay + this.validUntilDay, this.validFromTime, this.validFromUTCOffset);
 		} else {
-			return DateTimeUtils.getUTCDate(issuingDate, this.validFromDay, this.validUntilTime, this.validFromUTCOffset);
+			return DateTimeUtils.getUTCDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime, this.validFromUTCOffset);
 		}
 	}
 

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
@@ -598,6 +598,10 @@ public Date getValidUntilDate(Date issuingDate){
 			return null;
 		}		
 
+		//set to 23:59
+		if (this.getValidUntilTime() == null) {
+			this.setValidUntilTime(1439L);
+		}
 
 		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);
 

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
@@ -511,11 +511,14 @@ public Date getValidUntilDate(Date issuingDate){
 			this.validFromDay = 0L;
 		}
 
+		if (this.validUntilTime == null) {
+			this.validUntilTime = 1439L;
+		}
+
 		if (this.validUntilDay == null) {
 			return null;
 		}		
 
-
 		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);
 
 	}

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
@@ -359,6 +359,10 @@ public Date getValidUntilDate(Date issuingDate){
 			return null;
 		}		
 
+		//set to 23:59
+		if (this.getValidUntilTime() == null) {
+			this.setValidUntilTime(1439L);
+		}
 
 		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);
 

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
@@ -174,6 +174,10 @@ public Date getValidUntilDate(Date issuingDate){
 			return null;
 		}		
 
+		//set to 23:59
+		if (this.getValidUntilTime() == null) {
+			this.setValidUntilTime(1439L);
+		}
 
 		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);
 

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
@@ -139,6 +139,10 @@ public Date getValidUntilDate(Date issuingDate){
 			return null;
 		}		
 
+		//set to 23:59
+		if (this.getValidUntilTime() == null) {
+			this.setValidUntilTime(1439L);
+		}
 
 		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, this.validUntilTime);