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 999ee54f9e0e276a7415638c18e74e72cf20e972 Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Jan 28 11:39:40 2026 +0100 Camel-AWS components: Use ObjectHelper for null checks - SES Signed-off-by: Andrea Cosentino <[email protected]> --- .../camel/component/aws2/ses/Ses2Component.java | 3 ++- .../camel/component/aws2/ses/Ses2Endpoint.java | 4 ++-- .../camel/component/aws2/ses/Ses2Producer.java | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Component.java b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Component.java index 5e3796f2c614..63970289e984 100644 --- a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Component.java +++ b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Component.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 SES SDK v2. @@ -47,7 +48,7 @@ public class Ses2Component extends HealthCheckComponent { if (remaining == null || remaining.isBlank()) { throw new IllegalArgumentException("From must be specified."); } - Ses2Configuration configuration = this.configuration != null ? this.configuration.copy() : new Ses2Configuration(); + Ses2Configuration configuration = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new Ses2Configuration(); configuration.setFrom(remaining); Ses2Endpoint endpoint = new Ses2Endpoint(uri, this, configuration); setProperties(endpoint, parameters); diff --git a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Endpoint.java b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Endpoint.java index 6a9f420d202f..b918f2e1e952 100644 --- a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Endpoint.java +++ b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Endpoint.java @@ -54,7 +54,7 @@ public class Ses2Endpoint extends DefaultEndpoint implements EndpointServiceLoca @Override public void doStart() throws Exception { super.doStart(); - sesClient = configuration.getAmazonSESClient() != null + sesClient = ObjectHelper.isNotEmpty(configuration.getAmazonSESClient()) ? configuration.getAmazonSESClient() : Ses2ClientFactory.getSesClient(configuration); } @@ -62,7 +62,7 @@ public class Ses2Endpoint extends DefaultEndpoint implements EndpointServiceLoca @Override public void doStop() throws Exception { if (ObjectHelper.isEmpty(configuration.getAmazonSESClient())) { - if (sesClient != null) { + if (ObjectHelper.isNotEmpty(sesClient)) { sesClient.close(); } } diff --git a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Producer.java b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Producer.java index 6feec964451b..cf549df512ae 100644 --- a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Producer.java +++ b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Producer.java @@ -127,7 +127,7 @@ public class Ses2Producer extends DefaultProducer { private Collection<String> determineReplyToAddresses(Exchange exchange) { String replyToAddresses = exchange.getIn().getHeader(Ses2Constants.REPLY_TO_ADDRESSES, String.class); - if (replyToAddresses == null) { + if (ObjectHelper.isEmpty(replyToAddresses)) { replyToAddresses = getConfiguration().getReplyToAddresses(); } if (ObjectHelper.isNotEmpty(replyToAddresses)) { @@ -141,7 +141,7 @@ public class Ses2Producer extends DefaultProducer { private String determineReturnPath(Exchange exchange) { String returnPath = exchange.getIn().getHeader(Ses2Constants.RETURN_PATH, String.class); - if (returnPath == null) { + if (ObjectHelper.isEmpty(returnPath)) { returnPath = getConfiguration().getReturnPath(); } return returnPath; @@ -184,7 +184,7 @@ public class Ses2Producer extends DefaultProducer { private List<String> determineRawTo(Exchange exchange) { String to = exchange.getIn().getHeader(Ses2Constants.TO, String.class); - if (to == null) { + if (ObjectHelper.isEmpty(to)) { to = getConfiguration().getTo(); } if (ObjectHelper.isNotEmpty(to)) { @@ -198,7 +198,7 @@ public class Ses2Producer extends DefaultProducer { private String determineFrom(Exchange exchange) { String from = exchange.getIn().getHeader(Ses2Constants.FROM, String.class); - if (from == null) { + if (ObjectHelper.isEmpty(from)) { from = getConfiguration().getFrom(); } return from; @@ -206,7 +206,7 @@ public class Ses2Producer extends DefaultProducer { private String determineSubject(Exchange exchange) { String subject = exchange.getIn().getHeader(Ses2Constants.SUBJECT, String.class); - if (subject == null) { + if (ObjectHelper.isEmpty(subject)) { subject = getConfiguration().getSubject(); } return subject; @@ -215,7 +215,7 @@ public class Ses2Producer extends DefaultProducer { @SuppressWarnings("unchecked") private List<MessageTag> determineTags(Exchange exchange) { Map<String, String> tagMap = exchange.getIn().getHeader(Ses2Constants.TAGS, Map.class); - if (tagMap == null || tagMap.isEmpty()) { + if (ObjectHelper.isEmpty(tagMap)) { return null; } return tagMap.entrySet().stream() @@ -228,7 +228,7 @@ public class Ses2Producer extends DefaultProducer { private String determineConfigurationSet(Exchange exchange) { String configuration = exchange.getIn().getHeader(Ses2Constants.CONFIGURATION_SET, String.class); - if (configuration == null) { + if (ObjectHelper.isEmpty(configuration)) { configuration = getConfiguration().getConfigurationSet(); } return configuration; @@ -240,7 +240,7 @@ public class Ses2Producer extends DefaultProducer { @Override public String toString() { - if (sesProducerToString == null) { + if (ObjectHelper.isEmpty(sesProducerToString)) { sesProducerToString = "SesProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; } return sesProducerToString; @@ -263,7 +263,7 @@ public class Ses2Producer extends DefaultProducer { "producers", WritableHealthCheckRepository.class); - if (healthCheckRepository != null) { + if (ObjectHelper.isNotEmpty(healthCheckRepository)) { String id = getEndpoint().getId(); producerHealthCheck = new Ses2ProducerHealthCheck(getEndpoint(), id); producerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckProducerEnabled()); @@ -273,7 +273,7 @@ public class Ses2Producer 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; }
