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 2016/01/03 15:31:08 UTC

[2/2] camel git commit: Camel docs - Add missing option

Camel docs - Add missing option


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

Branch: refs/heads/camel-2.16.x
Commit: 36d8e0231f312af13bd737dfb4b480d4435c47e8
Parents: c7b43f2
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Jan 3 14:10:06 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jan 3 15:30:58 2016 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/camel/component/timer/TimerEndpoint.java | 2 +-
 .../java/org/apache/camel/tools/apt/helper/JsonSchemaHelper.java  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/36d8e023/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 b6589ba..d78a1db 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
@@ -53,7 +53,7 @@ public class TimerEndpoint extends DefaultEndpoint implements MultipleConsumersS
     private boolean fixedRate;
     @UriParam(defaultValue = "true", label = "advanced")
     private boolean daemon = true;
-    @UriParam(label = "advanced", javaType = "java.lang.String")
+    @UriParam(label = "advanced")
     private Date time;
     @UriParam(label = "advanced")
     private String pattern;

http://git-wip-us.apache.org/repos/asf/camel/blob/36d8e023/tooling/apt/src/main/java/org/apache/camel/tools/apt/helper/JsonSchemaHelper.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/helper/JsonSchemaHelper.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/helper/JsonSchemaHelper.java
index 686f8d6..f892093 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/helper/JsonSchemaHelper.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/helper/JsonSchemaHelper.java
@@ -20,6 +20,7 @@ import java.io.File;
 import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -131,6 +132,8 @@ public final class JsonSchemaHelper {
             return "string";
         } else if (type.equals(File.class.getName())) {
             return "string";
+        } else if (type.equals(Date.class.getName())) {
+            return "string";
         } else if (type.startsWith("java.lang.Class")) {
             return "string";
         } else if (type.startsWith("java.util.List") || type.startsWith("java.util.Collection")) {