From: Rodrigo Lima <rodrigo.lima@yoppworks.com>
Date: Fri, 5 Jun 2020 18:02:15 +0000 (-0400)
Subject: Java 11 migration - 'test-apis-ci'
X-Git-Tag: 1.7.0~83
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F34%2F108834%2F3;p=sdc.git

Java 11 migration - 'test-apis-ci'

- Removed references to protected packages (sun.net.*)

Issue-ID: SDC-3037
Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com>
Change-Id: Ibbf25af390e624e15fb2bc8ea17777056fe5f3b5
---

diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/http/HttpRequest.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/http/HttpRequest.java
index 0e81a7b2ac..ff01e7d999 100644
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/http/HttpRequest.java
+++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/http/HttpRequest.java
@@ -31,9 +31,7 @@ import org.apache.http.impl.client.HttpClients;
 import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sun.net.www.protocol.https.DefaultHostnameVerifier;
 
-import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import java.io.*;
 import java.net.HttpURLConnection;
@@ -256,12 +254,10 @@ public class HttpRequest {
 
 		RestResponse restResponse = new RestResponse();
 		url = url.replaceAll("\\s", "%20");
-		URL obj = new URL(null, url, new sun.net.www.protocol.https.Handler());
+		URL obj = new URL(null, url);
 		HttpsURLConnection con = (HttpsURLConnection)obj.openConnection();
 // optional default is GET
 		con.setRequestMethod("GET");
-		HostnameVerifier hostnameVerifier = new DefaultHostnameVerifier();
-		con.setHostnameVerifier(hostnameVerifier);
 		addHttpsRequestHeaders(headers, con);
 		Boolean multiPart = false;
 		if(headers.get(HttpHeaderEnum.ACCEPT.getValue()) != null) {
@@ -295,10 +291,8 @@ public class HttpRequest {
 	public RestResponse httpsSendPost(String url, String body, Map<String, String> headers) throws IOException {
 
 		RestResponse restResponse = new RestResponse();
-		URL obj = new URL(null, url, new sun.net.www.protocol.https.Handler());
+		URL obj = new URL(null, url);
 		HttpsURLConnection con = (HttpsURLConnection)obj.openConnection();
-		HostnameVerifier hostnameVerifier = new DefaultHostnameVerifier();
-		con.setHostnameVerifier(hostnameVerifier);
 // add request method
 		con.setRequestMethod("POST");
 // add request headers
@@ -336,10 +330,8 @@ public class HttpRequest {
 	public RestResponse httpsSendByMethod(String url, String method, String body, Map<String, String> headers) throws IOException {
 
 		RestResponse restResponse = new RestResponse();
-		URL obj = new URL(null, url, new sun.net.www.protocol.https.Handler());
+		URL obj = new URL(null, url);
 		HttpsURLConnection con = (HttpsURLConnection)obj.openConnection();
-		HostnameVerifier hostnameVerifier = new DefaultHostnameVerifier();
-		con.setHostnameVerifier(hostnameVerifier);
 // add request method
 		con.setRequestMethod(method);
 // add request headers
@@ -379,10 +371,8 @@ public class HttpRequest {
 	public RestResponse httpsSendDelete(String url, Map<String, String> headers) throws IOException {
 
 		RestResponse restResponse = new RestResponse();
-		URL obj = new URL(null, url, new sun.net.www.protocol.https.Handler());
+		URL obj = new URL(null, url);
 		HttpsURLConnection con = (HttpsURLConnection)obj.openConnection();
-		HostnameVerifier hostnameVerifier = new DefaultHostnameVerifier();
-		con.setHostnameVerifier(hostnameVerifier);
 // add request headers
 		addHttpRequestHEaders(headers, con);