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 2008/09/30 20:07:21 UTC
svn commit: r700537 - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/model/language/
components/camel-spring/src/test/java/org/apache/camel/component/bean/
components/camel-spring/src/test/resources/org/apache/camel/component/bean/...
Author: davsclaus
Date: Tue Sep 30 11:07:21 2008
New Revision: 700537
URL: http://svn.apache.org/viewvc?rev=700537&view=rev
Log:
Polished code
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/BeanShellExpression.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanBindingConsumer.java
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml
activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/BankResponseAggregationStrategy.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/BeanShellExpression.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/BeanShellExpression.java?rev=700537&r1=700536&r2=700537&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/BeanShellExpression.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/BeanShellExpression.java Tue Sep 30 11:07:21 2008
@@ -21,7 +21,7 @@
/**
* For BeanShell expressions and predicates
*
- * @deprecated use {@link org.apache.camel.model.language.LanguageExpression} will be remaved in Camel 2.0
+ * @deprecated use {@link org.apache.camel.model.language.LanguageExpression} will be removed in Camel 2.0
* @version $Revision$
*/
@XmlRootElement(name = "beanshell")
Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanBindingConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanBindingConsumer.java?rev=700537&r1=700536&r2=700537&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanBindingConsumer.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/MyBeanBindingConsumer.java Tue Sep 30 11:07:21 2008
@@ -45,7 +45,7 @@
}
@MessageDriven(uri = "direct:startMany")
- public void doSomethingHeaderExpression(String payload, @Constant(value = "5") int count, @Header(name = "number") int number) {
+ public void doSomethingManyExpression(String payload, @Constant(value = "5") int count, @Header(name = "number") int number) {
template.sendBodyAndHeader("mock:result", "Bye " + payload, "count", count * number);
}
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml?rev=700537&r1=700536&r2=700537&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/bean/beanBindingTest.xml Tue Sep 30 11:07:21 2008
@@ -24,9 +24,6 @@
<camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
<template id="template"/>
-
- <endpoint id="startBeanExpression" uri="direct:startBeanExpression"/>
- <endpoint id="result" uri="mock:result"/>
</camelContext>
<bean id="myConsumer" class="org.apache.camel.component.bean.MyBeanBindingConsumer">
Modified: activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/BankResponseAggregationStrategy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/BankResponseAggregationStrategy.java?rev=700537&r1=700536&r2=700537&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/BankResponseAggregationStrategy.java (original)
+++ activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/BankResponseAggregationStrategy.java Tue Sep 30 11:07:21 2008
@@ -24,10 +24,11 @@
//START SNIPPET: aggregation
public class BankResponseAggregationStrategy implements AggregationStrategy {
private static final transient Log LOG = LogFactory.getLog(BankResponseAggregationStrategy.class);
+
// Here we put the bank response together
public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
LOG.debug("Get the exchange to aggregate, older: " + oldExchange + " newer:" + newExchange);
- Integer old = oldExchange.getProperty("aggregated", Integer.class);
+
Double oldRate = oldExchange.getIn().getHeader(Constants.PROPERTY_RATE, Double.class);
Double newRate = newExchange.getIn().getHeader(Constants.PROPERTY_RATE, Double.class);
Exchange result = null;