Repository: camel Updated Branches: refs/heads/master 5cdd55b64 -> 02903870e
CAMEL-7999: Add component details to json Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/02903870 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/02903870 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/02903870 Branch: refs/heads/master Commit: 02903870ec2934ef91452042d91ac1b5034c6c0f Parents: 5cdd55b Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Nov 10 10:10:50 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Nov 10 10:10:50 2014 +0100 ---------------------------------------------------------------------- .../apache/camel/tools/apt/EndpointAnnotationProcessor.java | 6 ++++++ .../main/java/org/apache/camel/tools/apt/JsonSchemaHelper.java | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/02903870/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java ---------------------------------------------------------------------- diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java index 63d445c..675b5fe 100644 --- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java +++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java @@ -254,6 +254,12 @@ public class EndpointAnnotationProcessor extends AbstractProcessor { if (typeElement != null) { String doc = elementUtils.getDocComment(typeElement); if (doc != null) { + // grab the first sentence only as this is for short description + int idx = doc.indexOf('.'); + if (idx != -1) { + // do not include the dot, so do not use idx + 1 + doc = doc.substring(0, idx); + } model.setDescription(doc); } } http://git-wip-us.apache.org/repos/asf/camel/blob/02903870/tooling/apt/src/main/java/org/apache/camel/tools/apt/JsonSchemaHelper.java ---------------------------------------------------------------------- diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/JsonSchemaHelper.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/JsonSchemaHelper.java index 7a88eea..10b4649 100644 --- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/JsonSchemaHelper.java +++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/JsonSchemaHelper.java @@ -23,6 +23,8 @@ import java.util.Set; */ final class JsonSchemaHelper { + private static final String VALID_CHARS = ".-='/\\!&()"; + private JsonSchemaHelper() { } @@ -172,7 +174,7 @@ final class JsonSchemaHelper { } for (char c : line.toCharArray()) { - if (Character.isJavaIdentifierPart(c) || '.' == c) { + if (Character.isJavaIdentifierPart(c) || VALID_CHARS.indexOf(c) != -1) { sb.append(c); } else if (Character.isWhitespace(c)) { // always use space as whitespace, also for line feeds etc
