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
commit 77a127c03626ef2073e3feff13b6f9a3275b864b
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Jun 28 14:25:55 2019 +0200
CAMEL-13657: Use name instead of headerName, propertyName in XML DSL to
make it simpler and more natural.
---
.../apache/camel/model/SetHeaderDefinition.java | 26 +++++++++++-----------
.../apache/camel/model/SetPropertyDefinition.java | 26 +++++++++++-----------
.../org/apache/camel/reifier/SetHeaderReifier.java | 4 ++--
.../apache/camel/reifier/SetPropertyReifier.java | 4 ++--
.../java/org/apache/camel/model/XmlParseTest.java | 4 ++--
.../util/DumpModelAsXmlRouteExpressionTest.java | 2 +-
.../org/apache/camel/impl/route4_error.xml | 2 +-
.../resources/org/apache/camel/impl/route4_ok.xml | 2 +-
.../resources/org/apache/camel/model/setHeader.xml | 2 +-
.../org/apache/camel/model/setHeaderToConstant.xml | 2 +-
10 files changed, 37 insertions(+), 37 deletions(-)
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
b/core/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
index f54a84b..a43c09a 100644
---
a/core/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
+++
b/core/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
@@ -34,29 +34,29 @@ import org.apache.camel.spi.Metadata;
@XmlAccessorType(XmlAccessType.FIELD)
public class SetHeaderDefinition extends ExpressionNode {
@XmlAttribute(required = true)
- private String headerName;
+ private String name;
public SetHeaderDefinition() {
}
- public SetHeaderDefinition(String headerName, ExpressionDefinition
expression) {
+ public SetHeaderDefinition(String name, ExpressionDefinition expression) {
super(expression);
- setHeaderName(headerName);
+ setName(name);
}
- public SetHeaderDefinition(String headerName, Expression expression) {
+ public SetHeaderDefinition(String name, Expression expression) {
super(expression);
- setHeaderName(headerName);
+ setName(name);
}
- public SetHeaderDefinition(String headerName, String value) {
+ public SetHeaderDefinition(String name, String value) {
super(ExpressionBuilder.constantExpression(value));
- setHeaderName(headerName);
+ setName(name);
}
@Override
public String toString() {
- return "SetHeader[" + getHeaderName() + ", " + getExpression() + "]";
+ return "SetHeader[" + getName() + ", " + getExpression() + "]";
}
@Override
@@ -66,7 +66,7 @@ public class SetHeaderDefinition extends ExpressionNode {
@Override
public String getLabel() {
- return "setHeader[" + getHeaderName() + "]";
+ return "setHeader[" + getName() + "]";
}
/**
@@ -84,12 +84,12 @@ public class SetHeaderDefinition extends ExpressionNode {
* The <tt>simple</tt> language can be used to define a dynamic evaluated
header name to be used.
* Otherwise a constant name will be used.
*/
- public void setHeaderName(String headerName) {
- this.headerName = headerName;
+ public void setName(String name) {
+ this.name = name;
}
- public String getHeaderName() {
- return headerName;
+ public String getName() {
+ return name;
}
}
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
b/core/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
index c2b91d7..e1c5e5c 100644
---
a/core/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
+++
b/core/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
@@ -34,29 +34,29 @@ import org.apache.camel.spi.Metadata;
@XmlAccessorType(XmlAccessType.FIELD)
public class SetPropertyDefinition extends ExpressionNode {
@XmlAttribute(required = true)
- private String propertyName;
+ private String name;
public SetPropertyDefinition() {
}
- public SetPropertyDefinition(String propertyName, ExpressionDefinition
expression) {
+ public SetPropertyDefinition(String name, ExpressionDefinition expression)
{
super(expression);
- setPropertyName(propertyName);
+ setName(name);
}
- public SetPropertyDefinition(String propertyName, Expression expression) {
+ public SetPropertyDefinition(String name, Expression expression) {
super(expression);
- setPropertyName(propertyName);
+ setName(name);
}
- public SetPropertyDefinition(String propertyName, String value) {
+ public SetPropertyDefinition(String name, String value) {
super(ExpressionBuilder.constantExpression(value));
- setPropertyName(propertyName);
+ setName(name);
}
@Override
public String toString() {
- return "SetProperty[" + getPropertyName() + ", " + getExpression() +
"]";
+ return "SetProperty[" + getName() + ", " + getExpression() + "]";
}
@Override
@@ -66,7 +66,7 @@ public class SetPropertyDefinition extends ExpressionNode {
@Override
public String getLabel() {
- return "setProperty[" + getPropertyName() + "]";
+ return "setProperty[" + getName() + "]";
}
/**
@@ -84,12 +84,12 @@ public class SetPropertyDefinition extends ExpressionNode {
* The <tt>simple</tt> language can be used to define a dynamic evaluated
exchange property name to be used.
* Otherwise a constant name will be used.
*/
- public void setPropertyName(String propertyName) {
- this.propertyName = propertyName;
+ public void setName(String name) {
+ this.name = name;
}
- public String getPropertyName() {
- return propertyName;
+ public String getName() {
+ return name;
}
}
diff --git
a/core/camel-core/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java
b/core/camel-core/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java
index c7935c9..5f611a2b 100644
---
a/core/camel-core/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java
+++
b/core/camel-core/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java
@@ -33,9 +33,9 @@ class SetHeaderReifier extends
ExpressionReifier<SetHeaderDefinition> {
@Override
public Processor createProcessor(RouteContext routeContext) throws
Exception {
- ObjectHelper.notNull(definition.getHeaderName(), "headerName");
+ ObjectHelper.notNull(definition.getName(), "headerName");
Expression expr =
definition.getExpression().createExpression(routeContext);
- Expression nameExpr =
ExpressionBuilder.parseSimpleOrFallbackToConstantExpression(definition.getHeaderName(),
routeContext.getCamelContext());
+ Expression nameExpr =
ExpressionBuilder.parseSimpleOrFallbackToConstantExpression(definition.getName(),
routeContext.getCamelContext());
return new SetHeaderProcessor(nameExpr, expr);
}
}
diff --git
a/core/camel-core/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java
b/core/camel-core/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java
index 5f7fded..d048457 100644
---
a/core/camel-core/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java
+++
b/core/camel-core/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java
@@ -33,9 +33,9 @@ class SetPropertyReifier extends
ExpressionReifier<SetPropertyDefinition> {
@Override
public Processor createProcessor(RouteContext routeContext) throws
Exception {
- ObjectHelper.notNull(definition.getPropertyName(), "propertyName",
this);
+ ObjectHelper.notNull(definition.getName(), "propertyName", this);
Expression expr =
definition.getExpression().createExpression(routeContext);
- Expression nameExpr =
ExpressionBuilder.parseSimpleOrFallbackToConstantExpression(definition.getPropertyName(),
routeContext.getCamelContext());
+ Expression nameExpr =
ExpressionBuilder.parseSimpleOrFallbackToConstantExpression(definition.getName(),
routeContext.getCamelContext());
return new SetPropertyProcessor(nameExpr, expr);
}
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
b/core/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
index 4c2a383..7ee1301 100644
--- a/core/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
@@ -133,7 +133,7 @@ public class XmlParseTest extends XmlTestSupport {
RouteDefinition route = assertOneRoute("setHeader.xml");
assertFrom(route, "seda:a");
SetHeaderDefinition node =
assertNthProcessorInstanceOf(SetHeaderDefinition.class, route, 0);
- assertEquals("oldBodyValue", node.getHeaderName());
+ assertEquals("oldBodyValue", node.getName());
assertExpression(node.getExpression(), "simple", "body");
assertChildTo(route, "mock:b", 1);
}
@@ -143,7 +143,7 @@ public class XmlParseTest extends XmlTestSupport {
RouteDefinition route = assertOneRoute("setHeaderToConstant.xml");
assertFrom(route, "seda:a");
SetHeaderDefinition node =
assertNthProcessorInstanceOf(SetHeaderDefinition.class, route, 0);
- assertEquals("theHeader", node.getHeaderName());
+ assertEquals("theHeader", node.getName());
assertExpression(node.getExpression(), "constant", "a value");
assertChildTo(route, "mock:b", 1);
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlRouteExpressionTest.java
b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlRouteExpressionTest.java
index dfc5b69..75e007f 100644
---
a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlRouteExpressionTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlRouteExpressionTest.java
@@ -68,7 +68,7 @@ public class DumpModelAsXmlRouteExpressionTest extends
ContextTestSupport {
assertNotNull(xml);
log.info(xml);
- assertTrue(xml.contains("<setHeader headerName=\"foo\""));
+ assertTrue(xml.contains("<setHeader name=\"foo\""));
assertTrue(xml.contains("<method ref=\"myCoolBean\"/>"));
}
diff --git
a/core/camel-core/src/test/resources/org/apache/camel/impl/route4_error.xml
b/core/camel-core/src/test/resources/org/apache/camel/impl/route4_error.xml
index 95be73e..a079a62 100644
--- a/core/camel-core/src/test/resources/org/apache/camel/impl/route4_error.xml
+++ b/core/camel-core/src/test/resources/org/apache/camel/impl/route4_error.xml
@@ -19,7 +19,7 @@
-->
<route id="foo" xmlns="http://camel.apache.org/schema/spring";>
<from uri="direct:start"/>
- <setHeader headerName="failureHeader">
+ <setHeader name="failureHeader">
<simpl>${eaders.error}</simpl> <!-- it is an error -->
</setHeader>
<to uri="mock:foo"/>
diff --git
a/core/camel-core/src/test/resources/org/apache/camel/impl/route4_ok.xml
b/core/camel-core/src/test/resources/org/apache/camel/impl/route4_ok.xml
index 125d939..2905eef 100644
--- a/core/camel-core/src/test/resources/org/apache/camel/impl/route4_ok.xml
+++ b/core/camel-core/src/test/resources/org/apache/camel/impl/route4_ok.xml
@@ -19,7 +19,7 @@
-->
<route id="foo" xmlns="http://camel.apache.org/schema/spring";>
<from uri="direct:start"/>
- <setHeader headerName="failureHeader">
+ <setHeader name="failureHeader">
<simple>${headers.error}</simple> <!-- it is an error -->
</setHeader>
<to uri="mock:foo"/>
diff --git
a/core/camel-core/src/test/resources/org/apache/camel/model/setHeader.xml
b/core/camel-core/src/test/resources/org/apache/camel/model/setHeader.xml
index 776897f..6d364f4 100644
--- a/core/camel-core/src/test/resources/org/apache/camel/model/setHeader.xml
+++ b/core/camel-core/src/test/resources/org/apache/camel/model/setHeader.xml
@@ -20,7 +20,7 @@
<routes id="camel" xmlns="http://camel.apache.org/schema/spring";>
<route>
<from uri="seda:a"/>
- <setHeader headerName="oldBodyValue">
+ <setHeader name="oldBodyValue">
<simple>body</simple>
</setHeader>
<to uri="mock:b"/>
diff --git
a/core/camel-core/src/test/resources/org/apache/camel/model/setHeaderToConstant.xml
b/core/camel-core/src/test/resources/org/apache/camel/model/setHeaderToConstant.xml
index e71bf9a..24f5619 100644
---
a/core/camel-core/src/test/resources/org/apache/camel/model/setHeaderToConstant.xml
+++
b/core/camel-core/src/test/resources/org/apache/camel/model/setHeaderToConstant.xml
@@ -20,7 +20,7 @@
<routes id="camel" xmlns="http://camel.apache.org/schema/spring";>
<route>
<from uri="seda:a"/>
- <setHeader headerName="theHeader">
+ <setHeader name="theHeader">
<constant>a value</constant>
</setHeader>
<to uri="mock:b"/>
