+ Fix for issue #285 & #288.

Author: snavinch

src/main/java/Api/SearchTransactionsApi.java

@@ -142,6 +142,11 @@ public TssV2TransactionsPost201Response createSearch(CreateSearchRequest createS
         this.apiClient.setComputationStartTime(System.nanoTime());
         ApiResponse<TssV2TransactionsPost201Response> resp = createSearchWithHttpInfo(createSearchRequest);
         logger.info("CALL TO METHOD 'createSearch' ENDED");
+        if(resp == null)
+        {
+            logger.info("CALL TO METHOD 'createSearch' FAILED DUE TO AN EXCEPTION");
+            return null;
+        }
         return resp.getData();
     }
 

src/main/java/Invokers/ApiClient.java

@@ -138,7 +138,7 @@ public class ApiClient {
 
 	private JSON json;
 	private String versionInfo;
-	private static ConnectionPool connectionPool = new ConnectionPool(5, 10, TimeUnit.SECONDS);
+	private static ConnectionPool defaultConnectionPool = new ConnectionPool(5, 10, TimeUnit.SECONDS);
 	private HttpLoggingInterceptor loggingInterceptor;
 	private long computationStartTime;
 	private static Logger logger = LogManager.getLogger(ApiClient.class);
@@ -165,7 +165,7 @@ public static OkHttpClient initializeFinalVariables() {
 					.connectTimeout(1, TimeUnit.SECONDS)
 					.writeTimeout(60, TimeUnit.SECONDS)
 					.readTimeout(60, TimeUnit.SECONDS)
-					.connectionPool(ApiClient.connectionPool)
+					.connectionPool(ApiClient.defaultConnectionPool)
 					.addInterceptor(logging)
 					.build();
 		}
@@ -244,6 +244,8 @@ public ApiClient(MerchantConfig merchantConfig) {
 		int connectionTimeout = Math.max(merchantConfig.getUserDefinedConnectionTimeout(), 1);
 		int readTimeout = Math.max(merchantConfig.getUserDefinedReadTimeout(), 60);
 		int writeTimeout = Math.max(merchantConfig.getUserDefinedWriteTimeout(), 60);
+		int keepAliveDuration = Math.max(merchantConfig.getUserDefinedKeepAliveDuration(), 10);
+		ConnectionPool connectionPool = new ConnectionPool(5, keepAliveDuration, TimeUnit.SECONDS);
 
 		Authenticator proxyAuthenticator;
 
@@ -286,6 +288,7 @@ public Request authenticate(Route route, Response response) throws IOException {
 						.readTimeout(readTimeout, TimeUnit.SECONDS)
 						.retryOnConnectionFailure(true)
 						.addInterceptor(new RetryInterceptor(this.apiRequestMetrics))
+						.connectionPool(connectionPool)
 						.eventListener(new NetworkEventListener(this.getNewRandomId(), System.nanoTime()))
 						.build();
 			}
@@ -304,6 +307,7 @@ public Request authenticate(Route route, Response response) throws IOException {
 						.connectTimeout(connectionTimeout, TimeUnit.SECONDS)
 						.writeTimeout(writeTimeout, TimeUnit.SECONDS)
 						.readTimeout(readTimeout, TimeUnit.SECONDS)
+						.connectionPool(connectionPool)
 						.retryOnConnectionFailure(true)
 						.addInterceptor(new RetryInterceptor(this.apiRequestMetrics))
 						.eventListener(new NetworkEventListener(this.getNewRandomId(), System.nanoTime()))
@@ -1207,9 +1211,13 @@ public <T> ApiResponse<T> execute(Call call, Type returnType) throws ApiExceptio
 
 			return new ApiResponse<T>(response.code(), response.headers().toMultimap(), data);
 		} catch (IOException e) {
-			logger.error("ApiException : " + e);
+			logger.error("ApiException : " + e.getMessage());
 			throw new ApiException(e);
 		}
+		catch (NullPointerException e) {
+			logger.error("ApiException : " + e.getMessage());
+			return null;
+		}
 	}
 
 	/**
@@ -1280,7 +1288,7 @@ public <T> T handleResponse(Response response, Type returnType) throws ApiExcept
 			if (response.body() != null) {
 				try {
 					respBody = response.body().string();
-					System.out.println(respBody);
+					logger.info(respBody);
 				} catch (IOException e) {
 					logger.error("ApiException : " + e + " " + response.code() + " " + response.message());
 					throw new ApiException(response.message(), e, response.code(), response.headers().toMultimap());
@@ -1407,7 +1415,7 @@ public void callAuthenticationHeader(String method, String path, Object body, Li
 			}
 
 		} catch (ConfigException e) {
-			System.out.println(e.getMessage());
+			logger.error(e.getMessage());
 		}
 
 	}