You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/01/02 23:16:19 UTC
[3/4] camel git commit: Fixed apt plugin to define char as string
type in component schema docs
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/fbb31adc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fbb31adc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fbb31adc
Branch: refs/heads/camel-2.16.x
Commit: fbb31adc47b40284d76696c4c622881fb37cea65
Parents: 4e4e9e5
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Jan 2 23:00:22 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Jan 2 23:15:59 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/fbb31adc/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";
}