You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/03/18 09:39:19 UTC
[1/6] git commit: Polished
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x 9cd739d24 -> 7569a4b18
refs/heads/camel-2.13.x 519123bc3 -> a0cde9b08
refs/heads/master 40c9b2543 -> 856997e92
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/35d5dfb4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/35d5dfb4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/35d5dfb4
Branch: refs/heads/master
Commit: 35d5dfb41d8d559ccccbc7fd07f39f53cf295b44
Parents: 40c9b25
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Mar 18 07:36:09 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Mar 18 07:36:09 2014 +0100
----------------------------------------------------------------------
camel-core/src/main/java/org/apache/camel/StreamCache.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/35d5dfb4/camel-core/src/main/java/org/apache/camel/StreamCache.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/StreamCache.java b/camel-core/src/main/java/org/apache/camel/StreamCache.java
index 5333bd3..13ab6c1 100644
--- a/camel-core/src/main/java/org/apache/camel/StreamCache.java
+++ b/camel-core/src/main/java/org/apache/camel/StreamCache.java
@@ -23,8 +23,11 @@ import java.io.OutputStream;
* Tagging interface to indicate that a type is capable of caching the underlying data stream.
* <p/>
* This is a useful feature for avoiding message re-readability issues.
- * This interface is mainly used by the {@link org.apache.camel.processor.interceptor.StreamCachingInterceptor}
+ * This interface is mainly used by the {@link org.apache.camel.spi.StreamCachingStrategy}
* for determining if/how to wrap a stream-based message.
+ * <p/>
+ * The Camel routing engine uses the {@link org.apache.camel.processor.CamelInternalProcessor.StreamCachingAdvice}
+ * to apply the stream cache during routing.
*
* @version
*/
[6/6] git commit: CAMEL-7303: Simple language accesing header with
key quoted should unqoute, as headerAs does.
Posted by da...@apache.org.
CAMEL-7303: Simple language accesing header with key quoted should unqoute, as headerAs does.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7569a4b1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7569a4b1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7569a4b1
Branch: refs/heads/camel-2.12.x
Commit: 7569a4b1830842590d27de718925dd456711834d
Parents: c0d3d44
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Mar 18 09:25:10 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Mar 18 09:42:00 2014 +0100
----------------------------------------------------------------------
.../simple/ast/SimpleFunctionExpression.java | 10 ++++++----
.../apache/camel/language/simple/SimpleTest.java | 18 ++++++++++++++++++
2 files changed, 24 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7569a4b1/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java b/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
index 985857a..d02f050 100644
--- a/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
@@ -268,19 +268,21 @@ public class SimpleFunctionExpression extends LiteralExpression {
if (remainder.startsWith("[") && remainder.endsWith("]")) {
remainder = remainder.substring(1, remainder.length() - 1);
}
+ // remove quotes from key
+ String key = StringHelper.removeLeadingAndEndingQuotes(remainder);
// validate syntax
- boolean invalid = OgnlHelper.isInvalidValidOgnlExpression(remainder);
+ boolean invalid = OgnlHelper.isInvalidValidOgnlExpression(key);
if (invalid) {
throw new SimpleParserException("Valid syntax: ${header.name[key]} was: " + function, token.getIndex());
}
- if (OgnlHelper.isValidOgnlExpression(remainder)) {
+ if (OgnlHelper.isValidOgnlExpression(key)) {
// ognl based header
- return ExpressionBuilder.headersOgnlExpression(remainder);
+ return ExpressionBuilder.headersOgnlExpression(key);
} else {
// regular header
- return ExpressionBuilder.headerExpression(remainder);
+ return ExpressionBuilder.headerExpression(key);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7569a4b1/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
index 407f755..c9e22a3 100644
--- a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
@@ -524,6 +524,24 @@ public class SimpleTest extends LanguageTestSupport {
assertExpression("${in.headers}", headers);
}
+ public void testHeaderKeyWithSpace() throws Exception {
+ Map<String, Object> headers = exchange.getIn().getHeaders();
+ headers.put("some key", "Some Value");
+ assertEquals(3, headers.size());
+
+ assertExpression("${headerAs(foo,String)}", "abc");
+ assertExpression("${headerAs(some key,String)}", "Some Value");
+ assertExpression("${headerAs('some key',String)}", "Some Value");
+
+ assertExpression("${header[foo]}", "abc");
+ assertExpression("${header[some key]}", "Some Value");
+ assertExpression("${header['some key']}", "Some Value");
+
+ assertExpression("${headers[foo]}", "abc");
+ assertExpression("${headers[some key]}", "Some Value");
+ assertExpression("${headers['some key']}", "Some Value");
+ }
+
public void testHeaderAs() throws Exception {
assertExpression("${headerAs(foo,String)}", "abc");
[2/6] git commit: CAMEL-7303: Simple language accesing header with
key quoted should unqoute, as headerAs does.
Posted by da...@apache.org.
CAMEL-7303: Simple language accesing header with key quoted should unqoute, as headerAs does.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/856997e9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/856997e9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/856997e9
Branch: refs/heads/master
Commit: 856997e9246ef71ba82d6296e9f31ffdddb9102b
Parents: 35d5dfb
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Mar 18 09:25:10 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Mar 18 09:25:10 2014 +0100
----------------------------------------------------------------------
.../simple/ast/SimpleFunctionExpression.java | 10 ++++++----
.../apache/camel/language/simple/SimpleTest.java | 18 ++++++++++++++++++
2 files changed, 24 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/856997e9/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java b/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
index 985857a..d02f050 100644
--- a/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
@@ -268,19 +268,21 @@ public class SimpleFunctionExpression extends LiteralExpression {
if (remainder.startsWith("[") && remainder.endsWith("]")) {
remainder = remainder.substring(1, remainder.length() - 1);
}
+ // remove quotes from key
+ String key = StringHelper.removeLeadingAndEndingQuotes(remainder);
// validate syntax
- boolean invalid = OgnlHelper.isInvalidValidOgnlExpression(remainder);
+ boolean invalid = OgnlHelper.isInvalidValidOgnlExpression(key);
if (invalid) {
throw new SimpleParserException("Valid syntax: ${header.name[key]} was: " + function, token.getIndex());
}
- if (OgnlHelper.isValidOgnlExpression(remainder)) {
+ if (OgnlHelper.isValidOgnlExpression(key)) {
// ognl based header
- return ExpressionBuilder.headersOgnlExpression(remainder);
+ return ExpressionBuilder.headersOgnlExpression(key);
} else {
// regular header
- return ExpressionBuilder.headerExpression(remainder);
+ return ExpressionBuilder.headerExpression(key);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/856997e9/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
index 407f755..c9e22a3 100644
--- a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
@@ -524,6 +524,24 @@ public class SimpleTest extends LanguageTestSupport {
assertExpression("${in.headers}", headers);
}
+ public void testHeaderKeyWithSpace() throws Exception {
+ Map<String, Object> headers = exchange.getIn().getHeaders();
+ headers.put("some key", "Some Value");
+ assertEquals(3, headers.size());
+
+ assertExpression("${headerAs(foo,String)}", "abc");
+ assertExpression("${headerAs(some key,String)}", "Some Value");
+ assertExpression("${headerAs('some key',String)}", "Some Value");
+
+ assertExpression("${header[foo]}", "abc");
+ assertExpression("${header[some key]}", "Some Value");
+ assertExpression("${header['some key']}", "Some Value");
+
+ assertExpression("${headers[foo]}", "abc");
+ assertExpression("${headers[some key]}", "Some Value");
+ assertExpression("${headers['some key']}", "Some Value");
+ }
+
public void testHeaderAs() throws Exception {
assertExpression("${headerAs(foo,String)}", "abc");
[5/6] git commit: Polished
Posted by da...@apache.org.
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c0d3d44b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c0d3d44b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c0d3d44b
Branch: refs/heads/camel-2.12.x
Commit: c0d3d44bae30df876e7e363172553f6934f32e8f
Parents: 9cd739d
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Mar 18 07:36:09 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Mar 18 09:41:54 2014 +0100
----------------------------------------------------------------------
camel-core/src/main/java/org/apache/camel/StreamCache.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c0d3d44b/camel-core/src/main/java/org/apache/camel/StreamCache.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/StreamCache.java b/camel-core/src/main/java/org/apache/camel/StreamCache.java
index 5333bd3..13ab6c1 100644
--- a/camel-core/src/main/java/org/apache/camel/StreamCache.java
+++ b/camel-core/src/main/java/org/apache/camel/StreamCache.java
@@ -23,8 +23,11 @@ import java.io.OutputStream;
* Tagging interface to indicate that a type is capable of caching the underlying data stream.
* <p/>
* This is a useful feature for avoiding message re-readability issues.
- * This interface is mainly used by the {@link org.apache.camel.processor.interceptor.StreamCachingInterceptor}
+ * This interface is mainly used by the {@link org.apache.camel.spi.StreamCachingStrategy}
* for determining if/how to wrap a stream-based message.
+ * <p/>
+ * The Camel routing engine uses the {@link org.apache.camel.processor.CamelInternalProcessor.StreamCachingAdvice}
+ * to apply the stream cache during routing.
*
* @version
*/
[4/6] git commit: CAMEL-7303: Simple language accesing header with
key quoted should unqoute, as headerAs does.
Posted by da...@apache.org.
CAMEL-7303: Simple language accesing header with key quoted should unqoute, as headerAs does.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a0cde9b0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a0cde9b0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a0cde9b0
Branch: refs/heads/camel-2.13.x
Commit: a0cde9b086a7ea6e87f8829c38503a67bc239ddd
Parents: a10ab78
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Mar 18 09:25:10 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Mar 18 09:41:43 2014 +0100
----------------------------------------------------------------------
.../simple/ast/SimpleFunctionExpression.java | 10 ++++++----
.../apache/camel/language/simple/SimpleTest.java | 18 ++++++++++++++++++
2 files changed, 24 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a0cde9b0/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java b/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
index 985857a..d02f050 100644
--- a/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
@@ -268,19 +268,21 @@ public class SimpleFunctionExpression extends LiteralExpression {
if (remainder.startsWith("[") && remainder.endsWith("]")) {
remainder = remainder.substring(1, remainder.length() - 1);
}
+ // remove quotes from key
+ String key = StringHelper.removeLeadingAndEndingQuotes(remainder);
// validate syntax
- boolean invalid = OgnlHelper.isInvalidValidOgnlExpression(remainder);
+ boolean invalid = OgnlHelper.isInvalidValidOgnlExpression(key);
if (invalid) {
throw new SimpleParserException("Valid syntax: ${header.name[key]} was: " + function, token.getIndex());
}
- if (OgnlHelper.isValidOgnlExpression(remainder)) {
+ if (OgnlHelper.isValidOgnlExpression(key)) {
// ognl based header
- return ExpressionBuilder.headersOgnlExpression(remainder);
+ return ExpressionBuilder.headersOgnlExpression(key);
} else {
// regular header
- return ExpressionBuilder.headerExpression(remainder);
+ return ExpressionBuilder.headerExpression(key);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a0cde9b0/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
index 407f755..c9e22a3 100644
--- a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
@@ -524,6 +524,24 @@ public class SimpleTest extends LanguageTestSupport {
assertExpression("${in.headers}", headers);
}
+ public void testHeaderKeyWithSpace() throws Exception {
+ Map<String, Object> headers = exchange.getIn().getHeaders();
+ headers.put("some key", "Some Value");
+ assertEquals(3, headers.size());
+
+ assertExpression("${headerAs(foo,String)}", "abc");
+ assertExpression("${headerAs(some key,String)}", "Some Value");
+ assertExpression("${headerAs('some key',String)}", "Some Value");
+
+ assertExpression("${header[foo]}", "abc");
+ assertExpression("${header[some key]}", "Some Value");
+ assertExpression("${header['some key']}", "Some Value");
+
+ assertExpression("${headers[foo]}", "abc");
+ assertExpression("${headers[some key]}", "Some Value");
+ assertExpression("${headers['some key']}", "Some Value");
+ }
+
public void testHeaderAs() throws Exception {
assertExpression("${headerAs(foo,String)}", "abc");
[3/6] git commit: Polished
Posted by da...@apache.org.
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a10ab78b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a10ab78b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a10ab78b
Branch: refs/heads/camel-2.13.x
Commit: a10ab78b14b8f017ebdc61ac8b62c6009f5c70d8
Parents: 519123b
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Mar 18 07:36:09 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Mar 18 09:41:38 2014 +0100
----------------------------------------------------------------------
camel-core/src/main/java/org/apache/camel/StreamCache.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a10ab78b/camel-core/src/main/java/org/apache/camel/StreamCache.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/StreamCache.java b/camel-core/src/main/java/org/apache/camel/StreamCache.java
index 5333bd3..13ab6c1 100644
--- a/camel-core/src/main/java/org/apache/camel/StreamCache.java
+++ b/camel-core/src/main/java/org/apache/camel/StreamCache.java
@@ -23,8 +23,11 @@ import java.io.OutputStream;
* Tagging interface to indicate that a type is capable of caching the underlying data stream.
* <p/>
* This is a useful feature for avoiding message re-readability issues.
- * This interface is mainly used by the {@link org.apache.camel.processor.interceptor.StreamCachingInterceptor}
+ * This interface is mainly used by the {@link org.apache.camel.spi.StreamCachingStrategy}
* for determining if/how to wrap a stream-based message.
+ * <p/>
+ * The Camel routing engine uses the {@link org.apache.camel.processor.CamelInternalProcessor.StreamCachingAdvice}
+ * to apply the stream cache during routing.
*
* @version
*/