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 40ac75a0378706b1e42ecd87065de1592d420e7c Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Jan 28 11:28:09 2026 +0100 Camel-AWS components: Use ObjectHelper for null checks - MSK Signed-off-by: Andrea Cosentino <[email protected]> --- .../apache/camel/component/aws2/msk/MSK2Component.java | 3 ++- .../apache/camel/component/aws2/msk/MSK2Endpoint.java | 4 ++-- .../apache/camel/component/aws2/msk/MSK2Producer.java | 16 ++++++++-------- 3 files changed, 12 insertions(+), 11 deletions(-) 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 63d2a5c383d6..f6acbadc7409 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 @@ -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; /** * For working with Amazon MSK SDK v2. @@ -43,7 +44,7 @@ public class MSK2Component extends HealthCheckComponent { @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { - MSK2Configuration configuration = this.configuration != null ? 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-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2Endpoint.java b/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2Endpoint.java index d4c34d4c2eba..2eaff93e3b84 100644 --- a/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2Endpoint.java +++ b/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2Endpoint.java @@ -66,7 +66,7 @@ public class MSK2Endpoint extends ScheduledPollEndpoint implements EndpointServi public void doStart() throws Exception { super.doStart(); - mskClient = configuration.getMskClient() != null + mskClient = ObjectHelper.isNotEmpty(configuration.getMskClient()) ? configuration.getMskClient() : MSK2ClientFactory.getKafkaClient(configuration); } @@ -74,7 +74,7 @@ public class MSK2Endpoint extends ScheduledPollEndpoint implements EndpointServi @Override public void doStop() throws Exception { if (ObjectHelper.isEmpty(configuration.getMskClient())) { - if (mskClient != null) { + if (ObjectHelper.isNotEmpty(mskClient)) { mskClient.close(); } } diff --git a/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2Producer.java b/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2Producer.java index 40f2d6ef72bd..73aec28dc6ee 100644 --- a/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2Producer.java +++ b/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2Producer.java @@ -114,20 +114,20 @@ public class MSK2Producer extends DefaultProducer { Message message = getMessageForResponse(exchange); message.setBody(result); message.setHeader(MSK2Constants.NEXT_TOKEN, result.nextToken()); - message.setHeader(MSK2Constants.IS_TRUNCATED, result.nextToken() != null); + message.setHeader(MSK2Constants.IS_TRUNCATED, ObjectHelper.isNotEmpty(result.nextToken())); } } else { ListClustersRequest.Builder builder = ListClustersRequest.builder(); String filter = getOptionalHeader(exchange, MSK2Constants.CLUSTERS_FILTER, String.class); - if (filter != null) { + if (ObjectHelper.isNotEmpty(filter)) { builder.clusterNameFilter(filter); } String nextToken = getOptionalHeader(exchange, MSK2Constants.NEXT_TOKEN, String.class); - if (nextToken != null) { + if (ObjectHelper.isNotEmpty(nextToken)) { builder.nextToken(nextToken); } Integer maxResults = getOptionalHeader(exchange, MSK2Constants.MAX_RESULTS, Integer.class); - if (maxResults != null) { + if (ObjectHelper.isNotEmpty(maxResults)) { builder.maxResults(maxResults); } ListClustersResponse result; @@ -140,7 +140,7 @@ public class MSK2Producer extends DefaultProducer { Message message = getMessageForResponse(exchange); message.setBody(result); message.setHeader(MSK2Constants.NEXT_TOKEN, result.nextToken()); - message.setHeader(MSK2Constants.IS_TRUNCATED, result.nextToken() != null); + message.setHeader(MSK2Constants.IS_TRUNCATED, ObjectHelper.isNotEmpty(result.nextToken())); } } @@ -264,7 +264,7 @@ public class MSK2Producer extends DefaultProducer { } Message message = getMessageForResponse(exchange); message.setBody(result); - if (result.clusterInfo() != null) { + if (ObjectHelper.isNotEmpty(result.clusterInfo())) { message.setHeader(MSK2Constants.CLUSTER_ARN, result.clusterInfo().clusterArn()); message.setHeader(MSK2Constants.CLUSTER_STATE, result.clusterInfo().stateAsString()); } @@ -290,7 +290,7 @@ public class MSK2Producer extends DefaultProducer { "producers", WritableHealthCheckRepository.class); - if (healthCheckRepository != null) { + if (ObjectHelper.isNotEmpty(healthCheckRepository)) { String id = getEndpoint().getId(); producerHealthCheck = new MSK2ProducerHealthCheck(getEndpoint(), id); producerHealthCheck.setEnabled(getEndpoint().getComponent().isHealthCheckProducerEnabled()); @@ -300,7 +300,7 @@ public class MSK2Producer 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; }
