Repository: camel Updated Branches: refs/heads/master f846d6b57 -> ffc12ed93
CAMEL-7495: component createParameterJsonSchema now uses jscon shcema types to honor the spec. For object types we include a description that tells you the java type it is. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ffc12ed9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ffc12ed9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ffc12ed9 Branch: refs/heads/master Commit: ffc12ed9363f0cd285ba65fb2d02338ede058e96 Parents: 5353e40 Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Aug 25 11:25:03 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Aug 25 11:33:00 2014 +0200 ---------------------------------------------------------------------- .../camel/impl/ParameterConfiguration.java | 21 ++-- .../org/apache/camel/util/JsonSchemaHelper.java | 102 +++++++++++++++++++ ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 4 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 4 +- ...ponentConfigurationAndDocumentationTest.java | 4 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 4 +- ...ponentConfigurationAndDocumentationTest.java | 4 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 4 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 4 +- ...ponentConfigurationAndDocumentationTest.java | 4 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 4 +- ...ponentConfigurationAndDocumentationTest.java | 4 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 4 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 4 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- .../camel/component/jdbc/JdbcEndpoint.java | 3 + ...ponentConfigurationAndDocumentationTest.java | 4 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 4 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- .../component/netty/NettyConfiguration.java | 1 + ...ponentConfigurationAndDocumentationTest.java | 2 +- .../component/netty4/NettyConfiguration.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 6 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 2 +- ...ponentConfigurationAndDocumentationTest.java | 5 +- ...ponentConfigurationAndDocumentationTest.java | 4 +- 52 files changed, 188 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/camel-core/src/main/java/org/apache/camel/impl/ParameterConfiguration.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/ParameterConfiguration.java b/camel-core/src/main/java/org/apache/camel/impl/ParameterConfiguration.java index 652746a..d5b57ee 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/ParameterConfiguration.java +++ b/camel-core/src/main/java/org/apache/camel/impl/ParameterConfiguration.java @@ -20,6 +20,7 @@ import java.lang.reflect.Field; import org.apache.camel.spi.UriParam; import org.apache.camel.util.CollectionStringBuffer; +import org.apache.camel.util.JsonSchemaHelper; import static org.apache.camel.util.StringQuoteHelper.doubleQuote; @@ -66,19 +67,25 @@ public class ParameterConfiguration { * Returns the JSON format of this parameter configuration */ public String toJson() { - String typeName = parameterType.getCanonicalName(); - // TODO would be nice to add a description; wonder if we can find that from somewhere - // generated by the APT tool? - if (parameterType.isEnum()) { - typeName = "string"; + String typeName = "string"; CollectionStringBuffer sb = new CollectionStringBuffer(); for (Object value : parameterType.getEnumConstants()) { sb.append(doubleQuote(value.toString())); } - return doubleQuote(name) + ": { \"type\": " + doubleQuote(typeName) + ", \"enum\": [ " + sb.toString() + " ] }"; - } else { + return doubleQuote(name) + ": { \"type\": " + doubleQuote(typeName) + ", \"enum\": [ " + sb.toString() + " ] }"; + } else if (parameterType.isArray()) { + String typeName = "array"; return doubleQuote(name) + ": { \"type\": " + doubleQuote(typeName) + " }"; + } else { + String typeName = JsonSchemaHelper.getType(parameterType); + if ("object".equals(typeName)) { + // for object then include the javaType as a description so we know that + return doubleQuote(name) + ": { \"type\": " + doubleQuote(typeName) + + ", \"properties\": { \"javaType\": { \"description\": \"" + parameterType.getCanonicalName() + "\", \"type\": \"string\" } } }"; + } else { + return doubleQuote(name) + ": { \"type\": " + doubleQuote(typeName) + " }"; + } } } } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/camel-core/src/main/java/org/apache/camel/util/JsonSchemaHelper.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/util/JsonSchemaHelper.java b/camel-core/src/main/java/org/apache/camel/util/JsonSchemaHelper.java new file mode 100644 index 0000000..b7298da --- /dev/null +++ b/camel-core/src/main/java/org/apache/camel/util/JsonSchemaHelper.java @@ -0,0 +1,102 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.util; + +/** + * A helper class for <a href="http://json-schema.org/";>JSON schema</a>. + */ +public final class JsonSchemaHelper { + + private JsonSchemaHelper() { + } + + /** + * Gets the JSon schema type. + * + * @param type the java type + * @return the json schema type, is never null, but returns <tt>object</tt> as the generic type + */ + public static String getType(Class<?> type) { + if (type.isEnum()) { + return "enum"; + } else if (type.isArray()) { + return "array"; + } + + String primitive = getPrimitiveType(type); + if (primitive != null) { + return primitive; + } + + return "object"; + } + + /** + * Gets the JSon schema primitive type. + * + * @param type the java type + * @return the json schema primitive type, or <tt>null</tt> if not a primitive + */ + public static String getPrimitiveType(Class<?> type) { + String name = type.getCanonicalName(); + + // special for byte[] or Object[] as its common to use + if ("java.lang.byte[]".equals(name) || "byte[]".equals(name)) { + return "string"; + } else if ("java.lang.Byte[]".equals(name) || "Byte[]".equals(name)) { + return "array"; + } else if ("java.lang.Object[]".equals(name) || "Object[]".equals(name)) { + return "array"; + } else if ("java.lang.String[]".equals(name) || "String[]".equals(name)) { + return "array"; + // and these is common as well + } else if ("java.lang.String".equals(name) || "String".equals(name)) { + return "string"; + } else if ("java.lang.Boolean".equals(name) || "Boolean".equals(name)) { + return "boolean"; + } else if ("boolean".equals(name)) { + return "boolean"; + } else if ("java.lang.Integer".equals(name) || "Integer".equals(name)) { + return "integer"; + } else if ("int".equals(name)) { + return "integer"; + } else if ("java.lang.Long".equals(name) || "Long".equals(name)) { + return "integer"; + } else if ("long".equals(name)) { + return "integer"; + } else if ("java.lang.Short".equals(name) || "Short".equals(name)) { + return "integer"; + } else if ("short".equals(name)) { + return "integer"; + } else if ("java.lang.Byte".equals(name) || "Byte".equals(name)) { + return "integer"; + } else if ("byte".equals(name)) { + return "integer"; + } else if ("java.lang.Float".equals(name) || "Float".equals(name)) { + return "number"; + } else if ("float".equals(name)) { + return "number"; + } else if ("java.lang.Double".equals(name) || "Double".equals(name)) { + return "number"; + } else if ("double".equals(name)) { + return "number"; + } + + return null; + } + +} http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentConfigurationAndDocumentationTest.java index e9cbf12..128f271 100644 --- a/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentConfigurationAndDocumentationTest.java @@ -41,7 +41,7 @@ public class BeanComponentConfigurationAndDocumentationTest extends ContextTestS String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"method\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"method\": { \"type\": \"string\" }")); assertTrue(json.contains("\"cache\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusComponentConfigurationAndDocumentationTest.java index 62e521d..19d6776 100644 --- a/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/controlbus/ControlBusComponentConfigurationAndDocumentationTest.java @@ -42,7 +42,7 @@ public class ControlBusComponentConfigurationAndDocumentationTest extends Contex String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"action\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"action\": { \"type\": \"string\" }")); assertTrue(json.contains("\"async\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/camel-core/src/test/java/org/apache/camel/component/dataformat/DataFormatComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/dataformat/DataFormatComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/dataformat/DataFormatComponentConfigurationAndDocumentationTest.java index c2b5b7e..68983b8 100644 --- a/camel-core/src/test/java/org/apache/camel/component/dataformat/DataFormatComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/dataformat/DataFormatComponentConfigurationAndDocumentationTest.java @@ -41,7 +41,7 @@ public class DataFormatComponentConfigurationAndDocumentationTest extends Contex String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"operation\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"operation\": { \"type\": \"string\" }")); assertTrue(json.contains("\"synchronous\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetComponentConfigurationAndDocumentationTest.java index 7b886d5..4d79042 100644 --- a/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetComponentConfigurationAndDocumentationTest.java @@ -41,8 +41,8 @@ public class DataSetComponentConfigurationAndDocumentationTest extends ContextTe String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"preloadSize\": { \"type\": \"long\" }")); - assertTrue(json.contains("\"minRate\": { \"type\": \"int\" }")); + assertTrue(json.contains("\"preloadSize\": { \"type\": \"integer\" }")); + assertTrue(json.contains("\"minRate\": { \"type\": \"integer\" }")); assertTrue(json.contains("\"exchangePattern\": { \"type\": \"string\", \"enum\":")); assertTrue(json.contains("\"InOut\"")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 0ac0f7e..62083e4 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 @@ -41,7 +41,7 @@ public class DirectComponentConfigurationAndDocumentationTest extends ContextTes String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"timeout\": { \"type\": \"long\" }")); + assertTrue(json.contains("\"timeout\": { \"type\": \"integer\" }")); assertTrue(json.contains("\"block\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmComponentConfigurationAndDocumentationTest.java index 65966d0..1add691 100644 --- a/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmComponentConfigurationAndDocumentationTest.java @@ -41,7 +41,7 @@ public class DirectVmComponentConfigurationAndDocumentationTest extends ContextT String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"timeout\": { \"type\": \"long\" }")); + assertTrue(json.contains("\"timeout\": { \"type\": \"integer\" }")); assertTrue(json.contains("\"block\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/camel-core/src/test/java/org/apache/camel/component/file/FileComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileComponentConfigurationAndDocumentationTest.java index 7cc4dc5..2cd3d39 100644 --- a/camel-core/src/test/java/org/apache/camel/component/file/FileComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/file/FileComponentConfigurationAndDocumentationTest.java @@ -41,7 +41,7 @@ public class FileComponentConfigurationAndDocumentationTest extends ContextTestS String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"exclude\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"exclude\": { \"type\": \"string\" }")); assertTrue(json.contains("\"delete\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/camel-core/src/test/java/org/apache/camel/component/language/LanguageComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/language/LanguageComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/language/LanguageComponentConfigurationAndDocumentationTest.java index b2b1cf2..10b8ba5 100644 --- a/camel-core/src/test/java/org/apache/camel/component/language/LanguageComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/language/LanguageComponentConfigurationAndDocumentationTest.java @@ -41,7 +41,7 @@ public class LanguageComponentConfigurationAndDocumentationTest extends ContextT String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"script\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"script\": { \"type\": \"string\" }")); assertTrue(json.contains("\"cacheScript\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/camel-core/src/test/java/org/apache/camel/component/log/LogComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/log/LogComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/log/LogComponentConfigurationAndDocumentationTest.java index e5760ce..3e84dfb 100644 --- a/camel-core/src/test/java/org/apache/camel/component/log/LogComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/log/LogComponentConfigurationAndDocumentationTest.java @@ -41,8 +41,8 @@ public class LogComponentConfigurationAndDocumentationTest extends ContextTestSu String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"level\": { \"type\": \"java.lang.String\" }")); - assertTrue(json.contains("\"groupInterval\": { \"type\": \"java.lang.Long\" }")); + assertTrue(json.contains("\"level\": { \"type\": \"string\" }")); + assertTrue(json.contains("\"groupInterval\": { \"type\": \"integer\" }")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/camel-core/src/test/java/org/apache/camel/component/mock/MockComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/mock/MockComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/mock/MockComponentConfigurationAndDocumentationTest.java index 6e4b0f5..d991e91 100644 --- a/camel-core/src/test/java/org/apache/camel/component/mock/MockComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/mock/MockComponentConfigurationAndDocumentationTest.java @@ -41,8 +41,8 @@ public class MockComponentConfigurationAndDocumentationTest extends ContextTestS String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"expectedCount\": { \"type\": \"int\" }")); - assertTrue(json.contains("\"retainFirst\": { \"type\": \"int\" }")); + assertTrue(json.contains("\"expectedCount\": { \"type\": \"integer\" }")); + assertTrue(json.contains("\"retainFirst\": { \"type\": \"integer\" }")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/camel-core/src/test/java/org/apache/camel/component/seda/SedaComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/seda/SedaComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/seda/SedaComponentConfigurationAndDocumentationTest.java index 4b06596..f6a6108 100644 --- a/camel-core/src/test/java/org/apache/camel/component/seda/SedaComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/seda/SedaComponentConfigurationAndDocumentationTest.java @@ -41,7 +41,7 @@ public class SedaComponentConfigurationAndDocumentationTest extends ContextTestS String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"timeout\": { \"type\": \"long\" }")); + assertTrue(json.contains("\"timeout\": { \"type\": \"integer\" }")); assertTrue(json.contains("\"blockWhenFull\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/camel-core/src/test/java/org/apache/camel/component/test/TestComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/test/TestComponentConfigurationAndDocumentationTest.java b/camel-core/src/test/java/org/apache/camel/component/test/TestComponentConfigurationAndDocumentationTest.java index 46f4f82..7c96225 100644 --- a/camel-core/src/test/java/org/apache/camel/component/test/TestComponentConfigurationAndDocumentationTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/test/TestComponentConfigurationAndDocumentationTest.java @@ -41,8 +41,8 @@ public class TestComponentConfigurationAndDocumentationTest extends ContextTestS String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"retainFirst\": { \"type\": \"int\" }")); - assertTrue(json.contains("\"timeout\": { \"type\": \"long\" }")); + assertTrue(json.contains("\"retainFirst\": { \"type\": \"integer\" }")); + assertTrue(json.contains("\"timeout\": { \"type\": \"integer\" }")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 40b9ad1..d967314 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,8 +41,8 @@ public class TimerComponentConfigurationAndDocumentationTest extends ContextTest String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"timerName\": { \"type\": \"java.lang.String\" }")); - assertTrue(json.contains("\"delay\": { \"type\": \"long\" }")); + assertTrue(json.contains("\"timerName\": { \"type\": \"string\" }")); + assertTrue(json.contains("\"delay\": { \"type\": \"integer\" }")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 5785c45..df1b28c 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("\"resourceUri\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"resourceUri\": { \"type\": \"string\" }")); assertTrue(json.contains("\"synchronous\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 e74c63f..eaa57da 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,7 +42,7 @@ public class CxfComponentConfigurationAndDocumentationTest extends CamelTestSupp String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"serviceNameString\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"serviceNameString\": { \"type\": \"string\" }")); assertTrue(json.contains("\"isWrapped\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 336ad55..106bc57 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\": \"java.lang.String\" }")); - assertTrue(json.contains("\"maxClientCacheSize\": { \"type\": \"int\" }")); + assertTrue(json.contains("\"address\": { \"type\": \"string\" }")); + assertTrue(json.contains("\"maxClientCacheSize\": { \"type\": \"integer\" }")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 2acddb0..a30f425 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,7 +42,7 @@ public class ElasticsearchComponentConfigurationAndDocumentationTest extends Cam String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"indexName\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"indexName\": { \"type\": \"string\" }")); assertTrue(json.contains("\"local\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 24fb87a..7725d5e 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\": \"int\" }")); - assertTrue(json.contains("\"dataTimeout\": { \"type\": \"int\" }")); + assertTrue(json.contains("\"maximumReconnectAttempts\": { \"type\": \"integer\" }")); + assertTrue(json.contains("\"dataTimeout\": { \"type\": \"integer\" }")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 0ab69e3..9955746 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\": \"int\" }")); - assertTrue(json.contains("\"dataTimeout\": { \"type\": \"int\" }")); + assertTrue(json.contains("\"maximumReconnectAttempts\": { \"type\": \"integer\" }")); + assertTrue(json.contains("\"dataTimeout\": { \"type\": \"integer\" }")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 342fc8e..3964f48 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,7 +42,7 @@ public class SftpComponentConfigurationAndDocumentationTest extends CamelTestSup String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"maximumReconnectAttempts\": { \"type\": \"int\" }")); + assertTrue(json.contains("\"maximumReconnectAttempts\": { \"type\": \"integer\" }")); assertTrue(json.contains("\"download\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 ee32850..a86f1c1 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\": \"java.lang.String\" }")); - assertTrue(json.contains("\"scope\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"consumerKey\": { \"type\": \"string\" }")); + assertTrue(json.contains("\"scope\": { \"type\": \"string\" }")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 e72663e..86ec63b 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\": \"java.lang.String\" }")); - assertTrue(json.contains("\"HTTPS_SCHEME\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"GHTTP_SCHEME\": { \"type\": \"string\" }")); + assertTrue(json.contains("\"HTTPS_SCHEME\": { \"type\": \"string\" }")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 474fafd..3f57f90 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,7 +42,7 @@ public class GLoginComponentConfigurationAndDocumentationTest extends CamelTestS String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"clientName\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"clientName\": { \"type\": \"string\" }")); assertTrue(json.contains("\"devMode\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 7c72efc..c6240a4 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\": \"java.lang.String\" }")); - assertTrue(json.contains("\"bcc\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"sender\": { \"type\": \"string\" }")); + assertTrue(json.contains("\"bcc\": { \"type\": \"string\" }")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 08eeba4..61ab075 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,7 +41,7 @@ public class GTaskComponentConfigurationAndDocumentationTest extends CamelTestSu String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"workerRoot\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"workerRoot\": { \"type\": \"string\" }")); assertTrue(json.contains("\"disableStreamCache\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 80ee5b6..fd2b953 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,7 +44,7 @@ public class HdfsComponentConfigurationAndDocumentationTest extends CamelTestSup String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"pattern\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"pattern\": { \"type\": \"string\" }")); assertTrue(json.contains("\"wantAppend\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 803abfa..7d21287 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\": \"long\" }")); - assertTrue(json.contains("\"checkIdleInterval\": { \"type\": \"int\" }")); + assertTrue(json.contains("\"initialDelay\": { \"type\": \"integer\" }")); + assertTrue(json.contains("\"checkIdleInterval\": { \"type\": \"integer\" }")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 5ec5e70..0b650aa 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,7 +42,7 @@ public class HttpComponentConfigurationAndDocumentationTest extends CamelTestSup String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"httpMethodRestrict\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"httpMethodRestrict\": { \"type\": \"string\" }")); assertTrue(json.contains("\"matchOnUriPrefix\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 1a37183..3cb0fd0 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,7 +43,7 @@ public class HttpComponentConfigurationAndDocumentationTest extends CamelTestSup String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"httpMethodRestrict\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"httpMethodRestrict\": { \"type\": \"string\" }")); assertTrue(json.contains("\"throwExceptionOnFailure\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 6f5d94a..ff766be 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,7 +43,7 @@ public class InfinispanComponentConfigurationAndDocumentationTest extends CamelT String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"command\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"command\": { \"type\": \"string\" }")); assertTrue(json.contains("\"sync\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 19b4ce6..5df70a9 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 @@ -45,7 +45,7 @@ public class JcrComponentConfigurationAndDocumentationTest extends CamelTestSupp assertNotNull(json); assertTrue(json.contains("\"deep\": { \"type\": \"boolean\" }")); - assertTrue(json.contains("\"eventTypes\": { \"type\": \"int\" }")); + assertTrue(json.contains("\"eventTypes\": { \"type\": \"integer\" }")); assertTrue(json.contains("\"noLocal\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java index 5eeb987..ef8e8ce 100755 --- a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java +++ b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java @@ -39,10 +39,12 @@ public class JdbcEndpoint extends DefaultEndpoint { private boolean transacted; @UriParam private boolean resetAutoCommit = true; + @UriParam private DataSource dataSource; private Map<String, Object> parameters; @UriParam private boolean useJDBC4ColumnNameAndLabelSemantics = true; + @UriParam private JdbcPrepareStatementStrategy prepareStatementStrategy = new DefaultJdbcPrepareStatementStrategy(); @UriParam private boolean allowNamedParameters = true; @@ -52,6 +54,7 @@ public class JdbcEndpoint extends DefaultEndpoint { private JdbcOutputType outputType = JdbcOutputType.SelectList; @UriParam private String outputClass; + @UriParam private BeanRowMapper beanRowMapper = new DefaultBeanRowMapper(); public JdbcEndpoint() { http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 8033209..60b7182 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,8 +42,10 @@ public class JdbcComponentConfigurationAndDocumentationTest extends CamelTestSup String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"outputClass\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"outputClass\": { \"type\": \"string\" }")); assertTrue(json.contains("\"allowNamedParameters\": { \"type\": \"boolean\" }")); + assertTrue(json.contains("\"beanRowMapper\": { \"type\": \"object\",")); + assertTrue(json.contains("\"javaType\": { \"description\": \"org.apache.camel.component.jdbc.BeanRowMapper\", \"type\": \"string\" }")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 94a5eab..9a9c14f 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,7 +43,7 @@ public class JettyHttpComponentConfigurationAndDocumentationTest extends CamelTe String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"httpClientMaxThreads\": { \"type\": \"java.lang.Integer\" }")); + assertTrue(json.contains("\"httpClientMaxThreads\": { \"type\": \"integer\" }")); assertTrue(json.contains("\"sessionSupport\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 d2fac3e..08bdbf5 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,7 +41,7 @@ public class JGroupsComponentConfigurationAndDocumentationTest extends CamelTest String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"channelProperties\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"channelProperties\": { \"type\": \"string\" }")); assertTrue(json.contains("\"resolvedEnableViewMessages\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 942506b..e431604 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,7 +41,7 @@ public class JmsComponentConfigurationAndDocumentationTest extends CamelTestSupp String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"replyToDestination\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"replyToDestination\": { \"type\": \"string\" }")); assertTrue(json.contains("\"transacted\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 5ff9760..e3cb131 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,7 +43,7 @@ public class JpaComponentConfigurationAndDocumentationTest extends CamelTestSupp String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"persistenceUnit\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"persistenceUnit\": { \"type\": \"string\" }")); assertTrue(json.contains("\"usePassedInEntityManager\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 527995a..e5dc67b 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,7 +42,7 @@ public class MailComponentConfigurationAndDocumentationTest extends CamelTestSup String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"contentType\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"contentType\": { \"type\": \"string\" }")); assertTrue(json.contains("\"debugMode\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 0133b97..8b79bd4 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\": \"int\" }")); - assertTrue(json.contains("\"statement\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"maxMessagesPerPoll\": { \"type\": \"integer\" }")); + assertTrue(json.contains("\"statement\": { \"type\": \"string\" }")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 5fa2593..5588bc6 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,7 +43,7 @@ public class NettyHttpComponentConfigurationAndDocumentationTest extends CamelTe String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"httpMethodRestrict\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"httpMethodRestrict\": { \"type\": \"string\" }")); assertTrue(json.contains("\"traceEnabled\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java index f61e12b..db94631 100644 --- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java +++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java @@ -74,6 +74,7 @@ public class NettyConfiguration extends NettyServerBootstrapConfiguration implem private LoggingLevel serverClosedChannelExceptionCaughtLogLevel = LoggingLevel.DEBUG; @UriParam private boolean allowDefaultCodec = true; + @UriParam private ClientPipelineFactory clientPipelineFactory; @UriParam private int maximumPoolSize = 16; http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 a06f924..d098fe4 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,7 +43,7 @@ public class NettyComponentConfigurationAndDocumentationTest extends CamelTestSu String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"producerPoolMinEvictableIdle\": { \"type\": \"long\" }")); + assertTrue(json.contains("\"producerPoolMinEvictableIdle\": { \"type\": \"integer\" }")); assertTrue(json.contains("\"allowDefaultCodec\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java index ffdc77d..2912a46 100644 --- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java +++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.netty4; - import java.io.File; import java.net.URI; import java.nio.charset.Charset; @@ -75,6 +74,7 @@ public class NettyConfiguration extends NettyServerBootstrapConfiguration implem private LoggingLevel serverClosedChannelExceptionCaughtLogLevel = LoggingLevel.DEBUG; @UriParam private boolean allowDefaultCodec = true; + @UriParam private ClientPipelineFactory clientPipelineFactory; @UriParam private int maximumPoolSize = 16; http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 f670a31..cda8749 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,7 +43,7 @@ public class NettyComponentConfigurationAndDocumentationTest extends CamelTestSu String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"producerPoolMinEvictableIdle\": { \"type\": \"long\" }")); + assertTrue(json.contains("\"producerPoolMinEvictableIdle\": { \"type\": \"integer\" }")); assertTrue(json.contains("\"allowDefaultCodec\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 d24f94a..216f4e8 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\": \"java.lang.String\" }")); - assertTrue(json.contains("\"clientId\": { \"type\": \"java.lang.String\" }")); - assertTrue(json.contains("\"operation\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"application\": { \"type\": \"string\" }")); + assertTrue(json.contains("\"clientId\": { \"type\": \"string\" }")); + assertTrue(json.contains("\"operation\": { \"type\": \"string\" }")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 fd3ab3c..3edcc33 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,7 +42,7 @@ public class OptaPlannerComponentConfigurationAndDocumentationTest extends Camel String json = componentConfiguration.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"resourceUri\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"resourceUri\": { \"type\": \"string\" }")); assertTrue(json.contains("\"synchronous\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 93e99af..aa628b3 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,7 +41,7 @@ public class Quartz2ComponentConfigurationAndDocumentationTest extends CamelTest String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"cron\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"cron\": { \"type\": \"string\" }")); assertTrue(json.contains("\"fireNow\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 0098070..17a1762 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,7 +43,7 @@ public class ServletComponentConfigurationAndDocumentationTest extends CamelTest String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"servletName\": { \"type\": \"java.lang.String\" }")); + assertTrue(json.contains("\"servletName\": { \"type\": \"string\" }")); assertTrue(json.contains("\"matchOnUriPrefix\": { \"type\": \"boolean\" }")); } http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 feeafea..af2c3e0 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,9 @@ public class SqlComponentConfigurationAndDocumentationTest extends CamelTestSupp String json = compConf.createParameterJsonSchema(); assertNotNull(json); - assertTrue(json.contains("\"onConsumeBatchComplete\": { \"type\": \"java.lang.String\" }")); - assertTrue(json.contains("\"parametersCount\": { \"type\": \"int\" }")); + + assertTrue(json.contains("\"onConsumeBatchComplete\": { \"type\": \"string\" }")); + assertTrue(json.contains("\"parametersCount\": { \"type\": \"integer\" }")); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/ffc12ed9/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 c0cfe61..ed23d4a 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\": \"java.lang.String\" }")); - assertTrue(json.contains("\"backoff\": { \"type\": \"long\" }")); + assertTrue(json.contains("\"createMode\": { \"type\": \"string\" }")); + assertTrue(json.contains("\"backoff\": { \"type\": \"integer\" }")); } @Test
