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 2009/06/18 11:08:35 UTC
svn commit: r785969 - in
/camel/trunk/camel-core/src/test/java/org/apache/camel/processor:
BodyInAggregatingStrategy.java MulticastAnotherAggregatorTest.java
aggregator/AggregatorAndOnExceptionTest.java
aggregator/PredicateAggregatorCollectionTest.java
Author: davsclaus
Date: Thu Jun 18 09:08:35 2009
New Revision: 785969
URL: http://svn.apache.org/viewvc?rev=785969&view=rev
Log:
CAMEL-1702: EIP store decorated metadata as exchange property instead of message header. Fixed CS in camel-jms.
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BodyInAggregatingStrategy.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastAnotherAggregatorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorAndOnExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/PredicateAggregatorCollectionTest.java
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BodyInAggregatingStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BodyInAggregatingStrategy.java?rev=785969&r1=785968&r2=785969&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BodyInAggregatingStrategy.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BodyInAggregatingStrategy.java Thu Jun 18 09:08:35 2009
@@ -17,7 +17,7 @@
package org.apache.camel.processor;
import org.apache.camel.Exchange;
-import org.apache.camel.Header;
+import org.apache.camel.Property;
import org.apache.camel.processor.aggregate.AggregationStrategy;
public class BodyInAggregatingStrategy implements AggregationStrategy {
@@ -34,7 +34,7 @@
/**
* An expression used to determine if the aggregation is complete
*/
- public boolean isCompleted(@Header(Exchange.AGGREGATED_SIZE) Integer aggregated) {
+ public boolean isCompleted(@Property(Exchange.AGGREGATED_SIZE) Integer aggregated) {
if (aggregated == null) {
return false;
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastAnotherAggregatorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastAnotherAggregatorTest.java?rev=785969&r1=785968&r2=785969&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastAnotherAggregatorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastAnotherAggregatorTest.java Thu Jun 18 09:08:35 2009
@@ -81,7 +81,7 @@
from("direct:z").process(new AppendingProcessor("z")).to("direct:aggregator");
from("direct:aggregator").aggregate(header("cheese"), new BodyInAggregatingStrategy()).
- completionPredicate(header(Exchange.AGGREGATED_SIZE).isEqualTo(3)).to("mock:result");
+ completionPredicate(property(Exchange.AGGREGATED_SIZE).isEqualTo(3)).to("mock:result");
// END SNIPPET: example
}
};
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorAndOnExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorAndOnExceptionTest.java?rev=785969&r1=785968&r2=785969&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorAndOnExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorAndOnExceptionTest.java Thu Jun 18 09:08:35 2009
@@ -55,7 +55,7 @@
return newExchange;
}
},
- header(Exchange.AGGREGATED_SIZE).isEqualTo(2)))
+ property(Exchange.AGGREGATED_SIZE).isEqualTo(2)))
.batchTimeout(500L)
.to("mock:result");
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/PredicateAggregatorCollectionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/PredicateAggregatorCollectionTest.java?rev=785969&r1=785968&r2=785969&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/PredicateAggregatorCollectionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/PredicateAggregatorCollectionTest.java Thu Jun 18 09:08:35 2009
@@ -66,7 +66,7 @@
// - and finally we stop aggregate if we receive 2 or more messages
AggregationCollection ag = new PredicateAggregationCollection(header("id"),
new UseLatestAggregationStrategy(),
- header(Exchange.AGGREGATED_SIZE).isEqualTo(3));
+ property(Exchange.AGGREGATED_SIZE).isEqualTo(3));
// our route is aggregating from the direct queue and sending the response to the mock
from("direct:start")