CAMEL-8023: Model and component javadoc documentation
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/88f6c1e5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/88f6c1e5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/88f6c1e5 Branch: refs/heads/master Commit: 88f6c1e52368bc342e3d4c932eea0fdcebef6841 Parents: aae095f Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Feb 7 09:32:12 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Feb 7 09:32:12 2015 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/camel/model/LoopDefinition.java | 4 ---- .../main/java/org/apache/camel/model/ProcessorDefinition.java | 2 +- .../main/java/org/apache/camel/model/SamplingDefinition.java | 5 ++++- 3 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/88f6c1e5/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java b/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java index 57918a1..4e35c2b 100644 --- a/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java @@ -61,10 +61,6 @@ public class LoopDefinition extends ExpressionNode { return this; } - public void setExpression(Expression expr) { - setExpression(ExpressionNodeHelper.toExpressionDefinition(expr)); - } - public Boolean getCopy() { return copy; } http://git-wip-us.apache.org/repos/asf/camel/blob/88f6c1e5/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java index b94e959..a0bf492 100644 --- a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java @@ -2051,7 +2051,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type> */ public LoopDefinition loop(Expression expression) { LoopDefinition loop = new LoopDefinition(); - loop.setExpression(expression); + loop.setExpression(new ExpressionDefinition(expression)); addOutput(loop); return loop; } http://git-wip-us.apache.org/repos/asf/camel/blob/88f6c1e5/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java index c3f82a5..9376ce0 100644 --- a/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java @@ -158,7 +158,10 @@ public class SamplingDefinition extends OutputDefinition<SamplingDefinition> { public void setMessageFrequency(Long messageFrequency) { this.messageFrequency = messageFrequency; } - + + /** + * Sets the time units for the sample period, defaulting to seconds. + */ public void setUnits(String units) { this.units = TimeUnit.valueOf(units); }
