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 92287441fe2e3746ecfeb08b7496a26aaaae6bfd Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Jan 28 11:41:40 2026 +0100 Camel-AWS components: Use ObjectHelper for null checks - SNS Signed-off-by: Andrea Cosentino <[email protected]> --- .../apache/camel/component/aws2/sns/Sns2Component.java | 3 ++- .../apache/camel/component/aws2/sns/Sns2Endpoint.java | 16 ++++++++-------- .../apache/camel/component/aws2/sns/Sns2Producer.java | 14 +++++++------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Component.java b/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Component.java index 076372eaf4f3..c14a91785fb7 100644 --- a/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Component.java +++ b/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Component.java @@ -24,6 +24,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; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import software.amazon.awssdk.regions.Region; @@ -58,7 +59,7 @@ public class Sns2Component extends HealthCheckComponent { Map<String, Object> nonTransientParameters = getNonTransientParameters(parameters); - Sns2Configuration epConfiguration = this.configuration != null ? this.configuration.copy() : new Sns2Configuration(); + Sns2Configuration epConfiguration = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new Sns2Configuration(); if (remaining.startsWith("arn:")) { parseRemaining(epConfiguration, remaining); diff --git a/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Endpoint.java b/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Endpoint.java index 8d18e5df017c..10e13d46e43d 100644 --- a/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Endpoint.java +++ b/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Endpoint.java @@ -101,15 +101,15 @@ public class Sns2Endpoint extends DefaultEndpoint implements HeaderFilterStrateg @Override public void doInit() throws Exception { super.doInit(); - snsClient = configuration.getAmazonSNSClient() != null + snsClient = ObjectHelper.isNotEmpty(configuration.getAmazonSNSClient()) ? configuration.getAmazonSNSClient() : Sns2ClientFactory.getSnsClient(configuration); // check the setting the headerFilterStrategy - if (headerFilterStrategy == null) { + if (ObjectHelper.isEmpty(headerFilterStrategy)) { headerFilterStrategy = new Sns2HeaderFilterStrategy(); } - if (configuration.getTopicArn() == null) { + if (ObjectHelper.isEmpty(configuration.getTopicArn())) { try { String nextToken = null; final String arnSuffix = ":" + configuration.getTopicName(); @@ -124,14 +124,14 @@ public class Sns2Endpoint extends DefaultEndpoint implements HeaderFilterStrateg break; } } - } while (nextToken != null); + } while (ObjectHelper.isNotEmpty(nextToken)); } catch (final AwsServiceException ase) { LOG.trace("The list topics operation return the following error code {}", ase.awsErrorDetails().errorCode()); throw ase; } } - if (configuration.getTopicArn() == null && configuration.isAutoCreateTopic()) { + if (ObjectHelper.isEmpty(configuration.getTopicArn()) && configuration.isAutoCreateTopic()) { // creates a new topic, or returns the URL of an existing one CreateTopicRequest.Builder builder = CreateTopicRequest.builder().name(configuration.getTopicName()); @@ -189,7 +189,7 @@ public class Sns2Endpoint extends DefaultEndpoint implements HeaderFilterStrateg @Override public void doStop() throws Exception { if (ObjectHelper.isEmpty(configuration.getAmazonSNSClient())) { - if (snsClient != null) { + if (ObjectHelper.isNotEmpty(snsClient)) { snsClient.close(); } } @@ -229,10 +229,10 @@ public class Sns2Endpoint extends DefaultEndpoint implements HeaderFilterStrateg @Override public Map<String, String> getServiceMetadata() { HashMap<String, String> metadata = new HashMap<>(); - if (configuration.getQueueArn() != null) { + if (ObjectHelper.isNotEmpty(configuration.getQueueArn())) { metadata.put("queueArn", configuration.getQueueArn()); } - if (configuration.getTopicArn() != null) { + if (ObjectHelper.isNotEmpty(configuration.getTopicArn())) { metadata.put("topicArn", configuration.getTopicArn()); } return metadata; diff --git a/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Producer.java b/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Producer.java index 5c81f9d8dd88..8e947b9e43d1 100644 --- a/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Producer.java +++ b/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Producer.java @@ -87,15 +87,15 @@ public class Sns2Producer extends DefaultProducer { Message message = getMessageForResponse(exchange); message.setBody(response); message.setHeader(Sns2Constants.FAILED_MESSAGE_COUNT, - response.failed() != null ? response.failed().size() : 0); + ObjectHelper.isNotEmpty(response.failed()) ? response.failed().size() : 0); message.setHeader(Sns2Constants.SUCCESSFUL_MESSAGE_COUNT, - response.successful() != null ? response.successful().size() : 0); + ObjectHelper.isNotEmpty(response.successful()) ? response.successful().size() : 0); } } private String determineSubject(Exchange exchange) { String subject = exchange.getIn().getHeader(Sns2Constants.SUBJECT, String.class); - if (subject == null) { + if (ObjectHelper.isEmpty(subject)) { subject = getConfiguration().getSubject(); } @@ -104,7 +104,7 @@ public class Sns2Producer extends DefaultProducer { private String determineMessageStructure(Exchange exchange) { String structure = exchange.getIn().getHeader(Sns2Constants.MESSAGE_STRUCTURE, String.class); - if (structure == null) { + if (ObjectHelper.isEmpty(structure)) { structure = getConfiguration().getMessageStructure(); } @@ -188,7 +188,7 @@ public class Sns2Producer extends DefaultProducer { @Override public String toString() { - if (snsProducerToString == null) { + if (ObjectHelper.isEmpty(snsProducerToString)) { snsProducerToString = "SnsProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; } return snsProducerToString; @@ -211,7 +211,7 @@ public class Sns2Producer extends DefaultProducer { "producers", WritableHealthCheckRepository.class); - if (healthCheckRepository != null) { + if (ObjectHelper.isNotEmpty(healthCheckRepository)) { String id = getEndpoint().getId(); producerHealthCheck = new Sns2ProducerHealthCheck(getEndpoint(), id); producerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckProducerEnabled()); @@ -221,7 +221,7 @@ public class Sns2Producer 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; }
