restore from master

testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/ElasticUtils.java

 package org.opengroup.osdu.util;
 
-import java.io.IOException;
-import java.security.SecureRandom;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-
+import com.google.gson.Gson;
+import lombok.extern.java.Log;
 import org.apache.http.Header;
 import org.apache.http.HttpHost;
-import org.apache.http.conn.ssl.SSLSocketFactory;
-import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
 import org.apache.http.message.BasicHeader;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ElasticsearchStatusException;
@@ -34,11 +21,7 @@ import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
-import org.elasticsearch.client.RequestOptions;
-import org.elasticsearch.client.RestClient;
-import org.elasticsearch.client.RestClientBuilder;
-import org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback;
-import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.client.*;
 import org.elasticsearch.cluster.metadata.MappingMetaData;
 import org.elasticsearch.common.collect.ImmutableOpenMap;
 import org.elasticsearch.common.settings.Settings;
@@ -48,9 +31,12 @@ import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 
-import com.google.gson.Gson;
-
-import lombok.extern.java.Log;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
 
 
 /**
@@ -274,7 +260,7 @@ public class ElasticUtils {
     protected RestHighLevelClient createClient(String username, String password, String host) {
 
         RestHighLevelClient restHighLevelClient;
-        int port = Config.getPort();
+        int port = Config.PORT;
         try {
             String rawString = String.format("%s:%s", username, password);
             RestClientBuilder builder = RestClient.builder(new HttpHost(host, port, "https"));
@@ -291,36 +277,8 @@ public class ElasticUtils {
                     new BasicHeader("xpack.security.transport.ssl.enabled", Boolean.toString(true)),
                     new BasicHeader("Authorization", String.format("Basic %s", Base64.getEncoder().encodeToString(rawString.getBytes()))),
             };
-            
-            
-            SSLContext sslContext = SSLContext.getInstance("SSL");
-            // set up a TrustManager that trusts everything
-               sslContext.init(null, new TrustManager[] { new X509TrustManager() {
-               	public X509Certificate[] getAcceptedIssuers() {
-               		System.out.println("getAcceptedIssuers =============");
-               		return null;
-               	}
-               	public void checkClientTrusted(X509Certificate[] certs,
-               			String authType) {
-               		System.out.println("checkClientTrusted =============");
-               	}
-               	public void checkServerTrusted(X509Certificate[] certs,
-               			String authType) {
-               		System.out.println("checkServerTrusted =============");
-               	}
-               } }, new SecureRandom());
-              
-               builder.setHttpClientConfigCallback(new HttpClientConfigCallback() {
-                   @Override
-                   public HttpAsyncClientBuilder customizeHttpClient(
-                           HttpAsyncClientBuilder httpClientBuilder) {
-                       return httpClientBuilder
-                       		.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER)
-                       		.setSSLContext(sslContext);
-                   }
-               })
-               .setDefaultHeaders(defaultHeaders);
-            // TODO builder.setDefaultHeaders(defaultHeaders);
+
+            builder.setDefaultHeaders(defaultHeaders);
             restHighLevelClient = new RestHighLevelClient(builder);
 
         } catch (Exception e) {