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 cd971ef74f83b9ed74df970148348f25e0a6c144 Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Jan 28 10:40:36 2026 +0100 Camel-AWS components: Use ObjectHelper for null checks - MQ Signed-off-by: Andrea Cosentino <[email protected]> --- .../org/apache/camel/component/aws2/mq/MQ2Component.java | 3 ++- .../java/org/apache/camel/component/aws2/mq/MQ2Endpoint.java | 4 ++-- .../java/org/apache/camel/component/aws2/mq/MQ2Producer.java | 12 ++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Component.java b/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Component.java index b2585730d7ec..73193644fcf2 100644 --- a/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Component.java +++ b/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Component.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 MQ SDK v2. @@ -43,7 +44,7 @@ public class MQ2Component extends HealthCheckComponent { @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { - MQ2Configuration configuration = this.configuration != null ? this.configuration.copy() : new MQ2Configuration(); + MQ2Configuration configuration = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new MQ2Configuration(); MQ2Endpoint endpoint = new MQ2Endpoint(uri, this, configuration); setProperties(endpoint, parameters); if (Boolean.FALSE.equals(configuration.isUseDefaultCredentialsProvider()) diff --git a/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Endpoint.java b/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Endpoint.java index af3dfc01bcc0..76267f10158d 100644 --- a/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Endpoint.java +++ b/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Endpoint.java @@ -65,7 +65,7 @@ public class MQ2Endpoint extends ScheduledPollEndpoint implements EndpointServic public void doStart() throws Exception { super.doStart(); - mqClient = configuration.getAmazonMqClient() != null + mqClient = ObjectHelper.isNotEmpty(configuration.getAmazonMqClient()) ? configuration.getAmazonMqClient() : MQ2ClientFactory.getMqClient(configuration); } @@ -73,7 +73,7 @@ public class MQ2Endpoint extends ScheduledPollEndpoint implements EndpointServic @Override public void doStop() throws Exception { if (ObjectHelper.isEmpty(configuration.getAmazonMqClient())) { - if (mqClient != null) { + if (ObjectHelper.isNotEmpty(mqClient)) { mqClient.close(); } } diff --git a/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Producer.java b/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Producer.java index 36c657739c2a..44bb421f80dc 100644 --- a/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Producer.java +++ b/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Producer.java @@ -130,16 +130,16 @@ public class MQ2Producer extends DefaultProducer { Message message = getMessageForResponse(exchange); message.setBody(result); message.setHeader(MQ2Constants.NEXT_TOKEN, result.nextToken()); - message.setHeader(MQ2Constants.IS_TRUNCATED, result.nextToken() != null); + message.setHeader(MQ2Constants.IS_TRUNCATED, ObjectHelper.isNotEmpty(result.nextToken())); } } else { ListBrokersRequest.Builder builder = ListBrokersRequest.builder(); Integer maxResults = getOptionalHeader(exchange, MQ2Constants.MAX_RESULTS, Integer.class); - if (maxResults != null) { + if (ObjectHelper.isNotEmpty(maxResults)) { builder.maxResults(maxResults); } String nextToken = getOptionalHeader(exchange, MQ2Constants.NEXT_TOKEN, String.class); - if (nextToken != null) { + if (ObjectHelper.isNotEmpty(nextToken)) { builder.nextToken(nextToken); } ListBrokersResponse result; @@ -152,7 +152,7 @@ public class MQ2Producer extends DefaultProducer { Message message = getMessageForResponse(exchange); message.setBody(result); message.setHeader(MQ2Constants.NEXT_TOKEN, result.nextToken()); - message.setHeader(MQ2Constants.IS_TRUNCATED, result.nextToken() != null); + message.setHeader(MQ2Constants.IS_TRUNCATED, ObjectHelper.isNotEmpty(result.nextToken())); } } @@ -404,7 +404,7 @@ public class MQ2Producer extends DefaultProducer { "producers", WritableHealthCheckRepository.class); - if (healthCheckRepository != null) { + if (ObjectHelper.isNotEmpty(healthCheckRepository)) { String id = getEndpoint().getId(); producerHealthCheck = new MQ2ProducerHealthCheck(getEndpoint(), id); producerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckProducerEnabled()); @@ -414,7 +414,7 @@ public class MQ2Producer 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; }
