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/04/17 09:41:50 UTC
[camel] 33/38: Move mock component out of camel-core. Work in
progress.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch mock
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 73fb23fa465271b6094a692d5f7012c31613c404
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Apr 17 09:39:46 2019 +0200
Move mock component out of camel-core. Work in progress.
---
.../main/java/org/apache/camel/builder/ExpressionClauseSupport.java | 2 +-
.../org/apache/camel/language/simple/SimpleExpressionBuilder.java | 5 ++++-
.../src/test/java/org/apache/camel/issues/SetHeaderIssueTest.java | 3 ++-
.../src/test/java/org/apache/camel/language/XMLTokenSplitTest.java | 3 ++-
.../camel/language/tokenizer/XMLTokenizeLanguageGroupingTest.java | 2 +-
.../apache/camel/language/tokenizer/XMLTokenizeLanguageTest.java | 2 +-
.../org/apache/camel/processor/SplitGroupMultiXmlTokenTest.java | 6 ++----
.../apache/camel/processor/SplitGroupWrappedMultiXmlTokenTest.java | 6 ++----
.../java/org/apache/camel/processor/SplitterWithXqureyTest.java | 2 +-
.../apache/camel/processor/XPathWithNamespaceBuilderFilterTest.java | 2 +-
.../org/apache/camel/processor/XPathWithNamespacesFilterTest.java | 3 ++-
11 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java b/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
index ddfd467..9dd2217 100644
--- a/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
+++ b/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
@@ -20,7 +20,6 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Expression;
-import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.model.language.ConstantExpression;
import org.apache.camel.model.language.ExchangePropertyExpression;
import org.apache.camel.model.language.GroovyExpression;
@@ -39,6 +38,7 @@ import org.apache.camel.model.language.TokenizerExpression;
import org.apache.camel.model.language.XMLTokenizerExpression;
import org.apache.camel.model.language.XPathExpression;
import org.apache.camel.model.language.XQueryExpression;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.support.language.ExpressionModel;
/**
diff --git a/core/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
index 73117ff..ca80e5e 100644
--- a/core/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
@@ -51,10 +51,13 @@ import org.apache.camel.util.StringHelper;
/**
* Expression builder used by the simple language.
*/
-public class SimpleExpressionBuilder {
+public final class SimpleExpressionBuilder {
private static final Pattern OFFSET_PATTERN = Pattern.compile("([+-])([^+-]+)");
+ private SimpleExpressionBuilder() {
+ }
+
/**
* Returns the expression for the exchanges inbound message header invoking methods defined
* in a simple OGNL notation
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/SetHeaderIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/SetHeaderIssueTest.java
index a37728b..5c8b9de 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/SetHeaderIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/SetHeaderIssueTest.java
@@ -15,11 +15,12 @@
* limitations under the License.
*/
package org.apache.camel.issues;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/camel-core/src/test/java/org/apache/camel/language/XMLTokenSplitTest.java b/core/camel-core/src/test/java/org/apache/camel/language/XMLTokenSplitTest.java
index 342f85d..d103b15 100644
--- a/core/camel-core/src/test/java/org/apache/camel/language/XMLTokenSplitTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/language/XMLTokenSplitTest.java
@@ -15,11 +15,12 @@
* limitations under the License.
*/
package org.apache.camel.language;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageGroupingTest.java b/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageGroupingTest.java
index b9c147e..40c6eff 100644
--- a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageGroupingTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageGroupingTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.language.tokenizer;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.junit.Test;
public class XMLTokenizeLanguageGroupingTest extends ContextTestSupport {
diff --git a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageTest.java b/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageTest.java
index 86c0958..6fd58c8 100644
--- a/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguageTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.language.tokenizer;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.junit.Test;
public class XMLTokenizeLanguageTest extends ContextTestSupport {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SplitGroupMultiXmlTokenTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SplitGroupMultiXmlTokenTest.java
index e1d269d..0982ae2 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/SplitGroupMultiXmlTokenTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/SplitGroupMultiXmlTokenTest.java
@@ -15,17 +15,15 @@
* limitations under the License.
*/
package org.apache.camel.processor;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.junit.Before;
import org.junit.Test;
-/**
- *
- */
public class SplitGroupMultiXmlTokenTest extends ContextTestSupport {
@Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SplitGroupWrappedMultiXmlTokenTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SplitGroupWrappedMultiXmlTokenTest.java
index 1414b7e..a548dfb 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/SplitGroupWrappedMultiXmlTokenTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/SplitGroupWrappedMultiXmlTokenTest.java
@@ -15,17 +15,15 @@
* limitations under the License.
*/
package org.apache.camel.processor;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.junit.Before;
import org.junit.Test;
-/**
- *
- */
public class SplitGroupWrappedMultiXmlTokenTest extends ContextTestSupport {
@Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterWithXqureyTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterWithXqureyTest.java
index 0f29260..f2c027e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterWithXqureyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterWithXqureyTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.processor;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.junit.Test;
public class SplitterWithXqureyTest extends ContextTestSupport {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterTest.java
index de50553..c61eb54 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.processor;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.junit.Before;
import org.junit.Test;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespacesFilterTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespacesFilterTest.java
index 22d9bf7..90553c0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespacesFilterTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespacesFilterTest.java
@@ -15,11 +15,12 @@
* limitations under the License.
*/
package org.apache.camel.processor;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.support.builder.xml.Namespaces;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.support.builder.xml.Namespaces;
import org.junit.Before;
import org.junit.Test;