summaryrefslogtreecommitdiffstats
path: root/holmes-actions
diff options
context:
space:
mode:
authortang peng <tang.peng5@zte.com.cn>2019-04-28 01:59:48 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-28 01:59:48 +0000
commit43e4143f2eae50b820a66e4a7e64332c0dfe0441 (patch)
tree8d8e5414378651e4900c61c35137e6877b574a5b /holmes-actions
parent71432f8c9cdd5fb4b2eded82f271e90a1e603fca (diff)
parentbabb845c53219cb3a17f302c3f6bac5a20132c48 (diff)
Merge "Ajusted the version of the component"1.2.9
Diffstat (limited to 'holmes-actions')
-rw-r--r--holmes-actions/pom.xml7
-rw-r--r--holmes-actions/src/main/java/org/onap/holmes/common/utils/HttpsUtils.java28
2 files changed, 14 insertions, 21 deletions
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 @@
<parent>
<groupId>org.onap.holmes.common</groupId>
<artifactId>holmes-common-parent</artifactId>
- <version>1.2.8</version>
+ <version>1.2.9</version>
</parent>
<name>holmes-common-service</name>
@@ -154,7 +154,10 @@
<artifactId>fastjson</artifactId>
<version>1.2.49</version>
</dependency>
-
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
</dependencies>
<build>
<resources>
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 {