From babb845c53219cb3a17f302c3f6bac5a20132c48 Mon Sep 17 00:00:00 2001 From: GuangrongFu Date: Sun, 28 Apr 2019 08:55:03 +0800 Subject: Ajusted the version of the component Change-Id: Ib1491d5b2aa3f33ddb2bd4f97787404490094ba1 Issue-ID: HOLMES-220 Signed-off-by: GuangrongFu --- holmes-actions/pom.xml | 7 ++++-- .../org/onap/holmes/common/utils/HttpsUtils.java | 28 +++++++--------------- 2 files changed, 14 insertions(+), 21 deletions(-) (limited to 'holmes-actions') diff --git a/holmes-actions/pom.xml b/holmes-actions/pom.xml index 22fbe48..dbe4789 100644 --- a/holmes-actions/pom.xml +++ b/holmes-actions/pom.xml @@ -12,7 +12,7 @@ org.onap.holmes.common holmes-common-parent - 1.2.8 + 1.2.9 holmes-common-service @@ -154,7 +154,10 @@ fastjson 1.2.49 - + + com.google.guava + guava + diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/HttpsUtils.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/HttpsUtils.java index 2aa5695..8b4be57 100644 --- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/HttpsUtils.java +++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/HttpsUtils.java @@ -14,28 +14,11 @@ package org.onap.holmes.common.utils; -import java.io.IOException; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import lombok.extern.slf4j.Slf4j; -import org.apache.http.Consts; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.HttpStatus; -import org.apache.http.NameValuePair; +import org.apache.http.*; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpPut; -import org.apache.http.client.methods.HttpRequestBase; +import org.apache.http.client.methods.*; import org.apache.http.config.Registry; import org.apache.http.config.RegistryBuilder; import org.apache.http.conn.socket.ConnectionSocketFactory; @@ -54,6 +37,13 @@ import org.jvnet.hk2.annotations.Service; import org.onap.holmes.common.config.MicroServiceConfig; import org.onap.holmes.common.exception.CorrelationException; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + @Slf4j @Service public class HttpsUtils { -- cgit 1.2.3-korg