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 2015/07/12 20:14:32 UTC
[2/4] camel git commit: Tokenize language should validate some
options that are not valid together.
Tokenize language should validate some options that are not valid together.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8efac41c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8efac41c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8efac41c
Branch: refs/heads/master
Commit: 8efac41ca3993cd0b9d02cf6bac7aadcc1fe8ec7
Parents: 0a2ffd8
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Jul 12 17:58:48 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jul 12 20:16:16 2015 +0200
----------------------------------------------------------------------
.../apache/camel/language/tokenizer/TokenizeLanguage.java | 8 ++++++++
.../org/apache/camel/model/language/TokenizerExpression.java | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8efac41c/camel-core/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java b/camel-core/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
index ec3fadb..735bf40 100644
--- a/camel-core/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
+++ b/camel-core/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
@@ -98,6 +98,14 @@ public class TokenizeLanguage implements Language, IsSingleton {
public Expression createExpression() {
ObjectHelper.notNull(token, "token");
+ // validate some invalid combinations
+ if (endToken != null && inheritNamespaceTagName != null) {
+ throw new IllegalArgumentException("Cannot have both xml and pair tokenizer enabled.");
+ }
+ if (isXml() && (endToken != null || includeTokens)) {
+ throw new IllegalArgumentException("Cannot have both xml and pair tokenizer enabled.");
+ }
+
Expression answer = null;
if (isXml()) {
answer = ExpressionBuilder.tokenizeXMLExpression(token, inheritNamespaceTagName);
http://git-wip-us.apache.org/repos/asf/camel/blob/8efac41c/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
index d89a0c7..cefa84e 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
@@ -113,7 +113,7 @@ public class TokenizerExpression extends ExpressionDefinition {
}
/**
- * To inherit namepaces from a root/parent tag name
+ * To inherit namepaces from a root/parent tag name when using XML
*/
public void setInheritNamespaceTagName(String inheritNamespaceTagName) {
this.inheritNamespaceTagName = inheritNamespaceTagName;
@@ -136,7 +136,7 @@ public class TokenizerExpression extends ExpressionDefinition {
}
/**
- * Whether to include the tokens in the parts
+ * Whether to include the tokens in the parts when using pairs
* <p/>
* The default value is false
*/