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 2014/12/31 11:35:52 UTC
[2/3] camel git commit: CAMEL-7999: apt compiler to generate json
schema documentation for the model,
whcih we later use to enrich the xml xsd to include documentation. Work in
progress.
CAMEL-7999: apt compiler to generate json schema documentation for the model, whcih we later use to enrich the xml xsd to include documentation. Work in progress.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d42ba1f8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d42ba1f8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d42ba1f8
Branch: refs/heads/master
Commit: d42ba1f8984bc3fcba9f41e2f181157566d92f71
Parents: 1615993
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Dec 31 10:37:03 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Dec 31 10:37:03 2014 +0100
----------------------------------------------------------------------
.../DirectComponentConfigurationAndDocumentationTest.java | 2 +-
.../timer/TimerComponentConfigurationAndDocumentationTest.java | 3 ++-
.../xslt/XsltComponentConfigurationAndDocumentationTest.java | 2 +-
.../test/java/org/apache/camel/impl/EipDocumentationTest.java | 5 +++--
.../org/apache/camel/management/ManagedCamelContextTest.java | 2 +-
5 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d42ba1f8/camel-core/src/test/java/org/apache/camel/component/direct/DirectComponentConfigurationAndDocumentationTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/direct/DirectComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/direct/DirectComponentConfigurationAndDocumentationTest.java
index 60db3ec..b33c15a 100644
--- a/camel-core/src/test/java/org/apache/camel/component/direct/DirectComponentConfigurationAndDocumentationTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/direct/DirectComponentConfigurationAndDocumentationTest.java
@@ -61,7 +61,7 @@ public class DirectComponentConfigurationAndDocumentationTest extends ContextTes
// should include javadoc
assertTrue("Should include javadoc", json.contains("\"timeout\": { \"kind\": \"parameter\", \"type\": \"integer\", \"javaType\": \"long\","
- + " \"defaultValue\": \"30000\","
+ + " \"deprecated\": \"false\", \"defaultValue\": \"30000\","
+ " \"description\": \"The timeout value to use if block is enabled. Is by default 30000.\""));
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d42ba1f8/camel-core/src/test/java/org/apache/camel/component/timer/TimerComponentConfigurationAndDocumentationTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/timer/TimerComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/timer/TimerComponentConfigurationAndDocumentationTest.java
index e64d517..4fffa87 100644
--- a/camel-core/src/test/java/org/apache/camel/component/timer/TimerComponentConfigurationAndDocumentationTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/timer/TimerComponentConfigurationAndDocumentationTest.java
@@ -41,7 +41,8 @@ public class TimerComponentConfigurationAndDocumentationTest extends ContextTest
String json = compConf.createParameterJsonSchema();
assertNotNull(json);
- assertTrue(json.contains("\"timerName\": { \"kind\": \"path\", \"type\": \"string\", \"javaType\": \"java.lang.String\", \"description\": \"The name of the timer\" }"));
+ assertTrue(json.contains("\"timerName\": { \"kind\": \"path\", \"type\": \"string\", \"javaType\": \"java.lang.String\""
+ + ", \"deprecated\": \"false\", \"description\": \"The name of the timer\" }"));
assertTrue(json.contains("\"delay\": { \"kind\": \"parameter\", \"type\": \"integer\""));
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d42ba1f8/camel-core/src/test/java/org/apache/camel/component/xslt/XsltComponentConfigurationAndDocumentationTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltComponentConfigurationAndDocumentationTest.java
index 794d16a..ac069c4 100644
--- a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltComponentConfigurationAndDocumentationTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltComponentConfigurationAndDocumentationTest.java
@@ -41,7 +41,7 @@ public class XsltComponentConfigurationAndDocumentationTest extends ContextTestS
String json = compConf.createParameterJsonSchema();
assertNotNull(json);
- assertTrue(json.contains("\"contentCache\": { \"kind\": \"parameter\", \"type\": \"boolean\", \"javaType\": \"boolean\", \"defaultValue\": \"true\" }"));
+ assertTrue(json.contains("\"contentCache\": { \"kind\": \"parameter\", \"type\": \"boolean\", \"javaType\": \"boolean\", \"deprecated\": \"false\", \"defaultValue\": \"true\" }"));
assertTrue(json.contains("\"synchronous\": { \"kind\": \"parameter\", \"type\": \"boolean\""));
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d42ba1f8/camel-core/src/test/java/org/apache/camel/impl/EipDocumentationTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/EipDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/impl/EipDocumentationTest.java
index 01e5dab..5ed12dc 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/EipDocumentationTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/EipDocumentationTest.java
@@ -47,7 +47,7 @@ public class EipDocumentationTest extends ContextTestSupport {
// there should be javadoc included
assertTrue(json.contains("Whether to aggregate using a sequential single thread or allow parallel aggregation"));
// and it support outputs
- assertTrue(json.contains("\"outputs\": { \"kind\": \"element\": \"required\": \"true\", \"type\": \"array\","));
+ assertTrue(json.contains("\"outputs\": { \"kind\": \"element\", \"required\": \"true\", \"type\": \"array\", \"javaType\""));
}
public void testSimpleDocumentation() throws Exception {
@@ -67,7 +67,8 @@ public class EipDocumentationTest extends ContextTestSupport {
assertNotNull("Should have found json for failover", json);
assertTrue(json.contains("\"name\": \"failover\""));
- assertTrue(json.contains("\"exception\": { \"kind\": \"element\": \"required\": \"false\", \"type\": \"array\", \"javaType\": \"java.util.List<java.lang.String>\""));
+ assertTrue(json.contains("\"exception\": { \"kind\": \"element\", \"required\": \"false\", \"type\": \"array\""
+ + ", \"javaType\": \"java.util.List<java.lang.String>\", \"deprecated\": \"false\""));
}
public void testNotFound() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/d42ba1f8/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
index 4867ecc..9e7fb1b 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
@@ -265,7 +265,7 @@ public class ManagedCamelContextTest extends ManagementTestSupport {
assertNotNull(json);
assertTrue(json.contains("\"label\": \"transformation\""));
- assertTrue(json.contains("\"expression\": { \"kind\": \"element\": \"required\": \"true\""));
+ assertTrue(json.contains("\"expression\": { \"kind\": \"element\", \"required\": \"true\", \"type\": \"object\""));
}
@Override