1 files changed, 10 insertions, 19 deletions

diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/restful/client/PortalRestClientBase.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/restful/client/PortalRestClientBase.java
index 3bc6677b..5b22b75f 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/restful/client/PortalRestClientBase.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/restful/client/PortalRestClientBase.java
@@ -99,16 +99,13 @@ public class PortalRestClientBase {
 			throw new IllegalArgumentException(
 					"getRestWithCredentials: Missing one or more required properties and/or database entries");
 		String decryptedPassword = CipherUtil.decryptPKC(app.getAppPassword());
-		CloseableHttpClient httpClient = HttpClients.createDefault();
 		HttpGet httpGet = new HttpGet(uri);
 		httpGet.setHeader("uebkey", uebKey);
 		httpGet.setHeader("username", app.getUsername());
 		httpGet.setHeader("password", decryptedPassword);
 		String responseJson = null;
-		CloseableHttpResponse response = null;
 		logger.info(EELFLoggerDelegate.debugLogger, "getRestWithCredentials: URL {}", uri);
-		try {
-			response = httpClient.execute(httpGet);
+		try (CloseableHttpClient httpClient = HttpClients.createDefault();CloseableHttpResponse response = httpClient.execute(httpGet)){
 			logger.debug(EELFLoggerDelegate.debugLogger, "getRestWithCredentials: status " + response.getStatusLine());
 			HttpEntity entity = response.getEntity();
 			if (entity == null) {
@@ -120,12 +117,10 @@ public class PortalRestClientBase {
 				logger.debug(EELFLoggerDelegate.debugLogger, "getRestWithCredentials: JSON {}", responseJson);
 				EntityUtils.consume(entity);
 			}
-		} finally {
-			if (response != null)
-				response.close();
+		
+			return new HttpStatusAndResponse(response.getStatusLine().getStatusCode(), responseJson);
 		}
-		httpClient.close();
-		return new HttpStatusAndResponse(response.getStatusLine().getStatusCode(), responseJson);
+		
 	}
 
 	/**
@@ -151,7 +146,6 @@ public class PortalRestClientBase {
 			throw new IllegalArgumentException(
 					"postRestWithCredentials: missing one or more required properties and/or database entries");
 		String decryptedPassword = CipherUtil.decryptPKC(app.getAppPassword());
-		CloseableHttpClient httpClient = HttpClients.createDefault();
 		HttpPost httpPost = new HttpPost(uri);
 		httpPost.setHeader("uebkey", uebKey);
 		httpPost.setHeader("username", app.getUsername());
@@ -159,10 +153,8 @@ public class PortalRestClientBase {
 		StringEntity postEntity = new StringEntity(json, ContentType.create("application/json", Consts.UTF_8));
 		httpPost.setEntity(postEntity);
 		String responseJson = null;
-		CloseableHttpResponse response = null;
-		try {
+		try (CloseableHttpClient httpClient = HttpClients.createDefault();CloseableHttpResponse response = httpClient.execute(httpPost)){
 			logger.debug(EELFLoggerDelegate.debugLogger, "postRestWithCredentials: POST to {}", uri);
-			response = httpClient.execute(httpPost);
 			logger.debug(EELFLoggerDelegate.debugLogger, "postRestWithCredentials: status {} ",
 					response.getStatusLine());
 			HttpEntity entity = response.getEntity();
@@ -175,12 +167,11 @@ public class PortalRestClientBase {
 				logger.debug(EELFLoggerDelegate.debugLogger, "postRestWithCredentials: JSON {}", responseJson);
 				EntityUtils.consume(entity);
 			}
-		} finally {
-			if (response != null)
-				response.close();
-		}
-		httpClient.close();
-		return new HttpStatusAndResponse(response.getStatusLine().getStatusCode(), responseJson);
+			
+			return new HttpStatusAndResponse(response.getStatusLine().getStatusCode(), responseJson);
+		} 
+		
+		
 	}
 
 }