You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pa...@apache.org on 2020/09/23 21:04:20 UTC
[camel] branch master updated: Replace remaining usages of the
simple language "property" function (which was removed in Camel 3) with
"exchangeProperty".
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new fdbbb52 Replace remaining usages of the simple language "property" function (which was removed in Camel 3) with "exchangeProperty".
fdbbb52 is described below
commit fdbbb52a38e7b617e928f83b3668d2987143f534
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Wed Sep 23 23:03:56 2020 +0200
Replace remaining usages of the simple language "property" function (which was removed in Camel 3) with "exchangeProperty".
---
.../org/apache/camel/catalog/docs/beanstalk-component.adoc | 4 ++--
.../resources/org/apache/camel/catalog/docs/sql-component.adoc | 6 +++---
components/camel-beanstalk/src/main/docs/beanstalk-component.adoc | 4 ++--
components/camel-sql/src/main/docs/sql-component.adoc | 6 +++---
docs/components/modules/ROOT/pages/beanstalk-component.adoc | 4 ++--
docs/components/modules/ROOT/pages/sql-component.adoc | 6 +++---
docs/user-manual/modules/ROOT/pages/predicate.adoc | 2 +-
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/beanstalk-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/beanstalk-component.adoc
index 964ed11..486a46d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/beanstalk-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/beanstalk-component.adoc
@@ -207,7 +207,7 @@ supply them to Beanstalkd daemon. Our simple demo routes may look like
[source,java]
----------------------------------------------------------------------------------------------
from("beanstalk:testTube").
- log("Processing job #${property.beanstalk.jobId} with body ${in.body}").
+ log("Processing job #${exchangeProperty.beanstalk.jobId} with body ${in.body}").
process(new Processor() {
@Override
public void process(Exchange exchange) {
@@ -215,7 +215,7 @@ from("beanstalk:testTube").
exchange.getIn().setBody( Integer.valueOf(exchange.getIn().getBody(classOf[String])) );
}
}).
- log("Parsed job #${property.beanstalk.jobId} to body ${in.body}");
+ log("Parsed job #${exchangeProperty.beanstalk.jobId} to body ${in.body}");
----------------------------------------------------------------------------------------------
[source,java]
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sql-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sql-component.adoc
index e6adfce..e9fe125 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sql-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sql-component.adoc
@@ -76,7 +76,7 @@ shown:
[source,text]
----
-sql:select * from table where id=:#${property.myId} order by name[?options]
+sql:select * from table where id=:#${exchangeProperty.myId} order by name[?options]
----
Notice that the standard `?` symbol that denotes the parameters to an
@@ -100,7 +100,7 @@ And the myquery.sql file is in the classpath and is just a plain text
select *
from table
where
- id = :#${property.myId}
+ id = :#${exchangeProperty.myId}
order by
name
----
@@ -386,7 +386,7 @@ uses the value of a property as the second parameter.
from("direct:projects")
.setBody(constant("ASF"))
.setProperty("min", constant(123))
- .to("sql:select * from projects where license = :#${body} and id > :#${property.min} order by id")
+ .to("sql:select * from projects where license = :#${body} and id > :#${exchangeProperty.min} order by id")
----
=== Using expression parameters in consumers
diff --git a/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc b/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc
index 964ed11..486a46d 100644
--- a/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc
+++ b/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc
@@ -207,7 +207,7 @@ supply them to Beanstalkd daemon. Our simple demo routes may look like
[source,java]
----------------------------------------------------------------------------------------------
from("beanstalk:testTube").
- log("Processing job #${property.beanstalk.jobId} with body ${in.body}").
+ log("Processing job #${exchangeProperty.beanstalk.jobId} with body ${in.body}").
process(new Processor() {
@Override
public void process(Exchange exchange) {
@@ -215,7 +215,7 @@ from("beanstalk:testTube").
exchange.getIn().setBody( Integer.valueOf(exchange.getIn().getBody(classOf[String])) );
}
}).
- log("Parsed job #${property.beanstalk.jobId} to body ${in.body}");
+ log("Parsed job #${exchangeProperty.beanstalk.jobId} to body ${in.body}");
----------------------------------------------------------------------------------------------
[source,java]
diff --git a/components/camel-sql/src/main/docs/sql-component.adoc b/components/camel-sql/src/main/docs/sql-component.adoc
index e6adfce..e9fe125 100644
--- a/components/camel-sql/src/main/docs/sql-component.adoc
+++ b/components/camel-sql/src/main/docs/sql-component.adoc
@@ -76,7 +76,7 @@ shown:
[source,text]
----
-sql:select * from table where id=:#${property.myId} order by name[?options]
+sql:select * from table where id=:#${exchangeProperty.myId} order by name[?options]
----
Notice that the standard `?` symbol that denotes the parameters to an
@@ -100,7 +100,7 @@ And the myquery.sql file is in the classpath and is just a plain text
select *
from table
where
- id = :#${property.myId}
+ id = :#${exchangeProperty.myId}
order by
name
----
@@ -386,7 +386,7 @@ uses the value of a property as the second parameter.
from("direct:projects")
.setBody(constant("ASF"))
.setProperty("min", constant(123))
- .to("sql:select * from projects where license = :#${body} and id > :#${property.min} order by id")
+ .to("sql:select * from projects where license = :#${body} and id > :#${exchangeProperty.min} order by id")
----
=== Using expression parameters in consumers
diff --git a/docs/components/modules/ROOT/pages/beanstalk-component.adoc b/docs/components/modules/ROOT/pages/beanstalk-component.adoc
index 90b23b5..3ad2245 100644
--- a/docs/components/modules/ROOT/pages/beanstalk-component.adoc
+++ b/docs/components/modules/ROOT/pages/beanstalk-component.adoc
@@ -209,7 +209,7 @@ supply them to Beanstalkd daemon. Our simple demo routes may look like
[source,java]
----------------------------------------------------------------------------------------------
from("beanstalk:testTube").
- log("Processing job #${property.beanstalk.jobId} with body ${in.body}").
+ log("Processing job #${exchangeProperty.beanstalk.jobId} with body ${in.body}").
process(new Processor() {
@Override
public void process(Exchange exchange) {
@@ -217,7 +217,7 @@ from("beanstalk:testTube").
exchange.getIn().setBody( Integer.valueOf(exchange.getIn().getBody(classOf[String])) );
}
}).
- log("Parsed job #${property.beanstalk.jobId} to body ${in.body}");
+ log("Parsed job #${exchangeProperty.beanstalk.jobId} to body ${in.body}");
----------------------------------------------------------------------------------------------
[source,java]
diff --git a/docs/components/modules/ROOT/pages/sql-component.adoc b/docs/components/modules/ROOT/pages/sql-component.adoc
index d71d789..e0f034b 100644
--- a/docs/components/modules/ROOT/pages/sql-component.adoc
+++ b/docs/components/modules/ROOT/pages/sql-component.adoc
@@ -78,7 +78,7 @@ shown:
[source,text]
----
-sql:select * from table where id=:#${property.myId} order by name[?options]
+sql:select * from table where id=:#${exchangeProperty.myId} order by name[?options]
----
Notice that the standard `?` symbol that denotes the parameters to an
@@ -102,7 +102,7 @@ And the myquery.sql file is in the classpath and is just a plain text
select *
from table
where
- id = :#${property.myId}
+ id = :#${exchangeProperty.myId}
order by
name
----
@@ -388,7 +388,7 @@ uses the value of a property as the second parameter.
from("direct:projects")
.setBody(constant("ASF"))
.setProperty("min", constant(123))
- .to("sql:select * from projects where license = :#${body} and id > :#${property.min} order by id")
+ .to("sql:select * from projects where license = :#${body} and id > :#${exchangeProperty.min} order by id")
----
=== Using expression parameters in consumers
diff --git a/docs/user-manual/modules/ROOT/pages/predicate.adoc b/docs/user-manual/modules/ROOT/pages/predicate.adoc
index 773bce7..9a0b722 100644
--- a/docs/user-manual/modules/ROOT/pages/predicate.adoc
+++ b/docs/user-manual/modules/ROOT/pages/predicate.adoc
@@ -112,7 +112,7 @@ Combining different Expression Languages is also possible, e.g.:
[source,java]
----
-PredicateBuilder.and(XPathBuilder.xpath("/bookings/flights"), simple("${property.country = 'Spain'}"))
+PredicateBuilder.and(XPathBuilder.xpath("/bookings/flights"), simple("${exchangeProperty.country = 'Spain'}"))
----
The sample below demonstrates further use cases: