This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch when2
in repository https://gitbox.apache.org/repos/asf/camel.git
from 70c5e0dec30 CAMEL-21620: camel-core - Choice EIP fix to make
when/otherwise as exclusive for this EIP and not generic EIPs
add 5b386874683 CAMEL-21620: camel-core - Choice EIP fix to make
when/otherwise as exclusive for this EIP and not generic EIPs
add 3ee3b7b3984 CAMEL-21620: camel-core - Choice EIP fix to make
when/otherwise as exclusive for this EIP and not generic EIPs
add 92b172c1d16 CAMEL-21620: camel-core - Choice EIP fix to make
when/otherwise as exclusive for this EIP and not generic EIPs
No new revisions were added by this update.
Summary of changes:
.../org/apache/camel/catalog/models/aggregate.json | 2 +-
.../camel/catalog/models/circuitBreaker.json | 2 +-
.../org/apache/camel/catalog/models/doCatch.json | 2 +-
.../org/apache/camel/catalog/models/doFinally.json | 2 +-
.../org/apache/camel/catalog/models/doTry.json | 2 +-
.../org/apache/camel/catalog/models/filter.json | 2 +-
.../camel/catalog/models/idempotentConsumer.json | 2 +-
.../org/apache/camel/catalog/models/intercept.json | 2 +-
.../apache/camel/catalog/models/interceptFrom.json | 2 +-
.../catalog/models/interceptSendToEndpoint.json | 2 +-
.../org/apache/camel/catalog/models/kamelet.json | 2 +-
.../apache/camel/catalog/models/loadBalance.json | 2 +-
.../org/apache/camel/catalog/models/loop.json | 2 +-
.../org/apache/camel/catalog/models/multicast.json | 2 +-
.../apache/camel/catalog/models/onCompletion.json | 2 +-
.../apache/camel/catalog/models/onException.json | 2 +-
.../apache/camel/catalog/models/onFallback.json | 2 +-
.../org/apache/camel/catalog/models/otherwise.json | 2 +-
.../org/apache/camel/catalog/models/pipeline.json | 2 +-
.../apache/camel/catalog/models/resequence.json | 2 +-
.../org/apache/camel/catalog/models/route.json | 2 +-
.../org/apache/camel/catalog/models/saga.json | 2 +-
.../org/apache/camel/catalog/models/split.json | 2 +-
.../org/apache/camel/catalog/models/step.json | 2 +-
.../org/apache/camel/catalog/models/when.json | 6 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 40 ++++-------
.../transformer/SpringTransformerRouteTest.xml | 8 +--
.../SpringInterceptFromWhenNoStopTest.xml | 6 +-
.../processor/SpringInterceptFromWhenTest.xml | 8 +--
.../SpringInterceptFromWhenWithChoiceTest.xml | 24 +++----
.../META-INF/org/apache/camel/model/aggregate.json | 2 +-
.../org/apache/camel/model/circuitBreaker.json | 2 +-
.../META-INF/org/apache/camel/model/doCatch.json | 2 +-
.../META-INF/org/apache/camel/model/doFinally.json | 2 +-
.../META-INF/org/apache/camel/model/doTry.json | 2 +-
.../META-INF/org/apache/camel/model/filter.json | 2 +-
.../org/apache/camel/model/idempotentConsumer.json | 2 +-
.../META-INF/org/apache/camel/model/intercept.json | 2 +-
.../org/apache/camel/model/interceptFrom.json | 2 +-
.../camel/model/interceptSendToEndpoint.json | 2 +-
.../META-INF/org/apache/camel/model/kamelet.json | 2 +-
.../org/apache/camel/model/loadBalance.json | 2 +-
.../META-INF/org/apache/camel/model/loop.json | 2 +-
.../META-INF/org/apache/camel/model/multicast.json | 2 +-
.../org/apache/camel/model/onCompletion.json | 2 +-
.../org/apache/camel/model/onException.json | 2 +-
.../org/apache/camel/model/onFallback.json | 2 +-
.../META-INF/org/apache/camel/model/otherwise.json | 2 +-
.../META-INF/org/apache/camel/model/pipeline.json | 2 +-
.../org/apache/camel/model/resequence.json | 2 +-
.../META-INF/org/apache/camel/model/route.json | 2 +-
.../META-INF/org/apache/camel/model/saga.json | 2 +-
.../META-INF/org/apache/camel/model/split.json | 2 +-
.../META-INF/org/apache/camel/model/step.json | 2 +-
.../META-INF/org/apache/camel/model/when.json | 6 +-
.../org/apache/camel/builder/AdviceWithTasks.java | 10 ++-
...xpressionNode.java => BasicExpressionNode.java} | 48 +++----------
...ionNode.java => BasicOutputExpressionNode.java} | 26 ++++---
.../org/apache/camel/model/ChoiceDefinition.java | 26 ++++---
.../apache/camel/model/OtherwiseDefinition.java | 2 +-
.../apache/camel/model/ProcessorDefinition.java | 8 +--
.../org/apache/camel/model/WhenDefinition.java | 81 ++++++++++++++--------
.../org/apache/camel/reifier/ChoiceReifier.java | 43 +++---------
.../org/apache/camel/reifier/ProcessorReifier.java | 3 -
.../java/org/apache/camel/reifier/WhenReifier.java | 34 ---------
.../org/apache/camel/impl/CustomIdFactoryTest.java | 4 +-
.../camel/model/ProcessorDefinitionHelperTest.java | 2 -
.../ParentChildInterceptStrategyTest.java | 6 +-
.../management/BacklogTracerIdOnAllNodesTest.java | 2 +-
.../java/org/apache/camel/xml/in/ModelParser.java | 26 ++++++-
.../java/org/apache/camel/xml/out/ModelWriter.java | 25 ++++++-
.../org/apache/camel/yaml/out/ModelWriter.java | 25 ++++++-
.../dsl/yaml/deserializers/ModelDeserializers.java | 8 +--
.../generated/resources/schema/camelYamlDsl.json | 5 +-
74 files changed, 279 insertions(+), 299 deletions(-)
copy
core/camel-core-model/src/main/java/org/apache/camel/model/{ExpressionNode.java
=> BasicExpressionNode.java} (76%)
copy
core/camel-core-model/src/main/java/org/apache/camel/model/{OutputExpressionNode.java
=> BasicOutputExpressionNode.java} (69%)
delete mode 100644
core/camel-core-reifier/src/main/java/org/apache/camel/reifier/WhenReifier.java
