CAMEL-7999: Added kind attribute to the options so we know if its from url path or query parameter.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dcd0d357 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dcd0d357 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dcd0d357 Branch: refs/heads/master Commit: dcd0d3575fcb08f21f43e749224bd71958b19d8d Parents: dd85684 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Nov 12 14:40:31 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Nov 12 14:40:31 2014 +0100 ---------------------------------------------------------------------- ...bsocketComponentConfigurationAndDocumentationTest.java | 4 ++-- .../CxfComponentConfigurationAndDocumentationTest.java | 4 ++-- .../CxfRsComponentConfigurationAndDocumentationTest.java | 4 ++-- ...csearchComponentConfigurationAndDocumentationTest.java | 4 ++-- .../FtpComponentConfigurationAndDocumentationTest.java | 4 ++-- .../FtpsComponentConfigurationAndDocumentationTest.java | 4 ++-- .../SftpComponentConfigurationAndDocumentationTest.java | 4 ++-- .../GAuthComponentConfigurationAndDocumentationTest.java | 4 ++-- .../GHttpComponentConfigurationAndDocumentationTest.java | 4 ++-- .../GLoginComponentConfigurationAndDocumentationTest.java | 4 ++-- .../GMailComponentConfigurationAndDocumentationTest.java | 4 ++-- .../GTaskComponentConfigurationAndDocumentationTest.java | 4 ++-- .../HdfsComponentConfigurationAndDocumentationTest.java | 4 ++-- .../HdfsComponentConfigurationAndDocumentationTest.java | 4 ++-- .../HttpComponentConfigurationAndDocumentationTest.java | 4 ++-- .../HttpComponentConfigurationAndDocumentationTest.java | 4 ++-- ...inispanComponentConfigurationAndDocumentationTest.java | 4 ++-- .../JcrComponentConfigurationAndDocumentationTest.java | 6 +++--- .../JdbcComponentConfigurationAndDocumentationTest.java | 6 +++--- ...ttyHttpComponentConfigurationAndDocumentationTest.java | 4 ++-- ...JGroupsComponentConfigurationAndDocumentationTest.java | 4 ++-- .../JmsComponentConfigurationAndDocumentationTest.java | 4 ++-- .../JpaComponentConfigurationAndDocumentationTest.java | 4 ++-- .../MailComponentConfigurationAndDocumentationTest.java | 4 ++-- ...MyBatisComponentConfigurationAndDocumentationTest.java | 4 ++-- ...ttyHttpComponentConfigurationAndDocumentationTest.java | 4 ++-- .../NettyComponentConfigurationAndDocumentationTest.java | 4 ++-- ...ttyHttpComponentConfigurationAndDocumentationTest.java | 4 ++-- .../NettyComponentConfigurationAndDocumentationTest.java | 4 ++-- ...enShiftComponentConfigurationAndDocumentationTest.java | 6 +++--- ...PlannerComponentConfigurationAndDocumentationTest.java | 4 ++-- .../QuartzComponentConfigurationAndDocumentationTest.java | 4 ++-- ...Quartz2ComponentConfigurationAndDocumentationTest.java | 4 ++-- ...ServletComponentConfigurationAndDocumentationTest.java | 4 ++-- .../SqlComponentConfigurationAndDocumentationTest.java | 10 +++++----- ...WeatherComponentConfigurationAndDocumentationTest.java | 7 ++++--- ...okeeperComponentConfigurationAndDocumentationTest.java | 4 ++-- 37 files changed, 82 insertions(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketComponentConfigurationAndDocumentationTest.java b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketComponentConfigurationAndDocumentationTest.java index 52613a8..7e0b2f9 100644 --- a/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketComponentConfigurationAndDocumentationTest.java +++ b/components/camel-atmosphere-websocket/src/test/java/org/apache/camel/component/atmosphere/websocket/WebsocketComponentConfigurationAndDocumentationTest.java @@ -41,8 +41,8 @@ public class WebsocketComponentConfigurationAndDocumentationTest extends CamelTe ComponentConfiguration compConf = comp.createComponentConfiguration(); String json = compConf.createParameterJsonSchema(); - assertTrue(json.contains("\"useStreaming\": { \"type\": \"boolean\"")); - assertTrue(json.contains("\"sendToAll\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"useStreaming\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); + assertTrue(json.contains("\"sendToAll\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfComponentConfigurationAndDocumentationTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfComponentConfigurationAndDocumentationTest.java index 766b0ea..86bb0e5 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfComponentConfigurationAndDocumentationTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfComponentConfigurationAndDocumentationTest.java @@ -42,8 +42,8 @@ public class CxfComponentConfigurationAndDocumentationTest extends CamelTestSupp String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"serviceNameString\": { \"type\": \"string\"")); - assertTrue(json.contains("\"isWrapped\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"serviceNameString\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"isWrapped\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponentConfigurationAndDocumentationTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponentConfigurationAndDocumentationTest.java index 92e6b7d..080623d 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponentConfigurationAndDocumentationTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponentConfigurationAndDocumentationTest.java @@ -42,8 +42,8 @@ public class CxfRsComponentConfigurationAndDocumentationTest extends CamelTestSu String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"address\": { \"type\": \"string\"")); - assertTrue(json.contains("\"maxClientCacheSize\": { \"type\": \"integer\"")); + assertTrue(json.contains("\"address\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"maxClientCacheSize\": { \"kind\": \"parameter\", \"type\": \"integer\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchComponentConfigurationAndDocumentationTest.java b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchComponentConfigurationAndDocumentationTest.java index 453c6f5..e844c22 100644 --- a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchComponentConfigurationAndDocumentationTest.java +++ b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchComponentConfigurationAndDocumentationTest.java @@ -42,8 +42,8 @@ public class ElasticsearchComponentConfigurationAndDocumentationTest extends Cam String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"indexName\": { \"type\": \"string\"")); - assertTrue(json.contains("\"local\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"indexName\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"local\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpComponentConfigurationAndDocumentationTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpComponentConfigurationAndDocumentationTest.java index f3ce891..60c6268 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpComponentConfigurationAndDocumentationTest.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpComponentConfigurationAndDocumentationTest.java @@ -42,8 +42,8 @@ public class FtpComponentConfigurationAndDocumentationTest extends CamelTestSupp String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"maximumReconnectAttempts\": { \"type\": \"integer\"")); - assertTrue(json.contains("\"dataTimeout\": { \"type\": \"integer\"")); + assertTrue(json.contains("\"maximumReconnectAttempts\": { \"kind\": \"parameter\", \"type\": \"integer\"")); + assertTrue(json.contains("\"dataTimeout\": { \"kind\": \"parameter\", \"type\": \"integer\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsComponentConfigurationAndDocumentationTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsComponentConfigurationAndDocumentationTest.java index f0ffa16..25485fd 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsComponentConfigurationAndDocumentationTest.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsComponentConfigurationAndDocumentationTest.java @@ -42,8 +42,8 @@ public class FtpsComponentConfigurationAndDocumentationTest extends CamelTestSup String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"maximumReconnectAttempts\": { \"type\": \"integer\"")); - assertTrue(json.contains("\"dataTimeout\": { \"type\": \"integer\"")); + assertTrue(json.contains("\"maximumReconnectAttempts\": { \"kind\": \"parameter\", \"type\": \"integer\"")); + assertTrue(json.contains("\"dataTimeout\": { \"kind\": \"parameter\", \"type\": \"integer\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/SftpComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/SftpComponentConfigurationAndDocumentationTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/SftpComponentConfigurationAndDocumentationTest.java index 07279cd..a3a0ec1 100644 --- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/SftpComponentConfigurationAndDocumentationTest.java +++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/SftpComponentConfigurationAndDocumentationTest.java @@ -42,8 +42,8 @@ public class SftpComponentConfigurationAndDocumentationTest extends CamelTestSup String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"maximumReconnectAttempts\": { \"type\": \"integer\"")); - assertTrue(json.contains("\"download\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"maximumReconnectAttempts\": { \"kind\": \"parameter\", \"type\": \"integer\"")); + assertTrue(json.contains("\"download\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-gae/src/test/java/org/apache/camel/component/gae/auth/GAuthComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-gae/src/test/java/org/apache/camel/component/gae/auth/GAuthComponentConfigurationAndDocumentationTest.java b/components/camel-gae/src/test/java/org/apache/camel/component/gae/auth/GAuthComponentConfigurationAndDocumentationTest.java index 81bcab9..6d2003c 100644 --- a/components/camel-gae/src/test/java/org/apache/camel/component/gae/auth/GAuthComponentConfigurationAndDocumentationTest.java +++ b/components/camel-gae/src/test/java/org/apache/camel/component/gae/auth/GAuthComponentConfigurationAndDocumentationTest.java @@ -42,8 +42,8 @@ public class GAuthComponentConfigurationAndDocumentationTest extends CamelTestSu String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"consumerKey\": { \"type\": \"string\"")); - assertTrue(json.contains("\"scope\": { \"type\": \"string\"")); + assertTrue(json.contains("\"consumerKey\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"scope\": { \"kind\": \"parameter\", \"type\": \"string\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpComponentConfigurationAndDocumentationTest.java b/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpComponentConfigurationAndDocumentationTest.java index 41ee784..0c4f37b 100644 --- a/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpComponentConfigurationAndDocumentationTest.java +++ b/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpComponentConfigurationAndDocumentationTest.java @@ -43,8 +43,8 @@ public class GHttpComponentConfigurationAndDocumentationTest extends CamelTestSu String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"GHTTP_SCHEME\": { \"type\": \"string\"")); - assertTrue(json.contains("\"HTTPS_SCHEME\": { \"type\": \"string\"")); + assertTrue(json.contains("\"GHTTP_SCHEME\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"HTTPS_SCHEME\": { \"kind\": \"parameter\", \"type\": \"string\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-gae/src/test/java/org/apache/camel/component/gae/login/GLoginComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-gae/src/test/java/org/apache/camel/component/gae/login/GLoginComponentConfigurationAndDocumentationTest.java b/components/camel-gae/src/test/java/org/apache/camel/component/gae/login/GLoginComponentConfigurationAndDocumentationTest.java index dcfe8b3..8f105af 100644 --- a/components/camel-gae/src/test/java/org/apache/camel/component/gae/login/GLoginComponentConfigurationAndDocumentationTest.java +++ b/components/camel-gae/src/test/java/org/apache/camel/component/gae/login/GLoginComponentConfigurationAndDocumentationTest.java @@ -42,8 +42,8 @@ public class GLoginComponentConfigurationAndDocumentationTest extends CamelTestS String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"clientName\": { \"type\": \"string\"")); - assertTrue(json.contains("\"devMode\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"clientName\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"devMode\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailComponentConfigurationAndDocumentationTest.java b/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailComponentConfigurationAndDocumentationTest.java index 98d2a7d..6e54f23 100644 --- a/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailComponentConfigurationAndDocumentationTest.java +++ b/components/camel-gae/src/test/java/org/apache/camel/component/gae/mail/GMailComponentConfigurationAndDocumentationTest.java @@ -42,8 +42,8 @@ public class GMailComponentConfigurationAndDocumentationTest extends CamelTestSu String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"sender\": { \"type\": \"string\"")); - assertTrue(json.contains("\"bcc\": { \"type\": \"string\"")); + assertTrue(json.contains("\"sender\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"bcc\": { \"kind\": \"parameter\", \"type\": \"string\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskComponentConfigurationAndDocumentationTest.java b/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskComponentConfigurationAndDocumentationTest.java index 6151388..fd32ffd 100644 --- a/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskComponentConfigurationAndDocumentationTest.java +++ b/components/camel-gae/src/test/java/org/apache/camel/component/gae/task/GTaskComponentConfigurationAndDocumentationTest.java @@ -41,8 +41,8 @@ public class GTaskComponentConfigurationAndDocumentationTest extends CamelTestSu String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"workerRoot\": { \"type\": \"string\"")); - assertTrue(json.contains("\"disableStreamCache\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"workerRoot\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"disableStreamCache\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsComponentConfigurationAndDocumentationTest.java b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsComponentConfigurationAndDocumentationTest.java index cb90271..30ab536 100644 --- a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsComponentConfigurationAndDocumentationTest.java +++ b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsComponentConfigurationAndDocumentationTest.java @@ -44,8 +44,8 @@ public class HdfsComponentConfigurationAndDocumentationTest extends CamelTestSup String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"pattern\": { \"type\": \"string\"")); - assertTrue(json.contains("\"wantAppend\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"pattern\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"wantAppend\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsComponentConfigurationAndDocumentationTest.java b/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsComponentConfigurationAndDocumentationTest.java index 853978e..24c1baa 100644 --- a/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsComponentConfigurationAndDocumentationTest.java +++ b/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsComponentConfigurationAndDocumentationTest.java @@ -44,8 +44,8 @@ public class HdfsComponentConfigurationAndDocumentationTest extends CamelTestSup String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"initialDelay\": { \"type\": \"integer\"")); - assertTrue(json.contains("\"checkIdleInterval\": { \"type\": \"integer\"")); + assertTrue(json.contains("\"initialDelay\": { \"kind\": \"parameter\", \"type\": \"integer\"")); + assertTrue(json.contains("\"checkIdleInterval\": { \"kind\": \"parameter\", \"type\": \"integer\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-http/src/test/java/org/apache/camel/component/http/HttpComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpComponentConfigurationAndDocumentationTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpComponentConfigurationAndDocumentationTest.java index 62d63c5..eb02eec 100644 --- a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpComponentConfigurationAndDocumentationTest.java +++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpComponentConfigurationAndDocumentationTest.java @@ -42,8 +42,8 @@ public class HttpComponentConfigurationAndDocumentationTest extends CamelTestSup String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"httpMethodRestrict\": { \"type\": \"string\"")); - assertTrue(json.contains("\"matchOnUriPrefix\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"httpMethodRestrict\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"matchOnUriPrefix\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpComponentConfigurationAndDocumentationTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpComponentConfigurationAndDocumentationTest.java index 6fecc03..e8b8249 100644 --- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpComponentConfigurationAndDocumentationTest.java +++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpComponentConfigurationAndDocumentationTest.java @@ -43,8 +43,8 @@ public class HttpComponentConfigurationAndDocumentationTest extends CamelTestSup String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"httpMethodRestrict\": { \"type\": \"string\"")); - assertTrue(json.contains("\"throwExceptionOnFailure\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"httpMethodRestrict\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"throwExceptionOnFailure\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanComponentConfigurationAndDocumentationTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanComponentConfigurationAndDocumentationTest.java index 6fb357d..5c20b90 100644 --- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanComponentConfigurationAndDocumentationTest.java +++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanComponentConfigurationAndDocumentationTest.java @@ -43,8 +43,8 @@ public class InfinispanComponentConfigurationAndDocumentationTest extends CamelT String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"command\": { \"type\": \"string\"")); - assertTrue(json.contains("\"sync\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"command\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"sync\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrComponentConfigurationAndDocumentationTest.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrComponentConfigurationAndDocumentationTest.java index c3f98f3..56c7e57 100755 --- a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrComponentConfigurationAndDocumentationTest.java +++ b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrComponentConfigurationAndDocumentationTest.java @@ -44,9 +44,9 @@ public class JcrComponentConfigurationAndDocumentationTest extends CamelTestSupp String json = componentConfiguration.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"deep\": { \"type\": \"boolean\"")); - assertTrue(json.contains("\"eventTypes\": { \"type\": \"integer\"")); - assertTrue(json.contains("\"noLocal\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"deep\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); + assertTrue(json.contains("\"eventTypes\": { \"kind\": \"parameter\", \"type\": \"integer\"")); + assertTrue(json.contains("\"noLocal\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcComponentConfigurationAndDocumentationTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcComponentConfigurationAndDocumentationTest.java index 74f7f03..4be4197 100644 --- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcComponentConfigurationAndDocumentationTest.java +++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcComponentConfigurationAndDocumentationTest.java @@ -42,9 +42,9 @@ public class JdbcComponentConfigurationAndDocumentationTest extends CamelTestSup String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"outputClass\": { \"type\": \"string\"")); - assertTrue(json.contains("\"allowNamedParameters\": { \"type\": \"boolean\"")); - assertTrue(json.contains("\"beanRowMapper\": { \"type\": \"object\", \"javaType\": \"org.apache.camel.component.jdbc.BeanRowMapper\" }")); + assertTrue(json.contains("\"outputClass\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"allowNamedParameters\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); + assertTrue(json.contains("\"beanRowMapper\": { \"kind\": \"parameter\", \"type\": \"object\", \"javaType\": \"org.apache.camel.component.jdbc.BeanRowMapper\" }")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpComponentConfigurationAndDocumentationTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpComponentConfigurationAndDocumentationTest.java index a8869dc..242d24c 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpComponentConfigurationAndDocumentationTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpComponentConfigurationAndDocumentationTest.java @@ -43,8 +43,8 @@ public class JettyHttpComponentConfigurationAndDocumentationTest extends CamelTe String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"httpClientMaxThreads\": { \"type\": \"integer\"")); - assertTrue(json.contains("\"sessionSupport\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"httpClientMaxThreads\": { \"kind\": \"parameter\", \"type\": \"integer\"")); + assertTrue(json.contains("\"sessionSupport\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentConfigurationAndDocumentationTest.java b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentConfigurationAndDocumentationTest.java index e8d1402..76e3631 100644 --- a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentConfigurationAndDocumentationTest.java +++ b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsComponentConfigurationAndDocumentationTest.java @@ -41,8 +41,8 @@ public class JGroupsComponentConfigurationAndDocumentationTest extends CamelTest String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"channelProperties\": { \"type\": \"string\"")); - assertTrue(json.contains("\"resolvedEnableViewMessages\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"channelProperties\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"resolvedEnableViewMessages\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentConfigurationAndDocumentationTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentConfigurationAndDocumentationTest.java index e08c8a8..e046492 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentConfigurationAndDocumentationTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentConfigurationAndDocumentationTest.java @@ -41,8 +41,8 @@ public class JmsComponentConfigurationAndDocumentationTest extends CamelTestSupp String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"replyToDestination\": { \"type\": \"string\"")); - assertTrue(json.contains("\"transacted\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"replyToDestination\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"transacted\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaComponentConfigurationAndDocumentationTest.java b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaComponentConfigurationAndDocumentationTest.java index d781465..c6a1244 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaComponentConfigurationAndDocumentationTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaComponentConfigurationAndDocumentationTest.java @@ -43,8 +43,8 @@ public class JpaComponentConfigurationAndDocumentationTest extends CamelTestSupp String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"persistenceUnit\": { \"type\": \"string\"")); - assertTrue(json.contains("\"usePassedInEntityManager\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"persistenceUnit\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"usePassedInEntityManager\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentConfigurationAndDocumentationTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentConfigurationAndDocumentationTest.java index b29c547..5ecff06 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentConfigurationAndDocumentationTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentConfigurationAndDocumentationTest.java @@ -42,8 +42,8 @@ public class MailComponentConfigurationAndDocumentationTest extends CamelTestSup String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"contentType\": { \"type\": \"string\"")); - assertTrue(json.contains("\"debugMode\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"contentType\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"debugMode\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisComponentConfigurationAndDocumentationTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisComponentConfigurationAndDocumentationTest.java index 3620f74..2f5a854 100644 --- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisComponentConfigurationAndDocumentationTest.java +++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisComponentConfigurationAndDocumentationTest.java @@ -43,8 +43,8 @@ public class MyBatisComponentConfigurationAndDocumentationTest extends CamelTest String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"maxMessagesPerPoll\": { \"type\": \"integer\"")); - assertTrue(json.contains("\"statement\": { \"type\": \"string\"")); + assertTrue(json.contains("\"maxMessagesPerPoll\": { \"kind\": \"parameter\", \"type\": \"integer\"")); + assertTrue(json.contains("\"statement\": { \"kind\": \"parameter\", \"type\": \"string\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpComponentConfigurationAndDocumentationTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpComponentConfigurationAndDocumentationTest.java index 78ea582..712e179 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpComponentConfigurationAndDocumentationTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpComponentConfigurationAndDocumentationTest.java @@ -43,8 +43,8 @@ public class NettyHttpComponentConfigurationAndDocumentationTest extends CamelTe String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"httpMethodRestrict\": { \"type\": \"string\"")); - assertTrue(json.contains("\"traceEnabled\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"httpMethodRestrict\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"traceEnabled\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyComponentConfigurationAndDocumentationTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyComponentConfigurationAndDocumentationTest.java index 3a99562..cfc39fc 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyComponentConfigurationAndDocumentationTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyComponentConfigurationAndDocumentationTest.java @@ -43,8 +43,8 @@ public class NettyComponentConfigurationAndDocumentationTest extends CamelTestSu String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"producerPoolMinEvictableIdle\": { \"type\": \"integer\"")); - assertTrue(json.contains("\"allowDefaultCodec\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"producerPoolMinEvictableIdle\": { \"kind\": \"parameter\", \"type\": \"integer\"")); + assertTrue(json.contains("\"allowDefaultCodec\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpComponentConfigurationAndDocumentationTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpComponentConfigurationAndDocumentationTest.java index 913b0e9..0551b86 100644 --- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpComponentConfigurationAndDocumentationTest.java +++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpComponentConfigurationAndDocumentationTest.java @@ -43,8 +43,8 @@ public class NettyHttpComponentConfigurationAndDocumentationTest extends CamelTe String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"httpMethodRestrict\": { \"type\": \"string\"")); - assertTrue(json.contains("\"traceEnabled\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"httpMethodRestrict\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"traceEnabled\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentConfigurationAndDocumentationTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentConfigurationAndDocumentationTest.java index eb3129c..9c806fa 100644 --- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentConfigurationAndDocumentationTest.java +++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentConfigurationAndDocumentationTest.java @@ -43,8 +43,8 @@ public class NettyComponentConfigurationAndDocumentationTest extends CamelTestSu String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"producerPoolMinEvictableIdle\": { \"type\": \"integer\"")); - assertTrue(json.contains("\"allowDefaultCodec\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"producerPoolMinEvictableIdle\": { \"kind\": \"parameter\", \"type\": \"integer\"")); + assertTrue(json.contains("\"allowDefaultCodec\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftComponentConfigurationAndDocumentationTest.java b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftComponentConfigurationAndDocumentationTest.java index 72a0d75..dba275d 100644 --- a/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftComponentConfigurationAndDocumentationTest.java +++ b/components/camel-openshift/src/test/java/org/apache/camel/component/openshift/OpenShiftComponentConfigurationAndDocumentationTest.java @@ -42,9 +42,9 @@ public class OpenShiftComponentConfigurationAndDocumentationTest extends CamelTe String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"application\": { \"type\": \"string\"")); - assertTrue(json.contains("\"clientId\": { \"type\": \"string\"")); - assertTrue(json.contains("\"operation\": { \"type\": \"string\"")); + assertTrue(json.contains("\"application\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"clientId\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"operation\": { \"kind\": \"parameter\", \"type\": \"string\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerComponentConfigurationAndDocumentationTest.java b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerComponentConfigurationAndDocumentationTest.java index 1876622..9429533 100644 --- a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerComponentConfigurationAndDocumentationTest.java +++ b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerComponentConfigurationAndDocumentationTest.java @@ -42,8 +42,8 @@ public class OptaPlannerComponentConfigurationAndDocumentationTest extends Camel String json = componentConfiguration.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"resourceUri\": { \"type\": \"string\"")); - assertTrue(json.contains("\"synchronous\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"resourceUri\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"synchronous\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentConfigurationAndDocumentationTest.java b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentConfigurationAndDocumentationTest.java index 57bd305..801f582 100644 --- a/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentConfigurationAndDocumentationTest.java +++ b/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzComponentConfigurationAndDocumentationTest.java @@ -43,8 +43,8 @@ public class QuartzComponentConfigurationAndDocumentationTest extends CamelTestS String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"stateful\": { \"type\": \"boolean\"")); - assertTrue(json.contains("\"deleteJob\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"stateful\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); + assertTrue(json.contains("\"deleteJob\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/Quartz2ComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/Quartz2ComponentConfigurationAndDocumentationTest.java b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/Quartz2ComponentConfigurationAndDocumentationTest.java index 987b39e..f61e2bf 100644 --- a/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/Quartz2ComponentConfigurationAndDocumentationTest.java +++ b/components/camel-quartz2/src/test/java/org/apache/camel/component/quartz2/Quartz2ComponentConfigurationAndDocumentationTest.java @@ -41,8 +41,8 @@ public class Quartz2ComponentConfigurationAndDocumentationTest extends CamelTest String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"cron\": { \"type\": \"string\"")); - assertTrue(json.contains("\"fireNow\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"cron\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"fireNow\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletComponentConfigurationAndDocumentationTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletComponentConfigurationAndDocumentationTest.java index 83e24aa..caa005e 100644 --- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletComponentConfigurationAndDocumentationTest.java +++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletComponentConfigurationAndDocumentationTest.java @@ -43,8 +43,8 @@ public class ServletComponentConfigurationAndDocumentationTest extends CamelTest String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"servletName\": { \"type\": \"string\"")); - assertTrue(json.contains("\"matchOnUriPrefix\": { \"type\": \"boolean\"")); + assertTrue(json.contains("\"servletName\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"matchOnUriPrefix\": { \"kind\": \"parameter\", \"type\": \"boolean\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlComponentConfigurationAndDocumentationTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlComponentConfigurationAndDocumentationTest.java index 3ac52d5..8e10e76 100644 --- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlComponentConfigurationAndDocumentationTest.java +++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlComponentConfigurationAndDocumentationTest.java @@ -42,8 +42,8 @@ public class SqlComponentConfigurationAndDocumentationTest extends CamelTestSupp String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"onConsumeBatchComplete\": { \"type\": \"string\"")); - assertTrue(json.contains("\"parametersCount\": { \"type\": \"integer\"")); + assertTrue(json.contains("\"onConsumeBatchComplete\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"parametersCount\": { \"kind\": \"parameter\", \"type\": \"integer\"")); } @Test @@ -51,9 +51,9 @@ public class SqlComponentConfigurationAndDocumentationTest extends CamelTestSupp String json = context.explainEndpointJson("sql:select?dataSourceRef=jdbc/myDataSource&allowNamedParameters=true&consumer.onConsume=foo", true); assertNotNull(json); - assertTrue(json.contains("\"onConsumeBatchComplete\": { \"type\": \"string\"")); - assertTrue(json.contains("\"parametersCount\": { \"type\": \"integer\"")); - assertTrue(json.contains(" \"onConsume\": { \"type\": \"string\", \"javaType\": \"java.lang.String\", \"value\": \"foo\"")); + assertTrue(json.contains("\"onConsumeBatchComplete\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"parametersCount\": { \"kind\": \"parameter\", \"type\": \"integer\"")); + assertTrue(json.contains(" \"onConsume\": { \"kind\": \"parameter\", \"type\": \"string\", \"javaType\": \"java.lang.String\", \"value\": \"foo\"")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-weather/src/test/java/org/apache/camel/component/weather/WeatherComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/WeatherComponentConfigurationAndDocumentationTest.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/WeatherComponentConfigurationAndDocumentationTest.java index 0609d66..099b586 100644 --- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/WeatherComponentConfigurationAndDocumentationTest.java +++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/WeatherComponentConfigurationAndDocumentationTest.java @@ -41,9 +41,10 @@ public class WeatherComponentConfigurationAndDocumentationTest extends CamelTest String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"lat\": { \"type\": \"string\"")); - assertTrue(json.contains("\"location\": { \"type\": \"string\"")); - assertTrue(json.contains("\"mode\": { \"type\": \"string\", \"javaType\": \"org.apache.camel.component.weather.WeatherMode\", \"enum\": [ \"HTML\", \"JSON\", \"XML\" ]")); + assertTrue(json.contains("\"lat\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"location\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"mode\": { \"kind\": \"parameter\", \"type\": \"string\"," + + " \"javaType\": \"org.apache.camel.component.weather.WeatherMode\", \"enum\": [ \"HTML\", \"JSON\", \"XML\" ] }")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/dcd0d357/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperComponentConfigurationAndDocumentationTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperComponentConfigurationAndDocumentationTest.java index b2216fd..0387b73 100644 --- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperComponentConfigurationAndDocumentationTest.java +++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperComponentConfigurationAndDocumentationTest.java @@ -42,8 +42,8 @@ public class ZookeeperComponentConfigurationAndDocumentationTest extends CamelTe String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"createMode\": { \"type\": \"string\"")); - assertTrue(json.contains("\"backoff\": { \"type\": \"integer\"")); + assertTrue(json.contains("\"createMode\": { \"kind\": \"parameter\", \"type\": \"string\"")); + assertTrue(json.contains("\"backoff\": { \"kind\": \"parameter\", \"type\": \"integer\"")); } @Test
