(camel) 25/34: Camel-AWS components: Use ObjectHelper for null checks - Redshift

[ac...@apache.org]

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

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

commit d7d6180c9c9da06c489244cefff03adcf5f74b7f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jan 28 12:37:30 2026 +0100

    Camel-AWS components: Use ObjectHelper for null checks - Redshift
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 .../camel/component/aws2/redshift/data/RedshiftData2Component.java    | 3 ++-
 .../camel/component/aws2/redshift/data/RedshiftData2Endpoint.java     | 4 ++--
 .../camel/component/aws2/redshift/data/RedshiftData2Producer.java     | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/components/camel-aws/camel-aws2-redshift/src/main/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2Component.java b/components/camel-aws/camel-aws2-redshift/src/main/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2Component.java
index aaff041fae72..85b7c258dbf4 100644
--- a/components/camel-aws/camel-aws2-redshift/src/main/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2Component.java
+++ b/components/camel-aws/camel-aws2-redshift/src/main/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2Component.java
@@ -23,6 +23,7 @@ import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.annotations.Component;
 import org.apache.camel.support.HealthCheckComponent;
+import org.apache.camel.util.ObjectHelper;
 
 @Component(value = "aws2-redshift-data")
 public class RedshiftData2Component extends HealthCheckComponent {
@@ -41,7 +42,7 @@ public class RedshiftData2Component extends HealthCheckComponent {
     @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         RedshiftData2Configuration configuration
-                = this.configuration != null ? this.configuration.copy() : new RedshiftData2Configuration();
+                = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new RedshiftData2Configuration();
         RedshiftData2Endpoint endpoint = new RedshiftData2Endpoint(uri, this, configuration);
         setProperties(endpoint, parameters);
         if (Boolean.FALSE.equals(configuration.isUseDefaultCredentialsProvider())
diff --git a/components/camel-aws/camel-aws2-redshift/src/main/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2Endpoint.java b/components/camel-aws/camel-aws2-redshift/src/main/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2Endpoint.java
index 9adba536bed9..3ba18b0fc3aa 100644
--- a/components/camel-aws/camel-aws2-redshift/src/main/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2Endpoint.java
+++ b/components/camel-aws/camel-aws2-redshift/src/main/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2Endpoint.java
@@ -68,7 +68,7 @@ public class RedshiftData2Endpoint extends DefaultEndpoint implements EndpointSe
     @Override
     public void doStart() throws Exception {
         super.doStart();
-        awsRedshiftDataClient = configuration.getAwsRedshiftDataClient() != null
+        awsRedshiftDataClient = ObjectHelper.isNotEmpty(configuration.getAwsRedshiftDataClient())
                 ? configuration.getAwsRedshiftDataClient()
                 : RedshiftData2ClientFactory.getRedshiftDataClient(configuration);
     }
@@ -77,7 +77,7 @@ public class RedshiftData2Endpoint extends DefaultEndpoint implements EndpointSe
     public void doStop() throws Exception {
 
         if (ObjectHelper.isEmpty(configuration.getAwsRedshiftDataClient())) {
-            if (awsRedshiftDataClient != null) {
+            if (ObjectHelper.isNotEmpty(awsRedshiftDataClient)) {
                 awsRedshiftDataClient.close();
             }
         }
diff --git a/components/camel-aws/camel-aws2-redshift/src/main/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2Producer.java b/components/camel-aws/camel-aws2-redshift/src/main/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2Producer.java
index 5f7e1c180525..f0fb7d14d37c 100644
--- a/components/camel-aws/camel-aws2-redshift/src/main/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2Producer.java
+++ b/components/camel-aws/camel-aws2-redshift/src/main/java/org/apache/camel/component/aws2/redshift/data/RedshiftData2Producer.java
@@ -65,7 +65,7 @@ public class RedshiftData2Producer extends DefaultProducer {
     private RedshiftData2Operations determineOperation(Exchange exchange) {
         RedshiftData2Operations operation
                 = exchange.getIn().getHeader(RedshiftData2Constants.OPERATION, RedshiftData2Operations.class);
-        if (operation == null) {
+        if (ObjectHelper.isEmpty(operation)) {
             operation = getConfiguration().getOperation();
         }
         return operation;
@@ -77,7 +77,7 @@ public class RedshiftData2Producer extends DefaultProducer {
 
     @Override
     public String toString() {
-        if (redshiftDataProducerToString == null) {
+        if (ObjectHelper.isEmpty(redshiftDataProducerToString)) {
             redshiftDataProducerToString
                     = "RedshiftDataProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]";
         }