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 7916438994aa7684bbed905c0229b97b7263a258 Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Jan 28 12:02:44 2026 +0100 Camel-AWS components: Use ObjectHelper for null checks - Translate Signed-off-by: Andrea Cosentino <[email protected]> --- .../camel/component/aws2/translate/Translate2Component.java | 3 ++- .../apache/camel/component/aws2/translate/Translate2Endpoint.java | 4 ++-- .../apache/camel/component/aws2/translate/Translate2Producer.java | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Component.java b/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Component.java index 6de3119637d2..8ca3f4722af3 100644 --- a/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Component.java +++ b/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Component.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 Translate SDK v2. @@ -44,7 +45,7 @@ public class Translate2Component extends HealthCheckComponent { @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { Translate2Configuration configuration - = this.configuration != null ? this.configuration.copy() : new Translate2Configuration(); + = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new Translate2Configuration(); Translate2Endpoint endpoint = new Translate2Endpoint(uri, this, configuration); setProperties(endpoint, parameters); diff --git a/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Endpoint.java b/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Endpoint.java index 989f9c851b4c..bd5472b31c06 100644 --- a/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Endpoint.java +++ b/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Endpoint.java @@ -66,7 +66,7 @@ public class Translate2Endpoint extends ScheduledPollEndpoint implements Endpoin super.doStart(); translateClient - = configuration.getTranslateClient() != null + = ObjectHelper.isNotEmpty(configuration.getTranslateClient()) ? configuration.getTranslateClient() : Translate2ClientFactory.getTranslateClient(configuration); } @@ -74,7 +74,7 @@ public class Translate2Endpoint extends ScheduledPollEndpoint implements Endpoin @Override public void doStop() throws Exception { if (ObjectHelper.isEmpty(configuration.getTranslateClient())) { - if (translateClient != null) { + if (ObjectHelper.isNotEmpty(translateClient)) { translateClient.close(); } } diff --git a/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Producer.java b/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Producer.java index 8893bd7ec4e1..289b4dd36ddf 100644 --- a/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Producer.java +++ b/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2Producer.java @@ -64,7 +64,7 @@ public class Translate2Producer extends DefaultProducer { private Translate2Operations determineOperation(Exchange exchange) { Translate2Operations operation = exchange.getIn().getHeader(Translate2Constants.OPERATION, Translate2Operations.class); - if (operation == null) { + if (ObjectHelper.isEmpty(operation)) { operation = getConfiguration().getOperation(); } return operation; @@ -76,7 +76,7 @@ public class Translate2Producer extends DefaultProducer { @Override public String toString() { - if (translateProducerToString == null) { + if (ObjectHelper.isEmpty(translateProducerToString)) { translateProducerToString = "TranslateProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; } return translateProducerToString; @@ -163,7 +163,7 @@ public class Translate2Producer extends DefaultProducer { "producers", WritableHealthCheckRepository.class); - if (healthCheckRepository != null) { + if (ObjectHelper.isNotEmpty(healthCheckRepository)) { String id = getEndpoint().getId(); producerHealthCheck = new Translate2ProducerHealthCheck(getEndpoint(), id); producerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckProducerEnabled()); @@ -173,7 +173,7 @@ public class Translate2Producer 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; }
