Repository: camel Updated Branches: refs/heads/master cac784543 -> 90b224e86
CAMEL-7999: Camel model should include documentation and corrected default values Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/90b224e8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/90b224e8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/90b224e8 Branch: refs/heads/master Commit: 90b224e8672be3391941dad6193b341bd1721f55 Parents: cac7845 Author: Claus Ibsen <[email protected]> Authored: Wed Jan 28 10:14:27 2015 +0100 Committer: Claus Ibsen <[email protected]> Committed: Wed Jan 28 10:14:27 2015 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/camel/model/AggregateDefinition.java | 2 +- .../apache/camel/model/dataformat/UniVocityCsvDataFormat.java | 4 ++-- .../org/apache/camel/model/language/ExpressionDefinition.java | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/90b224e8/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java b/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java index 6270461..7313c12 100644 --- a/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java @@ -86,7 +86,7 @@ public class AggregateDefinition extends ProcessorDefinition<AggregateDefinition private String timeoutCheckerExecutorServiceRef; @XmlAttribute private String aggregationRepositoryRef; - @XmlAttribute + @XmlAttribute(required = true) private String strategyRef; @XmlAttribute private String strategyMethodName; http://git-wip-us.apache.org/repos/asf/camel/blob/90b224e8/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java index a549114..511f7fd 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java @@ -34,9 +34,9 @@ import org.apache.camel.spi.Metadata; public class UniVocityCsvDataFormat extends UniVocityAbstractDataFormat { @XmlAttribute protected Boolean quoteAllFields; - @XmlAttribute @Metadata(defaultValue = "''") + @XmlAttribute @Metadata(defaultValue = "\"") protected String quote; - @XmlAttribute @Metadata(defaultValue = "''") + @XmlAttribute @Metadata(defaultValue = "\"") protected String quoteEscape; @XmlAttribute @Metadata(defaultValue = ",") protected String delimiter; http://git-wip-us.apache.org/repos/asf/camel/blob/90b224e8/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java b/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java index aeb40ac..2a78904 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java @@ -43,8 +43,6 @@ import org.apache.camel.util.ObjectHelper; /** * A useful base class for an expression - * - * @version */ @Metadata(label = "language") @XmlRootElement @@ -196,6 +194,9 @@ public class ExpressionDefinition implements Expression, Predicate { return expression; } + /** + * The expression value in your chosen language syntax + */ @Required public void setExpression(String expression) { this.expression = expression;
