You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2009/03/08 06:57:18 UTC
svn commit: r751373 - in
/camel/trunk/camel-core/src/main/java/org/apache/camel/model: ./ config/
Author: hadrian
Date: Sun Mar 8 05:57:17 2009
New Revision: 751373
URL: http://svn.apache.org/viewvc?rev=751373&view=rev
Log:
CAMEL-1395. API renamed for model consistency.
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/EnrichDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.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=751373&r1=751372&r2=751373&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 Sun Mar 8 05:57:17 2009
@@ -98,12 +98,12 @@
@Override
public String toString() {
String expressionString = (getExpression() != null) ? getExpression().getLabel() : "";
- return "Aggregator[" + expressionString + " -> " + getOutputs() + "]";
+ return "Aggregate[" + expressionString + " -> " + getOutputs() + "]";
}
@Override
public String getShortName() {
- return "aggregator";
+ return "aggregate";
}
@Override
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=751373&r1=751372&r2=751373&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 Sun Mar 8 05:57:17 2009
@@ -58,7 +58,7 @@
@Override
public String toString() {
- return "Delayer[on: " + getExpression() + " delay: " + delayTime + " -> " + getOutputs() + "]";
+ return "Delay[on: " + getExpression() + " delay: " + delayTime + " -> " + getOutputs() + "]";
}
// Fluent API
@@ -84,7 +84,7 @@
@Override
public String getShortName() {
- return "delayer";
+ return "delay";
}
public Long getDelayTime() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java?rev=751373&r1=751372&r2=751373&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java Sun Mar 8 05:57:17 2009
@@ -58,6 +58,16 @@
}
@Override
+ public String toString() {
+ return "Enrich[" + resourceUri + " " + aggregationStrategy + "]";
+ }
+
+ @Override
+ public String getShortName() {
+ return "enrich";
+ }
+
+ @Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
Endpoint endpoint = routeContext.resolveEndpoint(resourceUri);
Enricher enricher = new Enricher(null, endpoint.createProducer());
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java?rev=751373&r1=751372&r2=751373&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java Sun Mar 8 05:57:17 2009
@@ -91,8 +91,13 @@
}
@Override
+ public String getShortName() {
+ return "onException";
+ }
+
+ @Override
public String toString() {
- return "Exception[" + getExceptionClasses() + (onWhen != null ? " " + onWhen : "") + " -> " + getOutputs() + "]";
+ return "OnException[" + getExceptionClasses() + (onWhen != null ? " " + onWhen : "") + " -> " + getOutputs() + "]";
}
/**
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java?rev=751373&r1=751372&r2=751373&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java Sun Mar 8 05:57:17 2009
@@ -63,7 +63,7 @@
@Override
public String getShortName() {
- return "resequencer";
+ return "resequence";
}
// Fluent API
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java?rev=751373&r1=751372&r2=751373&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java Sun Mar 8 05:57:17 2009
@@ -70,12 +70,12 @@
@Override
public String toString() {
- return "Splitter[" + getExpression() + " -> " + getOutputs() + "]";
+ return "Split[" + getExpression() + " -> " + getOutputs() + "]";
}
@Override
public String getShortName() {
- return "splitter";
+ return "split";
}
@Override
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=751373&r1=751372&r2=751373&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 Sun Mar 8 05:57:17 2009
@@ -53,13 +53,13 @@
@Override
public String toString() {
- return "Throttler[" + getMaximumRequestsPerPeriod() + " request per " + getTimePeriodMillis()
+ return "Throttle[" + getMaximumRequestsPerPeriod() + " request per " + getTimePeriodMillis()
+ " millis -> " + getOutputs() + "]";
}
@Override
public String getShortName() {
- return "throttler";
+ return "throttle";
}
@Override
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java?rev=751373&r1=751372&r2=751373&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java Sun Mar 8 05:57:17 2009
@@ -28,26 +28,26 @@
* {@link Resequencer}. Usage example:
*
* <pre>
- * from("direct:start").resequencer(body()).batch(
+ * from("direct:start").resequence(body()).batch(
* BatchResequencerConfig.getDefault()).to("mock:result")
* </pre>
* is equivalent to
*
* <pre>
- * from("direct:start").resequencer(body()).batch().to("mock:result")
+ * from("direct:start").resequence(body()).batch().to("mock:result")
* </pre>
*
* or
*
* <pre>
- * from("direct:start").resequencer(body()).to("mock:result")
+ * from("direct:start").resequence(body()).to("mock:result")
* </pre>
*
* Custom values for <code>batchSize</code> and <code>batchTimeout</code>
* can be set like in this example:
*
* <pre>
- * from("direct:start").resequencer(body()).batch(
+ * from("direct:start").resequence(body()).batch(
* new BatchResequencerConfig(300, 400L)).to("mock:result")
* </pre>
*