Java 11 migration - 'test-apis-ci' 34/108834/3
authorRodrigo Lima <rodrigo.lima@yoppworks.com>
Fri, 5 Jun 2020 18:02:15 +0000 (14:02 -0400)
committerOfir Sonsino <ofir.sonsino@intl.att.com>
Wed, 10 Jun 2020 08:23:11 +0000 (08:23 +0000)
- Removed references to protected packages (sun.net.*)

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

test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/http/HttpRequest.java

index 0e81a7b..ff01e7d 100644 (file)
@@ -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);