- Adding a default timeout value in case the property is not specified in properties file

- Adding http timeouts in HttpUtility

Author: akankari

src/main/java/net/authorize/util/Constants.java

@@ -28,5 +28,8 @@ public final class Constants {
 	public static final String PROP_MD5_HASHKEY_APPLEPAY = "md5.hash.key.applepay";
 
 	public static final String HTTP_CONNECTION_TIME_OUT = "http.ConnectionTimeout";
+	public static final int HTTP_CONNECTION_TIME_OUT_DEFAULT_VALUE = 30000;
+	
 	public static final String HTTP_READ_TIME_OUT = "http.ReadTimeout";
+	public static final int HTTP_READ_TIME_OUT_DEFAULT_VALUE = 30000;
 }

src/main/java/net/authorize/util/HttpClient.java

@@ -11,10 +11,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import net.authorize.Environment;
-import net.authorize.ResponseField;
-import net.authorize.Transaction;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.HttpEntity;
@@ -24,12 +20,14 @@
 import org.apache.http.conn.params.ConnRoutePNames;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.params.BasicHttpParams;
 import org.apache.http.params.CoreProtocolPNames;
 import org.apache.http.params.HttpConnectionParams;
-import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.HTTP;
 
+import net.authorize.Environment;
+import net.authorize.ResponseField;
+import net.authorize.Transaction;
+
 
 /**
  * Transportation object used to facilitate the communication with the respective gateway.
@@ -49,6 +47,9 @@ public class HttpClient {
 
 	static {
 		LogHelper.info(logger, "Use Proxy: '%s'", UseProxy);
+		
+		httpConnectionTimeout = (httpConnectionTimeout == 0 ? Constants.HTTP_CONNECTION_TIME_OUT_DEFAULT_VALUE : httpConnectionTimeout );
+		httpReadTimeout = (httpReadTimeout == 0 ? Constants.HTTP_READ_TIME_OUT_DEFAULT_VALUE : httpReadTimeout);
 	}
 	/**
 	 * Creates the http post object for an environment and transaction container.

src/main/java/net/authorize/util/HttpUtility.java

@@ -15,15 +15,16 @@
 
 import javax.xml.bind.JAXBException;
 
-import net.authorize.Environment;
-import net.authorize.api.contract.v1.ANetApiRequest;
-import net.authorize.api.contract.v1.ANetApiResponse;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.params.CoreProtocolPNames;
+import org.apache.http.params.HttpConnectionParams;
+
+import net.authorize.Environment;
+import net.authorize.api.contract.v1.ANetApiRequest;
+import net.authorize.api.contract.v1.ANetApiResponse;
 
 /**
  * Helper methods for http calls
@@ -34,6 +35,15 @@ public final class HttpUtility {
 
 	private static Log logger = LogFactory.getLog(HttpUtility.class);	
 
+	static int httpConnectionTimeout = Environment.getIntProperty(Constants.HTTP_CONNECTION_TIME_OUT);
+	static int httpReadTimeout = Environment.getIntProperty(Constants.HTTP_READ_TIME_OUT);
+	
+	static {
+		
+		httpConnectionTimeout = (httpConnectionTimeout == 0 ? Constants.HTTP_CONNECTION_TIME_OUT_DEFAULT_VALUE : httpConnectionTimeout );
+		httpReadTimeout = (httpReadTimeout == 0 ? Constants.HTTP_READ_TIME_OUT_DEFAULT_VALUE : httpReadTimeout);
+	}
+	
 	/**
      * Default C'tor, cannot be instantiated
      */
@@ -60,7 +70,13 @@ static HttpPost createPostRequest(Environment env, ANetApiRequest request) throw
 			  logger.debug(String.format("MerchantInfo->LoginId/TransactionKey: '%s':'%s'", request.getMerchantAuthentication().getName(), request.getMerchantAuthentication().getTransactionKey() ));
 			  logger.debug(String.format("Posting request to Url: '%s'", postUrl));
 			  httpPost = new HttpPost(postUrl);
-                          httpPost.getParams().setBooleanParameter(CoreProtocolPNames.USE_EXPECT_CONTINUE, false);
+              httpPost.getParams().setBooleanParameter(CoreProtocolPNames.USE_EXPECT_CONTINUE, false);
+              
+              //set the tcp connection timeout
+  			  httpPost.getParams().setIntParameter(HttpConnectionParams.CONNECTION_TIMEOUT, httpConnectionTimeout);
+  			  //set the time out on read-data request
+  			  httpPost.getParams().setIntParameter(HttpConnectionParams.SO_TIMEOUT, httpReadTimeout);
+              
 			  httpPost.setHeader("Content-Type", "text/xml; charset=utf-8");
 
 			  String xmlRequest = XmlUtility.getXml(request);