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 12:07:36 UTC
(camel) 26/34: Camel-AWS components: Use ObjectHelper for null checks - Rekognition
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch objectHelper
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2c198c374f709862cb6bc6a662b7dc77ae3354ce
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jan 28 12:42:07 2026 +0100
Camel-AWS components: Use ObjectHelper for null checks - Rekognition
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../camel/component/aws2/rekognition/Rekognition2Component.java | 3 ++-
.../camel/component/aws2/rekognition/Rekognition2Endpoint.java | 4 ++--
.../camel/component/aws2/rekognition/Rekognition2Producer.java | 8 ++++----
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/components/camel-aws/camel-aws2-rekognition/src/main/java/org/apache/camel/component/aws2/rekognition/Rekognition2Component.java b/components/camel-aws/camel-aws2-rekognition/src/main/java/org/apache/camel/component/aws2/rekognition/Rekognition2Component.java
index 3ca3720ab4a4..c5b169aa615c 100644
--- a/components/camel-aws/camel-aws2-rekognition/src/main/java/org/apache/camel/component/aws2/rekognition/Rekognition2Component.java
+++ b/components/camel-aws/camel-aws2-rekognition/src/main/java/org/apache/camel/component/aws2/rekognition/Rekognition2Component.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(value = "aws2-rekognition")
public class Rekognition2Component extends HealthCheckComponent {
@@ -41,7 +42,7 @@ public class Rekognition2Component extends HealthCheckComponent {
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
Rekognition2Configuration configuration
- = this.configuration != null ? this.configuration.copy() : new Rekognition2Configuration();
+ = ObjectHelper.isNotEmpty(this.configuration) ? this.configuration.copy() : new Rekognition2Configuration();
Rekognition2Endpoint endpoint = new Rekognition2Endpoint(uri, this, configuration);
setProperties(endpoint, parameters);
if (Boolean.FALSE.equals(configuration.isUseDefaultCredentialsProvider())
diff --git a/components/camel-aws/camel-aws2-rekognition/src/main/java/org/apache/camel/component/aws2/rekognition/Rekognition2Endpoint.java b/components/camel-aws/camel-aws2-rekognition/src/main/java/org/apache/camel/component/aws2/rekognition/Rekognition2Endpoint.java
index 88abad02ee9d..3b189225e7b1 100644
--- a/components/camel-aws/camel-aws2-rekognition/src/main/java/org/apache/camel/component/aws2/rekognition/Rekognition2Endpoint.java
+++ b/components/camel-aws/camel-aws2-rekognition/src/main/java/org/apache/camel/component/aws2/rekognition/Rekognition2Endpoint.java
@@ -62,7 +62,7 @@ public class Rekognition2Endpoint extends DefaultEndpoint implements EndpointSer
@Override
public void doStart() throws Exception {
super.doStart();
- awsRekognitionClient = configuration.getAwsRekognitionClient() != null
+ awsRekognitionClient = ObjectHelper.isNotEmpty(configuration.getAwsRekognitionClient())
? configuration.getAwsRekognitionClient()
: Rekognition2ClientFactory.getRekognitionClient(configuration);
}
@@ -71,7 +71,7 @@ public class Rekognition2Endpoint extends DefaultEndpoint implements EndpointSer
public void doStop() throws Exception {
if (ObjectHelper.isEmpty(configuration.getAwsRekognitionClient())) {
- if (awsRekognitionClient != null) {
+ if (ObjectHelper.isNotEmpty(awsRekognitionClient)) {
awsRekognitionClient.close();
}
}
diff --git a/components/camel-aws/camel-aws2-rekognition/src/main/java/org/apache/camel/component/aws2/rekognition/Rekognition2Producer.java b/components/camel-aws/camel-aws2-rekognition/src/main/java/org/apache/camel/component/aws2/rekognition/Rekognition2Producer.java
index 52a9354f7c98..eca1651e528a 100644
--- a/components/camel-aws/camel-aws2-rekognition/src/main/java/org/apache/camel/component/aws2/rekognition/Rekognition2Producer.java
+++ b/components/camel-aws/camel-aws2-rekognition/src/main/java/org/apache/camel/component/aws2/rekognition/Rekognition2Producer.java
@@ -152,7 +152,7 @@ public class Rekognition2Producer extends DefaultProducer {
private Rekognition2Operations determineOperation(Exchange exchange) {
Rekognition2Operations operation
= exchange.getIn().getHeader(Rekognition2Constants.OPERATION, Rekognition2Operations.class);
- if (operation == null) {
+ if (ObjectHelper.isEmpty(operation)) {
operation = getConfiguration().getOperation();
}
return operation;
@@ -164,7 +164,7 @@ public class Rekognition2Producer extends DefaultProducer {
@Override
public String toString() {
- if (rekognitionProducerToString == null) {
+ if (ObjectHelper.isEmpty(rekognitionProducerToString)) {
rekognitionProducerToString = "RekognitionProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]";
}
return rekognitionProducerToString;
@@ -1300,7 +1300,7 @@ public class Rekognition2Producer extends DefaultProducer {
"producers",
WritableHealthCheckRepository.class);
- if (healthCheckRepository != null) {
+ if (ObjectHelper.isNotEmpty(healthCheckRepository)) {
String id = getEndpoint().getId();
producerHealthCheck = new Rekognition2ProducerHealthCheck(getEndpoint(), id);
producerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckProducerEnabled());
@@ -1310,7 +1310,7 @@ public class Rekognition2Producer 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;
}