enabled shutdownhook with connection pooling

Author: mahendya1002

java/src/main/java/com/cybersource/ws/client/MerchantConfig.java

@@ -79,6 +79,7 @@ public class MerchantConfig {
     private boolean customHttpClassEnabled;
     private boolean certificateCacheEnabled; 
     private boolean merchantConfigCacheEnabled;
+    private boolean shutdownHookEnabled;
 
     public String getcustomHttpClass() {
 		return customHttpClass;
@@ -238,6 +239,11 @@ public boolean isCertificateCacheEnabled() {
     public boolean isMerchantConfigCacheEnabled() {
         return merchantConfigCacheEnabled;
     }
+
+    public boolean isShutdownHookEnabled() {
+        return shutdownHookEnabled;
+    }
+
     /**
      * Returns the effective server URL to which the request will be sent.
      * If a serverURL is specified, then that is what is returned.
@@ -426,6 +432,8 @@ public MerchantConfig(Properties _props, String _merchantID)
             } else {
                 maxKeepAliveTimeMs = getIntegerProperty(merchantID, "maxKeepAliveTimeMs");
             }
+
+            shutdownHookEnabled =getBooleanProperty(merchantID, "enabledShutdownHook", true);
         }
 
         allowRetry  = getBooleanProperty(merchantID, "allowRetry", true);
@@ -599,13 +607,25 @@ public String getLogString() {
         appendPair(sb, "customHttpClass", customHttpClass);
         appendPair(sb, "customHttpClassEnabled", customHttpClassEnabled);
         appendPair(sb, "useHttpClient", useHttpClient);
+        appendPair(sb, "useHttpClientWithConnectionPool", useHttpClientWithConnectionPool);
         appendPair(sb, "enableJdkCert", enableJdkCert);
         appendPair(sb, "enableCacert", enableCacert);
         if(useHttpClient){
             appendPair(sb, "allowRetry", allowRetry);
             appendPair(sb, "RetryCount", numberOfRetries);
             appendPair(sb, "RetryInterval", retryInterval);
         }
+        if(useHttpClientWithConnectionPool){
+            appendPair(sb, "maxConnections", maxConnections);
+            appendPair(sb, "defaultMaxConnectionsPerRoute", defaultMaxConnectionsPerRoute);
+            appendPair(sb, "maxConnectionsPerRoute", maxConnectionsPerRoute);
+            appendPair(sb, "connectionRequestTimeoutMs", connectionRequestTimeoutMs);
+            appendPair(sb, "connectionTimeoutMs", connectionTimeoutMs);
+            appendPair(sb, "socketTimeoutMs", socketTimeoutMs);
+            appendPair(sb, "evictThreadSleepTimeMs", evictThreadSleepTimeMs);
+            appendPair(sb, "maxKeepAliveTimeMs", maxKeepAliveTimeMs);
+            appendPair(sb, "enabledShutdownHook", shutdownHookEnabled);
+        }
         appendPair(sb, "timeout", timeout);
         if (proxyHost != null) {
             appendPair(sb, "proxyHost", proxyHost);

java/src/main/java/com/cybersource/ws/client/PoolingHttpClientConnection.java

@@ -69,7 +69,9 @@ private void initializeConnectionManager(MerchantConfig merchantConfig) throws C
                         connectionManager.setMaxPerRoute(new HttpRoute(httpHost), merchantConfig.getMaxConnectionsPerRoute());
                         initHttpClient(merchantConfig, connectionManager);
                         startStaleConnectionMonitorThread(merchantConfig, connectionManager);
-                        addShutdownHook();
+                        if(merchantConfig.isShutdownHookEnabled()) {
+                            addShutdownHook();
+                        }
                     } catch (Exception e) {
                         logger.log(Logger.LT_FAULT, "invalid server url");
                         throw new ClientException(e, logger);