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 fba06c83e77a3f020e3e9769215dad0d08f5aed6 Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Jan 28 12:55:55 2026 +0100 Camel-AWS components: Use ObjectHelper for null checks - Xray Signed-off-by: Andrea Cosentino <[email protected]> --- .../java/org/apache/camel/component/aws/xray/XRayTracer.java | 12 ++++++------ .../aws/xray/decorators/AbstractSegmentDecorator.java | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/XRayTracer.java b/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/XRayTracer.java index 41025098e28f..eaac2a6921d0 100644 --- a/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/XRayTracer.java +++ b/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/XRayTracer.java @@ -97,7 +97,7 @@ public class XRayTracer extends ServiceSupport implements RoutePolicyFactory, St SegmentDecorator existing = decorators.get(d.getComponent()); // Add segment decorator only if no existing decorator for the component exists yet or if we have have a // derived one. This allows custom decorators to be added if they extend the standard decorators - if (existing == null || existing.getClass().isInstance(d)) { + if (ObjectHelper.isEmpty(existing) || existing.getClass().isInstance(d)) { Logger log = LoggerFactory.getLogger(XRayTracer.class); log.trace("Adding segment decorator {}", d.getComponent()); decorators.put(d.getComponent(), d); @@ -130,7 +130,7 @@ public class XRayTracer extends ServiceSupport implements RoutePolicyFactory, St camelContext.addRoutePolicyFactory(this); } - if (null == tracingStrategy) { + if (ObjectHelper.isEmpty(tracingStrategy)) { LOG.info("No tracing strategy available. Defaulting to no-op strategy"); tracingStrategy = new NoopTracingStrategy(); } @@ -229,7 +229,7 @@ public class XRayTracer extends ServiceSupport implements RoutePolicyFactory, St protected SegmentDecorator getSegmentDecorator(Endpoint endpoint) { SegmentDecorator sd = decorators.get(URI.create(endpoint.getEndpointUri()).getScheme()); - if (null == sd) { + if (ObjectHelper.isEmpty(sd)) { return SegmentDecorator.DEFAULT; } return sd; @@ -237,7 +237,7 @@ public class XRayTracer extends ServiceSupport implements RoutePolicyFactory, St protected Entity getTraceEntityFromExchange(Exchange exchange) { Entity entity = exchange.getIn().getHeader(XRAY_TRACE_ENTITY, Entity.class); - if (entity == null) { + if (ObjectHelper.isEmpty(entity)) { entity = (Entity) exchange.getProperty(CURRENT_SEGMENT); } return entity; @@ -278,7 +278,7 @@ public class XRayTracer extends ServiceSupport implements RoutePolicyFactory, St } Entity entity = getTraceEntityFromExchange(ese.getExchange()); - if (entity != null) { + if (ObjectHelper.isNotEmpty(entity)) { AWSXRay.setTraceEntity(entity); // AWS XRay does only allow a certain set of characters to appear within a name // Allowed characters: a-z, A-Z, 0-9, _, ., :, /, %, &, #, =, +, \, -, @ @@ -381,7 +381,7 @@ public class XRayTracer extends ServiceSupport implements RoutePolicyFactory, St } Entity entity = getTraceEntityFromExchange(exchange); - boolean createSegment = entity == null || !Objects.equals(entity.getName(), routeId); + boolean createSegment = ObjectHelper.isEmpty(entity) || !Objects.equals(entity.getName(), routeId); TraceID traceID; if (exchange.getIn().getHeaders().containsKey(XRAY_TRACE_ID)) { diff --git a/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/decorators/AbstractSegmentDecorator.java b/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/decorators/AbstractSegmentDecorator.java index ee53df3e20f4..26c005a4a310 100644 --- a/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/decorators/AbstractSegmentDecorator.java +++ b/components/camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray/decorators/AbstractSegmentDecorator.java @@ -25,6 +25,7 @@ import com.amazonaws.xray.entities.Entity; import org.apache.camel.Endpoint; import org.apache.camel.Exchange; import org.apache.camel.component.aws.xray.SegmentDecorator; +import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.URISupport; /** @@ -53,7 +54,7 @@ public abstract class AbstractSegmentDecorator implements SegmentDecorator { public void post(Entity segment, Exchange exchange, Endpoint endpoint) { if (exchange.isFailed()) { segment.setFault(true); - if (exchange.getException() != null) { + if (ObjectHelper.isNotEmpty(exchange.getException())) { segment.addException(exchange.getException()); } }
