OctopusDeploy release: 14.0.1

Author: securesubmit-buildmaster

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
-## Latest Version - V14.0.0 (09/10/2024)
+## Latest Version - V14.0.1 (09/20/2024)
+### Bug Fixes
+- [VAPS/NTS] - Fixed Java Memory leak issue by implementing cache thread pool to optimize memory utilization(10331).
+- [Portico] - Added mapping for 3DSecure (Version 2) to Transaction Summary Report.
+
+## V14.0.0 (09/10/2024)
 ### Enhacements
 - [UPA] Add new UPA commands
 ### Bug Fixes

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.heartlandpaymentsystems</groupId>
   <artifactId>globalpayments-sdk</artifactId>
-  <version>14.0.0</version>
+  <version>14.0.1</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/entities/TransactionSummary.java

@@ -121,6 +121,7 @@ public class TransactionSummary {
     private String taxType;
     private String tranNo;
     private String terminalId;
+    private ThreeDSecure threeDSecure;
     private String tokenPanLastFour;
     private DateTime transactionDate;
     private DateTime transactionLocalDate;

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

@@ -45,6 +45,7 @@ public class NetworkGateway {
     private IGatewayEventHandler gatewayEventHandler;
     @Getter @Setter
     private Target target;
+    private final ExecutorService executorService = Executors.newCachedThreadPool();
 
     public String getPrimaryEndpoint() {
         return primaryEndpoint;
@@ -130,19 +131,16 @@ private void connect(String endpoint, Integer port) throws GatewayComsException
                     try {
                         SSLSocketFactory factory = new SSLSocketFactoryEx();
                         client = (SSLSocket) factory.createSocket();
-                        ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
                         Callable<Integer> task = () -> {
                             client.connect(new InetSocketAddress(endpoint, port), 5000);
                             return 0;
                         };
-                        try {
-                            Future<Integer> future = executorService.submit(task);
-                            future.get(5000, TimeUnit.MILLISECONDS);
-                            client.startHandshake();
-                            raiseGatewayEvent(new SslHandshakeEvent(connectorName, null));
-                        } catch (TimeoutException | InterruptedException | ExecutionException e) {
-                            throw new GatewayTimeoutException();
-                        }
+                        Future<Integer> future = executorService.submit(task);
+                        future.get(5000, TimeUnit.MILLISECONDS);
+                        client.startHandshake();
+                        raiseGatewayEvent(new SslHandshakeEvent(connectorName, null));
+                    } catch (TimeoutException | InterruptedException e) {
+                        throw new GatewayTimeoutException();
                     }
                     catch(Exception exc) {
                         raiseGatewayEvent(new SslHandshakeEvent(connectorName, exc));
@@ -282,7 +280,6 @@ private byte[] getGatewayResponse() throws IOException, GatewayTimeoutException
     }
 
     private int awaitResponse(InputStream in, byte[] buffer) throws GatewayTimeoutException {
-        ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
         Callable<Integer> task = () -> {
         long t = System.currentTimeMillis();
 
@@ -320,14 +317,25 @@ private int awaitResponse(InputStream in, byte[] buffer) throws GatewayTimeoutEx
 
         throw new GatewayTimeoutException();
         };
-        int result;
+        Future<Integer> future = executorService.submit(task);
         try {
-            Future<Integer> future = executorService.submit(task);
-            result = future.get( timeout, TimeUnit.MILLISECONDS);
+            return future.get( timeout, TimeUnit.MILLISECONDS);
         }  catch (TimeoutException | InterruptedException | ExecutionException e) {
             throw new GatewayTimeoutException();
+        } finally {
+            shutdownExecutorService();
+        }
+    }
+
+    public void shutdownExecutorService(){
+        executorService.shutdown();
+        try {
+            if(!executorService.awaitTermination(1,TimeUnit.SECONDS)){
+                executorService.shutdownNow();
+            }
+        } catch (InterruptedException e) {
+            executorService.shutdownNow();
         }
-        return result;
     }
 
     private void raiseGatewayEvent(final IGatewayEvent event) {

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

@@ -1349,6 +1349,30 @@ private TransactionSummary hydrateTransactionSummary(Element root) {
             summary.setBillingAddress(address);
         }
 
+        // 3DSecure
+        if (root.has("Secure3D")) {
+            ThreeDSecure secure3D = new ThreeDSecure();
+            secure3D.setAuthenticationValue(root.getString("AuthenticationValue"));
+            secure3D.setDirectoryServerTransactionId(root.getString("DirectoryServerTxnId"));
+            secure3D.setEci(root.getString("ECI"));
+            
+            try {
+                // account for default value of Version One. No value will be returned from Portico in this case.
+                String versionString = root.getString("Version");
+                if (versionString == null || versionString.isEmpty()) {
+                    // Default to version One.
+                    secure3D.setVersion(Secure3dVersion.ONE);
+                } else {
+                    int versionNumber = Integer.parseInt(root.getString("Version"));
+                    secure3D.setVersion(getSecure3dVersion(versionNumber));
+                }
+            } catch (ApiException e) {
+                throw new RuntimeException("No Matching Version Found");
+            }
+
+            summary.setThreeDSecure(secure3D);
+        }
+
         return summary;
     }
 
@@ -1404,6 +1428,19 @@ private int getSecure3DVersion(Secure3dVersion version) {
         }
     }
 
+    public static Secure3dVersion getSecure3dVersion(int versionNumber) {
+        switch (versionNumber) {
+            case 0:
+                return Secure3dVersion.NONE;
+            case 1:
+                return Secure3dVersion.ONE;
+            case 2:
+                return Secure3dVersion.TWO;
+            default:
+                return Secure3dVersion.ANY;
+        }
+    }
+
     private boolean isAppleOrGooglePay(PaymentDataSourceType paymentDataSource) {
         return paymentDataSource == PaymentDataSourceType.APPLEPAY
                 || paymentDataSource == PaymentDataSourceType.APPLEPAYAPP

src/test/java/com/global/api/tests/portico/PorticoEcommerceTests.java

@@ -126,7 +126,7 @@ public void ecomWithWalletData_02() throws ApiException {
     }
 
     @Test
-    public void ecomWithSecure3D_03() throws ApiException {
+    public void ecomWithSecure3D_03DefaultVersionOne() throws ApiException {
         ThreeDSecure ecom = new ThreeDSecure();
         ecom.setCavv("XXXXf98AAajXbDRg3HSUMAACAAA=");
         ecom.setXid("0l35fwh1sys3ojzyxelu4ddhmnu5zfke5vst");
@@ -139,8 +139,18 @@ public void ecomWithSecure3D_03() throws ApiException {
                 .withInvoiceNumber("1234567890")
                 .withAllowDuplicates(true)
                 .execute();
+
+        TransactionSummary txnDetails = ReportingService.transactionDetail(response.getTransactionId()).execute();
+
         assertNotNull(response);
+        assertNotNull(txnDetails);
+
         assertEquals("00", response.getResponseCode());
+
+        assertNotNull(txnDetails.getThreeDSecure().getAuthenticationValue());
+        assertNotNull(txnDetails.getThreeDSecure().getDirectoryServerTransactionId());
+        assertNotNull(txnDetails.getThreeDSecure().getEci());
+        assertNotNull(txnDetails.getThreeDSecure().getVersion());
     }
 
     @Test
@@ -161,6 +171,33 @@ public void testCardHolderEmail() throws ApiException {
         assertNotNull(txnSummary);
         assertEquals(customerEmail, txnSummary.getEmail() );
     }
+
+    @Test
+    public void ecomWithSecure3D_03Version2() throws ApiException {
+        ThreeDSecure ecom = new ThreeDSecure();
+        ecom.setCavv("XXXXf98AAajXbDRg3HSUMAACAAA=");
+        ecom.setXid("0l35fwh1sys3ojzyxelu4ddhmnu5zfke5vst");
+        ecom.setEci("5");
+        ecom.setVersion(Secure3dVersion.TWO);
+        card.setThreeDSecure(ecom);
+
+        Transaction response = card.charge(new BigDecimal("10"))
+                .withCurrency("USD")
+                .withInvoiceNumber("1234567890")
+                .withAllowDuplicates(true)
+                .execute();
+
+        TransactionSummary txnDetails = ReportingService.transactionDetail(response.getTransactionId()).execute();
+
+        assertNotNull(response);
+        assertNotNull(txnDetails);
+
+        assertEquals("00", response.getResponseCode());
+        assertNotNull(txnDetails.getThreeDSecure().getAuthenticationValue());
+        assertNotNull(txnDetails.getThreeDSecure().getDirectoryServerTransactionId());
+        assertNotNull(txnDetails.getThreeDSecure().getEci());
+        assertNotNull(txnDetails.getThreeDSecure().getVersion());
+    }
     @Test
     public void testCardHolderEmailIfCustomerDataIsNull() throws ApiException {
         Customer customerData = null;
@@ -242,4 +279,4 @@ public void UniqueTokenRequest() throws ApiException {
         assertNotNull(response2.getToken());
         assertNotEquals(response1.getToken(),response3.getToken());
     }
-}
+}