This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new be3ef65 camel3 - Lets keep policy model as-is, as making them no-output would break the behaviour and implementations with wrapping child processors. be3ef65 is described below commit be3ef6590c0550c3e204067cd7099d895dbd51cb Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Tue Feb 12 08:36:17 2019 +0100 camel3 - Lets keep policy model as-is, as making them no-output would break the behaviour and implementations with wrapping child processors. --- .../src/main/java/org/apache/camel/model/PolicyDefinition.java | 3 --- .../src/main/java/org/apache/camel/model/TransactedDefinition.java | 3 --- 2 files changed, 6 deletions(-) diff --git a/core/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java index edc6e5a..a41dd15 100644 --- a/core/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java +++ b/core/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java @@ -34,9 +34,6 @@ import org.apache.camel.spi.TransactedPolicy; @XmlAccessorType(XmlAccessType.FIELD) public class PolicyDefinition extends OutputDefinition<PolicyDefinition> { - // TODO: Align this code with TransactedDefinition - // TODO: Camel 3 should be NoOutputDefinition - @XmlTransient protected Class<? extends Policy> type; @XmlAttribute(required = true) diff --git a/core/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java index a85d3c7..bf1eb0b 100644 --- a/core/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java +++ b/core/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java @@ -34,9 +34,6 @@ import org.apache.camel.spi.TransactedPolicy; @XmlAccessorType(XmlAccessType.FIELD) public class TransactedDefinition extends OutputDefinition<TransactedDefinition> { - // TODO: Align this code with PolicyDefinition - // TODO: Camel 3 should be NoOutputDefinition - // JAXB does not support changing the ref attribute from required to optional // if we extend PolicyDefinition so we must make a copy of the class @XmlTransient