[1/4] camel git commit: Fixed apt plugin to define char as string type in component schema docs

[davsclaus]

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 4e4e9e59d -> 5e1300002
  refs/heads/master 622ccbb69 -> 7c52e786d


Fixed apt plugin to define char as string type in component schema docs


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

Branch: refs/heads/master
Commit: 409cc997711c964293d7967c53ff72d9410e4076
Parents: 622ccbb
Author: Claus Ibsen <davscl...@apache.org>
Authored: Sat Jan 2 23:00:22 2016 +0100
Committer: Claus Ibsen <davscl...@apache.org>
Committed: Sat Jan 2 23:00:22 2016 +0100

----------------------------------------------------------------------
 .../tools/apt/helper/JsonSchemaHelper.java      | 31 ++++++--------------
 1 file changed, 9 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/409cc997/tooling/apt/src/main/java/org/apache/camel/tools/apt/helper/JsonSchemaHelper.java
----------------------------------------------------------------------
diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/helper/JsonSchemaHelper.java
 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/helper/JsonSchemaHelper.java
index c3fa7c7..686f8d6 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/helper/JsonSchemaHelper.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/helper/JsonSchemaHelper.java
@@ -162,36 +162,23 @@ public final class JsonSchemaHelper {
             return "array";
         } else if ("java.lang.String[]".equals(name) || 
"String[]".equals(name)) {
             return "array";
-            // and these is common as well
+        } else if ("java.lang.Character".equals(name) || 
"Character".equals(name) || "char".equals(name)) {
+            return "string";
         } 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)) {
+        } else if ("java.lang.Boolean".equals(name) || "Boolean".equals(name) 
|| "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)) {
+        } else if ("java.lang.Integer".equals(name) || "Integer".equals(name) 
|| "int".equals(name)) {
             return "integer";
-        } else if ("long".equals(name)) {
+        } else if ("java.lang.Long".equals(name) || "Long".equals(name) || 
"long".equals(name)) {
             return "integer";
-        } else if ("java.lang.Short".equals(name) || "Short".equals(name)) {
+        } else if ("java.lang.Short".equals(name) || "Short".equals(name) || 
"short".equals(name)) {
             return "integer";
-        } else if ("short".equals(name)) {
+        } else if ("java.lang.Byte".equals(name) || "Byte".equals(name) || 
"byte".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)) {
+        } else if ("java.lang.Float".equals(name) || "Float".equals(name) || 
"float".equals(name)) {
             return "number";
-        } else if ("double".equals(name)) {
+        } else if ("java.lang.Double".equals(name) || "Double".equals(name) || 
"double".equals(name)) {
             return "number";
         }