From 67bd1413dc47ec37a9ba042949973eff0a5045fd Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Tue, 29 Jun 2021 14:59:45 +0200
Subject: - test for FCB version 3

---
 .../uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV3.java  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/main/java/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV3.java')

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 83406e8..9084d7a 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
@@ -155,7 +155,7 @@ import org.uic.barcode.ticket.api.spec.IZone;
 /**
  * The Class Api2OpenAsnEncoder.
  */
-public class Api2OpenAsnEncoderV3 {
+public class Api2OpenAsnEncoderV3 implements Api2AsnEncoder {
 	
 	/**
 	 * encode to asn1 model.
@@ -1500,8 +1500,7 @@ public class Api2OpenAsnEncoderV3 {
 		DocumentData asnDocument = new DocumentData();
 		TicketDetailData asnTicket = new TicketDetailData();		
 		asnDocument.setTicket(asnTicket);			
-		
-		
+				
 		VoucherData asnData = new VoucherData();
 		asnDocument.getTicket().setVoucher(asnData);
 		
@@ -1518,9 +1517,13 @@ public class Api2OpenAsnEncoderV3 {
 		
 		asnData.setValidity(document.getValidFrom(), document.getValidUntil());
 
-		asnData.setType(UicEncoderUtils.getRestrictedInt(document.getType(), 1,9999));
+		if (document.getType() != null) {
+			asnData.setType(UicEncoderUtils.getRestrictedInt(document.getType(), 1,32000));
+		}
 		
-		asnData.setValue(UicEncoderUtils.getRestrictedInt(document.getAmount(),1,9999999));
+		if (document.getAmount() != null) {
+			asnData.setValue(UicEncoderUtils.getRestrictedInt(document.getAmount(),1,9999999));
+		}
 		
 		return asnDocument;
 	}	
-- 
cgit v1.2.3