Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/91f133d9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/91f133d9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/91f133d9 Branch: refs/heads/master Commit: 91f133d9e40f2409b4458f9a5a85d19d58cf6d0e Parents: 54eb007 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Dec 23 10:43:36 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Dec 23 10:43:36 2016 +0100 ---------------------------------------------------------------------- .../model/transformer/CustomTransformerDefinition.java | 5 ++++- .../transformer/DataFormatTransformerDefinition.java | 12 ++++++++++++ .../transformer/EndpointTransformerDefinition.java | 2 ++ .../camel/model/transformer/TransformerDefinition.java | 8 ++++++++ 4 files changed, 26 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/91f133d9/camel-core/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java index 5a14b5b..b66f601 100644 --- a/camel-core/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java @@ -35,6 +35,7 @@ import org.apache.camel.spi.Transformer; @XmlType(name = "customTransformer") @XmlAccessorType(XmlAccessType.FIELD) public class CustomTransformerDefinition extends TransformerDefinition { + @XmlAttribute private String ref; @XmlAttribute @@ -74,6 +75,7 @@ public class CustomTransformerDefinition extends TransformerDefinition { /** * Set a bean reference of the Transformer + * * @param ref the bean reference of the Transformer */ public void setRef(String ref) { @@ -86,7 +88,8 @@ public class CustomTransformerDefinition extends TransformerDefinition { /** * Set a class name of the Transformer - * @param ref the class name of the Transformer + * + * @param type the class name of the Transformer */ public void setType(String type) { this.type = type; http://git-wip-us.apache.org/repos/asf/camel/blob/91f133d9/camel-core/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java index fa74e3e..db1c98b 100644 --- a/camel-core/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java @@ -26,6 +26,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.impl.transformer.DataFormatTransformer; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.model.dataformat.AvroDataFormat; +import org.apache.camel.model.dataformat.BarcodeDataFormat; import org.apache.camel.model.dataformat.Base64DataFormat; import org.apache.camel.model.dataformat.BeanioDataFormat; import org.apache.camel.model.dataformat.BindyDataFormat; @@ -37,11 +38,14 @@ import org.apache.camel.model.dataformat.CustomDataFormat; import org.apache.camel.model.dataformat.FlatpackDataFormat; import org.apache.camel.model.dataformat.GzipDataFormat; import org.apache.camel.model.dataformat.HL7DataFormat; +import org.apache.camel.model.dataformat.HessianDataFormat; import org.apache.camel.model.dataformat.IcalDataFormat; import org.apache.camel.model.dataformat.JacksonXMLDataFormat; import org.apache.camel.model.dataformat.JaxbDataFormat; import org.apache.camel.model.dataformat.JibxDataFormat; import org.apache.camel.model.dataformat.JsonDataFormat; +import org.apache.camel.model.dataformat.LZFDataFormat; +import org.apache.camel.model.dataformat.MimeMultipartDataFormat; import org.apache.camel.model.dataformat.PGPDataFormat; import org.apache.camel.model.dataformat.ProtobufDataFormat; import org.apache.camel.model.dataformat.RssDataFormat; @@ -59,6 +63,7 @@ import org.apache.camel.model.dataformat.XMLSecurityDataFormat; import org.apache.camel.model.dataformat.XStreamDataFormat; import org.apache.camel.model.dataformat.XmlJsonDataFormat; import org.apache.camel.model.dataformat.XmlRpcDataFormat; +import org.apache.camel.model.dataformat.YAMLDataFormat; import org.apache.camel.model.dataformat.ZipDataFormat; import org.apache.camel.model.dataformat.ZipFileDataFormat; import org.apache.camel.spi.DataFormat; @@ -79,6 +84,7 @@ public class DataFormatTransformerDefinition extends TransformerDefinition { @XmlElements({ @XmlElement(required = false, name = "avro", type = AvroDataFormat.class), + @XmlElement(required = false, name = "barcode", type = BarcodeDataFormat.class), @XmlElement(required = false, name = "base64", type = Base64DataFormat.class), @XmlElement(required = false, name = "beanio", type = BeanioDataFormat.class), @XmlElement(required = false, name = "bindy", type = BindyDataFormat.class), @@ -86,15 +92,19 @@ public class DataFormatTransformerDefinition extends TransformerDefinition { @XmlElement(required = false, name = "castor", type = CastorDataFormat.class), @XmlElement(required = false, name = "crypto", type = CryptoDataFormat.class), @XmlElement(required = false, name = "csv", type = CsvDataFormat.class), + // TODO: Camel 3.0 - Should be named customDataFormat to avoid naming clash with custom loadbalancer @XmlElement(required = false, name = "custom", type = CustomDataFormat.class), @XmlElement(required = false, name = "flatpack", type = FlatpackDataFormat.class), @XmlElement(required = false, name = "gzip", type = GzipDataFormat.class), + @XmlElement(required = false, name = "hessian", type = HessianDataFormat.class), @XmlElement(required = false, name = "hl7", type = HL7DataFormat.class), @XmlElement(required = false, name = "ical", type = IcalDataFormat.class), @XmlElement(required = false, name = "jacksonxml", type = JacksonXMLDataFormat.class), @XmlElement(required = false, name = "jaxb", type = JaxbDataFormat.class), @XmlElement(required = false, name = "jibx", type = JibxDataFormat.class), @XmlElement(required = false, name = "json", type = JsonDataFormat.class), + @XmlElement(required = false, name = "lzf", type = LZFDataFormat.class), + @XmlElement(required = false, name = "mimeMultipart", type = MimeMultipartDataFormat.class), @XmlElement(required = false, name = "protobuf", type = ProtobufDataFormat.class), @XmlElement(required = false, name = "rss", type = RssDataFormat.class), @XmlElement(required = false, name = "secureXML", type = XMLSecurityDataFormat.class), @@ -112,6 +122,7 @@ public class DataFormatTransformerDefinition extends TransformerDefinition { @XmlElement(required = false, name = "xmlrpc", type = XmlRpcDataFormat.class), @XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class), @XmlElement(required = false, name = "pgp", type = PGPDataFormat.class), + @XmlElement(required = false, name = "yaml", type = YAMLDataFormat.class), @XmlElement(required = false, name = "zip", type = ZipDataFormat.class), @XmlElement(required = false, name = "zipFile", type = ZipFileDataFormat.class)} ) @@ -136,6 +147,7 @@ public class DataFormatTransformerDefinition extends TransformerDefinition { /** * Set the reference of the DataFormat. + * * @param ref reference of the DataFormat */ public void setRef(String ref) { http://git-wip-us.apache.org/repos/asf/camel/blob/91f133d9/camel-core/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java index 92f0a85..7c0dc32 100644 --- a/camel-core/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java @@ -65,6 +65,7 @@ public class EndpointTransformerDefinition extends TransformerDefinition { /** * Set the reference of the Endpoint. + * * @param ref reference of the Endpoint */ public void setRef(String ref) { @@ -77,6 +78,7 @@ public class EndpointTransformerDefinition extends TransformerDefinition { /** * Set the URI of the Endpoint. + * * @param uri URI of the Endpoint */ public void setUri(String uri) { http://git-wip-us.apache.org/repos/asf/camel/blob/91f133d9/camel-core/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java index 57039c3..590bb5a 100644 --- a/camel-core/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java @@ -21,6 +21,8 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlType; import org.apache.camel.CamelContext; +import org.apache.camel.model.InputTypeDefinition; +import org.apache.camel.model.OutputTypeDefinition; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.Transformer; @@ -44,6 +46,7 @@ import org.apache.camel.spi.Transformer; @XmlType(name = "transformer") @XmlAccessorType(XmlAccessType.FIELD) public abstract class TransformerDefinition { + @XmlAttribute private String scheme; @XmlAttribute @@ -63,6 +66,7 @@ public abstract class TransformerDefinition { /** * Set a scheme name supported by the transformer. + * * @param scheme scheme name */ public void setScheme(String scheme) { @@ -75,6 +79,7 @@ public abstract class TransformerDefinition { /** * Set the 'from' data type . + * * @param from 'from' data type */ public void setFrom(String from) { @@ -83,6 +88,7 @@ public abstract class TransformerDefinition { /** * Set the 'from' data type using Java class. + * * @param clazz 'from' Java class */ public void setFrom(Class<?> clazz) { @@ -95,6 +101,7 @@ public abstract class TransformerDefinition { /** * Set the 'to' data type. + * * @param to 'to' data type */ public void setTo(String to) { @@ -103,6 +110,7 @@ public abstract class TransformerDefinition { /** * Set the 'to' data type using Java class. + * * @param clazz 'to' Java class */ public void setTo(Class<?> clazz) {
