Author: davsclaus
Date: Tue May 1 09:22:36 2012
New Revision: 1332586
URL: http://svn.apache.org/viewvc?rev=1332586&view=rev
Log:
tokenize regex option exposed in DSL
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
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
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java?rev=1332586&r1=1332585&r2=1332586&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
Tue May 1 09:22:36 2012
@@ -1102,7 +1102,7 @@ public final class ExpressionBuilder {
public Object evaluate(Exchange exchange) {
Object value = expression.evaluate(exchange, Object.class);
Scanner scanner = ObjectHelper.getScanner(exchange, value);
- scanner.useDelimiter(regexTokenizer);
+ scanner.useDelimiter(pattern);
return scanner;
}
@@ -1116,7 +1116,7 @@ public final class ExpressionBuilder {
/**
* Returns a sort expression which will sort the expression with the given
comparator.
* <p/>
- * The expression is evaluted as a {@link List} object to allow sorting.
+ * The expression is evaluated as a {@link List} object to allow sorting.
*/
@SuppressWarnings({"unchecked", "rawtypes"})
public static Expression sortExpression(final Expression expression, final
Comparator comparator) {
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=1332586&r1=1332585&r2=1332586&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
Tue May 1 09:22:36 2012
@@ -408,6 +408,17 @@ public class ExpressionClause<T> extends
}
/**
+ * Evaluates a token expression on the message body
+ *
+ * @param token the token
+ * @param regex whether the token is a regular expression or not
+ * @return the builder to continue processing the DSL
+ */
+ public T tokenize(String token, boolean regex) {
+ return delegate.tokenize(token, regex);
+ }
+
+ /**
* Evaluates a token expression on the given header
*
* @param token the token
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=1332586&r1=1332585&r2=1332586&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
Tue May 1 09:22:36 2012
@@ -445,6 +445,17 @@ public class ExpressionClauseSupport<T>
}
/**
+ * Evaluates a token expression on the message body
+ *
+ * @param token the token
+ * @param regex whether the token is a regular expression or not
+ * @return the builder to continue processing the DSL
+ */
+ public T tokenize(String token, boolean regex) {
+ return tokenize(token, null, regex);
+ }
+
+ /**
* Evaluates a token expression on the given header
*
* @param token the token
