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 5f9fa6c123ee00bc3abddf9d58e331a02fcb9c60 Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Jan 28 13:06:32 2026 +0100 Camel-AWS components: Use ObjectHelper for null checks - Cleanup Signed-off-by: Andrea Cosentino <[email protected]> --- catalog/camel-allcomponents/pom.xml | 2 -- .../aws2/bedrock/agentruntime/BedrockAgentRuntimeComponent.java | 3 ++- .../main/java/org/apache/camel/component/aws2/cw/Cw2Component.java | 3 ++- .../java/org/apache/camel/component/aws2/ddb/Ddb2Component.java | 3 ++- .../component/aws2/ddb/transform/Ddb2JsonDataTypeTransformer.java | 3 ++- .../java/org/apache/camel/component/aws2/ecs/ECS2Component.java | 3 ++- .../java/org/apache/camel/component/aws2/eks/EKS2Component.java | 3 ++- .../java/org/apache/camel/component/aws2/iam/IAM2Component.java | 3 ++- .../java/org/apache/camel/component/aws2/kms/KMS2Component.java | 3 ++- .../org/apache/camel/component/aws2/lambda/Lambda2Producer.java | 6 ++++-- .../main/java/org/apache/camel/component/aws2/mq/MQ2Component.java | 3 ++- .../java/org/apache/camel/component/aws2/msk/MSK2Component.java | 3 ++- .../java/org/apache/camel/component/aws2/ses/Ses2Component.java | 3 ++- .../java/org/apache/camel/component/aws2/sns/Sns2Component.java | 3 ++- .../java/org/apache/camel/component/aws2/sqs/Sqs2Component.java | 3 ++- .../main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java | 3 ++- .../java/org/apache/camel/component/aws2/sts/STS2Component.java | 3 ++- .../camel/component/aws2/transcribe/Transcribe2Component.java | 3 ++- 18 files changed, 36 insertions(+), 20 deletions(-) diff --git a/catalog/camel-allcomponents/pom.xml b/catalog/camel-allcomponents/pom.xml index 3becdd4fdf14..a79b4ce49b42 100644 --- a/catalog/camel-allcomponents/pom.xml +++ b/catalog/camel-allcomponents/pom.xml @@ -51,7 +51,6 @@ </repositories> <dependencies> - <!-- CODEGEN DEPENDENCIES START --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-activemq</artifactId> @@ -2277,7 +2276,6 @@ <artifactId>camel-zookeeper-master</artifactId> <version>${project.version}</version> </dependency> - <!-- CODEGEN DEPENDENCIES END --> </dependencies> </project> diff --git a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/agentruntime/BedrockAgentRuntimeComponent.java b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/agentruntime/BedrockAgentRuntimeComponent.java index d596b3e79da8..97d41c621c66 100644 --- a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/agentruntime/BedrockAgentRuntimeComponent.java +++ b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/agentruntime/BedrockAgentRuntimeComponent.java @@ -45,7 +45,8 @@ public class BedrockAgentRuntimeComponent extends HealthCheckComponent { @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { BedrockAgentRuntimeConfiguration configuration - = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new BedrockAgentRuntimeConfiguration(); + = ObjectHelper.isNotEmpty(this.configuration) + ? this.configuration.copy() : new BedrockAgentRuntimeConfiguration(); BedrockAgentRuntimeEndpoint endpoint = new BedrockAgentRuntimeEndpoint(uri, this, configuration); setProperties(endpoint, parameters); if (Boolean.FALSE.equals(configuration.isUseDefaultCredentialsProvider()) diff --git a/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Component.java b/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Component.java index eb63e32b5faf..e2541d0b9574 100644 --- a/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Component.java +++ b/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Component.java @@ -48,7 +48,8 @@ public class Cw2Component extends HealthCheckComponent { throw new IllegalArgumentException("Metric namespace must be specified."); } - Cw2Configuration configuration = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new Cw2Configuration(); + Cw2Configuration configuration + = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new Cw2Configuration(); configuration.setNamespace(remaining); Cw2Endpoint endpoint = new Cw2Endpoint(uri, this, configuration); diff --git a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2Component.java b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2Component.java index a4905953b702..85c94f90e172 100644 --- a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2Component.java +++ b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2Component.java @@ -45,7 +45,8 @@ public class Ddb2Component extends HealthCheckComponent { if (remaining == null || remaining.isBlank()) { throw new IllegalArgumentException("Table name must be specified."); } - Ddb2Configuration configuration = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new Ddb2Configuration(); + Ddb2Configuration configuration + = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new Ddb2Configuration(); configuration.setTableName(remaining); Ddb2Endpoint endpoint = new Ddb2Endpoint(uri, this, configuration); setProperties(endpoint, parameters); diff --git a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/transform/Ddb2JsonDataTypeTransformer.java b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/transform/Ddb2JsonDataTypeTransformer.java index edfb6f08250b..5cb3bdbf4ddf 100644 --- a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/transform/Ddb2JsonDataTypeTransformer.java +++ b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/transform/Ddb2JsonDataTypeTransformer.java @@ -96,7 +96,8 @@ public class Ddb2JsonDataTypeTransformer extends Transformer { String operation = Optional.ofNullable(jsonBody.get("operation")).map(JsonNode::asText).orElse(Ddb2Operations.PutItem.name()); - if (message.getExchange().hasProperties() && ObjectHelper.isNotEmpty(message.getExchange().getProperty("operation", String.class))) { + if (message.getExchange().hasProperties() + && ObjectHelper.isNotEmpty(message.getExchange().getProperty("operation", String.class))) { operation = message.getExchange().getProperty("operation", String.class); } diff --git a/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Component.java b/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Component.java index 6bbebe8e6a79..c94901e372f7 100644 --- a/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Component.java +++ b/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2Component.java @@ -44,7 +44,8 @@ public class ECS2Component extends HealthCheckComponent { @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { - ECS2Configuration configuration = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new ECS2Configuration(); + ECS2Configuration configuration + = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new ECS2Configuration(); ECS2Endpoint endpoint = new ECS2Endpoint(uri, this, configuration); setProperties(endpoint, parameters); if (Boolean.FALSE.equals(configuration.isUseDefaultCredentialsProvider()) diff --git a/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2Component.java b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2Component.java index 2fcf4d3412cc..b979afd543ec 100644 --- a/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2Component.java +++ b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2Component.java @@ -44,7 +44,8 @@ public class EKS2Component extends HealthCheckComponent { @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { - EKS2Configuration configuration = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new EKS2Configuration(); + EKS2Configuration configuration + = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new EKS2Configuration(); EKS2Endpoint endpoint = new EKS2Endpoint(uri, this, configuration); setProperties(endpoint, parameters); if (Boolean.FALSE.equals(configuration.isUseDefaultCredentialsProvider()) diff --git a/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2Component.java b/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2Component.java index a20b6882da73..bf53f246496e 100644 --- a/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2Component.java +++ b/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2Component.java @@ -44,7 +44,8 @@ public class IAM2Component extends HealthCheckComponent { @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { - IAM2Configuration configuration = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new IAM2Configuration(); + IAM2Configuration configuration + = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new IAM2Configuration(); IAM2Endpoint endpoint = new IAM2Endpoint(uri, this, configuration); setProperties(endpoint, parameters); if (Boolean.FALSE.equals(configuration.isUseDefaultCredentialsProvider()) 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 9add306e075d..9e5603b289bf 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 @@ -43,7 +43,8 @@ public class KMS2Component extends DefaultComponent { @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { - KMS2Configuration configuration = ObjectHelper.isNotEmpty(this.configuration) ? 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-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java index 8eabd89150ad..1b7828d76612 100644 --- a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java +++ b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Producer.java @@ -1003,8 +1003,10 @@ public class Lambda2Producer extends DefaultProducer { List<String> exposeHeaders = getOptionalHeader(exchange, Lambda2Constants.FUNCTION_URL_CORS_EXPOSE_HEADERS, List.class); Integer maxAge = getOptionalHeader(exchange, Lambda2Constants.FUNCTION_URL_CORS_MAX_AGE, Integer.class); - if (ObjectHelper.isNotEmpty(allowCredentials) || ObjectHelper.isNotEmpty(allowOrigins) || ObjectHelper.isNotEmpty(allowMethods) - || ObjectHelper.isNotEmpty(allowHeaders) || ObjectHelper.isNotEmpty(exposeHeaders) || ObjectHelper.isNotEmpty(maxAge)) { + if (ObjectHelper.isNotEmpty(allowCredentials) || ObjectHelper.isNotEmpty(allowOrigins) + || ObjectHelper.isNotEmpty(allowMethods) + || ObjectHelper.isNotEmpty(allowHeaders) || ObjectHelper.isNotEmpty(exposeHeaders) + || ObjectHelper.isNotEmpty(maxAge)) { Cors.Builder corsBuilder = Cors.builder(); if (ObjectHelper.isNotEmpty(allowCredentials)) { corsBuilder.allowCredentials(allowCredentials); diff --git a/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Component.java b/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Component.java index 73193644fcf2..9e6e28788012 100644 --- a/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Component.java +++ b/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Component.java @@ -44,7 +44,8 @@ public class MQ2Component extends HealthCheckComponent { @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { - MQ2Configuration configuration = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new MQ2Configuration(); + MQ2Configuration configuration + = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new MQ2Configuration(); MQ2Endpoint endpoint = new MQ2Endpoint(uri, this, configuration); setProperties(endpoint, parameters); if (Boolean.FALSE.equals(configuration.isUseDefaultCredentialsProvider()) diff --git a/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2Component.java b/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2Component.java index f6acbadc7409..a60df7adc8e2 100644 --- a/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2Component.java +++ b/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2Component.java @@ -44,7 +44,8 @@ public class MSK2Component extends HealthCheckComponent { @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { - MSK2Configuration configuration = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new MSK2Configuration(); + MSK2Configuration configuration + = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new MSK2Configuration(); MSK2Endpoint endpoint = new MSK2Endpoint(uri, this, configuration); setProperties(endpoint, parameters); if (Boolean.FALSE.equals(configuration.isUseDefaultCredentialsProvider()) diff --git a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Component.java b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Component.java index 63970289e984..18f3d605f514 100644 --- a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Component.java +++ b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Component.java @@ -48,7 +48,8 @@ public class Ses2Component extends HealthCheckComponent { if (remaining == null || remaining.isBlank()) { throw new IllegalArgumentException("From must be specified."); } - Ses2Configuration configuration = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new Ses2Configuration(); + Ses2Configuration configuration + = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new Ses2Configuration(); configuration.setFrom(remaining); Ses2Endpoint endpoint = new Ses2Endpoint(uri, this, configuration); setProperties(endpoint, parameters); diff --git a/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Component.java b/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Component.java index c14a91785fb7..c432a615dc8a 100644 --- a/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Component.java +++ b/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2Component.java @@ -59,7 +59,8 @@ public class Sns2Component extends HealthCheckComponent { Map<String, Object> nonTransientParameters = getNonTransientParameters(parameters); - Sns2Configuration epConfiguration = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new Sns2Configuration(); + Sns2Configuration epConfiguration + = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new Sns2Configuration(); if (remaining.startsWith("arn:")) { parseRemaining(epConfiguration, remaining); diff --git a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java index 7b716fd7238d..d4bb634052a4 100644 --- a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java +++ b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java @@ -48,7 +48,8 @@ public class Sqs2Component extends HealthCheckComponent { if (remaining == null || remaining.isBlank()) { throw new IllegalArgumentException("Queue name must be specified."); } - Sqs2Configuration configuration = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new Sqs2Configuration(); + Sqs2Configuration configuration + = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new Sqs2Configuration(); if (remaining.startsWith("arn:")) { String[] parts = remaining.split(":"); if (parts.length != 6 || !parts[2].equals("sqs")) { diff --git a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java index b5b2e08d61f7..df1d916507c1 100644 --- a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java +++ b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java @@ -163,7 +163,8 @@ public class Sqs2Endpoint extends ScheduledPollEndpoint implements HeaderFilterS // built manually. // This allows accessing queues where you don't have permission to // list queues or query queues - if (ObjectHelper.isNotEmpty(configuration.getRegion()) && ObjectHelper.isNotEmpty(configuration.getQueueOwnerAWSAccountId())) { + if (ObjectHelper.isNotEmpty(configuration.getRegion()) + && ObjectHelper.isNotEmpty(configuration.getQueueOwnerAWSAccountId())) { queueUrl = getAwsEndpointUri() + "/" + configuration.getQueueOwnerAWSAccountId() + "/" + configuration.getQueueName(); queueUrlInitialized = true; diff --git a/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/STS2Component.java b/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/STS2Component.java index 208bffa00c7d..65e0341b5638 100644 --- a/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/STS2Component.java +++ b/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/STS2Component.java @@ -43,7 +43,8 @@ public class STS2Component extends DefaultComponent { @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { - STS2Configuration configurationClone = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new STS2Configuration(); + STS2Configuration configurationClone + = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new STS2Configuration(); STS2Endpoint endpoint = new STS2Endpoint(uri, this, configurationClone); setProperties(endpoint, parameters); if (Boolean.FALSE.equals(configurationClone.isUseDefaultCredentialsProvider()) diff --git a/components/camel-aws/camel-aws2-transcribe/src/main/java/org/apache/camel/component/aws2/transcribe/Transcribe2Component.java b/components/camel-aws/camel-aws2-transcribe/src/main/java/org/apache/camel/component/aws2/transcribe/Transcribe2Component.java index 2589a12d6f6e..126f00f0656f 100644 --- a/components/camel-aws/camel-aws2-transcribe/src/main/java/org/apache/camel/component/aws2/transcribe/Transcribe2Component.java +++ b/components/camel-aws/camel-aws2-transcribe/src/main/java/org/apache/camel/component/aws2/transcribe/Transcribe2Component.java @@ -66,7 +66,8 @@ public class Transcribe2Component extends DefaultComponent { setRegionOnEndpoint(endpoint); } if (ObjectHelper.isEmpty(endpoint.getConfiguration().getTranscribeClient()) - && (ObjectHelper.isEmpty(endpoint.getConfiguration().getAccessKey()) || ObjectHelper.isEmpty(endpoint.getConfiguration().getSecretKey()))) { + && (ObjectHelper.isEmpty(endpoint.getConfiguration().getAccessKey()) + || ObjectHelper.isEmpty(endpoint.getConfiguration().getSecretKey()))) { throw new IllegalArgumentException("Amazon transcribe client or accessKey and secretKey must be specified"); }
