From 3c211707b277efba8b47c7a739b91ef1e6b4d305 Mon Sep 17 00:00:00 2001 From: anushkajuli Date: Tue, 21 Jan 2025 08:15:02 +0000 Subject: [PATCH] Enable ppc64le support for camel-elasticsearch --- components/camel-elasticsearch/pom.xml | 1 - .../es/integration/ElasticsearchTestSupport.java | 13 +++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/components/camel-elasticsearch/pom.xml b/components/camel-elasticsearch/pom.xml index 3fffd0373f19a..82cdc474e2a68 100644 --- a/components/camel-elasticsearch/pom.xml +++ b/components/camel-elasticsearch/pom.xml @@ -34,7 +34,6 @@ - true true false diff --git a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchTestSupport.java b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchTestSupport.java index 183b2ed44ea70..9b419722c4dc7 100644 --- a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchTestSupport.java +++ b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/es/integration/ElasticsearchTestSupport.java @@ -59,8 +59,9 @@ public class ElasticsearchTestSupport extends CamelTestSupport { @Override protected void setupResources() throws Exception { super.setupResources(); + String scheme = service.getSslContext().isPresent() ? "https" : "http"; HttpHost host - = new HttpHost(service.getElasticSearchHost(), service.getPort(), "https"); + = new HttpHost(service.getElasticSearchHost(), service.getPort(), scheme); final RestClientBuilder builder = RestClient.builder(host); final CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); credentialsProvider.setCredentials(AuthScope.ANY, @@ -68,7 +69,9 @@ protected void setupResources() throws Exception { builder.setHttpClientConfigCallback( httpClientBuilder -> { httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider); - httpClientBuilder.setSSLContext(service.getSslContext().orElseThrow()); + service.getSslContext().ifPresent(sslContext -> { + httpClientBuilder.setSSLContext(sslContext); + }); return httpClientBuilder; }); restClient = builder.build(); @@ -86,11 +89,13 @@ protected void cleanupResources() throws Exception { @Override protected CamelContext createCamelContext() throws Exception { final ElasticsearchComponent elasticsearchComponent = new ElasticsearchComponent(); - elasticsearchComponent.setEnableSSL(true); + elasticsearchComponent.setEnableSSL(service.getSslContext().isPresent()); elasticsearchComponent.setHostAddresses(service.getHttpHostAddress()); elasticsearchComponent.setUser(service.getUsername()); elasticsearchComponent.setPassword(service.getPassword()); - elasticsearchComponent.setCertificatePath("file:%s".formatted(service.getCertificatePath().orElseThrow())); + service.getCertificatePath().ifPresent(certificatePath -> { + elasticsearchComponent.setCertificatePath("file:%s".formatted(certificatePath)); + }); CamelContext context = super.createCamelContext(); context.addComponent("elasticsearch", elasticsearchComponent);