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 fb34ab3 CAMEL-17282: RemoveHeader EIP remove deprecated headerName
fb34ab3 is described below
commit fb34ab320a8f883ae03ae83d16506ff465d50275
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Dec 6 17:48:49 2021 +0100
CAMEL-17282: RemoveHeader EIP remove deprecated headerName
---
.../resources/org/apache/camel/catalog/models/removeHeader.json | 3 +--
.../resources/org/apache/camel/catalog/schemas/camel-spring.xsd | 9 +--------
.../apache/camel/dsl/yaml/deserializers/ModelDeserializers.java | 8 +-------
.../camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json | 6 ++----
4 files changed, 5 insertions(+), 21 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/removeHeader.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/removeHeader.json
index 5fb3ba1..7708722 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/removeHeader.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/removeHeader.json
@@ -11,8 +11,7 @@
"output": false
},
"properties": {
- "name": { "kind": "attribute", "displayName": "Name", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Name of header to remove"
},
- "headerName": { "kind": "attribute", "displayName": "Header Name",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": true, "autowired": false, "secret": false, "description": "Name
of header to remove (deprecated use name instead)" },
+ "name": { "kind": "attribute", "displayName": "Name", "required": true,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Name of header 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/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 d82a833..e00d99c 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
@@ -10226,20 +10226,13 @@ backward compatibility. Default value: false
<xs:complexContent>
<xs:extension base="tns:noOutputDefinition">
<xs:sequence/>
- <xs:attribute name="name" type="xs:string">
+ <xs:attribute name="name" type="xs:string" use="required">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
Name of header to remove.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="headerName" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Deprecated: Name of header to remove (deprecated use name instead).
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
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 d40cbeee..5f77018 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
@@ -10953,9 +10953,8 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
"removeHeader"
},
properties = {
- @YamlProperty(name = "header-name", type = "string"),
@YamlProperty(name = "inherit-error-handler", type =
"boolean"),
- @YamlProperty(name = "name", type = "string")
+ @YamlProperty(name = "name", type = "string", required =
true)
}
)
public static class RemoveHeaderDefinitionDeserializer extends
YamlDeserializerBase<RemoveHeaderDefinition> {
@@ -10977,11 +10976,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
protected boolean setProperty(RemoveHeaderDefinition target, String
propertyKey,
String propertyName, Node node) {
switch(propertyKey) {
- case "header-name": {
- String val = asText(node);
- target.setHeaderName(val);
- break;
- }
case "inherit-error-handler": {
String val = asText(node);
target.setInheritErrorHandler(java.lang.Boolean.valueOf(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 8614fed..e302c6c 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
@@ -1948,9 +1948,6 @@
}, {
"type" : "object",
"properties" : {
- "header-name" : {
- "type" : "string"
- },
"inherit-error-handler" : {
"type" : "boolean"
},
@@ -1958,7 +1955,8 @@
"type" : "string"
}
}
- } ]
+ } ],
+ "required" : [ "name" ]
},
"org.apache.camel.model.RemoveHeadersDefinition" : {
"oneOf" : [ {
