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 da4106f CAMEL-17286: camel-core - RemoveProperty EIP propertyName
should be renamed to name
da4106f is described below
commit da4106fc7af4a46c90e943de04513e97ab653527
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Dec 6 18:04:13 2021 +0100
CAMEL-17286: camel-core - RemoveProperty EIP propertyName should be renamed
to name
---
.../org/apache/camel/model/removeProperty.json | 3 ++-
.../camel/model/RemovePropertyDefinition.java | 22 ++++++++++++++++++++--
.../camel/reifier/RemovePropertyReifier.java | 8 +++++---
.../java/org/apache/camel/xml/in/ModelParser.java | 9 +++++----
.../dsl/yaml/deserializers/ModelDeserializers.java | 8 +++++++-
.../src/generated/resources/camel-yaml-dsl.json | 6 ++++--
6 files changed, 43 insertions(+), 13 deletions(-)
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/removeProperty.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/removeProperty.json
index f4765c2..3dcd057 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/removeProperty.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/removeProperty.json
@@ -11,7 +11,8 @@
"output": false
},
"properties": {
- "propertyName": { "kind": "attribute", "displayName": "Property Name",
"required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Name
of property to remove" },
+ "propertyName": { "kind": "attribute", "displayName": "Property Name",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": true, "autowired": false, "secret": false, "description": "Name
of property to remove." },
+ "name": { "kind": "attribute", "displayName": "Name", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Name of property to
remove." },
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the id of this node"
},
"description": { "kind": "element", "displayName": "Description",
"required": false, "type": "object", "javaType":
"org.apache.camel.model.DescriptionDefinition", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the description of
this node" }
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java
index f3cdc60..1afdd81 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java
@@ -30,8 +30,11 @@ import org.apache.camel.spi.Metadata;
@XmlRootElement(name = "removeProperty")
@XmlAccessorType(XmlAccessType.FIELD)
public class RemovePropertyDefinition extends
NoOutputDefinition<RemovePropertyDefinition> {
- @XmlAttribute(required = true)
+ @XmlAttribute
+ @Deprecated
private String propertyName;
+ @XmlAttribute
+ private String name;
public RemovePropertyDefinition() {
}
@@ -56,13 +59,28 @@ public class RemovePropertyDefinition extends
NoOutputDefinition<RemovePropertyD
}
/**
- * Name of property to remove
+ * Name of property to remove.
+ *
+ * @deprecated use name instead
*/
+ @Deprecated
public void setPropertyName(String propertyName) {
this.propertyName = propertyName;
}
+ @Deprecated
public String getPropertyName() {
return propertyName;
}
+
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Name of property to remove.
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
}
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RemovePropertyReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RemovePropertyReifier.java
index 23d6489..a69f6b8 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RemovePropertyReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RemovePropertyReifier.java
@@ -21,7 +21,6 @@ import org.apache.camel.Route;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.RemovePropertyDefinition;
import org.apache.camel.processor.RemovePropertyProcessor;
-import org.apache.camel.util.ObjectHelper;
public class RemovePropertyReifier extends
ProcessorReifier<RemovePropertyDefinition> {
@@ -31,7 +30,10 @@ public class RemovePropertyReifier extends
ProcessorReifier<RemovePropertyDefini
@Override
public Processor createProcessor() throws Exception {
- ObjectHelper.notNull(definition.getPropertyName(), "propertyName",
this);
- return new
RemovePropertyProcessor(parseString(definition.getPropertyName()));
+ String name = definition.getName();
+ if (name == null) {
+ name = definition.getPropertyName();
+ }
+ return new RemovePropertyProcessor(parseString(name));
}
}
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 4fafb4f..9d96ff3 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
@@ -844,11 +844,12 @@ public class ModelParser extends BaseParser {
}
protected RemovePropertyDefinition doParseRemovePropertyDefinition()
throws IOException, XmlPullParserException {
return doParse(new RemovePropertyDefinition(), (def, key, val) -> {
- if ("propertyName".equals(key)) {
- def.setPropertyName(val);
- return true;
+ switch (key) {
+ case "name": def.setName(val); break;
+ case "propertyName": def.setPropertyName(val); break;
+ default: return
processorDefinitionAttributeHandler().accept(def, key, val);
}
- return processorDefinitionAttributeHandler().accept(def, key, val);
+ return true;
}, optionalIdentifiedDefinitionElementHandler(), noValueHandler());
}
protected ResequenceDefinition doParseResequenceDefinition() throws
IOException, XmlPullParserException {
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 5f77018..1804ce1 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
@@ -11146,7 +11146,8 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
},
properties = {
@YamlProperty(name = "inherit-error-handler", type =
"boolean"),
- @YamlProperty(name = "property-name", type = "string",
required = true)
+ @YamlProperty(name = "name", type = "string"),
+ @YamlProperty(name = "property-name", type = "string")
}
)
public static class RemovePropertyDefinitionDeserializer extends
YamlDeserializerBase<RemovePropertyDefinition> {
@@ -11173,6 +11174,11 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setInheritErrorHandler(java.lang.Boolean.valueOf(val));
break;
}
+ case "name": {
+ String val = asText(node);
+ target.setName(val);
+ break;
+ }
case "property-name": {
String val = asText(node);
target.setPropertyName(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 e302c6c..62e992b 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
@@ -2005,12 +2005,14 @@
"inherit-error-handler" : {
"type" : "boolean"
},
+ "name" : {
+ "type" : "string"
+ },
"property-name" : {
"type" : "string"
}
}
- } ],
- "required" : [ "property-name" ]
+ } ]
},
"org.apache.camel.model.ResequenceDefinition" : {
"type" : "object",
