You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2026/01/28 14:37:02 UTC
(camel) 32/36: Camel-AWS components: Use ObjectHelper for null checks - Parameter Store
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 b24885a3993cf5c535a541175fba0fe391a0fcbd
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jan 28 12:53:56 2026 +0100
Camel-AWS components: Use ObjectHelper for null checks - Parameter Store
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../component/aws/parameterstore/ParameterStoreComponent.java | 3 ++-
.../component/aws/parameterstore/ParameterStoreEndpoint.java | 4 ++--
.../component/aws/parameterstore/ParameterStoreProducer.java | 8 ++++----
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/components/camel-aws/camel-aws-parameter-store/src/main/java/org/apache/camel/component/aws/parameterstore/ParameterStoreComponent.java b/components/camel-aws/camel-aws-parameter-store/src/main/java/org/apache/camel/component/aws/parameterstore/ParameterStoreComponent.java
index 26921934dd23..82f49abe524d 100644
--- a/components/camel-aws/camel-aws-parameter-store/src/main/java/org/apache/camel/component/aws/parameterstore/ParameterStoreComponent.java
+++ b/components/camel-aws/camel-aws-parameter-store/src/main/java/org/apache/camel/component/aws/parameterstore/ParameterStoreComponent.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 SSM Parameter Store SDK v2.
@@ -44,7 +45,7 @@ public class ParameterStoreComponent extends HealthCheckComponent {
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
ParameterStoreConfiguration configuration
- = this.configuration != null ? this.configuration.copy() : new ParameterStoreConfiguration();
+ = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new ParameterStoreConfiguration();
ParameterStoreEndpoint endpoint = new ParameterStoreEndpoint(uri, this, configuration);
setProperties(endpoint, parameters);
if (Boolean.FALSE.equals(configuration.isUseDefaultCredentialsProvider())
diff --git a/components/camel-aws/camel-aws-parameter-store/src/main/java/org/apache/camel/component/aws/parameterstore/ParameterStoreEndpoint.java b/components/camel-aws/camel-aws-parameter-store/src/main/java/org/apache/camel/component/aws/parameterstore/ParameterStoreEndpoint.java
index 29fbef5d42d9..7f87915a4c85 100644
--- a/components/camel-aws/camel-aws-parameter-store/src/main/java/org/apache/camel/component/aws/parameterstore/ParameterStoreEndpoint.java
+++ b/components/camel-aws/camel-aws-parameter-store/src/main/java/org/apache/camel/component/aws/parameterstore/ParameterStoreEndpoint.java
@@ -66,7 +66,7 @@ public class ParameterStoreEndpoint extends ScheduledPollEndpoint implements End
public void doStart() throws Exception {
super.doStart();
- ssmClient = configuration.getSsmClient() != null
+ ssmClient = ObjectHelper.isNotEmpty(configuration.getSsmClient())
? configuration.getSsmClient()
: ParameterStoreClientFactory.getSsmClient(configuration);
}
@@ -74,7 +74,7 @@ public class ParameterStoreEndpoint extends ScheduledPollEndpoint implements End
@Override
public void doStop() throws Exception {
if (ObjectHelper.isEmpty(configuration.getSsmClient())) {
- if (ssmClient != null) {
+ if (ObjectHelper.isNotEmpty(ssmClient)) {
ssmClient.close();
}
}
diff --git a/components/camel-aws/camel-aws-parameter-store/src/main/java/org/apache/camel/component/aws/parameterstore/ParameterStoreProducer.java b/components/camel-aws/camel-aws-parameter-store/src/main/java/org/apache/camel/component/aws/parameterstore/ParameterStoreProducer.java
index 1f94005e6abf..874c9fa0f7a6 100644
--- a/components/camel-aws/camel-aws-parameter-store/src/main/java/org/apache/camel/component/aws/parameterstore/ParameterStoreProducer.java
+++ b/components/camel-aws/camel-aws-parameter-store/src/main/java/org/apache/camel/component/aws/parameterstore/ParameterStoreProducer.java
@@ -103,7 +103,7 @@ public class ParameterStoreProducer extends DefaultProducer {
private ParameterStoreOperations determineOperation(Exchange exchange) {
ParameterStoreOperations operation = exchange.getIn().getHeader(ParameterStoreConstants.OPERATION,
ParameterStoreOperations.class);
- if (operation == null) {
+ if (ObjectHelper.isEmpty(operation)) {
operation = getConfiguration().getOperation();
}
return operation;
@@ -115,7 +115,7 @@ public class ParameterStoreProducer extends DefaultProducer {
@Override
public String toString() {
- if (parameterStoreProducerToString == null) {
+ if (ObjectHelper.isEmpty(parameterStoreProducerToString)) {
parameterStoreProducerToString = "ParameterStoreProducer["
+ URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]";
}
@@ -403,7 +403,7 @@ public class ParameterStoreProducer extends DefaultProducer {
"producers",
WritableHealthCheckRepository.class);
- if (healthCheckRepository != null) {
+ if (ObjectHelper.isNotEmpty(healthCheckRepository)) {
String id = getEndpoint().getId();
producerHealthCheck = new ParameterStoreProducerHealthCheck(getEndpoint(), id);
producerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckProducerEnabled());
@@ -413,7 +413,7 @@ public class ParameterStoreProducer 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;
}