(camel) branch main updated: Camel-opensearch: Use ObjectHelper where it makes sense (#15542)

[acosentino]

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new fa43711c09f Camel-opensearch: Use ObjectHelper where it makes sense 
(#15542)
fa43711c09f is described below

commit fa43711c09f9956961dec3bd2fe4bc7840fd2e7e
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Fri Sep 13 09:35:00 2024 +0200

    Camel-opensearch: Use ObjectHelper where it makes sense (#15542)
    
    Signed-off-by: Andrea Cosentino <anco...@gmail.com>
---
 .../apache/camel/component/opensearch/OpensearchProducer.java | 11 ++++++-----
 .../aggregation/OpensearchBulkRequestAggregationStrategy.java |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git 
a/components/camel-opensearch/src/main/java/org/apache/camel/component/opensearch/OpensearchProducer.java
 
b/components/camel-opensearch/src/main/java/org/apache/camel/component/opensearch/OpensearchProducer.java
index 0d95488a833..e95a02e133a 100644
--- 
a/components/camel-opensearch/src/main/java/org/apache/camel/component/opensearch/OpensearchProducer.java
+++ 
b/components/camel-opensearch/src/main/java/org/apache/camel/component/opensearch/OpensearchProducer.java
@@ -35,6 +35,7 @@ import org.apache.camel.Message;
 import org.apache.camel.support.DefaultAsyncProducer;
 import org.apache.camel.support.ResourceHelper;
 import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.ObjectHelper;
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;
@@ -103,7 +104,7 @@ class OpensearchProducer extends DefaultAsyncProducer {
         // In the event we can't discover the operation from a, b or c we throw
         // an error.
         Object request = exchange.getIn().getBody();
-        if (request != null) {
+        if (ObjectHelper.isNotEmpty(request)) {
             LOG.debug("Operation request body: {}", request);
         }
 
@@ -454,7 +455,7 @@ class OpensearchProducer extends DefaultAsyncProducer {
             synchronized (mutex) {
                 if (client == null) {
                     LOG.info("Connecting to the OpenSearch cluster: {}", 
configuration.getClusterName());
-                    if (configuration.getHostAddressesList() != null
+                    if 
(ObjectHelper.isNotEmpty(configuration.getHostAddressesList())
                             && 
!configuration.getHostAddressesList().isEmpty()) {
                         client = createClient();
                     } else {
@@ -470,16 +471,16 @@ class OpensearchProducer extends DefaultAsyncProducer {
 
         builder.setRequestConfigCallback(requestConfigBuilder -> 
requestConfigBuilder
                 
.setConnectTimeout(configuration.getConnectionTimeout()).setSocketTimeout(configuration.getSocketTimeout()));
-        if (configuration.getUser() != null && configuration.getPassword() != 
null) {
+        if (ObjectHelper.isNotEmpty(configuration.getUser()) && 
ObjectHelper.isNotEmpty(configuration.getPassword())) {
             final CredentialsProvider credentialsProvider = new 
BasicCredentialsProvider();
             credentialsProvider.setCredentials(AuthScope.ANY,
                     new UsernamePasswordCredentials(configuration.getUser(), 
configuration.getPassword()));
             builder.setHttpClientConfigCallback(httpClientBuilder -> {
                 
httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
-                if (configuration.getCertificatePath() != null) {
+                if 
(ObjectHelper.isNotEmpty(configuration.getCertificatePath())) {
                     httpClientBuilder.setSSLContext(createSslContextFromCa());
                 }
-                if (configuration.getHostnameVerifier() != null) {
+                if 
(ObjectHelper.isNotEmpty(configuration.getHostnameVerifier())) {
                     
httpClientBuilder.setSSLHostnameVerifier(configuration.getHostnameVerifier());
                 }
                 return httpClientBuilder;
diff --git 
a/components/camel-opensearch/src/main/java/org/apache/camel/component/opensearch/aggregation/OpensearchBulkRequestAggregationStrategy.java
 
b/components/camel-opensearch/src/main/java/org/apache/camel/component/opensearch/aggregation/OpensearchBulkRequestAggregationStrategy.java
index c475792dde5..a4e15fd7329 100644
--- 
a/components/camel-opensearch/src/main/java/org/apache/camel/component/opensearch/aggregation/OpensearchBulkRequestAggregationStrategy.java
+++ 
b/components/camel-opensearch/src/main/java/org/apache/camel/component/opensearch/aggregation/OpensearchBulkRequestAggregationStrategy.java
@@ -23,6 +23,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.InvalidPayloadRuntimeException;
 import org.apache.camel.spi.Configurer;
 import org.apache.camel.spi.Metadata;
+import org.apache.camel.util.ObjectHelper;
 import org.opensearch.client.opensearch.core.BulkRequest;
 import org.opensearch.client.opensearch.core.bulk.BulkOperation;
 
@@ -46,7 +47,7 @@ public class OpensearchBulkRequestAggregationStrategy 
implements AggregationStra
         BulkOperation[] newBody = (BulkOperation[]) objBody;
         BulkRequest.Builder builder = new BulkRequest.Builder();
         builder.operations(List.of(newBody));
-        if (oldExchange != null) {
+        if (ObjectHelper.isNotEmpty(oldExchange)) {
             BulkRequest request = 
oldExchange.getIn().getBody(BulkRequest.class);
             builder.operations(request.operations());
         }