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
commit 16d9fd65914cf37e68ab304bb2b3567c69d0a7b1 Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Jan 28 10:13:09 2026 +0100 Camel-AWS components: Use ObjectHelper for null checks - EC2 Signed-off-by: Andrea Cosentino <[email protected]> --- .../camel/component/aws2/ec2/AWS2EC2Component.java | 3 ++- .../camel/component/aws2/ec2/AWS2EC2Endpoint.java | 4 ++-- .../camel/component/aws2/ec2/AWS2EC2Producer.java | 24 +++++++++++----------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Component.java b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Component.java index 091830800fa4..777409b2c49b 100644 --- a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Component.java +++ b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Component.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's Elastic Compute Cloud (EC2) SDK v2. @@ -46,7 +47,7 @@ public class AWS2EC2Component extends HealthCheckComponent { protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { AWS2EC2Configuration configuration - = this.configuration != null ? this.configuration.copy() : new AWS2EC2Configuration(); + = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new AWS2EC2Configuration(); AWS2EC2Endpoint endpoint = new AWS2EC2Endpoint(uri, this, configuration); setProperties(endpoint, parameters); if (Boolean.FALSE.equals(configuration.isUseDefaultCredentialsProvider()) diff --git a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Endpoint.java b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Endpoint.java index 896549489e7d..bc8b5baff391 100644 --- a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Endpoint.java +++ b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Endpoint.java @@ -61,14 +61,14 @@ public class AWS2EC2Endpoint extends DefaultEndpoint implements EndpointServiceL public void doStart() throws Exception { super.doStart(); - ec2Client = configuration.getAmazonEc2Client() != null + ec2Client = ObjectHelper.isNotEmpty(configuration.getAmazonEc2Client()) ? configuration.getAmazonEc2Client() : AWS2EC2ClientFactory.getEc2Client(configuration); } @Override public void doStop() throws Exception { if (ObjectHelper.isEmpty(configuration.getAmazonEc2Client())) { - if (ec2Client != null) { + if (ObjectHelper.isNotEmpty(ec2Client)) { ec2Client.close(); } } diff --git a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Producer.java b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Producer.java index 7b39b752d3f0..83b4d6d6c39b 100644 --- a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Producer.java +++ b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Producer.java @@ -371,15 +371,15 @@ public class AWS2EC2Producer extends DefaultProducer { DescribeInstancesRequest.Builder builder = DescribeInstancesRequest.builder(); Collection<String> instanceIds = getOptionalHeader(exchange, AWS2EC2Constants.INSTANCES_IDS, Collection.class); - if (instanceIds != null) { + if (ObjectHelper.isNotEmpty(instanceIds)) { builder.instanceIds(instanceIds); } String nextToken = getOptionalHeader(exchange, AWS2EC2Constants.NEXT_TOKEN, String.class); - if (nextToken != null) { + if (ObjectHelper.isNotEmpty(nextToken)) { builder.nextToken(nextToken); } Integer maxResults = getOptionalHeader(exchange, AWS2EC2Constants.MAX_RESULTS, Integer.class); - if (maxResults != null) { + if (ObjectHelper.isNotEmpty(maxResults)) { builder.maxResults(maxResults); } return ec2Client.describeInstances(builder.build()); @@ -387,7 +387,7 @@ public class AWS2EC2Producer extends DefaultProducer { "Describe Instances", (DescribeInstancesResponse response, Message message) -> { message.setHeader(AWS2EC2Constants.NEXT_TOKEN, response.nextToken()); - message.setHeader(AWS2EC2Constants.IS_TRUNCATED, response.nextToken() != null); + message.setHeader(AWS2EC2Constants.IS_TRUNCATED, ObjectHelper.isNotEmpty(response.nextToken())); }); } @@ -401,15 +401,15 @@ public class AWS2EC2Producer extends DefaultProducer { DescribeInstanceStatusRequest.Builder builder = DescribeInstanceStatusRequest.builder(); Collection<String> instanceIds = getOptionalHeader(exchange, AWS2EC2Constants.INSTANCES_IDS, Collection.class); - if (instanceIds != null) { + if (ObjectHelper.isNotEmpty(instanceIds)) { builder.instanceIds(instanceIds); } String nextToken = getOptionalHeader(exchange, AWS2EC2Constants.NEXT_TOKEN, String.class); - if (nextToken != null) { + if (ObjectHelper.isNotEmpty(nextToken)) { builder.nextToken(nextToken); } Integer maxResults = getOptionalHeader(exchange, AWS2EC2Constants.MAX_RESULTS, Integer.class); - if (maxResults != null) { + if (ObjectHelper.isNotEmpty(maxResults)) { builder.maxResults(maxResults); } return ec2Client.describeInstanceStatus(builder.build()); @@ -417,7 +417,7 @@ public class AWS2EC2Producer extends DefaultProducer { "Describe Instances Status", (DescribeInstanceStatusResponse response, Message message) -> { message.setHeader(AWS2EC2Constants.NEXT_TOKEN, response.nextToken()); - message.setHeader(AWS2EC2Constants.IS_TRUNCATED, response.nextToken() != null); + message.setHeader(AWS2EC2Constants.IS_TRUNCATED, ObjectHelper.isNotEmpty(response.nextToken())); }); } @@ -682,7 +682,7 @@ public class AWS2EC2Producer 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 { @@ -694,7 +694,7 @@ public class AWS2EC2Producer extends DefaultProducer { } Message message = getMessageForResponse(exchange); message.setBody(result); - if (responseProcessor != null) { + if (ObjectHelper.isNotEmpty(responseProcessor)) { responseProcessor.accept(result, message); } } @@ -726,7 +726,7 @@ public class AWS2EC2Producer extends DefaultProducer { "producers", WritableHealthCheckRepository.class); - if (healthCheckRepository != null) { + if (ObjectHelper.isNotEmpty(healthCheckRepository)) { String id = getEndpoint().getId(); producerHealthCheck = new AWS2EC2ProducerHealthCheck(getEndpoint(), id); producerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckProducerEnabled()); @@ -736,7 +736,7 @@ public class AWS2EC2Producer 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; }
