Repository: camel
Updated Branches:
  refs/heads/master 6e8d58bc3 -> 02f6569e1


[CAMEL-9930] Add supported formats to UriParam annotation


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cb4d34ea
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cb4d34ea
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cb4d34ea

Branch: refs/heads/master
Commit: cb4d34ea35a8e54b4c26e66e85a25bb96a2059c9
Parents: 705a5ee
Author: Josef Ludvicek <jludv...@redhat.com>
Authored: Tue May 3 12:41:18 2016 +0200
Committer: Claus Ibsen <davscl...@apache.org>
Committed: Tue May 3 19:49:54 2016 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/camel/component/timer/TimerEndpoint.java | 3 ++-
 .../main/java/org/apache/camel/impl/ScheduledPollEndpoint.java    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/cb4d34ea/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java 
b/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
index 4f10903..860a1e1 100644
--- 
a/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
+++ 
b/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
@@ -43,7 +43,8 @@ import org.apache.camel.spi.UriPath;
 public class TimerEndpoint extends DefaultEndpoint implements 
MultipleConsumersSupport {
     @UriPath @Metadata(required = "true")
     private String timerName;
-    @UriParam(defaultValue = "1000")
+    @UriParam(defaultValue = "1000", description = "If greater than 0, 
generate periodic events every period milliseconds."
+            + " You can also specify time values using units, such as 60s (60 
seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour).")
     private long period = 1000;
     @UriParam(defaultValue = "1000")
     private long delay = 1000;

http://git-wip-us.apache.org/repos/asf/camel/blob/cb4d34ea/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java 
b/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
index 21e1d53..2d4c97e 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
@@ -48,7 +48,8 @@ public abstract class ScheduledPollEndpoint extends 
DefaultEndpoint {
             description = "Whether the scheduler should be auto started.")
     private boolean startScheduler = true;
     @UriParam(optionalPrefix = "consumer.", defaultValue = "1000", label = 
"consumer,scheduler",
-            description = "Milliseconds before the first poll starts.")
+            description = "Milliseconds before the first poll starts."
+                    + " You can also specify time values using units, such as 
60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour).")
     private long initialDelay = 1000;
     @UriParam(optionalPrefix = "consumer.", defaultValue = "500", label = 
"consumer,scheduler",
             description = "Milliseconds before the next poll.")

Reply via email to