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 6b4df41ae0881a515b7d0d3e2040362a49427fb4 Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Jan 28 12:14:11 2026 +0100 Camel-AWS components: Use ObjectHelper for null checks - Config Signed-off-by: Andrea Cosentino <[email protected]> --- .../org/apache/camel/component/aws/config/AWSConfigComponent.java | 3 ++- .../org/apache/camel/component/aws/config/AWSConfigEndpoint.java | 4 ++-- .../org/apache/camel/component/aws/config/AWSConfigProducer.java | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigComponent.java b/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigComponent.java index f64ffbc719d7..a7ac43f95994 100644 --- a/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigComponent.java +++ b/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigComponent.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 Config SDK v2. @@ -44,7 +45,7 @@ public class AWSConfigComponent extends HealthCheckComponent { @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { AWSConfigConfiguration configuration - = this.configuration != null ? this.configuration.copy() : new AWSConfigConfiguration(); + = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new AWSConfigConfiguration(); AWSConfigEndpoint endpoint = new AWSConfigEndpoint(uri, this, configuration); setProperties(endpoint, parameters); if (Boolean.FALSE.equals(configuration.isUseDefaultCredentialsProvider()) diff --git a/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigEndpoint.java b/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigEndpoint.java index 8459fc8668bf..4bbb097c7c42 100644 --- a/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigEndpoint.java +++ b/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigEndpoint.java @@ -66,14 +66,14 @@ public class AWSConfigEndpoint extends DefaultEndpoint implements EndpointServic public void doStart() throws Exception { super.doStart(); - configClient = configuration.getConfigClient() != null + configClient = ObjectHelper.isNotEmpty(configuration.getConfigClient()) ? configuration.getConfigClient() : AWSConfigClientFactory.getConfigClient(configuration); } @Override public void doStop() throws Exception { if (ObjectHelper.isEmpty(configuration.getConfigClient())) { - if (configClient != null) { + if (ObjectHelper.isNotEmpty(configClient)) { configClient.close(); } } diff --git a/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigProducer.java b/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigProducer.java index 66f72d11682e..5d107db63980 100644 --- a/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigProducer.java +++ b/components/camel-aws/camel-aws-config/src/main/java/org/apache/camel/component/aws/config/AWSConfigProducer.java @@ -73,7 +73,7 @@ public class AWSConfigProducer extends DefaultProducer { private AWSConfigOperations determineOperation(Exchange exchange) { AWSConfigOperations operation = exchange.getIn().getHeader(AWSConfigConstants.OPERATION, AWSConfigOperations.class); - if (operation == null) { + if (ObjectHelper.isEmpty(operation)) { operation = getConfiguration().getOperation(); } return operation; @@ -85,7 +85,7 @@ public class AWSConfigProducer extends DefaultProducer { @Override public String toString() { - if (configProducerToString == null) { + if (ObjectHelper.isEmpty(configProducerToString)) { configProducerToString = "AWSConfigProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; } return configProducerToString; @@ -315,7 +315,7 @@ public class AWSConfigProducer extends DefaultProducer { "producers", WritableHealthCheckRepository.class); - if (healthCheckRepository != null) { + if (ObjectHelper.isNotEmpty(healthCheckRepository)) { String id = getEndpoint().getId(); producerHealthCheck = new AWSConfigProducerHealthCheck(getEndpoint(), id); producerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckProducerEnabled()); @@ -325,7 +325,7 @@ public class AWSConfigProducer 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; }
