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:55 UTC
[camel] 01/03: CAMEL-13552: camel3 - Move last language from
camel-core to camel-base
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;