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 2019/05/21 13:44:54 UTC
[camel] branch master updated (a3309df -> 95cf42b)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from a3309df [CAMEL-13371] Move languages to camel-base
new 7c6e1c8 CAMEL-13552: camel3 - Move last language from camel-core to camel-base
new 58425ae CAMEL-13552: camel3 - Move last language from camel-core to camel-base
new 95cf42b Regen
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
components/readme.adoc | 4 +-
.../camel/language/tokenizer/TokenizeLanguage.java | 4 +-
.../apache/camel/language/tokenizer/package.html | 0
.../apache/camel/builder/ExpressionBuilder.java | 62 ----------------------
.../builder/RecordableInputStreamTest.java | 2 +-
.../builder/RecordableReaderTest.java | 2 +-
.../language/xtokenizer/RecordableReader.java | 1 -
.../camel/support/builder/ExpressionBuilder.java | 55 +++++++++++++++++++
.../support}/builder/RecordableInputStream.java | 5 +-
.../builder/TokenPairExpressionIterator.java | 2 +-
.../builder/TokenXMLExpressionIterator.java | 2 +-
11 files changed, 65 insertions(+), 74 deletions(-)
rename core/{camel-core => camel-base}/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java (98%)
rename core/{camel-core => camel-base}/src/main/java/org/apache/camel/language/tokenizer/package.html (100%)
rename core/camel-core/src/test/java/org/apache/camel/{ => support}/builder/RecordableInputStreamTest.java (98%)
rename core/camel-core/src/test/java/org/apache/camel/{ => support}/builder/RecordableReaderTest.java (98%)
rename core/{camel-core/src/main/java/org/apache/camel => camel-support/src/main/java/org/apache/camel/support}/builder/RecordableInputStream.java (93%)
rename core/{camel-core/src/main/java/org/apache/camel => camel-support/src/main/java/org/apache/camel/support}/builder/TokenPairExpressionIterator.java (99%)
rename core/{camel-core/src/main/java/org/apache/camel => camel-support/src/main/java/org/apache/camel/support}/builder/TokenXMLExpressionIterator.java (99%)
[camel] 01/03: CAMEL-13552: camel3 - Move last language from
camel-core to camel-base
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7c6e1c8a5b579b39c217f04fd0353851035f982b
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue May 21 13:00:41 2019 +0200
CAMEL-13552: camel3 - Move last language from camel-core to camel-base
---
.../camel/language/tokenizer/TokenizeLanguage.java | 4 +-
.../apache/camel/language/tokenizer/package.html | 0
.../apache/camel/builder/ExpressionBuilder.java | 62 ----------------------
.../builder/RecordableInputStreamTest.java | 2 +-
.../builder/RecordableReaderTest.java | 2 +-
.../camel/support/builder/ExpressionBuilder.java | 55 +++++++++++++++++++
.../support}/builder/RecordableInputStream.java | 5 +-
.../builder/TokenPairExpressionIterator.java | 2 +-
.../builder/TokenXMLExpressionIterator.java | 2 +-
9 files changed, 62 insertions(+), 72 deletions(-)
diff --git a/core/camel-core/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java b/core/camel-base/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
similarity index 98%
rename from core/camel-core/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
rename to core/camel-base/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
index 9ba1a2f..2e3899d 100644
--- a/core/camel-core/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
+++ b/core/camel-base/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
@@ -19,9 +19,9 @@ package org.apache.camel.language.tokenizer;
import org.apache.camel.Expression;
import org.apache.camel.IsSingleton;
import org.apache.camel.Predicate;
-import org.apache.camel.builder.ExpressionBuilder;
import org.apache.camel.spi.Language;
import org.apache.camel.support.ExpressionToPredicateAdapter;
+import org.apache.camel.support.builder.ExpressionBuilder;
import org.apache.camel.util.ObjectHelper;
/**
@@ -40,8 +40,6 @@ import org.apache.camel.util.ObjectHelper;
@org.apache.camel.spi.annotations.Language("tokenize")
public class TokenizeLanguage implements Language, IsSingleton {
- // TODO: Move this to camel-base
-
private String token;
private String endToken;
private String inheritNamespaceTagName;
diff --git a/core/camel-core/src/main/java/org/apache/camel/language/tokenizer/package.html b/core/camel-base/src/main/java/org/apache/camel/language/tokenizer/package.html
similarity index 100%
rename from core/camel-core/src/main/java/org/apache/camel/language/tokenizer/package.html
rename to core/camel-base/src/main/java/org/apache/camel/language/tokenizer/package.html
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java b/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
index 3ee51ee..8da8f8f 100644
--- a/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
@@ -16,13 +16,6 @@
*/
package org.apache.camel.builder;
-import org.apache.camel.Exchange;
-import org.apache.camel.Expression;
-import org.apache.camel.spi.Language;
-import org.apache.camel.support.ExpressionAdapter;
-import org.apache.camel.support.builder.Namespaces;
-import org.apache.camel.util.StringHelper;
-
/**
* A helper class for working with <a href="http://camel.apache.org/expression.html">expressions</a>.
*/
@@ -36,59 +29,4 @@ public final class ExpressionBuilder extends org.apache.camel.support.builder.Ex
private ExpressionBuilder() {
}
- /**
- * Returns an {@link TokenPairExpressionIterator} expression
- */
- public static Expression tokenizePairExpression(String startToken, String endToken, boolean includeTokens) {
- return new TokenPairExpressionIterator(startToken, endToken, includeTokens);
- }
-
- /**
- * Returns an {@link TokenXMLExpressionIterator} expression
- */
- public static Expression tokenizeXMLExpression(String tagName, String inheritNamespaceTagName) {
- StringHelper.notEmpty(tagName, "tagName");
- return new TokenXMLExpressionIterator(tagName, inheritNamespaceTagName);
- }
-
- public static Expression tokenizeXMLAwareExpression(String path, char mode) {
- return tokenizeXMLAwareExpression(null, path, mode, 1, null);
- }
-
- public static Expression tokenizeXMLAwareExpression(String path, char mode, int group) {
- return tokenizeXMLAwareExpression(null, path, mode, group, null);
- }
-
- public static Expression tokenizeXMLAwareExpression(String path, char mode, int group, Namespaces namespaces) {
- return tokenizeXMLAwareExpression(null, path, mode, group, namespaces);
- }
-
- public static Expression tokenizeXMLAwareExpression(String headerName, String path, char mode, int group, Namespaces namespaces) {
- StringHelper.notEmpty(path, "path");
- return new ExpressionAdapter() {
- public Object evaluate(Exchange exchange) {
- Language language = exchange.getContext().resolveLanguage("xtokenize");
- if (headerName != null) {
- setProperty(language, "headerName", headerName);
- }
- if (mode != 'i') {
- setProperty(language, "mode", mode);
- }
- if (group > 1) {
- setProperty(language, "group", group);
- }
- if (namespaces != null) {
- setProperty(language, "namespaces", namespaces);
- }
- setProperty(language, "path", path);
- return language.createExpression(null).evaluate(exchange, Object.class);
- }
-
- @Override
- public String toString() {
- return "xtokenize(" + path + ")";
- }
- };
- }
-
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/RecordableInputStreamTest.java b/core/camel-core/src/test/java/org/apache/camel/support/builder/RecordableInputStreamTest.java
similarity index 98%
rename from core/camel-core/src/test/java/org/apache/camel/builder/RecordableInputStreamTest.java
rename to core/camel-core/src/test/java/org/apache/camel/support/builder/RecordableInputStreamTest.java
index 7a18412..08c9b7d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/RecordableInputStreamTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/support/builder/RecordableInputStreamTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.builder;
+package org.apache.camel.support.builder;
import java.io.ByteArrayInputStream;
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/RecordableReaderTest.java b/core/camel-core/src/test/java/org/apache/camel/support/builder/RecordableReaderTest.java
similarity index 98%
rename from core/camel-core/src/test/java/org/apache/camel/builder/RecordableReaderTest.java
rename to core/camel-core/src/test/java/org/apache/camel/support/builder/RecordableReaderTest.java
index e24d6ba..03a6eaa 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/RecordableReaderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/support/builder/RecordableReaderTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.builder;
+package org.apache.camel.support.builder;
import java.io.ByteArrayInputStream;
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
index dd289d6..e97813c 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
@@ -1585,6 +1585,61 @@ public class ExpressionBuilder {
};
}
+ /**
+ * Returns an {@link TokenPairExpressionIterator} expression
+ */
+ public static Expression tokenizePairExpression(String startToken, String endToken, boolean includeTokens) {
+ return new TokenPairExpressionIterator(startToken, endToken, includeTokens);
+ }
+
+ /**
+ * Returns an {@link TokenXMLExpressionIterator} expression
+ */
+ public static Expression tokenizeXMLExpression(String tagName, String inheritNamespaceTagName) {
+ StringHelper.notEmpty(tagName, "tagName");
+ return new TokenXMLExpressionIterator(tagName, inheritNamespaceTagName);
+ }
+
+ public static Expression tokenizeXMLAwareExpression(String path, char mode) {
+ return tokenizeXMLAwareExpression(null, path, mode, 1, null);
+ }
+
+ public static Expression tokenizeXMLAwareExpression(String path, char mode, int group) {
+ return tokenizeXMLAwareExpression(null, path, mode, group, null);
+ }
+
+ public static Expression tokenizeXMLAwareExpression(String path, char mode, int group, Namespaces namespaces) {
+ return tokenizeXMLAwareExpression(null, path, mode, group, namespaces);
+ }
+
+ public static Expression tokenizeXMLAwareExpression(String headerName, String path, char mode, int group, Namespaces namespaces) {
+ StringHelper.notEmpty(path, "path");
+ return new ExpressionAdapter() {
+ public Object evaluate(Exchange exchange) {
+ Language language = exchange.getContext().resolveLanguage("xtokenize");
+ if (headerName != null) {
+ setProperty(language, "headerName", headerName);
+ }
+ if (mode != 'i') {
+ setProperty(language, "mode", mode);
+ }
+ if (group > 1) {
+ setProperty(language, "group", group);
+ }
+ if (namespaces != null) {
+ setProperty(language, "namespaces", namespaces);
+ }
+ setProperty(language, "path", path);
+ return language.createExpression(null).evaluate(exchange, Object.class);
+ }
+
+ @Override
+ public String toString() {
+ return "xtokenize(" + path + ")";
+ }
+ };
+ }
+
protected static void setProperty(Object bean, String name, Object value) {
try {
IntrospectionSupport.setProperty(bean, name, value);
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/RecordableInputStream.java b/core/camel-support/src/main/java/org/apache/camel/support/builder/RecordableInputStream.java
similarity index 94%
rename from core/camel-core/src/main/java/org/apache/camel/builder/RecordableInputStream.java
rename to core/camel-support/src/main/java/org/apache/camel/support/builder/RecordableInputStream.java
index 48355db..06dbbb2 100644
--- a/core/camel-core/src/main/java/org/apache/camel/builder/RecordableInputStream.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/builder/RecordableInputStream.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.builder;
+package org.apache.camel.support.builder;
import java.io.ByteArrayOutputStream;
import java.io.FilterInputStream;
@@ -24,9 +24,8 @@ import java.io.UnsupportedEncodingException;
/**
* This class is used by the tokenizer to extract data while reading from the stream.
- * TODO it is used package internally but may be moved to some common package.
*/
-class RecordableInputStream extends FilterInputStream {
+public class RecordableInputStream extends FilterInputStream {
private TrimmableByteArrayOutputStream buf;
private String charset;
private boolean recording;
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/TokenPairExpressionIterator.java b/core/camel-support/src/main/java/org/apache/camel/support/builder/TokenPairExpressionIterator.java
similarity index 99%
rename from core/camel-core/src/main/java/org/apache/camel/builder/TokenPairExpressionIterator.java
rename to core/camel-support/src/main/java/org/apache/camel/support/builder/TokenPairExpressionIterator.java
index 421c910..973b896 100644
--- a/core/camel-core/src/main/java/org/apache/camel/builder/TokenPairExpressionIterator.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/builder/TokenPairExpressionIterator.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.builder;
+package org.apache.camel.support.builder;
import java.io.Closeable;
import java.io.IOException;
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/TokenXMLExpressionIterator.java b/core/camel-support/src/main/java/org/apache/camel/support/builder/TokenXMLExpressionIterator.java
similarity index 99%
rename from core/camel-core/src/main/java/org/apache/camel/builder/TokenXMLExpressionIterator.java
rename to core/camel-support/src/main/java/org/apache/camel/support/builder/TokenXMLExpressionIterator.java
index daff581..ff0dd5b 100644
--- a/core/camel-core/src/main/java/org/apache/camel/builder/TokenXMLExpressionIterator.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/builder/TokenXMLExpressionIterator.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.builder;
+package org.apache.camel.support.builder;
import java.io.Closeable;
import java.io.IOException;
[camel] 03/03: Regen
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 95cf42b27d7c3f8fde07b0f71ee4fcdff40a6846
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue May 21 15:44:00 2019 +0200
Regen
---
components/readme.adoc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/components/readme.adoc b/components/readme.adoc
index be98681..ebbbf5f 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1000,7 +1000,7 @@ Number of Data Formats: 43 in 35 JAR artifacts (0 deprecated)
==== Expression Languages
// languages: START
-Number of Languages: 16 in 11 JAR artifacts (0 deprecated)
+Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -1032,6 +1032,8 @@ Number of Languages: 16 in 11 JAR artifacts (0 deprecated)
| link:camel-spring/src/main/docs/spel-language.adoc[SpEL] (camel-spring) | 2.7 | To use Spring Expression Language (SpEL) in Camel expressions or predicates.
+| link:camel-base/src/main/docs/tokenize-language.adoc[Tokenize] (camel-base) | 2.0 | To use Camel message body or header with a tokenizer in Camel expressions or predicates.
+
| link:camel-jaxp/src/main/docs/xtokenize-language.adoc[XML Tokenize] (camel-jaxp) | 2.14 | To use Camel message body or header with a XML tokenizer in Camel expressions or predicates.
| link:camel-xpath/src/main/docs/xpath-language.adoc[XPath] (camel-xpath) | 1.1 | To use XPath (XML) in Camel expressions or predicates.
[camel] 02/03: CAMEL-13552: camel3 - Move last language from
camel-core to camel-base
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 58425aed2f6453a1faa3b177917c441eba23d241
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue May 21 14:24:37 2019 +0200
CAMEL-13552: camel3 - Move last language from camel-core to camel-base
---
.../java/org/apache/camel/language/xtokenizer/RecordableReader.java | 1 -
.../java/org/apache/camel/support/builder/RecordableInputStream.java | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/core/camel-jaxp/src/main/java/org/apache/camel/language/xtokenizer/RecordableReader.java b/core/camel-jaxp/src/main/java/org/apache/camel/language/xtokenizer/RecordableReader.java
index 51020bb..702f920 100644
--- a/core/camel-jaxp/src/main/java/org/apache/camel/language/xtokenizer/RecordableReader.java
+++ b/core/camel-jaxp/src/main/java/org/apache/camel/language/xtokenizer/RecordableReader.java
@@ -23,7 +23,6 @@ import java.io.Reader;
/**
* This class is used by the tokenizer to extract data while reading from the stream.
- * TODO it is used package internally but may be moved to some common package.
*/
class RecordableReader extends FilterReader {
private TrimmableCharArrayWriter buf;
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/builder/RecordableInputStream.java b/core/camel-support/src/main/java/org/apache/camel/support/builder/RecordableInputStream.java
index 06dbbb2..1111d99 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/builder/RecordableInputStream.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/builder/RecordableInputStream.java
@@ -23,9 +23,9 @@ import java.io.InputStream;
import java.io.UnsupportedEncodingException;
/**
- * This class is used by the tokenizer to extract data while reading from the stream.
+ * This class is used internally by the tokenizer to extract data while reading from the stream.
*/
-public class RecordableInputStream extends FilterInputStream {
+class RecordableInputStream extends FilterInputStream {
private TrimmableByteArrayOutputStream buf;
private String charset;
private boolean recording;