Skip to content
Snippets Groups Projects
Commit a026129a authored by ethiraj krishnamanaidu's avatar ethiraj krishnamanaidu
Browse files

Fixed IBM build issue

parent 242b0ac8
No related branches found
No related tags found
1 merge request!1ado-codemerge and removed slb reference
Pipeline #1157 failed
...@@ -40,16 +40,15 @@ import lombok.extern.java.Log; ...@@ -40,16 +40,15 @@ import lombok.extern.java.Log;
*/ */
@Log @Log
public class ElasticUtilsIBM extends ElasticUtils { public class ElasticUtilsIBM extends ElasticUtils {
private static final int REST_CLIENT_CONNECT_TIMEOUT = 5000; private static final int REST_CLIENT_CONNECT_TIMEOUT = 5000;
private static final int REST_CLIENT_SOCKET_TIMEOUT = 60000; private static final int REST_CLIENT_SOCKET_TIMEOUT = 60000;
private static final int REST_CLIENT_RETRY_TIMEOUT = 60000; private static final int REST_CLIENT_RETRY_TIMEOUT = 60000;
public ElasticUtilsIBM() { public ElasticUtilsIBM() {
super(); super();
} }
@Override
protected RestHighLevelClient createClient(String username, String password, String host) { protected RestHighLevelClient createClient(String username, String password, String host) {
RestHighLevelClient restHighLevelClient; RestHighLevelClient restHighLevelClient;
...@@ -70,29 +69,33 @@ public class ElasticUtilsIBM extends ElasticUtils { ...@@ -70,29 +69,33 @@ public class ElasticUtilsIBM extends ElasticUtils {
new BasicHeader("xpack.security.transport.ssl.enabled", Boolean.toString(true)), new BasicHeader("xpack.security.transport.ssl.enabled", Boolean.toString(true)),
new BasicHeader("Authorization", String.format("Basic %s", Base64.getEncoder().encodeToString(rawString.getBytes()))), new BasicHeader("Authorization", String.format("Basic %s", Base64.getEncoder().encodeToString(rawString.getBytes()))),
}; };
SSLContext sslContext = SSLContext.getInstance("SSL"); SSLContext sslContext = SSLContext.getInstance("SSL");
// set up a TrustManager that trusts everything // set up a TrustManager that trusts everything
sslContext.init(null, new TrustManager[] { new X509TrustManager() { sslContext.init(null, new TrustManager[]{new X509TrustManager() {
public X509Certificate[] getAcceptedIssuers() { public X509Certificate[] getAcceptedIssuers() {
return null; return null;
} }
public void checkClientTrusted(X509Certificate[] certs, String authType) { }
public void checkServerTrusted(X509Certificate[] certs, String authType) { } public void checkClientTrusted(X509Certificate[] certs, String authType) {
} }, new SecureRandom()); }
builder.setHttpClientConfigCallback(new HttpClientConfigCallback() { public void checkServerTrusted(X509Certificate[] certs, String authType) {
@Override }
public HttpAsyncClientBuilder customizeHttpClient( }}, new SecureRandom());
HttpAsyncClientBuilder httpClientBuilder) {
return httpClientBuilder builder.setHttpClientConfigCallback(new HttpClientConfigCallback() {
.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER)
.setSSLContext(sslContext); public HttpAsyncClientBuilder customizeHttpClient(
} HttpAsyncClientBuilder httpClientBuilder) {
}) return httpClientBuilder
.setDefaultHeaders(defaultHeaders); .setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER)
.setSSLContext(sslContext);
}
})
.setDefaultHeaders(defaultHeaders);
restHighLevelClient = new RestHighLevelClient(builder); restHighLevelClient = new RestHighLevelClient(builder);
} catch (Exception e) { } catch (Exception e) {
...@@ -100,5 +103,4 @@ public class ElasticUtilsIBM extends ElasticUtils { ...@@ -100,5 +103,4 @@ public class ElasticUtilsIBM extends ElasticUtils {
} }
return restHighLevelClient; return restHighLevelClient;
} }
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment