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:36:41 UTC
(camel) 11/36: Camel-AWS components: Use ObjectHelper for null checks - KMS
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 c12a1946c672a1eda12d8040bd507b862905745d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jan 28 10:32:42 2026 +0100
Camel-AWS components: Use ObjectHelper for null checks - KMS
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../apache/camel/component/aws2/kms/KMS2Component.java | 3 ++-
.../apache/camel/component/aws2/kms/KMS2Endpoint.java | 4 ++--
.../apache/camel/component/aws2/kms/KMS2Producer.java | 16 ++++++++--------
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Component.java b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Component.java
index ed000a7dae6d..9add306e075d 100644
--- a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Component.java
+++ b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Component.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.DefaultComponent;
+import org.apache.camel.util.ObjectHelper;
/**
* For working with Amazon KMS.
@@ -42,7 +43,7 @@ public class KMS2Component extends DefaultComponent {
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- KMS2Configuration configuration = this.configuration != null ? this.configuration.copy() : new KMS2Configuration();
+ KMS2Configuration configuration = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new KMS2Configuration();
KMS2Endpoint endpoint = new KMS2Endpoint(uri, this, configuration);
setProperties(endpoint, parameters);
diff --git a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Endpoint.java b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Endpoint.java
index 8a111b4e40e2..a86db8f420c1 100644
--- a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Endpoint.java
+++ b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Endpoint.java
@@ -61,7 +61,7 @@ public class KMS2Endpoint extends ScheduledPollEndpoint implements EndpointServi
public void doStart() throws Exception {
super.doStart();
- kmsClient = configuration.getKmsClient() != null
+ kmsClient = ObjectHelper.isNotEmpty(configuration.getKmsClient())
? configuration.getKmsClient()
: KMS2ClientFactory.getKmsClient(configuration);
}
@@ -69,7 +69,7 @@ public class KMS2Endpoint extends ScheduledPollEndpoint implements EndpointServi
@Override
public void doStop() throws Exception {
if (ObjectHelper.isEmpty(configuration.getKmsClient())) {
- if (kmsClient != null) {
+ if (ObjectHelper.isNotEmpty(kmsClient)) {
kmsClient.close();
}
}
diff --git a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Producer.java b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Producer.java
index dcbc8c92ace3..260066344263 100644
--- a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Producer.java
+++ b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Producer.java
@@ -119,11 +119,11 @@ public class KMS2Producer extends DefaultProducer {
() -> {
ListKeysRequest.Builder builder = ListKeysRequest.builder();
Integer limit = getOptionalHeader(exchange, KMS2Constants.LIMIT, Integer.class);
- if (limit != null) {
+ if (ObjectHelper.isNotEmpty(limit)) {
builder.limit(limit);
}
String marker = getOptionalHeader(exchange, KMS2Constants.MARKER, String.class);
- if (marker != null) {
+ if (ObjectHelper.isNotEmpty(marker)) {
builder.marker(marker);
}
return kmsClient.listKeys(builder.build());
@@ -143,14 +143,14 @@ public class KMS2Producer extends DefaultProducer {
() -> {
CreateKeyRequest.Builder builder = CreateKeyRequest.builder();
String description = getOptionalHeader(exchange, KMS2Constants.DESCRIPTION, String.class);
- if (description != null) {
+ if (ObjectHelper.isNotEmpty(description)) {
builder.description(description);
}
return kmsClient.createKey(builder.build());
},
"Create Key",
(CreateKeyResponse response, Message message) -> {
- if (response.keyMetadata() != null) {
+ if (ObjectHelper.isNotEmpty(response.keyMetadata())) {
message.setHeader(KMS2Constants.KEY_ID, response.keyMetadata().keyId());
message.setHeader(KMS2Constants.KEY_ARN, response.keyMetadata().arn());
message.setHeader(KMS2Constants.KEY_STATE, response.keyMetadata().keyStateAsString());
@@ -180,7 +180,7 @@ public class KMS2Producer extends DefaultProducer {
String keyId = getRequiredHeader(exchange, KMS2Constants.KEY_ID, String.class, MISSING_KEY_ID);
builder.keyId(keyId);
Integer pendingWindows = getOptionalHeader(exchange, KMS2Constants.PENDING_WINDOW_IN_DAYS, Integer.class);
- if (pendingWindows != null) {
+ if (ObjectHelper.isNotEmpty(pendingWindows)) {
builder.pendingWindowInDays(pendingWindows);
}
return kmsClient.scheduleKeyDeletion(builder.build());
@@ -203,7 +203,7 @@ public class KMS2Producer extends DefaultProducer {
},
"Describe Key",
(DescribeKeyResponse response, Message message) -> {
- if (response.keyMetadata() != null) {
+ if (ObjectHelper.isNotEmpty(response.keyMetadata())) {
message.setHeader(KMS2Constants.KEY_ID, response.keyMetadata().keyId());
message.setHeader(KMS2Constants.KEY_ARN, response.keyMetadata().arn());
message.setHeader(KMS2Constants.KEY_STATE, response.keyMetadata().keyStateAsString());
@@ -266,7 +266,7 @@ public class KMS2Producer extends DefaultProducer {
throw new IllegalArgumentException(
String.format("Expected body of type %s but was %s",
requestClass.getName(),
- payload != null ? payload.getClass().getName() : "null"));
+ ObjectHelper.isNotEmpty(payload) ? payload.getClass().getName() : "null"));
}
} else {
try {
@@ -278,7 +278,7 @@ public class KMS2Producer extends DefaultProducer {
}
Message message = getMessageForResponse(exchange);
message.setBody(result);
- if (responseProcessor != null) {
+ if (ObjectHelper.isNotEmpty(responseProcessor)) {
responseProcessor.accept(result, message);
}
}