camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [2/9] camel git commit: Camel docs - Add missing option
Date Sun, 03 Jan 2016 14:28:24 GMT
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/467b3dc6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/467b3dc6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/467b3dc6

Branch: refs/heads/master
Commit: 467b3dc64a6c5907934ed231e1fe3994b860d1be
Parents: f630a87
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sun Jan 3 14:10:06 2016 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sun Jan 3 14:10:06 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/467b3dc6/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 8d63aa2..9473bc7 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/467b3dc6/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"))
{


Mime
View raw message