This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 18f7bd8 CAMEL-17701: camel-core-model - Add labels to EIP options
18f7bd8 is described below
commit 18f7bd8d98f34e20d28b5731dee5f8b03ea340af
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Feb 28 15:40:19 2022 +0100
CAMEL-17701: camel-core-model - Add labels to EIP options
---
.../org/apache/camel/catalog/schemas/camel-spring.xsd | 1 -
.../model/transformer/CustomTransformerDefinition.java | 2 +-
.../transformer/DataFormatTransformerDefinition.java | 15 ---------------
.../model/transformer/EndpointTransformerDefinition.java | 2 +-
.../camel/model/transformer/TransformerDefinition.java | 12 ++++--------
.../reifier/transformer/DataFormatTransformerReifier.java | 2 +-
.../java/org/apache/camel/xml/in/ModelParser.java | 9 ++-------
.../camel/dsl/yaml/deserializers/ModelDeserializers.java | 6 ------
.../src/generated/resources/camel-yaml-dsl.json | 3 ---
.../src/generated/resources/camelYamlDsl.json | 3 ---
10 files changed, 9 insertions(+), 46 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index 96acc62..5c107a1 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -14795,7 +14795,6 @@ To configure a special tag for the operations within
this rest definition.
<xs:element ref="tns:zipFile"/>
</xs:choice>
</xs:sequence>
- <xs:attribute name="ref" type="xs:string"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java
index acc2d9d..5f6886f 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java
@@ -26,7 +26,7 @@ import org.apache.camel.spi.Transformer;
/**
* Represents a CustomTransformer. One of the bean reference (ref) or fully
qualified class name (type) of the custom
- * {@link Transformer} needs to be specified. {@see TransformerDefinition}
{@see Transformer}
+ * {@link Transformer} needs to be specified.
*/
@Metadata(label = "transformation")
@XmlType(name = "customTransformer")
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
index d10d67e..72dbfcb 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
@@ -18,7 +18,6 @@ package org.apache.camel.model.transformer;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlType;
@@ -119,20 +118,6 @@ public class DataFormatTransformerDefinition extends
TransformerDefinition {
@XmlElement(name = "zipFile", type = ZipFileDataFormat.class) })
private DataFormatDefinition dataFormatType;
- @XmlAttribute
- private String ref;
-
- public String getRef() {
- return ref;
- }
-
- /**
- * Set the reference of the DataFormat.
- */
- public void setRef(String ref) {
- this.ref = ref;
- }
-
public DataFormatDefinition getDataFormatType() {
return dataFormatType;
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
index fdf456f..d6e37ba 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
@@ -28,7 +28,7 @@ import org.apache.camel.spi.Metadata;
* {@link org.apache.camel.Endpoint} to perform transformation. A
* {@link org.apache.camel.processor.transformer.ProcessorTransformer} will be
created internally with a
* {@link org.apache.camel.processor.SendProcessor} which forwards the message
to the specified Endpoint. One of the
- * Endpoint 'ref' or 'uri' needs to be specified. {@see TransformerDefinition}
{@see ProcessorTransformer}
+ * Endpoint 'ref' or 'uri' needs to be specified.
*/
@Metadata(label = "transformation")
@XmlType(name = "endpointTransformer")
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java
index 13212f9..514cf53 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java
@@ -27,17 +27,13 @@ import org.apache.camel.spi.DataType;
import org.apache.camel.spi.Metadata;
/**
- * <p>
- * Represents a {@link org.apache.camel.spi.Transformer} which declaratively
transforms message content according to the
+ * Represents a {@link org.apache.camel.spi.Transformer} which declarative
transforms message content according to the
* input type declared by {@link InputTypeDefinition} and/or output type
declared by {@link OutputTypeDefinition}.
- * </p>
- * <p>
+ *
* If you specify from='java:com.example.ABC' and to='xml:XYZ', the
transformer will be picked up when current message
* type is 'java:com.example.ABC' and expected message type is 'xml:XYZ'. If
you specify from='java' to='xml', then it
- * will be picked up for all of java to xml transformation. Also it's possible
to specify scheme='xml' so that the
- * transformer will be picked up for all of java to xml and xml to java
transformation.
- * </p>
- * {@see org.apache.camel.spi.Transformer} {@see InputTypeDefinition} {@see
OutputTypeDefinition}
+ * will be picked up for all of Java to xml transformation. Also it's possible
to specify scheme='xml' so that the
+ * transformer will be picked up for all of Java to xml and xml to java
transformation.
*/
@Metadata(label = "transformation")
@XmlType(name = "transformer")
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/transformer/DataFormatTransformerReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/transformer/DataFormatTransformerReifier.java
index 75e4017..294a5c5 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/transformer/DataFormatTransformerReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/transformer/DataFormatTransformerReifier.java
@@ -33,7 +33,7 @@ public class DataFormatTransformerReifier extends
TransformerReifier<DataFormatT
@Override
protected Transformer doCreateTransformer() {
DataFormat dataFormat
- = DataFormatReifier.getDataFormat(camelContext,
definition.getDataFormatType(), definition.getRef());
+ = DataFormatReifier.getDataFormat(camelContext,
definition.getDataFormatType());
return new
DataFormatTransformer(camelContext).setDataFormat(dataFormat).setModel(definition.getScheme())
.setFrom(definition.getFromType()).setTo(definition.getToType());
}
diff --git
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
index c6df265..9b1b769 100644
---
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
+++
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
@@ -3116,13 +3116,8 @@ public class ModelParser extends BaseParser {
};
}
protected DataFormatTransformerDefinition
doParseDataFormatTransformerDefinition() throws IOException,
XmlPullParserException {
- return doParse(new DataFormatTransformerDefinition(), (def, key, val)
-> {
- if ("ref".equals(key)) {
- def.setRef(val);
- return true;
- }
- return transformerDefinitionAttributeHandler().accept(def, key,
val);
- }, (def, key) -> {
+ return doParse(new DataFormatTransformerDefinition(),
+ transformerDefinitionAttributeHandler(), (def, key) -> {
DataFormatDefinition v = doParseDataFormatDefinitionRef(key);
if (v != null) {
def.setDataFormatType(v);
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index 3cee3d0..712bf44 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -3010,7 +3010,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
@YamlProperty(name = "mime-multipart", type =
"object:org.apache.camel.model.dataformat.MimeMultipartDataFormat"),
@YamlProperty(name = "pgp", type =
"object:org.apache.camel.model.dataformat.PGPDataFormat"),
@YamlProperty(name = "protobuf", type =
"object:org.apache.camel.model.dataformat.ProtobufDataFormat"),
- @YamlProperty(name = "ref", type = "string"),
@YamlProperty(name = "rss", type =
"object:org.apache.camel.model.dataformat.RssDataFormat"),
@YamlProperty(name = "scheme", type = "string"),
@YamlProperty(name = "soap", type =
"object:org.apache.camel.model.dataformat.SoapDataFormat"),
@@ -3253,11 +3252,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setFromType(val);
break;
}
- case "ref": {
- String val = asText(node);
- target.setRef(val);
- break;
- }
case "scheme": {
String val = asText(node);
target.setScheme(val);
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
index 6577fc4..cf95044 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
@@ -7530,9 +7530,6 @@
"protobuf" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.dataformat.ProtobufDataFormat"
},
- "ref" : {
- "type" : "string"
- },
"rss" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.dataformat.RssDataFormat"
},
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
index 421c8e4..4e11fc7 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
@@ -7428,9 +7428,6 @@
"protobuf" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.dataformat.ProtobufDataFormat"
},
- "ref" : {
- "type" : "string"
- },
"rss" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.dataformat.RssDataFormat"
},
