1.18.4

Author: Maksim Markov

README.md

@@ -31,7 +31,7 @@ cd genesis_java
 <dependency>
         <groupId>com.emerchantpay.gateway</groupId>
         <artifactId>genesis-java</artifactId>
-        <version>1.18.3</version>
+        <version>1.18.4</version>
 </dependency>
 ```
 
@@ -162,6 +162,20 @@ Endpoints
 
 The current version supports two endpoints: ```ECOMPROCESSING``` and ```EMERCHANTPAY```
 
+Proxy configuration
+-------------------
+
+Proxy configuration is optional. You can use proxy host domain name or IP address and proxy port number.
+
+```java
+// Create proxy configuration
+GenesisClient client = new GenesisClient(configuration, request);
+client.setProxyHost("proxy_host");
+client.setProxyPort(8080);
+client.debugMode(true);
+client.execute();
+```
+
 Request types
 -------------
 

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.emerchantpay.gateway</groupId>
 	<artifactId>genesis-java</artifactId>
-	<version>1.18.3</version>
+	<version>1.18.4</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.3</tag>
+		<tag>1.18.4</tag>
 	</scm>
 
 	<distributionManagement>
@@ -66,22 +66,22 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>4.8.0</version>
+			<version>4.11.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
-			<version>2.13.4</version>
+			<version>2.18.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-xml</artifactId>
-			<version>2.13.4</version>
+			<version>2.18.0</version>
 		</dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
-            <version>1.10.0</version>
+            <version>1.12.0</version>
         </dependency>
 	</dependencies>
 

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

@@ -48,6 +48,8 @@ public class GenesisClient extends Request {
 
     private int connectTimeout = 60000;
     private int readTimeout = 60000;
+    private String proxyHost;
+    private int proxyPort;
 
     // Execute
     private Http http;
@@ -255,6 +257,8 @@ private void execute(Request request, Configuration configuration) {
         http = new Http(configuration);
         http.setConnectTimeout(connectTimeout);
         http.setReadTimeout(readTimeout);
+        http.setProxyHost(proxyHost);
+        http.setProxyPort(proxyPort);
         NodeWrapper response = http.postXML(configuration.getBaseUrl(), request);
 
         String requestIdentifier = getRequestIdentifier(request);
@@ -310,6 +314,29 @@ public void setReadTimeout(int timeout) {
         readTimeout = timeout;
     }
 
+    /**
+     * Sets a specified proxy host value to be used when opening a communications link to the resource
+     * referenced by this GenesisClient. Use domain or IP address.
+     *
+     * @param proxyHost proxy host
+     */
+    public void setProxyHost(String proxyHost) {
+        this.proxyHost = proxyHost;
+    }
+
+    /**
+     * Sets a specified proxy port value to be used when opening a communications link to the resource
+     * referenced by this GenesisClient. A non-zero value specifies the proxy port.
+     *
+     * @param proxyPort proxy port
+     */
+    public void setProxyPort(int proxyPort) {
+        if (proxyPort < 1 || proxyPort > 65535) {
+            throw new IllegalArgumentException("invalid port: " + proxyPort);
+        }
+        this.proxyPort = proxyPort;
+    }
+
     private Configuration getConfiguration() {
         Iterator<Configuration> iterator = configurationMap.values().iterator();
 

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

@@ -26,6 +26,8 @@
 import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.net.UnknownHostException;
@@ -72,6 +74,8 @@ enum RequestMethod {
 
     private int connectTimeout;
     private int readTimeout;
+    private String proxyHost;
+    private int proxyPort;
 
     public Http(Configuration configuration) {
         this.configuration = configuration;
@@ -126,14 +130,22 @@ public NodeWrapper put(String url, Request request) {
         return httpRequestXML(RequestMethod.PUT, url, request.toXML());
     }
 
-    public void setConnectTimeout(int timeout){
+    public void setConnectTimeout(int timeout) {
         connectTimeout = timeout;
     }
 
     public void setReadTimeout(int timeout) {
         readTimeout = timeout;
     }
 
+    public void setProxyHost(String proxyHost) {
+        this.proxyHost = proxyHost;
+    }
+
+    public void setProxyPort(int proxyPort) {
+        this.proxyPort = proxyPort;
+    }
+
     private NodeWrapper httpRequestXML(RequestMethod requestMethod, String url) {
         return httpRequestXML(requestMethod, url, null);
     }
@@ -182,28 +194,36 @@ private NodeWrapper httpRequestXML(RequestMethod requestMethod, String url, Stri
                 responseStream = connection.getResponseCode() == 422 ? connection.getErrorStream()
                         : connection.getInputStream();
 
-                String xml = StringUtils.inputStreamToString(responseStream);
+                String responseXml = StringUtils.inputStreamToString(responseStream);
 
                 configuration.getLogger().log(Level.INFO, "[Genesis] [{0}]] {1} {2}",
                         new Object[]{getCurrentTime(), requestMethod.toString(), url});
                 configuration.getLogger().log(Level.FINE, "[Genesis] [{0}] {1} {2} {3}",
                         new Object[]{getCurrentTime(), requestMethod.toString(), url, connection.getResponseCode()});
 
-                if (xml != null && configuration.isDebugModeEnabled() == true) {
+                if (configuration.isDebugModeEnabled()) {
                     configuration.getLogger().log(Level.INFO, formatSanitizeBodyForLog(postBody));
-                    configuration.getLogger().log(Level.INFO, formatSanitizeBodyForLog(xml));
+                    configuration.getLogger().log(Level.INFO, formatSanitizeBodyForLog(responseXml));
                 }
 
-                nodeWrapper = NodeWrapperFactory.instance.create(xml);
+                nodeWrapper = NodeWrapperFactory.instance.create(responseXml);
             } finally {
                 if (responseStream != null) {
                     responseStream.close();
                 }
             }
         } catch (UnknownHostException e) {
-            throw new NetworkException("No route to host " + e.getMessage() + ":" + port, e);
+            String errorStr = "No route to host " + host + ":" + port;
+            if (proxyHost != null && proxyPort > 0) {
+                errorStr += " , used proxy_host: " + proxyHost + ", proxy_port: " + proxyPort;
+            }
+            throw new NetworkException(errorStr, e);
         } catch (IOException e) {
-            throw new UnexpectedException(e.getMessage() + ", host: " + host + ", port: " + port, e);
+            String errorStr = ", host: " + host + ", port: " + port;
+            if (proxyHost != null && proxyPort > 0) {
+                errorStr += ", used proxy_host: " + proxyHost + ", proxy_port: " + proxyPort;
+            }
+            throw new UnexpectedException(e.getMessage() + errorStr, e);
         } finally {
             if (connection != null) {
                 connection.disconnect();
@@ -252,7 +272,7 @@ private JsonNode httpRequestJson(RequestMethod requestMethod, String url, String
                 configuration.getLogger().log(Level.FINE, "[Genesis] [{0}] {1} {2} {3}",
                         new Object[]{getCurrentTime(), requestMethod.toString(), url, connection.getResponseCode()});
 
-                if (json != null && configuration.isDebugModeEnabled() == true) {
+                if (configuration.isDebugModeEnabled()) {
                     configuration.getLogger().log(Level.INFO, formatSanitizeBodyForLog(postBody));
                     configuration.getLogger().log(Level.INFO, formatSanitizeBodyForLog(json));
                 }
@@ -338,11 +358,15 @@ private HttpURLConnection buildConnection(RequestMethod requestMethod, String ur
         String user_pass = configuration.getUsername() + ":" + configuration.getPassword();
         String encoded = Base64.getEncoder().encodeToString(user_pass.getBytes());
 
-
-        connection = (HttpURLConnection) url.openConnection();
+        if (proxyHost != null && !proxyHost.isEmpty() && proxyPort > 0) {
+            Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, proxyPort));
+            connection = (HttpURLConnection) url.openConnection(proxy);
+        } else {
+            connection = (HttpURLConnection) url.openConnection();
+        }
         connection.setRequestMethod(requestMethod.toString());
         connection.addRequestProperty("Accept", acceptHeader);
-        connection.setRequestProperty("Content-Type",contentType);
+        connection.setRequestProperty("Content-Type", contentType);
         connection.addRequestProperty("Authorization", "Basic " + encoded);
         connection.setDoOutput(true);
         connection.setConnectTimeout(connectTimeout);