[camel] branch master updated: Fixed duplicate dataformat in model and added missing.

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 9cba6d5  Fixed duplicate dataformat in model and added missing.
9cba6d5 is described below

commit 9cba6d50bbce629d979b04a5e33cc3d4a5861be9
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Oct 16 06:24:21 2019 +0200

    Fixed duplicate dataformat in model and added missing.
---
 .../src/main/java/org/apache/camel/model/MarshalDefinition.java    | 2 +-
 .../src/main/java/org/apache/camel/model/UnmarshalDefinition.java  | 2 +-
 .../camel/model/transformer/DataFormatTransformerDefinition.java   | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/MarshalDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/MarshalDefinition.java
index 3cd41e3..d2b22da 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/MarshalDefinition.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/MarshalDefinition.java
@@ -69,7 +69,7 @@ import org.apache.camel.spi.Metadata;
  * Marshals data into a specified format for transmission over a transport or
  * component
  */
-@Metadata(label = "eip,transformation")
+@Metadata(label = "dataformat,transformation")
 @XmlRootElement(name = "marshal")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> {
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/UnmarshalDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
index 0e40e0a..7d7d871 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
@@ -69,7 +69,7 @@ import org.apache.camel.spi.Metadata;
  * Converts the message data received from the wire into a format that Apache
  * Camel processors can consume
  */
-@Metadata(label = "eip,transformation")
+@Metadata(label = "dataformat,transformation")
 @XmlRootElement(name = "unmarshal")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition> {
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
index 0f8de7e..7313e02 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
@@ -25,6 +25,7 @@ import javax.xml.bind.annotation.XmlType;
 
 import org.apache.camel.model.DataFormatDefinition;
 import org.apache.camel.model.dataformat.ASN1DataFormat;
+import org.apache.camel.model.dataformat.Any23DataFormat;
 import org.apache.camel.model.dataformat.AvroDataFormat;
 import org.apache.camel.model.dataformat.BarcodeDataFormat;
 import org.apache.camel.model.dataformat.Base64DataFormat;
@@ -70,14 +71,14 @@ import org.apache.camel.spi.Metadata;
  * Represents a {@link org.apache.camel.impl.transformer.DataFormatTransformer}
  * which leverages {@link org.apache.camel.spi.DataFormat} to perform
  * transformation. One of the DataFormat 'ref' or DataFormat 'type' needs to be
- * specified. {@see TransformerDefinition} {@see DataFormatTransformer}
+ * specified.
  */
-@Metadata(label = "transformation")
+@Metadata(label = "dataformat,transformation")
 @XmlType(name = "dataFormatTransformer")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class DataFormatTransformerDefinition extends TransformerDefinition {
 
-    @XmlElements({@XmlElement(required = false, name = "asn1", type = ASN1DataFormat.class),
+    @XmlElements({@XmlElement(required = false, name = "any23", type = Any23DataFormat.class),
             @XmlElement(required = false, name = "asn1", type = ASN1DataFormat.class),
             @XmlElement(required = false, name = "avro", type = AvroDataFormat.class),
             @XmlElement(required = false, name = "barcode", type = BarcodeDataFormat.class),