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:45 UTC
(camel) 15/36: Camel-AWS components: Use ObjectHelper for null checks - S3
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 0c85263cbe09aeee1e5ba9b79b58901ee31f2ba9
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jan 28 11:36:24 2026 +0100
Camel-AWS components: Use ObjectHelper for null checks - S3
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../camel/component/aws2/s3/AWS2S3Component.java | 3 +-
.../camel/component/aws2/s3/AWS2S3Endpoint.java | 10 ++---
.../camel/component/aws2/s3/AWS2S3Producer.java | 46 +++++++++++-----------
3 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Component.java b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Component.java
index 18421446d019..b879eccc09b5 100644
--- a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Component.java
+++ b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Component.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;
@Component("aws2-s3")
public class AWS2S3Component extends HealthCheckComponent {
@@ -47,7 +48,7 @@ public class AWS2S3Component extends HealthCheckComponent {
remaining = remaining.substring(remaining.lastIndexOf(':') + 1, remaining.length());
}
final AWS2S3Configuration configuration
- = this.configuration != null ? this.configuration.copy() : new AWS2S3Configuration();
+ = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new AWS2S3Configuration();
configuration.setBucketName(remaining);
AWS2S3Endpoint endpoint = new AWS2S3Endpoint(uri, this, configuration);
setProperties(endpoint, parameters);
diff --git a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java
index 614d1143ea95..b095089e225d 100644
--- a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java
+++ b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Endpoint.java
@@ -99,7 +99,7 @@ public class AWS2S3Endpoint extends ScheduledPollEndpoint implements EndpointSer
@Override
public Map<String, String> getServiceMetadata() {
- if (configuration.getRegion() != null) {
+ if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
return Map.of("region", configuration.getRegion());
}
return null;
@@ -131,12 +131,12 @@ public class AWS2S3Endpoint extends ScheduledPollEndpoint implements EndpointSer
public void doStart() throws Exception {
super.doStart();
- s3Client = configuration.getAmazonS3Client() != null
+ s3Client = ObjectHelper.isNotEmpty(configuration.getAmazonS3Client())
? configuration.getAmazonS3Client() : AWS2S3ClientFactory.getS3Client(configuration);
String fileName = getConfiguration().getFileName();
- if (fileName != null) {
+ if (ObjectHelper.isNotEmpty(fileName)) {
LOG.trace("File name [{}] requested, so skipping bucket check...", fileName);
return;
}
@@ -176,7 +176,7 @@ public class AWS2S3Endpoint extends ScheduledPollEndpoint implements EndpointSer
LOG.trace("Bucket created");
}
- if (configuration.getPolicy() != null) {
+ if (ObjectHelper.isNotEmpty(configuration.getPolicy())) {
LOG.trace("Updating bucket [{}] with policy [{}]", bucketName, configuration.getPolicy());
s3Client.putBucketPolicy(
@@ -191,7 +191,7 @@ public class AWS2S3Endpoint extends ScheduledPollEndpoint implements EndpointSer
@Override
public void doStop() throws Exception {
if (ObjectHelper.isEmpty(configuration.getAmazonS3Client())) {
- if (s3Client != null) {
+ if (ObjectHelper.isNotEmpty(s3Client)) {
s3Client.close();
}
}
diff --git a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
index 640b64679a61..ac20947dd14e 100644
--- a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
+++ b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
@@ -217,18 +217,18 @@ public class AWS2S3Producer extends DefaultProducer {
= CreateMultipartUploadRequest.builder().bucket(getConfiguration().getBucketName()).key(keyName);
String storageClass = AWS2S3Utils.determineStorageClass(exchange, getConfiguration());
- if (storageClass != null) {
+ if (ObjectHelper.isNotEmpty(storageClass)) {
createMultipartUploadRequest.storageClass(storageClass);
}
String cannedAcl = exchange.getIn().getHeader(AWS2S3Constants.CANNED_ACL, String.class);
- if (cannedAcl != null) {
+ if (ObjectHelper.isNotEmpty(cannedAcl)) {
ObjectCannedACL objectAcl = ObjectCannedACL.valueOf(cannedAcl);
createMultipartUploadRequest.acl(objectAcl);
}
BucketCannedACL acl = exchange.getIn().getHeader(AWS2S3Constants.ACL, BucketCannedACL.class);
- if (acl != null) {
+ if (ObjectHelper.isNotEmpty(acl)) {
// note: if cannedacl and acl are both specified the last one will
// be used. refer to
// PutObjectRequest#setAccessControlList for more details
@@ -236,22 +236,22 @@ public class AWS2S3Producer extends DefaultProducer {
}
String contentType = exchange.getIn().getHeader(AWS2S3Constants.CONTENT_TYPE, String.class);
- if (contentType != null) {
+ if (ObjectHelper.isNotEmpty(contentType)) {
createMultipartUploadRequest.contentType(contentType);
}
String cacheControl = exchange.getIn().getHeader(AWS2S3Constants.CACHE_CONTROL, String.class);
- if (cacheControl != null) {
+ if (ObjectHelper.isNotEmpty(cacheControl)) {
createMultipartUploadRequest.cacheControl(cacheControl);
}
String contentDisposition = exchange.getIn().getHeader(AWS2S3Constants.CONTENT_DISPOSITION, String.class);
- if (contentDisposition != null) {
+ if (ObjectHelper.isNotEmpty(contentDisposition)) {
createMultipartUploadRequest.contentDisposition(contentDisposition);
}
String contentEncoding = exchange.getIn().getHeader(AWS2S3Constants.CONTENT_ENCODING, String.class);
- if (contentEncoding != null) {
+ if (ObjectHelper.isNotEmpty(contentEncoding)) {
createMultipartUploadRequest.contentEncoding(contentEncoding);
}
@@ -305,11 +305,11 @@ public class AWS2S3Producer extends DefaultProducer {
message.setHeader(AWS2S3Constants.E_TAG, uploadResult.eTag());
message.setHeader(AWS2S3Constants.PRODUCED_KEY, keyName);
message.setHeader(AWS2S3Constants.PRODUCED_BUCKET_NAME, bucketName);
- if (uploadResult.versionId() != null) {
+ if (ObjectHelper.isNotEmpty(uploadResult.versionId())) {
message.setHeader(AWS2S3Constants.VERSION_ID, uploadResult.versionId());
}
- if (filePayload != null && getConfiguration().isDeleteAfterWrite()) {
+ if (ObjectHelper.isNotEmpty(filePayload) && getConfiguration().isDeleteAfterWrite()) {
FileUtil.deleteFile(filePayload);
}
}
@@ -370,33 +370,33 @@ public class AWS2S3Producer extends DefaultProducer {
putObjectRequest.bucket(bucketName).key(keyName).metadata(objectMetadata);
String storageClass = AWS2S3Utils.determineStorageClass(exchange, getConfiguration());
- if (storageClass != null) {
+ if (ObjectHelper.isNotEmpty(storageClass)) {
putObjectRequest.storageClass(storageClass);
}
String cannedAcl = exchange.getIn().getHeader(AWS2S3Constants.CANNED_ACL, String.class);
- if (cannedAcl != null) {
+ if (ObjectHelper.isNotEmpty(cannedAcl)) {
ObjectCannedACL objectAcl = ObjectCannedACL.valueOf(cannedAcl);
putObjectRequest.acl(objectAcl);
}
String contentType = exchange.getIn().getHeader(AWS2S3Constants.CONTENT_TYPE, String.class);
- if (contentType != null) {
+ if (ObjectHelper.isNotEmpty(contentType)) {
putObjectRequest.contentType(contentType);
}
String cacheControl = exchange.getIn().getHeader(AWS2S3Constants.CACHE_CONTROL, String.class);
- if (cacheControl != null) {
+ if (ObjectHelper.isNotEmpty(cacheControl)) {
putObjectRequest.cacheControl(cacheControl);
}
String contentDisposition = exchange.getIn().getHeader(AWS2S3Constants.CONTENT_DISPOSITION, String.class);
- if (contentDisposition != null) {
+ if (ObjectHelper.isNotEmpty(contentDisposition)) {
putObjectRequest.contentDisposition(contentDisposition);
}
String contentEncoding = exchange.getIn().getHeader(AWS2S3Constants.CONTENT_ENCODING, String.class);
- if (contentEncoding != null) {
+ if (ObjectHelper.isNotEmpty(contentEncoding)) {
putObjectRequest.contentEncoding(contentEncoding);
}
@@ -405,7 +405,7 @@ public class AWS2S3Producer extends DefaultProducer {
}
BucketCannedACL acl = exchange.getIn().getHeader(AWS2S3Constants.ACL, BucketCannedACL.class);
- if (acl != null) {
+ if (ObjectHelper.isNotEmpty(acl)) {
// note: if cannedacl and acl are both specified the last one will
// be used. refer to
// PutObjectRequest#setAccessControlList for more details
@@ -413,7 +413,7 @@ public class AWS2S3Producer extends DefaultProducer {
}
String contentMd5 = exchange.getIn().getHeader(AWS2S3Constants.CONTENT_MD5, String.class);
- if (contentMd5 != null) {
+ if (ObjectHelper.isNotEmpty(contentMd5)) {
putObjectRequest.contentMD5(contentMd5);
}
@@ -461,7 +461,7 @@ public class AWS2S3Producer extends DefaultProducer {
message.setHeader(AWS2S3Constants.E_TAG, putObjectResult.eTag());
message.setHeader(AWS2S3Constants.PRODUCED_KEY, keyName);
message.setHeader(AWS2S3Constants.PRODUCED_BUCKET_NAME, bucketName);
- if (putObjectResult.versionId() != null) {
+ if (ObjectHelper.isNotEmpty(putObjectResult.versionId())) {
message.setHeader(AWS2S3Constants.VERSION_ID, putObjectResult.versionId());
}
}
@@ -534,7 +534,7 @@ public class AWS2S3Producer extends DefaultProducer {
CopyObjectResponse copyObjectResult = s3Client.copyObject(copyObjectRequest.build());
Message message = getMessageForResponse(exchange);
- if (copyObjectResult.versionId() != null) {
+ if (ObjectHelper.isNotEmpty(copyObjectResult.versionId())) {
message.setHeader(AWS2S3Constants.VERSION_ID, copyObjectResult.versionId());
}
message.setHeader(AWS2S3Constants.PRODUCED_KEY, keyName);
@@ -704,7 +704,7 @@ public class AWS2S3Producer extends DefaultProducer {
long milliSeconds = 0;
Long expirationMillis = exchange.getIn().getHeader(AWS2S3Constants.DOWNLOAD_LINK_EXPIRATION_TIME, Long.class);
- if (expirationMillis != null) {
+ if (ObjectHelper.isNotEmpty(expirationMillis)) {
milliSeconds += expirationMillis;
} else {
milliSeconds += 1000 * 60 * 60;
@@ -1023,7 +1023,7 @@ public class AWS2S3Producer extends DefaultProducer {
long milliSeconds = 0;
Long expirationMillis = exchange.getIn().getHeader(AWS2S3Constants.UPLOAD_LINK_EXPIRATION_TIME, Long.class);
- if (expirationMillis != null) {
+ if (ObjectHelper.isNotEmpty(expirationMillis)) {
milliSeconds += expirationMillis;
} else {
milliSeconds += 1000 * 60 * 60;
@@ -1099,7 +1099,7 @@ public class AWS2S3Producer extends DefaultProducer {
// Add location constraint if region is not us-east-1
String region = getConfiguration().getRegion();
- if (region != null && !region.equals("us-east-1")) {
+ if (ObjectHelper.isNotEmpty(region) && !region.equals("us-east-1")) {
CreateBucketConfiguration bucketConfiguration = CreateBucketConfiguration.builder()
.locationConstraint(BucketLocationConstraint.fromValue(region))
.build();
@@ -1342,7 +1342,7 @@ public class AWS2S3Producer extends DefaultProducer {
Map<String, String> objectMetadata = new HashMap<>();
Map<String, String> metadata = exchange.getIn().getHeader(AWS2S3Constants.METADATA, Map.class);
- if (metadata != null) {
+ if (ObjectHelper.isNotEmpty(metadata)) {
objectMetadata.putAll(metadata);
}