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 8793858304dc97781db1f6c8ab9a37dde4a9e0ac Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Jan 28 12:10:31 2026 +0100 Camel-AWS components: Use ObjectHelper for null checks - Secrets Manager Signed-off-by: Andrea Cosentino <[email protected]> --- .../component/aws/secretsmanager/SecretsManagerComponent.java | 3 ++- .../component/aws/secretsmanager/SecretsManagerEndpoint.java | 4 ++-- .../component/aws/secretsmanager/SecretsManagerProducer.java | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerComponent.java b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerComponent.java index a208766cc4cf..21b5cbb28b33 100644 --- a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerComponent.java +++ b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerComponent.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 Secrets Manager SDK v2. @@ -44,7 +45,7 @@ public class SecretsManagerComponent extends HealthCheckComponent { @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { SecretsManagerConfiguration configuration - = this.configuration != null ? this.configuration.copy() : new SecretsManagerConfiguration(); + = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new SecretsManagerConfiguration(); SecretsManagerEndpoint endpoint = new SecretsManagerEndpoint(uri, this, configuration); setProperties(endpoint, parameters); if (Boolean.FALSE.equals(configuration.isUseDefaultCredentialsProvider()) diff --git a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerEndpoint.java b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerEndpoint.java index a2fa0489f14e..750b03aefa05 100644 --- a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerEndpoint.java +++ b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerEndpoint.java @@ -70,7 +70,7 @@ public class SecretsManagerEndpoint extends ScheduledPollEndpoint implements End public void doStart() throws Exception { super.doStart(); - secretsManagerClient = configuration.getSecretsManagerClient() != null + secretsManagerClient = ObjectHelper.isNotEmpty(configuration.getSecretsManagerClient()) ? configuration.getSecretsManagerClient() : SecretsManagerClientFactory.getSecretsManagerClient(configuration); } @@ -78,7 +78,7 @@ public class SecretsManagerEndpoint extends ScheduledPollEndpoint implements End @Override public void doStop() throws Exception { if (ObjectHelper.isEmpty(configuration.getSecretsManagerClient())) { - if (secretsManagerClient != null) { + if (ObjectHelper.isNotEmpty(secretsManagerClient)) { secretsManagerClient.close(); } } diff --git a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java index 6b31f1e84d33..69864268a7bd 100644 --- a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java +++ b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerProducer.java @@ -99,7 +99,7 @@ public class SecretsManagerProducer extends DefaultProducer { private SecretsManagerOperations determineOperation(Exchange exchange) { SecretsManagerOperations operation = exchange.getIn().getHeader(SecretsManagerConstants.OPERATION, SecretsManagerOperations.class); - if (operation == null) { + if (ObjectHelper.isEmpty(operation)) { operation = getConfiguration().getOperation(); } return operation; @@ -111,7 +111,7 @@ public class SecretsManagerProducer extends DefaultProducer { @Override public String toString() { - if (secretsManagerProducerToString == null) { + if (ObjectHelper.isEmpty(secretsManagerProducerToString)) { secretsManagerProducerToString = "SecretsManagerProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; } @@ -502,7 +502,7 @@ public class SecretsManagerProducer extends DefaultProducer { "producers", WritableHealthCheckRepository.class); - if (healthCheckRepository != null) { + if (ObjectHelper.isNotEmpty(healthCheckRepository)) { String id = getEndpoint().getId(); producerHealthCheck = new SecretsManagerProducerHealthCheck(getEndpoint(), id); producerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckProducerEnabled()); @@ -512,7 +512,7 @@ public class SecretsManagerProducer 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; }
