1.18.6

Author: Vladimir Kozlov

README.md

@@ -31,7 +31,7 @@ cd genesis_java
 <dependency>
         <groupId>com.emerchantpay.gateway</groupId>
         <artifactId>genesis-java</artifactId>
-        <version>1.18.5</version>
+        <version>1.18.6</version>
 </dependency>
 ```
 

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.emerchantpay.gateway</groupId>
     <artifactId>genesis-java</artifactId>
-    <version>1.18.5</version>
+    <version>1.18.6</version>
     <name>Genesis Gateway Java Client Library</name>
     <description>Java Client Library for Genesis Gateway</description>
     <url>https://www.emerchantpay.com</url>
@@ -32,7 +32,7 @@
         <developerConnection>
             ${scmConnection}
         </developerConnection>
-        <tag>1.18.5</tag>
+        <tag>1.18.6</tag>
     </scm>
 
     <distributionManagement>
@@ -155,7 +155,7 @@
                         <configuration>
                             <show>private</show>
                             <nohelp>true</nohelp>
-                            <additionalparam>-Xdoclint:none</additionalparam>
+                            <additionalOptions>-Xdoclint:none</additionalOptions>
                         </configuration>
                         <executions>
                             <execution>
@@ -269,14 +269,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <version>3.5.1</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
 
             <plugin>

src/main/java/com/emerchantpay/gateway/GenesisClient.java

@@ -3,6 +3,7 @@
 import com.emerchantpay.gateway.api.Request;
 import com.emerchantpay.gateway.api.constants.DeprecatedTransactionTypes;
 import com.emerchantpay.gateway.api.constants.EndpointActions;
+import com.emerchantpay.gateway.api.constants.TransactionTypes;
 import com.emerchantpay.gateway.api.exceptions.LimitsException;
 import com.emerchantpay.gateway.api.requests.financial.FinancialRequest;
 import com.emerchantpay.gateway.util.Configuration;
@@ -181,6 +182,14 @@ private void executeAsync() {
 
     private void execute(Request request, Configuration configuration) {
 
+        // TODO: Consider refactoring the architecture to be like in the rest of the SDKs:
+        //  Use an ApiConfig (contains pre-request configuration: URL, etc.) separate from Configuration (username, password, etc.)
+        //  Allow each request to modify its ApiConfig
+        //  This Request -> Api Config provides required “things” for the Network/Request execution.
+        //  GenesisClient should connect SDK components and load the Network with the Request object
+        //  Remove the switch construction from GenesisClient->execute; avoid repetitive switch cases
+        //  Goal: Enable each request to define its endpoint without GenesisClient needing to handle it
+
         switch ((request.getTransactionType() != null) ? request.getTransactionType() : "") {
             case "wpf_payment":
                 configuration.setWpfEnabled(true);
@@ -242,6 +251,13 @@ private void execute(Request request, Configuration configuration) {
                 configuration.setTokenEnabled(false);
                 configuration.setAction("retrieval_requests/by_date");
                 break;
+            case TransactionTypes.CONTINUE_3D:
+                configuration.setWpfEnabled(false);
+                configuration.setTokenEnabled(false);
+                // ThreedsV2ContinueRequest disables token and sets the action in setThreedsConfiguration
+                // But it will not be called if config is not associated with the request
+                // setAction will also not be called and set... if we create bare ThreedsV2ContinueRequest object without config
+                break;
             default:
                 configuration.setWpfEnabled(false);
                 FinancialRequest financialRequest = request instanceof FinancialRequest ? ((FinancialRequest) request) : null;

src/main/java/com/emerchantpay/gateway/api/constants/EndpointApiTypes.java

@@ -0,0 +1,59 @@
+package com.emerchantpay.gateway.api.constants;
+
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to permit
+ * persons to whom the Software is furnished to do so, subject to the
+ * following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * @license http://opensource.org/licenses/MIT The MIT License
+ */
+
+@Getter
+public enum EndpointApiTypes {
+    WPF("wpf"),
+    GATE("gate"),
+    API("api");
+
+    private final String urlPart;
+
+    private static final Map<String, EndpointApiTypes> lookup = new HashMap<>();
+
+    static {
+        for (EndpointApiTypes service : EndpointApiTypes.values()) {
+            lookup.put(service.urlPart, service);
+        }
+    }
+
+    EndpointApiTypes(String urlPart) {
+        this.urlPart = urlPart;
+    }
+
+    public static EndpointApiTypes fromUrlPart(String urlPart) {
+        return lookup.get(urlPart);
+    }
+
+    @Override
+    public String toString() {
+        return urlPart;
+    }
+}

src/main/java/com/emerchantpay/gateway/api/constants/Environments.java

@@ -23,28 +23,30 @@
  * @license http://opensource.org/licenses/MIT The MIT License
  */
 
+import lombok.Getter;
+import lombok.ToString;
+
 import java.io.Serializable;
+import java.util.*;
 
-//TODO: Move API subdomains out of environments (i.e. "gate")
+@Getter
 public class Environments implements Serializable {
 
-	private String environmentName;
+	private final String environmentName;
 
-	// Production Environments
-	public static Environments PRODUCTION = new Environments("gate");
+	// Production Environment (empty subdomain or "prod" when necessary)
+	public static final Environments PRODUCTION = new Environments("prod");
 
-	// Staging Environments
-	public static Environments STAGING = new Environments("staging.gate");
+	// Staging Environment
+	public static final Environments STAGING = new Environments("staging");
 
-	public Environments(String environmentName) {
+	// Define services that require "prod" subdomain in production
+	public static final Set<EndpointApiTypes> SERVICES_WITH_PROD_SUBDOMAIN = EnumSet.of(EndpointApiTypes.API);
 
+	public Environments(String environmentName) {
 		this.environmentName = environmentName;
 	}
 
-	public String getEnvironmentName() {
-		return this.environmentName;
-	}
-
 	public String toString() {
 		return getEnvironmentName();
 	}

src/main/java/com/emerchantpay/gateway/api/constants/TransactionTypes.java

@@ -42,6 +42,9 @@ public class TransactionTypes {
     // 3D-Secure Sale
     public static final String SALE_3D = "sale3d";
 
+    // 3D-Secure Continue
+    public static final String CONTINUE_3D = "continue3d";
+
     // Capture settles a transaction which has been authorized before
     public static final String CAPTURE = "capture";
 
@@ -269,6 +272,7 @@ public static ArrayList<String> getWPFTransactionTypes() {
                 CASHU,
                 CENCOSUD,
                 CITADEL_PAYIN,
+                CONTINUE_3D,
                 DAVIVIENDA,
                 EFECTY,
                 ELO,

src/main/java/com/emerchantpay/gateway/api/requests/financial/card/threeds/v2/ThreedsV2ContinueRequest.java

@@ -26,6 +26,7 @@
 import com.emerchantpay.gateway.api.RequestBuilder;
 import com.emerchantpay.gateway.api.constants.ContentTypes;
 import com.emerchantpay.gateway.api.constants.Endpoints;
+import com.emerchantpay.gateway.api.constants.TransactionTypes;
 import com.emerchantpay.gateway.api.exceptions.InvalidParamException;
 import com.emerchantpay.gateway.api.exceptions.RegexException;
 import com.emerchantpay.gateway.api.exceptions.RequiredParamsException;
@@ -55,6 +56,7 @@ public class ThreedsV2ContinueRequest extends FinancialRequest {
     private Configuration configuration;
     private NodeWrapper node;
     private static final String PATH_SEPARATOR = "/";
+    private final String transactionType = TransactionTypes.CONTINUE_3D;
 
     public ThreedsV2ContinueRequest(){
         super();
@@ -70,11 +72,15 @@ public ThreedsV2ContinueRequest(Transaction trx, Configuration configuration) {
         setAmount(trx.getAmount());
         setCurrency(trx.getCurrency());
         setThreedsTimestamp(trx.getTimestamp());
-        configuration.setAction(Endpoints.THREEDS_METHOD.getEndpointName() + PATH_SEPARATOR + getUniqueId());
         setThreedsConfiguration(configuration);
         setThreedsSignature(generateSignature());
     }
 
+    @Override
+    public String getTransactionType() {
+        return transactionType;
+    }
+
     public Configuration getThreedsConfiguration() {
         return configuration;
     }
@@ -160,6 +166,14 @@ public ThreedsV2ContinueRequest setThreedsTimestamp(String threedsTimestamp) {
         return this;
     }
 
+    @Override
+    public void setUseSmartRouting(Boolean useSmartRouting) {
+        if (useSmartRouting) {
+            throw new IllegalArgumentException("Smart routing is not supported for this request");
+        }
+        super.setUseSmartRouting(false);
+    }
+
     @Override
     public String toXML() {
         return buildRequest("").toXML();

src/main/java/com/emerchantpay/gateway/util/Configuration.java

@@ -209,22 +209,48 @@ public Configuration clearQueryParameters(){
 
     public String getBaseUrl() {
         String queryParamStr = queryParams != null ? "?" + queryParams : "";
+        EndpointApiTypes service = getEndpointApiType();
+        String fullSubdomain = getFullSubDomain(service);
 
-        String baseEnvironment = environment.getEnvironmentName();
-        if (!getTokenEnabled()) {
+        return buildUrl(fullSubdomain, queryParamStr);
+    }
+
+    private EndpointApiTypes getEndpointApiType() {
+        if (getTokenEnabled()) {
+            return EndpointApiTypes.GATE;
+        } else {
             if (getWpfEnabled()) {
-                baseEnvironment = baseEnvironment.replace("gate", "wpf");
+                return EndpointApiTypes.WPF;
             } else if (EndpointActions.TRANSACTIONS.equals(getAction())) {
-                baseEnvironment = baseEnvironment.replace("gate", "api");
+                return EndpointApiTypes.API;
+            } else {
+                // This can occur when we have ThreedsV2ContinueRequest, it is a non-token request
+                return EndpointApiTypes.GATE;
             }
         }
+    }
 
-        return buildUrl(baseEnvironment, queryParamStr);
+    private String getFullSubDomain(EndpointApiTypes service) {
+        switch (environment.getEnvironmentName()) {
+            case "prod":
+                if (Environments.SERVICES_WITH_PROD_SUBDOMAIN.contains(service)) {
+                    return environment.getEnvironmentName() + "." + service.getUrlPart();
+                } else {
+                    return service.getUrlPart();
+                }
+
+            case "staging":
+                return environment.getEnvironmentName() + "." + service.getUrlPart();
+
+            default:
+                // Allow users flexibility with defining subdomains
+                return environment.getEnvironmentName();
+        }
     }
 
-    private String buildUrl(String environmentName, String queryParamStr) {
+    private String buildUrl(String fullSubDomain, String queryParamStr) {
         return String.format("https://%s.%s%s%s%s",
-                environmentName,
+                fullSubDomain,
                 endpoint.getEndpointName(),
                 pathSeparator,
                 getAction(),