Repository: camel Updated Branches: refs/heads/camel-2.16.x 7ad4fe372 -> 31929b025 refs/heads/master f647d33ab -> ab101cb4e
added support to exclude a route from documentation Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5b0714bc Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5b0714bc Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5b0714bc Branch: refs/heads/camel-2.16.x Commit: 5b0714bcb23b97241d00b1c3f349e6c2b0ccc3ca Parents: 7ad4fe3 Author: Simion Hantig <simion.han...@hgdata.com> Authored: Mon Mar 14 12:10:27 2016 +0200 Committer: Simion Hantig <simion.han...@hgdata.com> Committed: Mon Mar 14 12:16:08 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/model/rest/RestDefinition.java | 6 ++++++ .../java/org/apache/camel/model/rest/VerbDefinition.java | 10 ++++++++++ .../java/org/apache/camel/swagger/RestSwaggerReader.java | 7 ++++++- 3 files changed, 22 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5b0714bc/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java index 41f6fe3..176d31d 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java @@ -497,6 +497,12 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition> return this; } + public RestDefinition excludeFromDocs() { + VerbDefinition verb = getVerbs().get(getVerbs().size() - 1); + verb.setExcludeFromDocs(true); + return this; + } + public RouteDefinition route() { // add to last verb if (getVerbs().isEmpty()) { http://git-wip-us.apache.org/repos/asf/camel/blob/5b0714bc/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java index 8d1e686..d3a9aba 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java @@ -98,6 +98,8 @@ public class VerbDefinition extends OptionalIdentifiedDefinition<VerbDefinition> private RestDefinition rest; @XmlAttribute private String routeId; + @XmlAttribute + private Boolean excludeFromDocs; @Override public String getLabel() { @@ -369,6 +371,14 @@ public class VerbDefinition extends OptionalIdentifiedDefinition<VerbDefinition> return rest.verb(verb, uri); } + public Boolean getExcludeFromDocs() { + return excludeFromDocs; + } + + public void setExcludeFromDocs(Boolean excludeFromDocs) { + this.excludeFromDocs = excludeFromDocs; + } + public String asVerb() { // we do not want the jaxb model to repeat itself, by outputting <get method="get"> // so we defer the verb from the instance type http://git-wip-us.apache.org/repos/asf/camel/blob/5b0714bc/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java ---------------------------------------------------------------------- diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java index 29b2e72..36e306c 100644 --- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java +++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java @@ -116,6 +116,9 @@ public class RestSwaggerReader { // gather all types in use Set<String> types = new LinkedHashSet<>(); for (VerbDefinition verb : verbs) { + if (verb.getExcludeFromDocs() != null && verb.getExcludeFromDocs()) { + continue; + } String type = verb.getType(); if (ObjectHelper.isNotEmpty(type)) { if (type.endsWith("[]")) { @@ -156,7 +159,9 @@ public class RestSwaggerReader { String basePath = rest.getPath(); for (VerbDefinition verb : verbs) { - + if (verb.getExcludeFromDocs() != null && verb.getExcludeFromDocs()) { + continue; + } // the method must be in lower case String method = verb.asVerb().toLowerCase(Locale.US); // operation path is a key