You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@camel.apache.org by da...@apache.org on 2025/01/17 08:25:30 UTC

(camel) branch when2 updated (77ba3dccc2c -> 70c5e0dec30)

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 77ba3dccc2c CAMEL-21620: camel-core - Choice EIP fix to make when/otherwise as exclusive for this EIP and not generic EIPs
     add 70c5e0dec30 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/otherwise.json |  3 +-
 .../apache/camel/catalog/schemas/camel-spring.xsd  | 10 ++++++
 .../META-INF/org/apache/camel/model/otherwise.json |  3 +-
 .../org/apache/camel/model/ChoiceDefinition.java   | 18 ++++++++--
 ...ssionType.java => DisabledAwareDefinition.java} | 17 ++++-----
 .../apache/camel/model/OtherwiseDefinition.java    | 17 ++++++++-
 .../apache/camel/model/ProcessorDefinition.java    |  4 ++-
 .../org/apache/camel/reifier/ChoiceReifier.java    | 12 +++++--
 .../org/apache/camel/reifier/ProcessorReifier.java | 40 ++++++++++++++--------
 .../java/org/apache/camel/xml/in/ModelParser.java  |  5 ++-
 .../java/org/apache/camel/xml/out/ModelWriter.java |  1 +
 .../org/apache/camel/yaml/out/ModelWriter.java     |  1 +
 .../dsl/yaml/deserializers/ModelDeserializers.java |  6 ++++
 .../generated/resources/schema/camelYamlDsl.json   |  5 +++
 14 files changed, 108 insertions(+), 34 deletions(-)
 copy core/camel-core-model/src/main/java/org/apache/camel/model/{HasExpressionType.java => DisabledAwareDefinition.java} (67%)