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 2013/05/17 08:09:07 UTC
[1/2] git commit: CAMEL-6191: Simple predicate parser should keep
whitespace in functions. Thanks to Antoine DESSAIGNE for the patch.
Updated Branches:
refs/heads/camel-2.10.x ce7452c7e -> f8087e27b
refs/heads/camel-2.11.x a2b1df78e -> 596d389aa
CAMEL-6191: Simple predicate parser should keep whitespace in functions. Thanks to Antoine DESSAIGNE for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/596d389a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/596d389a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/596d389a
Branch: refs/heads/camel-2.11.x
Commit: 596d389aac5e21bf725246ee6255cfe50faad503
Parents: a2b1df7
Author: Claus Ibsen <da...@apache.org>
Authored: Fri May 17 08:03:53 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri May 17 08:04:52 2013 +0200
----------------------------------------------------------------------
.../language/simple/SimplePredicateParser.java | 13 ++++++++++---
.../language/simple/SimpleParserPredicateTest.java | 8 ++++++--
2 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/596d389a/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java b/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
index eae8296..44f7cc0 100644
--- a/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
+++ b/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
@@ -287,16 +287,23 @@ public class SimplePredicateParser extends BaseSimpleParser {
* which makes the succeeding parsing easier.
*/
private void removeIgnorableWhiteSpaceTokens() {
- // white space can be removed if its not part of a quoted text
+ // white space can be removed if its not part of a quoted text or within function(s)
boolean quote = false;
+ int functionCount = 0;
Iterator<SimpleToken> it = tokens.iterator();
while (it.hasNext()) {
SimpleToken token = it.next();
if (token.getType().isSingleQuote()) {
quote = !quote;
- } else if (token.getType().isWhitespace() && !quote) {
- it.remove();
+ } else if (!quote) {
+ if (token.getType().isFunctionStart()) {
+ functionCount++;
+ } else if (token.getType().isFunctionEnd()) {
+ functionCount--;
+ } else if (token.getType().isWhitespace() && functionCount == 0) {
+ it.remove();
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/596d389a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java
index 020a286..f089afa 100644
--- a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java
@@ -180,7 +180,7 @@ public class SimpleParserPredicateTest extends ExchangeTestSupport {
assertTrue("Should match", pre.matches(exchange));
}
-
+
public void testSimpleExpressionPredicate() throws Exception {
exchange.getIn().setBody("Hello");
exchange.getIn().setHeader("number", "1234");
@@ -203,6 +203,10 @@ public class SimpleParserPredicateTest extends ExchangeTestSupport {
parser = new SimplePredicateParser("${body['foo bar']} == 456", true);
pre = parser.parsePredicate();
assertTrue("Should match", pre.matches(exchange));
- }
+ // the predicate has whitespace in the function
+ parser = new SimplePredicateParser("${body[foo bar]} == 456", true);
+ pre = parser.parsePredicate();
+ assertTrue("Should match", pre.matches(exchange));
+ }
}
[2/2] git commit: CAMEL-6191: Simple predicate parser should keep
whitespace in functions. Thanks to Antoine DESSAIGNE for the patch.
Posted by da...@apache.org.
CAMEL-6191: Simple predicate parser should keep whitespace in functions. Thanks to Antoine DESSAIGNE for the patch.
Conflicts:
camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f8087e27
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f8087e27
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f8087e27
Branch: refs/heads/camel-2.10.x
Commit: f8087e27b50acaa31d91abd9bbb830c4c03bfd9c
Parents: ce7452c
Author: Claus Ibsen <da...@apache.org>
Authored: Fri May 17 08:03:53 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri May 17 08:08:48 2013 +0200
----------------------------------------------------------------------
.../language/simple/SimplePredicateParser.java | 13 ++++++--
.../language/simple/SimpleParserPredicateTest.java | 26 ++++++++++++++-
2 files changed, 35 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f8087e27/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java b/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
index eae8296..44f7cc0 100644
--- a/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
+++ b/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
@@ -287,16 +287,23 @@ public class SimplePredicateParser extends BaseSimpleParser {
* which makes the succeeding parsing easier.
*/
private void removeIgnorableWhiteSpaceTokens() {
- // white space can be removed if its not part of a quoted text
+ // white space can be removed if its not part of a quoted text or within function(s)
boolean quote = false;
+ int functionCount = 0;
Iterator<SimpleToken> it = tokens.iterator();
while (it.hasNext()) {
SimpleToken token = it.next();
if (token.getType().isSingleQuote()) {
quote = !quote;
- } else if (token.getType().isWhitespace() && !quote) {
- it.remove();
+ } else if (!quote) {
+ if (token.getType().isFunctionStart()) {
+ functionCount++;
+ } else if (token.getType().isFunctionEnd()) {
+ functionCount--;
+ } else if (token.getType().isWhitespace() && functionCount == 0) {
+ it.remove();
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f8087e27/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java
index b96d6a0..fcdc0bf 100644
--- a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.camel.language.simple;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.camel.ExchangeTestSupport;
import org.apache.camel.Predicate;
@@ -177,7 +180,7 @@ public class SimpleParserPredicateTest extends ExchangeTestSupport {
assertTrue("Should match", pre.matches(exchange));
}
-
+
public void testSimpleExpressionPredicate() throws Exception {
exchange.getIn().setBody("Hello");
exchange.getIn().setHeader("number", "1234");
@@ -186,4 +189,25 @@ public class SimpleParserPredicateTest extends ExchangeTestSupport {
assertTrue("Should match", pre.matches(exchange));
}
+ public void testSimpleMap() throws Exception {
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("foo", "123");
+ map.put("foo bar", "456");
+
+ exchange.getIn().setBody(map);
+
+ SimplePredicateParser parser = new SimplePredicateParser("${body[foo]} == 123", true);
+ Predicate pre = parser.parsePredicate();
+ assertTrue("Should match", pre.matches(exchange));
+
+ parser = new SimplePredicateParser("${body['foo bar']} == 456", true);
+ pre = parser.parsePredicate();
+ assertTrue("Should match", pre.matches(exchange));
+
+ // the predicate has whitespace in the function
+ parser = new SimplePredicateParser("${body[foo bar]} == 456", true);
+ pre = parser.parsePredicate();
+ assertTrue("Should match", pre.matches(exchange));
+ }
+
}