Repository: camel Updated Branches: refs/heads/master 736ae9a48 -> 5cdd55b64
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/5cdd55b6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5cdd55b6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5cdd55b6 Branch: refs/heads/master Commit: 5cdd55b645f5b7888e8001a21626be25b20b6ec1 Parents: 736ae9a Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Nov 10 08:38:55 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Nov 10 08:38:55 2014 +0100 ---------------------------------------------------------------------- .../camel/tools/apt/EndpointAnnotationProcessor.java | 12 ++++++++++++ .../org/apache/camel/tools/apt/JsonSchemaHelper.java | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5cdd55b6/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 2149bed..63d445c 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 @@ -247,6 +247,18 @@ public class EndpointAnnotationProcessor extends AbstractProcessor { model.setVersionId(map.get("version")); } + // favor to use class javadoc of component as description + if (model.getJavaType() != null) { + Elements elementUtils = processingEnv.getElementUtils(); + TypeElement typeElement = findTypeElement(roundEnv, model.getJavaType()); + if (typeElement != null) { + String doc = elementUtils.getDocComment(typeElement); + if (doc != null) { + model.setDescription(doc); + } + } + } + return model; } http://git-wip-us.apache.org/repos/asf/camel/blob/5cdd55b6/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 f396bef..7a88eea 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 @@ -161,7 +161,10 @@ final class JsonSchemaHelper { } // remove all HTML tags - line = line.replaceAll("\\</?\\w+\\/?>", ""); + line = line.replaceAll("<.*?>", ""); + + // remove all inlined javadoc links + line = line.replaceAll("\\{\\@\\w+\\s(\\w+)\\}", "$1"); // we are starting from a new line, so add a whitespace if (!first) {
