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 b85831c3a8296437574b39c50cf5428b8d90afda
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Apr 17 10:16:27 2019 +0200
Move mock component out of camel-core. Work in progress.
---
.../org/apache/camel/component/mock/AssertionClause.java | 4 ++--
.../camel/component/mock/MockExpressionClause.java | 4 ++--
.../component/mock/MockExpressionClauseSupport.java | 16 ++++++++--------
.../main/java/org/apache/camel/ExpressionFactory.java} | 10 ++++------
.../java/org/apache/camel/builder/ExpressionClause.java | 4 ++--
.../apache/camel/builder/ExpressionClauseSupport.java | 16 ++++++++--------
.../java/org/apache/camel/model/AggregateDefinition.java | 4 ++--
.../java/org/apache/camel/model/ChoiceDefinition.java | 4 ++--
.../main/java/org/apache/camel/model/ExpressionNode.java | 4 ++--
.../camel/model/language/ExpressionDefinition.java | 4 ++--
.../java/org/apache/camel/reifier/ChoiceReifier.java | 6 ++----
11 files changed, 36 insertions(+), 40 deletions(-)
diff --git
a/components/camel-mock/src/main/java/org/apache/camel/component/mock/AssertionClause.java
b/components/camel-mock/src/main/java/org/apache/camel/component/mock/AssertionClause.java
index cf7f05f..ab502ed 100644
---
a/components/camel-mock/src/main/java/org/apache/camel/component/mock/AssertionClause.java
+++
b/components/camel-mock/src/main/java/org/apache/camel/component/mock/AssertionClause.java
@@ -22,10 +22,10 @@ import java.util.Set;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
+import org.apache.camel.ExpressionFactory;
import org.apache.camel.Predicate;
import org.apache.camel.StreamCache;
import org.apache.camel.support.PredicateAssertHelper;
-import org.apache.camel.support.language.ExpressionModel;
/**
* A builder of assertions on message exchanges
@@ -52,7 +52,7 @@ public abstract class AssertionClause extends
MockExpressionClauseSupport<MockVa
return new PredicateValueBuilder(expression);
}
- public MockValueBuilder language(ExpressionModel expression) {
+ public MockValueBuilder language(ExpressionFactory expression) {
// must override this method as we provide null in the constructor
super.expression(expression.createExpression(mock.getCamelContext()));
return new PredicateValueBuilder(getExpressionValue());
diff --git
a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClause.java
b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClause.java
index 04178ec..fa4b202 100644
---
a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClause.java
+++
b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClause.java
@@ -23,11 +23,11 @@ import java.util.function.Supplier;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
+import org.apache.camel.ExpressionFactory;
import org.apache.camel.Message;
import org.apache.camel.Predicate;
import org.apache.camel.support.ExpressionAdapter;
import org.apache.camel.support.ExpressionToPredicateAdapter;
-import org.apache.camel.support.language.ExpressionModel;
/**
* Represents an expression clause within the DSL which when the expression is
@@ -474,7 +474,7 @@ public class MockExpressionClause<T> implements Expression,
Predicate {
return delegate.getExpressionValue();
}
- public ExpressionModel getExpressionType() {
+ public ExpressionFactory getExpressionType() {
return delegate.getExpressionType();
}
diff --git
a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClauseSupport.java
b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClauseSupport.java
index 35795b0..b518bab 100644
---
a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClauseSupport.java
+++
b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClauseSupport.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.mock;
import org.apache.camel.CamelContext;
import org.apache.camel.Expression;
+import org.apache.camel.ExpressionFactory;
import org.apache.camel.support.builder.ExpressionBuilder;
-import org.apache.camel.support.language.ExpressionModel;
/**
* A support class for building expression clauses.
@@ -28,7 +28,7 @@ public class MockExpressionClauseSupport<T> {
private T result;
private Expression expressionValue;
- private ExpressionModel expressionType;
+ private ExpressionFactory expressionType;
public MockExpressionClauseSupport(T result) {
this.result = result;
@@ -42,16 +42,16 @@ public class MockExpressionClauseSupport<T> {
*/
public T expression(Expression expression) {
setExpressionValue(expression);
- if (expression instanceof ExpressionModel) {
- setExpressionType((ExpressionModel) expression);
+ if (expression instanceof ExpressionFactory) {
+ setExpressionType((ExpressionFactory) expression);
}
return result;
}
/**
- * Specify an {@link ExpressionModel} instance
+ * Specify an {@link ExpressionFactory} instance
*/
- public T language(ExpressionModel expression) {
+ public T language(ExpressionFactory expression) {
setExpressionType(expression);
return result;
}
@@ -351,11 +351,11 @@ public class MockExpressionClauseSupport<T> {
this.expressionValue = expressionValue;
}
- public ExpressionModel getExpressionType() {
+ public ExpressionFactory getExpressionType() {
return expressionType;
}
- public void setExpressionType(ExpressionModel expressionType) {
+ public void setExpressionType(ExpressionFactory expressionType) {
this.expressionType = expressionType;
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/language/ExpressionModel.java
b/core/camel-api/src/main/java/org/apache/camel/ExpressionFactory.java
similarity index 81%
rename from
core/camel-support/src/main/java/org/apache/camel/support/language/ExpressionModel.java
rename to core/camel-api/src/main/java/org/apache/camel/ExpressionFactory.java
index 4861651..8a7be29 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/language/ExpressionModel.java
+++ b/core/camel-api/src/main/java/org/apache/camel/ExpressionFactory.java
@@ -14,15 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.support.language;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Expression;
+package org.apache.camel;
/**
- * Represents a model that can be created as an expression (eg language).
+ * A factory for creating {@link Expression}
*/
-public interface ExpressionModel {
+@FunctionalInterface
+public interface ExpressionFactory {
/**
* Creates an expression
diff --git
a/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
b/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
index 6dd377b..893263d 100644
---
a/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
+++
b/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
@@ -23,12 +23,12 @@ import java.util.function.Supplier;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
+import org.apache.camel.ExpressionFactory;
import org.apache.camel.Message;
import org.apache.camel.Predicate;
import org.apache.camel.support.ExpressionAdapter;
import org.apache.camel.support.ExpressionToPredicateAdapter;
import org.apache.camel.support.builder.xml.Namespaces;
-import org.apache.camel.support.language.ExpressionModel;
/**
* Represents an expression clause within the DSL which when the expression is
@@ -1061,7 +1061,7 @@ public class ExpressionClause<T> implements Expression,
Predicate {
return delegate.getExpressionValue();
}
- public ExpressionModel getExpressionType() {
+ public ExpressionFactory getExpressionType() {
return delegate.getExpressionType();
}
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 9dd2217..bd70189 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,6 +20,7 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Expression;
+import org.apache.camel.ExpressionFactory;
import org.apache.camel.model.language.ConstantExpression;
import org.apache.camel.model.language.ExchangePropertyExpression;
import org.apache.camel.model.language.GroovyExpression;
@@ -39,7 +40,6 @@ 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;
/**
* A support class for building expression clauses.
@@ -51,7 +51,7 @@ public class ExpressionClauseSupport<T> {
private T result;
private Expression expressionValue;
- private ExpressionModel expressionType;
+ private ExpressionFactory expressionType;
public ExpressionClauseSupport(T result) {
this.result = result;
@@ -65,16 +65,16 @@ public class ExpressionClauseSupport<T> {
*/
public T expression(Expression expression) {
setExpressionValue(expression);
- if (expression instanceof ExpressionModel) {
- setExpressionType((ExpressionModel) expression);
+ if (expression instanceof ExpressionFactory) {
+ setExpressionType((ExpressionFactory) expression);
}
return result;
}
/**
- * Specify an {@link ExpressionModel} instance
+ * Specify an {@link ExpressionFactory} instance
*/
- public T language(ExpressionModel expression) {
+ public T language(ExpressionFactory expression) {
setExpressionType(expression);
return result;
}
@@ -1087,11 +1087,11 @@ public class ExpressionClauseSupport<T> {
this.expressionValue = expressionValue;
}
- public ExpressionModel getExpressionType() {
+ public ExpressionFactory getExpressionType() {
return expressionType;
}
- public void setExpressionType(ExpressionModel expressionType) {
+ public void setExpressionType(ExpressionFactory expressionType) {
this.expressionType = expressionType;
}
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
b/core/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
index a81e290..e8b6727 100644
---
a/core/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
+++
b/core/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
@@ -31,6 +31,7 @@ import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.AggregationStrategy;
import org.apache.camel.Expression;
+import org.apache.camel.ExpressionFactory;
import org.apache.camel.Predicate;
import org.apache.camel.builder.AggregationStrategyClause;
import org.apache.camel.builder.ExpressionClause;
@@ -41,7 +42,6 @@ import
org.apache.camel.processor.aggregate.OptimisticLockRetryPolicy;
import org.apache.camel.spi.AggregationRepository;
import org.apache.camel.spi.AsPredicate;
import org.apache.camel.spi.Metadata;
-import org.apache.camel.support.language.ExpressionModel;
/**
* Aggregates many messages into a single message
@@ -176,7 +176,7 @@ public class AggregateDefinition extends
ProcessorDefinition<AggregateDefinition
// ExpressionClause which is a fancy builder to define
expressions and predicates
// using fluent builders in the DSL. However we need
afterwards a callback to
// reset the expression to the expression type the
ExpressionClause did build for us
- ExpressionModel model = clause.getExpressionType();
+ ExpressionFactory model = clause.getExpressionType();
if (model instanceof ExpressionDefinition) {
correlationExpression = new
ExpressionSubElementDefinition();
correlationExpression.setExpressionType((ExpressionDefinition) model);
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
b/core/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
index a782d5e..de4dd2a 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
@@ -26,12 +26,12 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlRootElement;
+import org.apache.camel.ExpressionFactory;
import org.apache.camel.Predicate;
import org.apache.camel.builder.ExpressionClause;
import org.apache.camel.model.language.ExpressionDefinition;
import org.apache.camel.spi.AsPredicate;
import org.apache.camel.spi.Metadata;
-import org.apache.camel.support.language.ExpressionModel;
import org.apache.camel.util.CollectionStringBuffer;
import org.apache.camel.util.ObjectHelper;
@@ -267,7 +267,7 @@ public class ChoiceDefinition extends
ProcessorDefinition<ChoiceDefinition> {
// ExpressionClause which is a fancy builder to define
expressions and predicates
// using fluent builders in the DSL. However we need
afterwards a callback to
// reset the expression to the expression type the
ExpressionClause did build for us
- ExpressionModel model = clause.getExpressionType();
+ ExpressionFactory model = clause.getExpressionType();
if (model instanceof ExpressionDefinition) {
when.setExpression((ExpressionDefinition) model);
}
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
b/core/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
index 7372044..596432c 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
@@ -25,10 +25,10 @@ import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.Expression;
+import org.apache.camel.ExpressionFactory;
import org.apache.camel.Predicate;
import org.apache.camel.builder.ExpressionClause;
import org.apache.camel.model.language.ExpressionDefinition;
-import org.apache.camel.support.language.ExpressionModel;
/**
* A base class for nodes which contain an expression and a number of outputs
@@ -115,7 +115,7 @@ public abstract class ExpressionNode extends
ProcessorDefinition<ExpressionNode>
// ExpressionClause which is a fancy builder to define
expressions and predicates
// using fluent builders in the DSL. However we need
afterwards a callback to
// reset the expression to the expression type the
ExpressionClause did build for us
- ExpressionModel model = clause.getExpressionType();
+ ExpressionFactory model = clause.getExpressionType();
if (model instanceof ExpressionDefinition) {
setExpression((ExpressionDefinition) model);
}
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
b/core/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
index 7eb9a4c..b74b9d2 100644
---
a/core/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
+++
b/core/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
@@ -35,6 +35,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
+import org.apache.camel.ExpressionFactory;
import org.apache.camel.NoSuchLanguageException;
import org.apache.camel.Predicate;
import org.apache.camel.builder.ScriptHelper;
@@ -44,7 +45,6 @@ import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.support.ExpressionToPredicateAdapter;
import org.apache.camel.support.IntrospectionSupport;
-import org.apache.camel.support.language.ExpressionModel;
import org.apache.camel.util.CollectionStringBuffer;
import org.apache.camel.util.ObjectHelper;
@@ -55,7 +55,7 @@ import org.apache.camel.util.ObjectHelper;
@XmlRootElement
@XmlType(name = "expression") // must be named expression
@XmlAccessorType(XmlAccessType.FIELD)
-public class ExpressionDefinition implements Expression, Predicate,
OtherAttributesAware, ExpressionModel {
+public class ExpressionDefinition implements Expression, Predicate,
OtherAttributesAware, ExpressionFactory {
@XmlAttribute
@XmlID
private String id;
diff --git
a/core/camel-core/src/main/java/org/apache/camel/reifier/ChoiceReifier.java
b/core/camel-core/src/main/java/org/apache/camel/reifier/ChoiceReifier.java
index 1944472..11fa17e 100644
--- a/core/camel-core/src/main/java/org/apache/camel/reifier/ChoiceReifier.java
+++ b/core/camel-core/src/main/java/org/apache/camel/reifier/ChoiceReifier.java
@@ -19,12 +19,11 @@ package org.apache.camel.reifier;
import java.util.ArrayList;
import java.util.List;
-import org.apache.camel.Expression;
+import org.apache.camel.ExpressionFactory;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
import org.apache.camel.builder.ExpressionClause;
import org.apache.camel.model.ChoiceDefinition;
-import org.apache.camel.model.ExpressionNode;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.ProcessorDefinitionHelper;
import org.apache.camel.model.WhenDefinition;
@@ -32,7 +31,6 @@ import org.apache.camel.model.language.ExpressionDefinition;
import org.apache.camel.processor.ChoiceProcessor;
import org.apache.camel.processor.FilterProcessor;
import org.apache.camel.spi.RouteContext;
-import org.apache.camel.support.language.ExpressionModel;
class ChoiceReifier extends ProcessorReifier<ChoiceDefinition> {
@@ -56,7 +54,7 @@ class ChoiceReifier extends
ProcessorReifier<ChoiceDefinition> {
// ExpressionClause which is a fancy builder to define
expressions and predicates
// using fluent builders in the DSL. However we need
afterwards a callback to
// reset the expression to the expression type the
ExpressionClause did build for us
- ExpressionModel model = clause.getExpressionType();
+ ExpressionFactory model = clause.getExpressionType();
if (model instanceof ExpressionDefinition) {
whenClause.setExpression((ExpressionDefinition) model);
}
