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 3d582ef945e5b17630aeb79992840e866d0814ad Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Jan 28 11:59:29 2026 +0100 Camel-AWS components: Use ObjectHelper for null checks - STS Signed-off-by: Andrea Cosentino <[email protected]> --- .../org/apache/camel/component/aws2/sts/STS2Component.java | 3 ++- .../org/apache/camel/component/aws2/sts/STS2Endpoint.java | 4 ++-- .../org/apache/camel/component/aws2/sts/STS2Producer.java | 12 ++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) 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 91d098384fb0..208bffa00c7d 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 @@ -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.DefaultComponent; +import org.apache.camel.util.ObjectHelper; /** * For working with Amazon STS SDK v2. @@ -42,7 +43,7 @@ public class STS2Component extends DefaultComponent { @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { - STS2Configuration configurationClone = this.configuration != null ? 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-sts/src/main/java/org/apache/camel/component/aws2/sts/STS2Endpoint.java b/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/STS2Endpoint.java index 525faf79c2c1..612f5258ef54 100644 --- a/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/STS2Endpoint.java +++ b/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/STS2Endpoint.java @@ -63,7 +63,7 @@ public class STS2Endpoint extends DefaultEndpoint implements EndpointServiceLoca public void doStart() throws Exception { super.doStart(); - stsClient = configuration.getStsClient() != null + stsClient = ObjectHelper.isNotEmpty(configuration.getStsClient()) ? configuration.getStsClient() : STS2ClientFactory.getStsClient(configuration); } @@ -71,7 +71,7 @@ public class STS2Endpoint extends DefaultEndpoint implements EndpointServiceLoca @Override public void doStop() throws Exception { if (ObjectHelper.isEmpty(configuration.getStsClient())) { - if (stsClient != null) { + if (ObjectHelper.isNotEmpty(stsClient)) { stsClient.close(); } } diff --git a/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/STS2Producer.java b/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/STS2Producer.java index efc06025b94e..8b2c040e5d6e 100644 --- a/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/STS2Producer.java +++ b/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/STS2Producer.java @@ -67,7 +67,7 @@ public class STS2Producer extends DefaultProducer { private STS2Operations determineOperation(Exchange exchange) { STS2Operations operation = exchange.getIn().getHeader(STS2Constants.OPERATION, STS2Operations.class); - if (operation == null) { + if (ObjectHelper.isEmpty(operation)) { operation = getConfiguration().getOperation(); } return operation; @@ -79,7 +79,7 @@ public class STS2Producer extends DefaultProducer { @Override public String toString() { - if (stsProducerToString == null) { + if (ObjectHelper.isEmpty(stsProducerToString)) { stsProducerToString = "STSProducer[" + URISupport.sanitizeUri(getEndpoint().getEndpointUri()) + "]"; } return stsProducerToString; @@ -133,13 +133,13 @@ public class STS2Producer extends DefaultProducer { } Message message = getMessageForResponse(exchange); message.setBody(result); - if (result.credentials() != null) { + if (ObjectHelper.isNotEmpty(result.credentials())) { message.setHeader(STS2Constants.ACCESS_KEY_ID, result.credentials().accessKeyId()); message.setHeader(STS2Constants.SECRET_KEY_ID, result.credentials().secretAccessKey()); message.setHeader(STS2Constants.SESSION_TOKEN, result.credentials().sessionToken()); message.setHeader(STS2Constants.EXPIRATION, result.credentials().expiration()); } - if (result.assumedRoleUser() != null) { + if (ObjectHelper.isNotEmpty(result.assumedRoleUser())) { message.setHeader(STS2Constants.ASSUMED_ROLE_ARN, result.assumedRoleUser().arn()); } } @@ -171,7 +171,7 @@ public class STS2Producer extends DefaultProducer { } Message message = getMessageForResponse(exchange); message.setBody(result); - if (result.credentials() != null) { + if (ObjectHelper.isNotEmpty(result.credentials())) { message.setHeader(STS2Constants.ACCESS_KEY_ID, result.credentials().accessKeyId()); message.setHeader(STS2Constants.SECRET_KEY_ID, result.credentials().secretAccessKey()); message.setHeader(STS2Constants.SESSION_TOKEN, result.credentials().sessionToken()); @@ -212,7 +212,7 @@ public class STS2Producer extends DefaultProducer { } Message message = getMessageForResponse(exchange); message.setBody(result); - if (result.credentials() != null) { + if (ObjectHelper.isNotEmpty(result.credentials())) { message.setHeader(STS2Constants.ACCESS_KEY_ID, result.credentials().accessKeyId()); message.setHeader(STS2Constants.SECRET_KEY_ID, result.credentials().secretAccessKey()); message.setHeader(STS2Constants.SESSION_TOKEN, result.credentials().sessionToken());
