CAMEL-10649: Fix missing javadoc on model, and added missing data formats to transformers.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f54a309d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f54a309d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f54a309d Branch: refs/heads/master Commit: f54a309d1b63443dc4e9a21549b2d3f2ad27b3fd Parents: 91f133d Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Dec 23 11:03:27 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Dec 23 11:03:27 2016 +0100 ---------------------------------------------------------------------- .../camel/model/dataformat/YAMLTypeFilterDefinition.java | 9 +++++++++ .../camel/model/transformer/TransformersDefinition.java | 4 ++-- .../apache/camel/maven/packaging/PrepareCatalogMojo.java | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f54a309d/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java index 8e4babb..43a71db 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java @@ -21,6 +21,9 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; +import org.apache.camel.spi.Metadata; + +@Metadata(label = "dataformat,transformation,yaml", title = "YAML Type Filter") @XmlRootElement(name = "typeFilter") @XmlAccessorType(XmlAccessType.FIELD) public final class YAMLTypeFilterDefinition { @@ -33,6 +36,9 @@ public final class YAMLTypeFilterDefinition { return value; } + /** + * Value of type such as class name or regular expression + */ public void setValue(String value) { this.value = value; } @@ -41,6 +47,9 @@ public final class YAMLTypeFilterDefinition { return type; } + /** + * Whether to filter by class type or regular expression + */ public void setType(YAMLTypeFilterType type) { this.type = type; } http://git-wip-us.apache.org/repos/asf/camel/blob/f54a309d/camel-core/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java b/camel-core/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java index 9cca157..ede69cc 100644 --- a/camel-core/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java @@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.spi.Metadata; /** - * To configure transforms. + * To configure transformers. */ @Metadata(label = "transformation", title = "Transformations") @XmlRootElement(name = "transformers") @@ -41,7 +41,7 @@ public class TransformersDefinition { private List<TransformerDefinition> transforms; /** - * A list holding the configured transformations + * The configured transformers */ public void setTransformers(List<TransformerDefinition> transforms) { this.transforms = transforms; http://git-wip-us.apache.org/repos/asf/camel/blob/f54a309d/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java index ae1ab13..584a2a2 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java @@ -265,7 +265,7 @@ public class PrepareCatalogMojo extends AbstractMojo { for (Map<String, String> row : rows) { String name = row.get("name"); // skip checking these as they have no documentation - if ("outputs".equals(name)) { + if ("outputs".equals(name) || "transforms".equals(name)) { continue; }