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 6ddc342 CAMEL-17282: RemoveHeader EIP remove deprecated headerName
6ddc342 is described below
commit 6ddc3423b18eb1268eec6d93e987f9becd4f52d1
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Dec 6 17:09:17 2021 +0100
CAMEL-17282: RemoveHeader EIP remove deprecated headerName
---
.../resources/org/apache/camel/model/removeHeader.json | 3 +--
.../org/apache/camel/model/RemoveHeaderDefinition.java | 17 +----------------
.../org/apache/camel/reifier/RemoveHeaderReifier.java | 6 +-----
.../java/org/apache/camel/xml/in/ModelParser.java | 9 ++++-----
.../modules/ROOT/pages/camel-3x-upgrade-guide-3_14.adoc | 2 ++
.../org/apache/camel/dsl/yaml/RemoveHeaderTest.groovy | 4 ++--
6 files changed, 11 insertions(+), 30 deletions(-)
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/removeHeader.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/removeHeader.json
index 5fb3ba1..7708722 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/removeHeader.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/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/core/camel-core-model/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java
index 93badb6..59d7263 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java
@@ -30,11 +30,8 @@ import org.apache.camel.spi.Metadata;
@XmlRootElement(name = "removeHeader")
@XmlAccessorType(XmlAccessType.FIELD)
public class RemoveHeaderDefinition extends
NoOutputDefinition<RemoveHeaderDefinition> {
- @XmlAttribute
+ @XmlAttribute(required = true)
private String name;
- @XmlAttribute
- @Deprecated
- private String headerName;
public RemoveHeaderDefinition() {
}
@@ -69,16 +66,4 @@ public class RemoveHeaderDefinition extends
NoOutputDefinition<RemoveHeaderDefin
this.name = name;
}
- @Deprecated
- public String getHeaderName() {
- return headerName;
- }
-
- /**
- * Name of header to remove (deprecated use name instead)
- */
- @Deprecated
- public void setHeaderName(String headerName) {
- this.headerName = headerName;
- }
}
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RemoveHeaderReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RemoveHeaderReifier.java
index 4329c00..d974125 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RemoveHeaderReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RemoveHeaderReifier.java
@@ -30,10 +30,6 @@ public class RemoveHeaderReifier extends
ProcessorReifier<RemoveHeaderDefinition
@Override
public Processor createProcessor() throws Exception {
- String name = definition.getName();
- if (name == null) {
- name = definition.getHeaderName();
- }
- return new RemoveHeaderProcessor(parseString(name));
+ return new RemoveHeaderProcessor(parseString(definition.getName()));
}
}
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 60eb730..4fafb4f 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
@@ -815,12 +815,11 @@ public class ModelParser extends BaseParser {
}
protected RemoveHeaderDefinition doParseRemoveHeaderDefinition() throws
IOException, XmlPullParserException {
return doParse(new RemoveHeaderDefinition(), (def, key, val) -> {
- switch (key) {
- case "headerName": def.setHeaderName(val); break;
- case "name": def.setName(val); break;
- default: return
processorDefinitionAttributeHandler().accept(def, key, val);
+ if ("name".equals(key)) {
+ def.setName(val);
+ return true;
}
- return true;
+ return processorDefinitionAttributeHandler().accept(def, key, val);
}, optionalIdentifiedDefinitionElementHandler(), noValueHandler());
}
protected RemoveHeadersDefinition doParseRemoveHeadersDefinition() throws
IOException, XmlPullParserException {
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_14.adoc
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_14.adoc
index a58d86e..391d0f3 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_14.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_14.adoc
@@ -14,6 +14,8 @@ Added parameter `Resource` in `createRoute` method on
`org.apache.camel.spi.Rout
Added method `reloadProperties` to
`org.apache.camel.spi.LoadablePropertiesSource`.
+Removed the deprecated `headerName` option from RemoveHeader EIP. Use `name`
instead.
+
=== camel-kafka
The APIs in `camel-kafka` component changed from using the Kafka Client
classes `org.apache.kafka.clients.producer.KafkaProducer` and
`org.apache.kafka.clients.consumer.KafkaConsumer`
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RemoveHeaderTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RemoveHeaderTest.groovy
index dc1cc0c..a669843 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RemoveHeaderTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RemoveHeaderTest.groovy
@@ -37,7 +37,7 @@ class RemoveHeaderTest extends YamlTestSupport {
uri: "direct:start"
steps:
- remove-header:
- header-name: test
+ name: test
- to: "mock:result"
'''),
asResource('expression-block', '''
@@ -45,7 +45,7 @@ class RemoveHeaderTest extends YamlTestSupport {
uri: "direct:start"
steps:
- remove-header:
- header-name: test
+ name: test
- to: "mock:result"
''')
]
