OctopusDeploy release: 14.2.15

Author: securesubmit-buildmaster

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
+## Latest Version - V14.2.15 (04/17/2025)
+### Bug Fixes
+- [NTS] - EMV tag data removal from the Wex Fleet Retransmit Data Collect transaction(Issue -10356).
+- [UPA] - Unit test addition to check the mapping of Merchant ID in Terminal Response object.
+- [UPA] - General maintenance on Java SDK to clean-up inconsistent getters and setters.
+- [UPA] - Updated UpaTcpInterface to account for multi-messaging.
 
-## Latest Version - V14.2.14 (04/03/2025)
+## V14.2.14 (04/03/2025)
 ### Enhancements
 - [Portico] - Added variable to Transaction for splitTenderBalanceDueAmt, rewards, and notes.
 - [Portico] - Added the parsing of these values to PorticoConnector.

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.heartlandpaymentsystems</groupId>
   <artifactId>globalpayments-sdk</artifactId>
-  <version>14.2.14</version>
+  <version>14.2.15</version>
   <packaging>jar</packaging>
   <name>Heartland &amp; Global Payments SDK</name>
   <description>API for processing payments through Global Payments</description>

src/main/java/com/global/api/builders/TransactionBuilder.java

@@ -18,6 +18,7 @@
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 
+@Getter @Setter
 public abstract class TransactionBuilder<TResult> extends BaseBuilder<TResult> {
     protected TransactionType transactionType;
     protected TransactionModifier transactionModifier = TransactionModifier.None;
@@ -27,8 +28,6 @@ public abstract class TransactionBuilder<TResult> extends BaseBuilder<TResult> {
     // network fields
     protected int batchNumber;
     protected String companyId;
-    @Getter
-    @Setter
     protected String description;
     protected FleetData fleetData;
     protected LinkedHashMap<CardIssuerEntryTag, String> issuerData;
@@ -38,270 +37,118 @@ public abstract class TransactionBuilder<TResult> extends BaseBuilder<TResult> {
     protected int sequenceNumber;
     protected int systemTraceAuditNumber;
     protected String uniqueDeviceId;
-    // Entity specific to PayByLink service
-    @Getter
-    @Setter
-    protected PayByLinkData payByLinkData;
-    // A unique identifier generated by Global Payments to identify the payment link.
-    @Getter
-    @Setter
-    protected String paymentLinkId;
+    protected PayByLinkData payByLinkData; // Entity specific to PayByLink service
+    protected String paymentLinkId; // A unique identifier generated by Global Payments to identify the payment link.
     protected TransactionMatchingData transactionMatchingData;
-    @Getter
     protected MasterCardCITMITIndicator citMitIndicator;
     protected boolean terminalError;
-    @Getter
     protected GnapRequestData gnapRequestData;
-    @Getter
     protected BigDecimal taxAmount;
-    @Getter
     protected BigDecimal tipAmount;
-    @Getter
     protected BigDecimal surchargeAmount;
-    @Getter
     protected BigDecimal cashBackAmount;
+
     //Nts
-    @Getter
     protected String invoiceNumber;
-    @Getter
     protected String cvn;
-    @Getter
     protected BigDecimal amount;
-    @Getter
     protected String tagData;
+
     //Emv
-    @Getter
     protected String emvMaxPinEntry;
 
     // P66 Tag 16
-    @Getter
     protected NtsTag16 ntsTag16;
-    @Getter
-    @Setter
     private String posSequenceNumber;
-    @Getter
     protected String serviceCode;
-    @Getter
     protected String cardSequenceNumber;     // Card Sequence number.
-    @Getter
     protected NtsProductData ntsProductData;
-    @Getter
     protected String ecommerceAuthIndicator;
-    @Getter
     protected String ecommerceData1;
-    @Getter
     protected String ecommerceData2;
-    @Getter
     protected String mcUCAF;
-    @Getter
     protected String mcWalletId;
-    @Getter
     protected String mcSLI;
-    @Getter
     protected NtsNetworkMessageHeader ntsNetworkMessageHeader;
-    @Getter
     protected NtsRequestMessageHeader ntsRequestMessageHeader;
-    @Getter
     protected String transactionDate;
-    @Getter
     protected String transactionTime;
-    @Getter
     protected EWICData ewicData;
     protected String ewicIssuingEntity;
-    @Getter
     private String zipCode;
-
-    @Getter
-    @Setter
     private String customerCode;
-    @Getter
-    @Setter
     private String hostResponseCode = "";
-    @Getter
-    @Setter
     private String offlineDeclineIndicator;
-    @Getter
     private Boolean isSAFIndicator;
-    @Getter
-    private String safOrignDT;
-    @Getter
+    private String safOriginalDateTime;
     private int pdlTimeout;
-    @Getter @Setter
     protected EcommerceInfo ecommerceInfo;
-    @Getter @Setter
     protected String merchantOrCustomerInitiatedFlag;
 
-
-
-    public void setNtsRequestMessageHeader(NtsRequestMessageHeader ntsRequestMessageHeader) {
-        this.ntsRequestMessageHeader = ntsRequestMessageHeader;
-    }
-
-    public TransactionType getTransactionType() {
-        return transactionType;
-    }
-
-    public void setTransactionType(TransactionType transactionType) {
-        this.transactionType = transactionType;
-    }
-
-    public TransactionModifier getTransactionModifier() {
-        return transactionModifier;
-    }
-
-    public void setTransactionModifier(TransactionModifier transactionModifier) {
-        this.transactionModifier = transactionModifier;
-    }
-
-    public IPaymentMethod getPaymentMethod() {
-        return paymentMethod;
-    }
-
-    public void setPaymentMethod(IPaymentMethod paymentMethod) {
-        this.paymentMethod = paymentMethod;
-    }
-
-    public HashMap<Host, ArrayList<HostError>> getSimulatedHostErrors() {
-        return simulatedHostErrors;
-    }
-
-    // network fields
-    public int getBatchNumber() {
-        return batchNumber;
-    }
-
-    public String getCompanyId() {
-        return companyId;
-    }
-
-    public FleetData getFleetData() {
-        return fleetData;
-    }
-
-    public LinkedHashMap<CardIssuerEntryTag, String> getIssuerData() {
-        return issuerData;
-    }
-
-    public Integer getFollowOnStan() {
-        return followOnStan;
-    }
-
-    public PriorMessageInformation getPriorMessageInformation() {
-        return priorMessageInformation;
-    }
-
-    public void setPriorMessageInformation(PriorMessageInformation priorMessageInformation) {
-        this.priorMessageInformation = priorMessageInformation;
-    }
-
-    public ProductData getProductData() {
-        return productData;
-    }
-
-    public int getSequenceNumber() {
-        return sequenceNumber;
-    }
-
-    public int getSystemTraceAuditNumber() {
-        return systemTraceAuditNumber;
-    }
-
-    public String getUniqueDeviceId() {
-        return uniqueDeviceId;
-    }
-
-    public TransactionMatchingData getTransactionMatchingData() {
-        return transactionMatchingData;
-    }
-
-    public boolean isTerminalError() {
-        return terminalError;
-    }
-
-    protected TransactionBuilder(TransactionType type) {
-        this(type, null);
-    }
-
-    protected TransactionBuilder(TransactionType type, IPaymentMethod paymentMethod) {
-        super();
-        this.transactionType = type;
-        this.paymentMethod = paymentMethod;
-    }
-
     public TransactionBuilder<TResult> withServiceCode(String serviceCode) {
         this.serviceCode = serviceCode;
         return this;
     }
-
     public TransactionBuilder<TResult> withNtsProductData(NtsProductData ntsProductData) {
         this.ntsProductData = ntsProductData;
         return this;
     }
-
     public TransactionBuilder<TResult> withEcommerceAuthIndicator(String ecommerceAuthIndicator) {
         this.ecommerceAuthIndicator = ecommerceAuthIndicator;
         return this;
     }
-
     public TransactionBuilder<TResult> withEcommerceData1(String ecommerceData1) {
         this.ecommerceData1 = ecommerceData1;
         return this;
     }
-
     public TransactionBuilder<TResult> withEcommerceData2(String ecommerceData2) {
         this.ecommerceData2 = ecommerceData2;
         return this;
     }
-
     public TransactionBuilder<TResult> withEWICData(EWICData ewicData) {
         this.ewicData = ewicData;
         return this;
     }
-
-    public String getEwicIssuingEntity() {
-        return ewicIssuingEntity;
-    }
-
-    public void setEwicIssuingEntity(String ewicIssuingEntity) {
-        this.ewicIssuingEntity = ewicIssuingEntity;
-    }
-
     public TransactionBuilder<TResult> withZipCode(String zipCode) {
         this.zipCode = zipCode;
         return this;
     }
-
     public TransactionBuilder<TResult> withCustomerCode(String customerCode) {
         this.customerCode = customerCode;
         return this;
     }
-
     public TransactionBuilder<TResult> withHostResponseCode(String hostResponseCode) {
         this.hostResponseCode = hostResponseCode;
         return this;
     }
-
     public TransactionBuilder<TResult> withOfflineDeclineIndicator(String offlineDeclineIndicator) {
         this.offlineDeclineIndicator = offlineDeclineIndicator;
         return this;
     }
-
     public TransactionBuilder<TResult> withSAFIndicator(Boolean value) {
         this.isSAFIndicator = value;
         return this;
     }
-
     public TransactionBuilder<TResult> withSAFOrigDT(String value) {
-        this.safOrignDT = value;
+        this.safOriginalDateTime = value;
         return this;
     }
     public TransactionBuilder<TResult> withMerchantOrCustomerInitiatedFlag(String merchantOrCustomerInitiatedFlag){
         this.merchantOrCustomerInitiatedFlag = merchantOrCustomerInitiatedFlag;
         return this;
     }
-
     public TransactionBuilder<TResult> withPDLTimeout(int value){
         this.pdlTimeout = value;
         return this;
     }
+
+    protected TransactionBuilder(TransactionType type) {
+        this(type, null);
+    }
+
+    protected TransactionBuilder(TransactionType type, IPaymentMethod paymentMethod) {
+        super();
+        this.transactionType = type;
+        this.paymentMethod = paymentMethod;
+    }
 }

src/main/java/com/global/api/entities/enums/ConnectionModes.java

@@ -6,5 +6,6 @@ public enum ConnectionModes {
     SSL_TCP,
     HTTP,
     MEET_IN_THE_CLOUD,
-    DIAMOND_CLOUD
+    DIAMOND_CLOUD,
+    AIDL
 }

src/main/java/com/global/api/gateways/NtsConnector.java

@@ -1135,6 +1135,9 @@ private static MessageWriter prepareNtsDataCollectRequest(NtsObjectParam ntsObje
 
             if (!StringUtils.isNullOrEmpty(userData)) {
                 if (userData.length() != 99) {
+                    if (builder.getTagData() != null && builder.getTransactionType().equals(TransactionType.DataCollect) && cardType.equals(NTSCardTypes.WexFleet)){
+                        userData = StringUtils.trimEnd(userData,String.valueOf(builder.getTagData().length()).concat(builder.getTagData()));
+                    }
                     // Extended user data flag
                     request.addRange("E", 1);
                     // User data length

src/main/java/com/global/api/gateways/PorticoConnector.java

@@ -863,8 +863,8 @@ private String buildEnvelope(ElementTree et, Element transaction, String clientT
             Element safData = et.subElement(header, "SAFData");
             et.subElement(safData, "SAFIndicator", builder.getIsSAFIndicator() ? "Y" : "N");
 
-            if (builder.getSafOrignDT() != null) {
-                et.subElement(safData, "SAFOrigDT", builder.getSafOrignDT());
+            if (builder.getSafOriginalDateTime() != null) {
+                et.subElement(safData, "SAFOrigDT", builder.getSafOriginalDateTime());
             } else {
                 throw new UnsupportedOperationException("SAFData operation not supported without SAFOrigDT");
             }

src/main/java/com/global/api/terminals/ConnectionConfig.java

@@ -6,6 +6,7 @@
 import com.global.api.logging.IRequestLogger;
 import com.global.api.serviceConfigs.Configuration;
 import com.global.api.serviceConfigs.GatewayConfig;
+import com.global.api.terminals.abstractions.IAidlService;
 import com.global.api.terminals.abstractions.ITerminalConfiguration;
 import com.global.api.terminals.diamond.DiamondCloudConfig;
 import com.global.api.terminals.diamond.DiamondController;
@@ -32,6 +33,7 @@ public class ConnectionConfig extends Configuration implements ITerminalConfigur
     private IRequestIdProvider requestIdProvider;
     private MitcConfig geniusMitcConfig;
     private IRequestLogger logManagementProvider;
+    private IAidlService iAidlService;
 
     public ConnectionConfig() {
         timeout = 30000;
@@ -44,6 +46,10 @@ public void setConnectionMode(ConnectionModes connectionModes) {
         this.connectionMode = connectionModes;
     }
 
+    public void setAidlService(IAidlService aidlServiceMode) {
+        this.iAidlService = aidlServiceMode;
+    }
+
     public void setBaudRate(BaudRate baudRate) {
         this.baudRate = baudRate;
     }
@@ -134,6 +140,10 @@ public void validate() throws ConfigurationException {
             if (this.geniusMitcConfig == null && gatewayConfig == null) {
                 throw new ConfigurationException("meetInTheCloudConfig or gatewayConfig objects are required for this connection method");
             }
+        } else if (connectionMode == ConnectionModes.AIDL) {
+            if (deviceType != DeviceType.UPA_DEVICE) {
+                throw new ConfigurationException("AIDL is only currently supported on UPA Devices!");
+            }
         }
     }
 }