Author: davsclaus
Date: Sat Oct 20 14:57:44 2012
New Revision: 1400468
URL: http://svn.apache.org/viewvc?rev=1400468&view=rev
Log:
CAMEL-5721: Removed not really used NodeFactory. Ensure expressions is set
consistent in the DSL.
Removed:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/NodeFactory.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java?rev=1400468&r1=1400467&r2=1400468&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
Sat Oct 20 14:57:44 2012
@@ -106,13 +106,13 @@ public class AggregateDefinition extends
public AggregateDefinition(Predicate predicate) {
if (predicate != null) {
- setExpression(new ExpressionDefinition(predicate));
+
setExpression(ExpressionNodeHelper.toExpressionDefinition(predicate));
}
}
public AggregateDefinition(Expression correlationExpression) {
if (correlationExpression != null) {
- setExpression(new ExpressionDefinition(correlationExpression));
+
setExpression(ExpressionNodeHelper.toExpressionDefinition(correlationExpression));
}
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java?rev=1400468&r1=1400467&r2=1400468&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
Sat Oct 20 14:57:44 2012
@@ -112,7 +112,7 @@ public class DelayDefinition extends Exp
* @return the builder
*/
public DelayDefinition delayTime(Long delay) {
- setExpression(new
ExpressionDefinition(ExpressionBuilder.constantExpression(delay)));
+
setExpression(ExpressionNodeHelper.toExpressionDefinition(ExpressionBuilder.constantExpression(delay)));
return this;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java?rev=1400468&r1=1400467&r2=1400468&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
Sat Oct 20 14:57:44 2012
@@ -164,7 +164,6 @@ public class InterceptSendToEndpointDefi
newWhen.setInheritErrorHandler(when.isInheritErrorHandler());
newWhen.setParent(when.getParent());
newWhen.setOtherAttributes(when.getOtherAttributes());
- newWhen.setNodeFactory(when.getNodeFactory());
newWhen.setDescription(when.getDescription());
// move this outputs to the when, expect the first one
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java?rev=1400468&r1=1400467&r2=1400468&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java
Sat Oct 20 14:57:44 2012
@@ -65,7 +65,7 @@ public class LoopDefinition extends Expr
}
public void setExpression(Expression expr) {
- setExpression(new ExpressionDefinition(expr));
+ setExpression(ExpressionNodeHelper.toExpressionDefinition(expr));
}
public Boolean getCopy() {
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java?rev=1400468&r1=1400467&r2=1400468&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
Sat Oct 20 14:57:44 2012
@@ -80,7 +80,6 @@ import org.slf4j.LoggerFactory;
public abstract class ProcessorDefinition<Type extends
ProcessorDefinition<Type>> extends OptionalIdentifiedDefinition<Type>
implements Block {
protected final transient Logger log = LoggerFactory.getLogger(getClass());
protected Boolean inheritErrorHandler;
- private NodeFactory nodeFactory;
private final LinkedList<Block> blocks = new LinkedList<Block>();
private ProcessorDefinition<?> parent;
private final List<InterceptStrategy> interceptStrategies = new
ArrayList<InterceptStrategy>();
@@ -165,7 +164,6 @@ public abstract class ProcessorDefinitio
}
output.setParent(this);
- output.setNodeFactory(getNodeFactory());
configureChild(output);
getOutputs().add(output);
}
@@ -1257,7 +1255,7 @@ public abstract class ProcessorDefinitio
*/
public IdempotentConsumerDefinition idempotentConsumer(Expression
messageIdExpression) {
IdempotentConsumerDefinition answer = new
IdempotentConsumerDefinition();
- answer.setExpression(new ExpressionDefinition(messageIdExpression));
+
answer.setExpression(ExpressionNodeHelper.toExpressionDefinition(messageIdExpression));
addOutput(answer);
return answer;
}
@@ -1330,7 +1328,7 @@ public abstract class ProcessorDefinitio
* @return the builder
*/
public FilterDefinition filter(ExpressionDefinition expression) {
- FilterDefinition filter = getNodeFactory().createFilter();
+ FilterDefinition filter = new FilterDefinition();
filter.setExpression(expression);
addOutput(filter);
return filter;
@@ -1359,7 +1357,7 @@ public abstract class ProcessorDefinitio
*/
public ValidateDefinition validate(Expression expression) {
ValidateDefinition answer = new ValidateDefinition();
- answer.setExpression(new ExpressionDefinition(expression));
+
answer.setExpression(ExpressionNodeHelper.toExpressionDefinition(expression));
addOutput(answer);
return answer;
}
@@ -1374,7 +1372,7 @@ public abstract class ProcessorDefinitio
*/
public ValidateDefinition validate(Predicate predicate) {
ValidateDefinition answer = new ValidateDefinition();
- answer.setExpression(new ExpressionDefinition(predicate));
+
answer.setExpression(ExpressionNodeHelper.toExpressionDefinition(predicate));
addOutput(answer);
return answer;
}
@@ -1849,7 +1847,7 @@ public abstract class ProcessorDefinitio
*/
public ResequenceDefinition resequence(Expression expression) {
ResequenceDefinition answer = new ResequenceDefinition();
- answer.setExpression(new ExpressionDefinition(expression));
+
answer.setExpression(ExpressionNodeHelper.toExpressionDefinition(expression));
addOutput(answer);
return answer;
}
@@ -2007,7 +2005,7 @@ public abstract class ProcessorDefinitio
* @return the builder
*/
public LoopDefinition loop(Expression expression) {
- LoopDefinition loop = getNodeFactory().createLoop();
+ LoopDefinition loop = new LoopDefinition();
loop.setExpression(expression);
addOutput(loop);
return loop;
@@ -2022,7 +2020,7 @@ public abstract class ProcessorDefinitio
* @return the builder
*/
public LoopDefinition loop(int count) {
- LoopDefinition loop = getNodeFactory().createLoop();
+ LoopDefinition loop = new LoopDefinition();
loop.setExpression(new ConstantExpression(Integer.toString(count)));
addOutput(loop);
return loop;
@@ -3117,18 +3115,6 @@ public abstract class ProcessorDefinitio
}
@XmlTransient
- public NodeFactory getNodeFactory() {
- if (nodeFactory == null) {
- nodeFactory = new NodeFactory();
- }
- return nodeFactory;
- }
-
- public void setNodeFactory(NodeFactory nodeFactory) {
- this.nodeFactory = nodeFactory;
- }
-
- @XmlTransient
public List<InterceptStrategy> getInterceptStrategies() {
return interceptStrategies;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java?rev=1400468&r1=1400467&r2=1400468&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
Sat Oct 20 14:57:44 2012
@@ -47,7 +47,7 @@ public class SortDefinition<T> extends N
}
public SortDefinition(Expression expression) {
- setExpression(new ExpressionDefinition(expression));
+ setExpression(ExpressionNodeHelper.toExpressionDefinition(expression));
}
public SortDefinition(Expression expression, Comparator<? super T>
comparator) {
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java?rev=1400468&r1=1400467&r2=1400468&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
Sat Oct 20 14:57:44 2012
@@ -139,7 +139,7 @@ public class ThrottleDefinition extends
* @return the builder
*/
public ThrottleDefinition maximumRequestsPerPeriod(Long
maximumRequestsPerPeriod) {
- setExpression(new
ExpressionDefinition(ExpressionBuilder.constantExpression(maximumRequestsPerPeriod)));
+
setExpression(ExpressionNodeHelper.toExpressionDefinition(ExpressionBuilder.constantExpression(maximumRequestsPerPeriod)));
return this;
}
