(camel) 22/34: Camel-AWS components: Use ObjectHelper for null checks - Cloudtrail

[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 4e6ae2dfc922f5036357de4b81b57efeb58747df
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jan 28 12:12:07 2026 +0100

    Camel-AWS components: Use ObjectHelper for null checks - Cloudtrail
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 .../apache/camel/component/aws/cloudtrail/CloudtrailComponent.java  | 3 ++-
 .../apache/camel/component/aws/cloudtrail/CloudtrailConsumer.java   | 2 +-
 .../apache/camel/component/aws/cloudtrail/CloudtrailEndpoint.java   | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailComponent.java b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailComponent.java
index 7d03f95257a3..48f49945c0a2 100644
--- a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailComponent.java
+++ b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailComponent.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("aws-cloudtrail")
 public class CloudtrailComponent extends HealthCheckComponent {
@@ -41,7 +42,7 @@ public class CloudtrailComponent extends HealthCheckComponent {
     @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         CloudtrailConfiguration configuration
-                = this.configuration != null ? this.configuration.copy() : new CloudtrailConfiguration();
+                = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new CloudtrailConfiguration();
         configuration.setLabel(remaining);
         CloudtrailEndpoint endpoint = new CloudtrailEndpoint(uri, configuration, this);
         setProperties(endpoint, parameters);
diff --git a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumer.java b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumer.java
index f74a831e2f7f..2bd5ba58cfbb 100644
--- a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumer.java
+++ b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumer.java
@@ -53,7 +53,7 @@ public class CloudtrailConsumer extends ScheduledBatchPollingConsumer {
         if (!attributes.isEmpty()) {
             eventsRequestBuilder.lookupAttributes(attributes);
         }
-        if (lastTime != null) {
+        if (ObjectHelper.isNotEmpty(lastTime)) {
             eventsRequestBuilder.startTime(lastTime.plusMillis(1000));
         }
 
diff --git a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailEndpoint.java b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailEndpoint.java
index fbc618878cc4..570e52919545 100644
--- a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailEndpoint.java
+++ b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailEndpoint.java
@@ -51,7 +51,7 @@ public class CloudtrailEndpoint extends ScheduledPollEndpoint implements Endpoin
     @Override
     protected void doStart() throws Exception {
         super.doStart();
-        cloudTrailClient = configuration.getCloudTrailClient() != null
+        cloudTrailClient = ObjectHelper.isNotEmpty(configuration.getCloudTrailClient())
                 ? configuration.getCloudTrailClient()
                 : CloudtrailClientFactory.getCloudtrailClient(configuration);
     }
@@ -59,7 +59,7 @@ public class CloudtrailEndpoint extends ScheduledPollEndpoint implements Endpoin
     @Override
     public void doStop() throws Exception {
         if (ObjectHelper.isEmpty(configuration.getCloudTrailClient())) {
-            if (cloudTrailClient != null) {
+            if (ObjectHelper.isNotEmpty(cloudTrailClient)) {
                 cloudTrailClient.close();
             }
         }
@@ -111,7 +111,7 @@ public class CloudtrailEndpoint extends ScheduledPollEndpoint implements Endpoin
 
     @Override
     public Map<String, String> getServiceMetadata() {
-        if (configuration.getEventSource() != null) {
+        if (ObjectHelper.isNotEmpty(configuration.getEventSource())) {
             return Map.of("source", configuration.getEventSource());
         }
         return null;