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 3e4f78d16001564588e03fb21d4cd507dd4aa4ed Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Jan 28 10:15:23 2026 +0100 Camel-AWS components: Use ObjectHelper for null checks - ECS Signed-off-by: Andrea Cosentino <[email protected]> --- .../camel/component/aws2/ecs/ECS2Component.java | 3 ++- .../camel/component/aws2/ecs/ECS2Endpoint.java | 4 ++-- .../camel/component/aws2/ecs/ECS2Producer.java | 22 +++++++++++----------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Component.java b/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Component.java index 46dd41203ba4..6bbebe8e6a79 100644 --- a/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Component.java +++ b/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Component.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; /** * For working with Amazon ECS SDK v2. @@ -43,7 +44,7 @@ public class ECS2Component extends HealthCheckComponent { @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { - ECS2Configuration configuration = this.configuration != null ? this.configuration.copy() : new ECS2Configuration(); + ECS2Configuration configuration = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new ECS2Configuration(); ECS2Endpoint endpoint = new ECS2Endpoint(uri, this, configuration); setProperties(endpoint, parameters); if (Boolean.FALSE.equals(configuration.isUseDefaultCredentialsProvider()) diff --git a/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Endpoint.java b/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Endpoint.java index 34a99d95de93..285f629d1a41 100644 --- a/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Endpoint.java +++ b/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Endpoint.java @@ -66,14 +66,14 @@ public class ECS2Endpoint extends ScheduledPollEndpoint implements EndpointServi public void doStart() throws Exception { super.doStart(); - ecsClient = configuration.getEcsClient() != null + ecsClient = ObjectHelper.isNotEmpty(configuration.getEcsClient()) ? configuration.getEcsClient() : ECS2ClientFactory.getEcsClient(configuration); } @Override public void doStop() throws Exception { if (ObjectHelper.isEmpty(configuration.getEcsClient())) { - if (ecsClient != null) { + if (ObjectHelper.isNotEmpty(ecsClient)) { ecsClient.close(); } } diff --git a/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Producer.java b/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Producer.java index 49a40337e00b..7e26e831b397 100644 --- a/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Producer.java +++ b/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Producer.java @@ -111,11 +111,11 @@ public class ECS2Producer extends DefaultProducer { () -> { ListClustersRequest.Builder builder = ListClustersRequest.builder(); Integer maxResults = getOptionalHeader(exchange, ECS2Constants.MAX_RESULTS, Integer.class); - if (maxResults != null) { + if (ObjectHelper.isNotEmpty(maxResults)) { builder.maxResults(maxResults); } String nextToken = getOptionalHeader(exchange, ECS2Constants.NEXT_TOKEN, String.class); - if (nextToken != null) { + if (ObjectHelper.isNotEmpty(nextToken)) { builder.nextToken(nextToken); } return ecsClient.listClusters(builder.build()); @@ -123,7 +123,7 @@ public class ECS2Producer extends DefaultProducer { "List Clusters", (ListClustersResponse response, Message message) -> { message.setHeader(ECS2Constants.NEXT_TOKEN, response.nextToken()); - message.setHeader(ECS2Constants.IS_TRUNCATED, response.nextToken() != null); + message.setHeader(ECS2Constants.IS_TRUNCATED, ObjectHelper.isNotEmpty(response.nextToken())); }); } @@ -135,14 +135,14 @@ public class ECS2Producer extends DefaultProducer { () -> { CreateClusterRequest.Builder builder = CreateClusterRequest.builder(); String clusterName = getOptionalHeader(exchange, ECS2Constants.CLUSTER_NAME, String.class); - if (clusterName != null) { + if (ObjectHelper.isNotEmpty(clusterName)) { builder.clusterName(clusterName); } return ecsClient.createCluster(builder.build()); }, "Create Cluster", (CreateClusterResponse response, Message message) -> { - if (response.cluster() != null) { + if (ObjectHelper.isNotEmpty(response.cluster())) { message.setHeader(ECS2Constants.CLUSTER_ARN, response.cluster().clusterArn()); } }); @@ -156,7 +156,7 @@ public class ECS2Producer extends DefaultProducer { () -> { DescribeClustersRequest.Builder builder = DescribeClustersRequest.builder(); String clusterName = getOptionalHeader(exchange, ECS2Constants.CLUSTER_NAME, String.class); - if (clusterName != null) { + if (ObjectHelper.isNotEmpty(clusterName)) { builder.clusters(clusterName); } return ecsClient.describeClusters(builder.build()); @@ -181,7 +181,7 @@ public class ECS2Producer extends DefaultProducer { }, "Delete Cluster", (DeleteClusterResponse response, Message message) -> { - if (response.cluster() != null) { + if (ObjectHelper.isNotEmpty(response.cluster())) { message.setHeader(ECS2Constants.CLUSTER_ARN, response.cluster().clusterArn()); } }); @@ -230,7 +230,7 @@ public class ECS2Producer extends DefaultProducer { throw new IllegalArgumentException( String.format("Expected body of type %s but was %s", requestClass.getName(), - payload != null ? payload.getClass().getName() : "null")); + ObjectHelper.isNotEmpty(payload) ? payload.getClass().getName() : "null")); } } else { try { @@ -242,7 +242,7 @@ public class ECS2Producer extends DefaultProducer { } Message message = getMessageForResponse(exchange); message.setBody(result); - if (responseProcessor != null) { + if (ObjectHelper.isNotEmpty(responseProcessor)) { responseProcessor.accept(result, message); } } @@ -273,7 +273,7 @@ public class ECS2Producer extends DefaultProducer { "producers", WritableHealthCheckRepository.class); - if (healthCheckRepository != null) { + if (ObjectHelper.isNotEmpty(healthCheckRepository)) { String id = getEndpoint().getId(); producerHealthCheck = new ECS2ProducerHealthCheck(getEndpoint(), id); producerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckProducerEnabled()); @@ -283,7 +283,7 @@ public class ECS2Producer extends DefaultProducer { @Override protected void doStop() throws Exception { - if (healthCheckRepository != null && producerHealthCheck != null) { + if (ObjectHelper.isNotEmpty(healthCheckRepository) && ObjectHelper.isNotEmpty(producerHealthCheck)) { healthCheckRepository.removeHealthCheck(producerHealthCheck); producerHealthCheck = null; }
