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 2011/11/04 20:27:36 UTC
svn commit: r1197722 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/builder/ExpressionClause.java
main/java/org/apache/camel/builder/ExpressionClauseSupport.java
test/java/org/apache/camel/processor/SplitTokenizerTest.java
Author: davsclaus
Date: Fri Nov 4 19:27:35 2011
New Revision: 1197722
URL: http://svn.apache.org/viewvc?rev=1197722&view=rev
Log:
CAMEL-4617: Polished and fixed test.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitTokenizerTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java?rev=1197722&r1=1197721&r2=1197722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java Fri Nov 4 19:27:35 2011
@@ -424,14 +424,28 @@ public class ExpressionClause<T> extends
}
/**
- * Evaluates a token pair expression on the message body
+ * Evaluates a token pair expression on the message body.
+ * <p/>
+ * Tokens is not included.
*
* @param startToken the start token
* @param endToken the end token
* @return the builder to continue processing the DSL
*/
public T tokenizePair(String startToken, String endToken) {
- return delegate.tokenizePair(startToken, endToken);
+ return tokenizePair(startToken, endToken, false);
+ }
+
+ /**
+ * Evaluates a token pair expression on the message body
+ *
+ * @param startToken the start token
+ * @param endToken the end token
+ * @param includeTokens whether to include tokens
+ * @return the builder to continue processing the DSL
+ */
+ public T tokenizePair(String startToken, String endToken, boolean includeTokens) {
+ return delegate.tokenizePair(startToken, endToken, includeTokens);
}
/**
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java?rev=1197722&r1=1197721&r2=1197722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java Fri Nov 4 19:27:35 2011
@@ -475,12 +475,14 @@ public class ExpressionClauseSupport<T>
*
* @param startToken the start token
* @param endToken the end token
+ * @param includeTokens whether to include tokens
* @return the builder to continue processing the DSL
*/
- public T tokenizePair(String startToken, String endToken) {
+ public T tokenizePair(String startToken, String endToken, boolean includeTokens) {
TokenizerExpression expression = new TokenizerExpression();
expression.setToken(startToken);
expression.setEndToken(endToken);
+ expression.setIncludeTokens(includeTokens);
setExpressionType(expression);
return result;
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitTokenizerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitTokenizerTest.java?rev=1197722&r1=1197721&r2=1197722&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitTokenizerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitTokenizerTest.java Fri Nov 4 19:27:35 2011
@@ -89,11 +89,11 @@ public class SplitTokenizerTest extends
.to("mock:split");
from("direct:d")
- .split().tokenizePair("[", "]")
+ .split().tokenizePair("[", "]", true)
.to("mock:split");
from("direct:e")
- .split().tokenizePair("<person>", "</person>")
+ .split().tokenizeXML("person")
.to("mock:split");
}
};