diff options
| author |   tangpeng <tang.peng5@zte.com.cn> | 2019-03-30 07:56:48 +0000 |
|---|---|---|
| committer | tangpeng <tang.peng5@zte.com.cn> | 2019-03-30 07:56:48 +0000 |
| commit | cc31e5503fbc9c17ada9e3b324457c3a2d67ec54 (patch) | |
| tree | 998325547d20eaf8aacb86c3f5b1443a63b9dc7e /rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java | |
| parent | dd6a7fa137605db8e2eec437167c438af0ea2447 (diff) | |
HTTP/S Modifications
Change-Id: I731a37f868a8145f3018314db7c0248a75c8d62d
Issue-ID: HOLMES-203
Signed-off-by: tangpeng <tang.peng5@zte.com.cn>
Diffstat (limited to 'rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java')
| -rw-r--r-- | rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java | 15 |
1 files changed, 3 insertions, 12 deletions
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 68314e1..dcd530c 100644 --- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java +++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPolling.java @@ -13,19 +13,10 @@ */ package org.onap.holmes.rulemgt.dcae; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonParseException; -import com.google.gson.reflect.TypeToken; import java.io.IOException; import java.io.UnsupportedEncodingException; -import java.lang.reflect.Type; import java.util.HashMap; import java.util.List; import javax.ws.rs.core.MediaType; @@ -112,7 +103,7 @@ public class DcaeConfigurationPolling implements Runnable { CloseableHttpClient httpClient = null; HttpGet httpGet = new HttpGet(url); try { - httpClient = HttpsUtils.getHttpClient(HttpsUtils.DEFUALT_TIMEOUT); + httpClient = HttpsUtils.getConditionalHttpsClient(HttpsUtils.DEFUALT_TIMEOUT); HttpResponse httpResponse = HttpsUtils.get(httpGet, headers, httpClient); String response = HttpsUtils.extractResponseEntity(httpResponse); return JSONObject.parseObject(response, RuleQueryListResponse.class); @@ -139,7 +130,7 @@ public class DcaeConfigurationPolling implements Runnable { CloseableHttpClient httpClient = null; HttpPut httpPut = new HttpPut(url); try { - httpClient = HttpsUtils.getHttpClient(HttpsUtils.DEFUALT_TIMEOUT); + httpClient = HttpsUtils.getConditionalHttpsClient(HttpsUtils.DEFUALT_TIMEOUT); httpResponse = HttpsUtils .put(httpPut, headers, new HashMap<>(), new StringEntity(content), httpClient); } catch (UnsupportedEncodingException e) { @@ -167,7 +158,7 @@ public class DcaeConfigurationPolling implements Runnable { CloseableHttpClient httpClient = null; HttpDelete httpDelete = new HttpDelete(url + "/" + correlationRule.getRuleId()); try { - httpClient = HttpsUtils.getHttpClient(HttpsUtils.DEFUALT_TIMEOUT); + httpClient = HttpsUtils.getConditionalHttpsClient(HttpsUtils.DEFUALT_TIMEOUT); HttpsUtils.delete(httpDelete, headers, httpClient); } catch (Exception e) { log.warn("Failed to delete rule, the rule id is : " + correlationRule.getRuleId() |