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 7206c313c23f27c5d20017edadb1d754068c69d6 Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Jan 28 12:44:08 2026 +0100 Camel-AWS components: Use ObjectHelper for null checks - S3 Vectors Signed-off-by: Andrea Cosentino <[email protected]> --- .../aws2/s3vectors/AWS2S3VectorsComponent.java | 3 +- .../aws2/s3vectors/AWS2S3VectorsEndpoint.java | 6 ++-- .../aws2/s3vectors/AWS2S3VectorsProducer.java | 32 +++++++++++----------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/components/camel-aws/camel-aws2-s3-vectors/src/main/java/org/apache/camel/component/aws2/s3vectors/AWS2S3VectorsComponent.java b/components/camel-aws/camel-aws2-s3-vectors/src/main/java/org/apache/camel/component/aws2/s3vectors/AWS2S3VectorsComponent.java index ae52da4df71e..d36996701a30 100644 --- a/components/camel-aws/camel-aws2-s3-vectors/src/main/java/org/apache/camel/component/aws2/s3vectors/AWS2S3VectorsComponent.java +++ b/components/camel-aws/camel-aws2-s3-vectors/src/main/java/org/apache/camel/component/aws2/s3vectors/AWS2S3VectorsComponent.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-vectors") public class AWS2S3VectorsComponent extends HealthCheckComponent { @@ -47,7 +48,7 @@ public class AWS2S3VectorsComponent extends HealthCheckComponent { remaining = remaining.substring(remaining.lastIndexOf(':') + 1, remaining.length()); } final AWS2S3VectorsConfiguration configuration - = this.configuration != null ? this.configuration.copy() : new AWS2S3VectorsConfiguration(); + = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new AWS2S3VectorsConfiguration(); configuration.setVectorBucketName(remaining); AWS2S3VectorsEndpoint endpoint = new AWS2S3VectorsEndpoint(uri, this, configuration); setProperties(endpoint, parameters); diff --git a/components/camel-aws/camel-aws2-s3-vectors/src/main/java/org/apache/camel/component/aws2/s3vectors/AWS2S3VectorsEndpoint.java b/components/camel-aws/camel-aws2-s3-vectors/src/main/java/org/apache/camel/component/aws2/s3vectors/AWS2S3VectorsEndpoint.java index 2928e42de8c1..5c6be4a6a2cd 100644 --- a/components/camel-aws/camel-aws2-s3-vectors/src/main/java/org/apache/camel/component/aws2/s3vectors/AWS2S3VectorsEndpoint.java +++ b/components/camel-aws/camel-aws2-s3-vectors/src/main/java/org/apache/camel/component/aws2/s3vectors/AWS2S3VectorsEndpoint.java @@ -75,7 +75,7 @@ public class AWS2S3VectorsEndpoint extends ScheduledPollEndpoint implements Endp @Override public Map<String, String> getServiceMetadata() { - if (configuration.getRegion() != null) { + if (ObjectHelper.isNotEmpty(configuration.getRegion())) { return Map.of("region", configuration.getRegion()); } return null; @@ -102,7 +102,7 @@ public class AWS2S3VectorsEndpoint extends ScheduledPollEndpoint implements Endp public void doStart() throws Exception { super.doStart(); - s3VectorsClient = configuration.getS3VectorsClient() != null + s3VectorsClient = ObjectHelper.isNotEmpty(configuration.getS3VectorsClient()) ? configuration.getS3VectorsClient() : AWS2S3VectorsClientFactory.getS3VectorsClient(configuration); @@ -112,7 +112,7 @@ public class AWS2S3VectorsEndpoint extends ScheduledPollEndpoint implements Endp @Override public void doStop() throws Exception { if (ObjectHelper.isEmpty(configuration.getS3VectorsClient())) { - if (s3VectorsClient != null) { + if (ObjectHelper.isNotEmpty(s3VectorsClient)) { s3VectorsClient.close(); } } diff --git a/components/camel-aws/camel-aws2-s3-vectors/src/main/java/org/apache/camel/component/aws2/s3vectors/AWS2S3VectorsProducer.java b/components/camel-aws/camel-aws2-s3-vectors/src/main/java/org/apache/camel/component/aws2/s3vectors/AWS2S3VectorsProducer.java index b6d6df3fd982..cb8c7ea98f86 100644 --- a/components/camel-aws/camel-aws2-s3-vectors/src/main/java/org/apache/camel/component/aws2/s3vectors/AWS2S3VectorsProducer.java +++ b/components/camel-aws/camel-aws2-s3-vectors/src/main/java/org/apache/camel/component/aws2/s3vectors/AWS2S3VectorsProducer.java @@ -119,7 +119,7 @@ public class AWS2S3VectorsProducer extends DefaultProducer { private AWS2S3VectorsOperations determineOperation(Exchange exchange) { AWS2S3VectorsOperations operation = exchange.getIn().getHeader(AWS2S3VectorsConstants.OPERATION, AWS2S3VectorsOperations.class); - if (operation == null) { + if (ObjectHelper.isEmpty(operation)) { operation = getConfiguration().getOperation(); } return operation; @@ -132,13 +132,13 @@ public class AWS2S3VectorsProducer extends DefaultProducer { // Get vector data from header or body Object vectorDataObj = message.getHeader(AWS2S3VectorsConstants.VECTOR_DATA); - if (vectorDataObj == null) { + if (ObjectHelper.isEmpty(vectorDataObj)) { vectorDataObj = message.getBody(); } // Get vector ID String vectorId = message.getHeader(AWS2S3VectorsConstants.VECTOR_ID, String.class); - if (vectorId == null) { + if (ObjectHelper.isEmpty(vectorId)) { vectorId = exchange.getExchangeId(); // Use exchange ID as default } @@ -185,7 +185,7 @@ public class AWS2S3VectorsProducer extends DefaultProducer { // Get query vector from header or body Object queryVectorObj = message.getHeader(AWS2S3VectorsConstants.QUERY_VECTOR); - if (queryVectorObj == null) { + if (ObjectHelper.isEmpty(queryVectorObj)) { queryVectorObj = message.getBody(); } @@ -193,7 +193,7 @@ public class AWS2S3VectorsProducer extends DefaultProducer { // Get query parameters Integer topK = message.getHeader(AWS2S3VectorsConstants.TOP_K, Integer.class); - if (topK == null) { + if (ObjectHelper.isEmpty(topK)) { topK = getConfiguration().getTopK(); } @@ -220,7 +220,7 @@ public class AWS2S3VectorsProducer extends DefaultProducer { // Get vector IDs from header or body Object vectorIdsObj = message.getHeader(AWS2S3VectorsConstants.VECTOR_ID); - if (vectorIdsObj == null) { + if (ObjectHelper.isEmpty(vectorIdsObj)) { vectorIdsObj = message.getBody(); } @@ -247,7 +247,7 @@ public class AWS2S3VectorsProducer extends DefaultProducer { // Get vector IDs from header or body Object vectorIdsObj = message.getHeader(AWS2S3VectorsConstants.VECTOR_ID); - if (vectorIdsObj == null) { + if (ObjectHelper.isEmpty(vectorIdsObj)) { vectorIdsObj = message.getBody(); } @@ -333,17 +333,17 @@ public class AWS2S3VectorsProducer extends DefaultProducer { String vectorIndexName = determineVectorIndexName(exchange); Integer dimensions = message.getHeader(AWS2S3VectorsConstants.VECTOR_DIMENSIONS, Integer.class); - if (dimensions == null) { + if (ObjectHelper.isEmpty(dimensions)) { dimensions = getConfiguration().getVectorDimensions(); } String dataType = message.getHeader(AWS2S3VectorsConstants.DATA_TYPE, String.class); - if (dataType == null) { + if (ObjectHelper.isEmpty(dataType)) { dataType = getConfiguration().getDataType(); } String distanceMetric = message.getHeader(AWS2S3VectorsConstants.DISTANCE_METRIC, String.class); - if (distanceMetric == null) { + if (ObjectHelper.isEmpty(distanceMetric)) { distanceMetric = getConfiguration().getDistanceMetric(); } @@ -417,10 +417,10 @@ public class AWS2S3VectorsProducer extends DefaultProducer { private String determineVectorBucketName(Exchange exchange) { String vectorBucketName = exchange.getIn().getHeader(AWS2S3VectorsConstants.VECTOR_BUCKET_NAME, String.class); - if (vectorBucketName == null) { + if (ObjectHelper.isEmpty(vectorBucketName)) { vectorBucketName = getConfiguration().getVectorBucketName(); } - if (vectorBucketName == null) { + if (ObjectHelper.isEmpty(vectorBucketName)) { throw new IllegalArgumentException("Vector bucket name must be specified"); } return vectorBucketName; @@ -428,10 +428,10 @@ public class AWS2S3VectorsProducer extends DefaultProducer { private String determineVectorIndexName(Exchange exchange) { String vectorIndexName = exchange.getIn().getHeader(AWS2S3VectorsConstants.VECTOR_INDEX_NAME, String.class); - if (vectorIndexName == null) { + if (ObjectHelper.isEmpty(vectorIndexName)) { vectorIndexName = getConfiguration().getVectorIndexName(); } - if (vectorIndexName == null) { + if (ObjectHelper.isEmpty(vectorIndexName)) { throw new IllegalArgumentException("Vector index name must be specified"); } return vectorIndexName; @@ -439,7 +439,7 @@ public class AWS2S3VectorsProducer extends DefaultProducer { @SuppressWarnings("unchecked") private List<Float> convertToFloatList(Object obj) { - if (obj == null) { + if (ObjectHelper.isEmpty(obj)) { throw new IllegalArgumentException("Vector data cannot be null"); } @@ -474,7 +474,7 @@ public class AWS2S3VectorsProducer extends DefaultProducer { @SuppressWarnings("unchecked") private List<String> convertToStringList(Object obj) { - if (obj == null) { + if (ObjectHelper.isEmpty(obj)) { throw new IllegalArgumentException("Vector IDs cannot be null"); }
