fix https timeout get connection

Issue-ID: HOLMES-104

Change-Id: Ib235d4df9a221bbf2d2f0322aac73f9ca894bfbe
Signed-off-by: Shiwei Tian <tian.shiwei@zte.com.cn>

diff --git a/pom.xml b/pom.xml
index 479d84b..77a344b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
             <dependency>\r
                 <groupId>org.onap.msb.java-sdk</groupId>\r
                 <artifactId>msb-java-sdk</artifactId>\r
-                <version>1.1.1-SNAPSHOT</version>\r
+                <version>1.1.1</version>\r
             </dependency>\r
             <dependency>\r
                 <groupId>org.reflections</groupId>\r

diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineService.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineService.java
index aa0bf32..15af38d 100644 (file)
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineService.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineService.java
@@ -20,6 +20,9 @@ import java.util.HashMap;
 import javax.ws.rs.core.MediaType;\r
 import lombok.extern.slf4j.Slf4j;\r
 import org.apache.http.HttpResponse;\r
+import org.apache.http.client.methods.HttpDelete;\r
+import org.apache.http.client.methods.HttpPost;\r
+import org.apache.http.client.methods.HttpPut;\r
 import org.apache.http.entity.StringEntity;\r
 import org.apache.http.impl.client.CloseableHttpClient;\r
 import org.jvnet.hk2.annotations.Service;\r
@@ -41,10 +44,12 @@ public class EngineService {
         HashMap headers = createHeaders();\r
         String url = PREFIX + ip + PORT + RuleMgtConstant.ENGINE_PATH + "/" + packageName;\r
         CloseableHttpClient httpClient = null;\r
+        HttpDelete httpDelete = new HttpDelete(url);\r
         try {\r
             httpClient = HttpsUtils.getHttpClient(HttpsUtils.DEFUALT_TIMEOUT);\r
-            return HttpsUtils.delete(url, headers, httpClient);\r
+            return HttpsUtils.delete(httpDelete, headers, httpClient);\r
         } finally {\r
+            httpDelete.releaseConnection();\r
             closeHttpClient(httpClient);\r
         }\r
     }\r
@@ -55,10 +60,12 @@ public class EngineService {
         HashMap headers = createHeaders();\r
         String url = PREFIX + ip + PORT + RuleMgtConstant.ENGINE_PATH;\r
         CloseableHttpClient httpClient = null;\r
+        HttpPost httpPost = new HttpPost(url);\r
         try {\r
             httpClient = HttpsUtils.getHttpClient(HttpsUtils.DEFUALT_TIMEOUT);\r
-            return HttpsUtils.post(url, headers, new HashMap<>(), new StringEntity(content), httpClient);\r
+            return HttpsUtils.post(httpPost, headers, new HashMap<>(), new StringEntity(content), httpClient);\r
         } finally {\r
+            httpPost.releaseConnection();\r
             closeHttpClient(httpClient);\r
         }\r
     }\r
@@ -68,9 +75,10 @@ public class EngineService {
         HashMap headers = createHeaders();\r
         String url = PREFIX + ip + PORT + RuleMgtConstant.ENGINE_PATH;\r
         CloseableHttpClient httpClient = null;\r
+        HttpPut httpPut = new HttpPut(url);\r
         try {\r
             httpClient = HttpsUtils.getHttpClient(HttpsUtils.DEFUALT_TIMEOUT);\r
-            return HttpsUtils.put(url, headers, new HashMap<>(), new StringEntity(content),httpClient);\r
+            return HttpsUtils.put(httpPut, headers, new HashMap<>(), new StringEntity(content),httpClient);\r
         } finally {\r
             closeHttpClient(httpClient);\r
         }\r

diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java
index d1b2aba..2d63bb6 100644 (file)
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java
@@ -29,6 +29,9 @@ import java.util.List;
 import javax.ws.rs.core.MediaType;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpDelete;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPut;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.onap.holmes.common.dcae.DcaeConfigurationQuery;
@@ -104,12 +107,14 @@ public class DcaeConfigurationPolling implements Runnable {
               HashMap<String, String> headers = new HashMap<>();
         headers.put("Content-Type", MediaType.APPLICATION_JSON);
         CloseableHttpClient httpClient = null;
+        HttpGet httpGet = new HttpGet(url);
         try {
             httpClient = HttpsUtils.getHttpClient(HttpsUtils.DEFUALT_TIMEOUT);
-            HttpResponse httpResponse = HttpsUtils.get(url, headers, httpClient);
+            HttpResponse httpResponse = HttpsUtils.get(httpGet, headers, httpClient);
             String response = HttpsUtils.extractResponseEntity(httpResponse);
             return JSON.parseObject(response,RuleQueryListResponse.class);
         } finally {
+            httpGet.releaseConnection();
             closeHttpClient(httpClient);
         }
     }
@@ -129,15 +134,17 @@ public class DcaeConfigurationPolling implements Runnable {
             headers.put("Accept", MediaType.APPLICATION_JSON);
             HttpResponse httpResponse;
             CloseableHttpClient httpClient = null;
+            HttpPut httpPut = new HttpPut(url);
             try {
                 httpClient = HttpsUtils.getHttpClient(HttpsUtils.DEFUALT_TIMEOUT);
                 httpResponse = HttpsUtils
-                        .put(url, headers, new HashMap<>(), new StringEntity(content), httpClient);
+                        .put(httpPut, headers, new HashMap<>(), new StringEntity(content), httpClient);
             } catch (UnsupportedEncodingException e) {
                 throw new CorrelationException("Failed to create https entity.", e);
             } catch (Exception e) {
                 throw new CorrelationException(e.getMessage());
             } finally {
+                httpPut.releaseConnection();
                 closeHttpClient(httpClient);
             }
             if (httpResponse != null) {
@@ -155,13 +162,15 @@ public class DcaeConfigurationPolling implements Runnable {
             HashMap<String, String> headers = new HashMap<>();
             headers.put("Content-Type", MediaType.APPLICATION_JSON);
             CloseableHttpClient httpClient = null;
+            HttpDelete httpDelete = new HttpDelete(url + "/" + correlationRule.getRuleId());
             try {
                 httpClient = HttpsUtils.getHttpClient(HttpsUtils.DEFUALT_TIMEOUT);
-                HttpsUtils.delete(url + "/" + correlationRule.getRuleId(), headers, httpClient);
+                HttpsUtils.delete(httpDelete, headers, httpClient);
             } catch (Exception e) {
                 log.warn("Failed to delete rule, the rule id is : " + correlationRule.getRuleId()
                         + " exception messge is : " + e.getMessage(), e);
             } finally {
+                httpDelete.releaseConnection();
                 closeHttpClient(httpClient);
             }
         });

diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/msb/EngineIpList.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/msb/EngineIpList.java
index 992785f..9b30705 100644 (file)
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/msb/EngineIpList.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/msb/EngineIpList.java
@@ -19,6 +19,7 @@ package org.onap.holmes.rulemgt.msb;
 import java.io.IOException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.jvnet.hk2.annotations.Service;
 import org.onap.holmes.common.api.entity.ServiceEntity;
@@ -52,14 +53,16 @@ public class EngineIpList {
     public List<String> getServiceCount()throws Exception{
         String response;
         CloseableHttpClient httpClient = null;
+        HttpGet httpGet = new HttpGet(url);
         try {
             httpClient = HttpsUtils.getHttpClient(HttpsUtils.DEFUALT_TIMEOUT);
             HttpResponse httpResponse = HttpsUtils
-                    .get(url, new HashMap<>(), httpClient);
+                    .get(httpGet, new HashMap<>(), httpClient);
             response = HttpsUtils.extractResponseEntity(httpResponse);
         } catch (Exception e) {
             throw e;
         } finally {
+            httpGet.releaseConnection();
             if (httpClient != null) {
                 try {
                     httpClient.close();