This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch when in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9abf1127537776a40589b7f038a26bdfd7f034c6 Author: Claus Ibsen <[email protected]> AuthorDate: Wed Jan 15 14:30:32 2025 +0100 CAMEL-21620: camel-core - Fix onWhen to not include outputs in model --- .../main/java/org/apache/camel/model/InterceptDefinition.java | 10 ---------- .../java/org/apache/camel/reifier/InterceptFromReifier.java | 4 ++-- .../main/java/org/apache/camel/reifier/InterceptReifier.java | 7 ++----- .../main/java/org/apache/camel/reifier/ProcessorReifier.java | 2 +- 4 files changed, 5 insertions(+), 18 deletions(-) diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/InterceptDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/InterceptDefinition.java index 147192b53da..023300259da 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/InterceptDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/InterceptDefinition.java @@ -16,7 +16,6 @@ */ package org.apache.camel.model; -import java.util.ArrayList; import java.util.List; import jakarta.xml.bind.annotation.XmlAccessType; @@ -24,10 +23,8 @@ import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlElementRef; import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlTransient; import org.apache.camel.Predicate; -import org.apache.camel.Processor; import org.apache.camel.spi.AsPredicate; import org.apache.camel.spi.Metadata; @@ -39,8 +36,6 @@ import org.apache.camel.spi.Metadata; @XmlAccessorType(XmlAccessType.FIELD) public class InterceptDefinition extends OutputDefinition<InterceptDefinition> { - @XmlTransient - protected List<Processor> intercepted = new ArrayList<>(); @XmlElement @AsPredicate private OnWhenDefinition onWhen; @@ -50,7 +45,6 @@ public class InterceptDefinition extends OutputDefinition<InterceptDefinition> { protected InterceptDefinition(InterceptDefinition source) { super(source); - this.intercepted = new ArrayList<>(source.intercepted); this.onWhen = source.onWhen != null ? source.onWhen.copyDefinition() : null; } @@ -126,8 +120,4 @@ public class InterceptDefinition extends OutputDefinition<InterceptDefinition> { return this; } - public List<Processor> getIntercepted() { - return intercepted; - } - } diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java index 5ed803f7de9..c4fe62d0e8e 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java @@ -25,10 +25,10 @@ import org.apache.camel.model.ProcessorDefinition; import org.apache.camel.processor.FilterProcessor; import org.apache.camel.processor.Pipeline; -public class InterceptFromReifier extends InterceptReifier<InterceptFromDefinition> { +public class InterceptFromReifier extends ProcessorReifier<InterceptFromDefinition> { public InterceptFromReifier(Route route, ProcessorDefinition<?> definition) { - super(route, definition); + super(route, (InterceptFromDefinition) definition); } @Override diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptReifier.java index b8444e5b4da..9da0235a4fb 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptReifier.java @@ -28,10 +28,10 @@ import org.apache.camel.processor.FilterProcessor; import org.apache.camel.processor.Pipeline; import org.apache.camel.spi.InterceptStrategy; -public class InterceptReifier<T extends InterceptDefinition> extends ProcessorReifier<T> { +public class InterceptReifier extends ProcessorReifier<InterceptDefinition> { public InterceptReifier(Route route, ProcessorDefinition<?> definition) { - super(route, (T) definition); + super(route, (InterceptDefinition) definition); } @Override @@ -60,9 +60,6 @@ public class InterceptReifier<T extends InterceptDefinition> extends ProcessorRe // store the target we are intercepting this.interceptedTarget = target; - // remember the target that was intercepted // TODO: Remove me - InterceptReifier.this.definition.getIntercepted().add(interceptedTarget); - if (interceptedTarget != null) { // wrap in a pipeline so we continue routing to the next return Pipeline.newInstance(context, output, interceptedTarget); diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java index f362674b532..1eb9bfd8a30 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/ProcessorReifier.java @@ -257,7 +257,7 @@ public abstract class ProcessorReifier<T extends ProcessorDefinition<?>> extends } else if (definition instanceof InterceptFromDefinition) { return new InterceptFromReifier(route, definition); } else if (definition instanceof InterceptDefinition) { - return new InterceptReifier<>(route, definition); + return new InterceptReifier(route, definition); } else if (definition instanceof InterceptSendToEndpointDefinition) { return new InterceptSendToEndpointReifier(route, definition); } else if (definition instanceof KameletDefinition) {
