Author: davsclaus
Date: Wed Jun 29 10:53:48 2011
New Revision: 1141040
URL: http://svn.apache.org/viewvc?rev=1141040&view=rev
Log:
Added tokenize to java dsl.
Added:
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
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.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=1141040&r1=1141039&r2=1141040&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
Wed Jun 29 10:53:48 2011
@@ -391,6 +391,39 @@ public class ExpressionClause<T> extends
}
/**
+ * Evaluates a token expression on the message body
+ *
+ * @param token the token
+ * @return the builder to continue processing the DSL
+ */
+ public T tokenize(String token) {
+ return delegate.tokenize(token);
+ }
+
+ /**
+ * Evaluates a token expression on the given header
+ *
+ * @param token the token
+ * @param headerName name of header to tokenize
+ * @return the builder to continue processing the DSL
+ */
+ public T tokenize(String token, String headerName) {
+ return delegate.tokenize(token, headerName);
+ }
+
+ /**
+ * Evaluates a token expression on the given header
+ *
+ * @param token the token
+ * @param headerName name of header to tokenize
+ * @param regex whether the token is a regular expression or not
+ * @return the builder to continue processing the DSL
+ */
+ public T tokenize(String token, String headerName, boolean regex) {
+ return delegate.tokenize(token, headerName, regex);
+ }
+
+ /**
* Evaluates an <a href="http://camel.apache.org/xpath.html">XPath
* expression</a>
*
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=1141040&r1=1141039&r2=1141040&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
Wed Jun 29 10:53:48 2011
@@ -39,6 +39,7 @@ import org.apache.camel.model.language.R
import org.apache.camel.model.language.SimpleExpression;
import org.apache.camel.model.language.SpELExpression;
import org.apache.camel.model.language.SqlExpression;
+import org.apache.camel.model.language.TokenizerExpression;
import org.apache.camel.model.language.XPathExpression;
import org.apache.camel.model.language.XQueryExpression;
import org.apache.camel.spi.Language;
@@ -432,6 +433,44 @@ public class ExpressionClauseSupport<T>
}
/**
+ * Evaluates a token expression on the message body
+ *
+ * @param token the token
+ * @return the builder to continue processing the DSL
+ */
+ public T tokenize(String token) {
+ return tokenize(token, null, false);
+ }
+
+ /**
+ * Evaluates a token expression on the given header
+ *
+ * @param token the token
+ * @param headerName name of header to tokenize
+ * @return the builder to continue processing the DSL
+ */
+ public T tokenize(String token, String headerName) {
+ return tokenize(token, headerName, false);
+ }
+
+ /**
+ * Evaluates a token expression on the given header
+ *
+ * @param token the token
+ * @param headerName name of header to tokenize
+ * @param regex whether the token is a regular expression or not
+ * @return the builder to continue processing the DSL
+ */
+ public T tokenize(String token, String headerName, boolean regex) {
+ TokenizerExpression expression = new TokenizerExpression();
+ expression.setToken(token);
+ expression.setHeaderName(headerName);
+ expression.setRegex(regex);
+ setExpressionType(expression);
+ return result;
+ }
+
+ /**
* Evaluates an <a href="http://camel.apache.org/xpath.html">XPath
* expression</a>
*
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java?rev=1141040&r1=1141039&r2=1141040&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
Wed Jun 29 10:53:48 2011
@@ -38,10 +38,10 @@ public class TokenizeLanguage implements
}
public static Expression tokenize(String token, boolean regex) {
- TokenizeLanguage langugage = new TokenizeLanguage();
- langugage.setToken(token);
- langugage.setRegex(regex);
- return langugage.createExpression(null);
+ TokenizeLanguage language = new TokenizeLanguage();
+ language.setToken(token);
+ language.setRegex(regex);
+ return language.createExpression(null);
}
public static Expression tokenize(String headerName, String token) {
@@ -49,11 +49,11 @@ public class TokenizeLanguage implements
}
public static Expression tokenize(String headerName, String token, boolean
regex) {
- TokenizeLanguage langugage = new TokenizeLanguage();
- langugage.setHeaderName(headerName);
- langugage.setToken(token);
- langugage.setRegex(regex);
- return langugage.createExpression(null);
+ TokenizeLanguage language = new TokenizeLanguage();
+ language.setHeaderName(headerName);
+ language.setToken(token);
+ language.setRegex(regex);
+ return language.createExpression(null);
}
public Predicate createPredicate(String expression) {
Added:
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=1141040&view=auto
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitTokenizerTest.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitTokenizerTest.java
Wed Jun 29 10:53:48 2011
@@ -0,0 +1,74 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+
+/**
+ *
+ */
+public class SplitTokenizerTest extends ContextTestSupport {
+
+ public void testSplitTokenizerA() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:split");
+ mock.expectedBodiesReceived("Claus", "James", "Willem");
+
+ template.sendBody("direct:a", "Claus,James,Willem");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testSplitTokenizerB() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:split");
+ mock.expectedBodiesReceived("Claus", "James", "Willem");
+
+ template.sendBodyAndHeader("direct:b", "Hello World", "myHeader",
"Claus,James,Willem");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testSplitTokenizerC() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:split");
+ mock.expectedBodiesReceived("Claus", "James", "Willem");
+
+ template.sendBody("direct:c", "Claus James Willem");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:a")
+ .split().tokenize(",")
+ .to("mock:split");
+
+ from("direct:b")
+ .split().tokenize(",", "myHeader")
+ .to("mock:split");
+
+ from("direct:c")
+ .split().tokenize("(\\W+)\\s*", null, true)
+ .to("mock:split");
+ }
+ };
+ }
+}