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 10:29:08 UTC
svn commit: r785949 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/component/seda/
camel-core/src/main/java/org/apache/camel/processor/
camel-core/src/test/java/org/apache/camel/
camel-core/src/test/java/org/apache/camel/component/file/ c...
Author: davsclaus
Date: Thu Jun 18 08:29:08 2009
New Revision: 785949
URL: http://svn.apache.org/viewvc?rev=785949&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/main/java/org/apache/camel/component/seda/SedaProducer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java
camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelExceptionCausePropagatedTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java?rev=785949&r1=785948&r2=785949&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java Thu Jun 18 08:29:08 2009
@@ -46,8 +46,8 @@
copy.setFromEndpoint(endpoint);
WaitForTaskToComplete wait = waitForTaskToComplete;
- if (exchange.getIn().getHeader(Exchange.ASYNC_WAIT) != null) {
- wait = exchange.getIn().getHeader(Exchange.ASYNC_WAIT, WaitForTaskToComplete.class);
+ if (exchange.getProperty(Exchange.ASYNC_WAIT) != null) {
+ wait = exchange.getProperty(Exchange.ASYNC_WAIT, WaitForTaskToComplete.class);
}
if (wait == WaitForTaskToComplete.Always
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java?rev=785949&r1=785948&r2=785949&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java Thu Jun 18 08:29:08 2009
@@ -217,7 +217,7 @@
}
protected void updateNewExchange(Exchange exchange, int index, Iterable<ProcessorExchangePair> allPairs) {
- exchange.getIn().setHeader(Exchange.MULTICAST_INDEX, index);
+ exchange.setProperty(Exchange.MULTICAST_INDEX, index);
}
protected Iterable<ProcessorExchangePair> createProcessorExchangePairs(Exchange exchange) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java?rev=785949&r1=785948&r2=785949&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java Thu Jun 18 08:29:08 2009
@@ -133,9 +133,9 @@
@Override
protected void updateNewExchange(Exchange exchange, int index, Iterable<ProcessorExchangePair> allPairs) {
super.updateNewExchange(exchange, index, allPairs);
- exchange.getIn().setHeader(Exchange.SPLIT_INDEX, index);
+ exchange.setProperty(Exchange.SPLIT_INDEX, index);
if (allPairs instanceof Collection) {
- exchange.getIn().setHeader(Exchange.SPLIT_SIZE, ((Collection) allPairs).size());
+ exchange.setProperty(Exchange.SPLIT_SIZE, ((Collection) allPairs).size());
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java?rev=785949&r1=785948&r2=785949&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java Thu Jun 18 08:29:08 2009
@@ -68,8 +68,8 @@
// compute if we should wait for task to complete or not
WaitForTaskToComplete wait = waitForTaskToComplete;
- if (exchange.getIn().getHeader(Exchange.ASYNC_WAIT) != null) {
- wait = exchange.getIn().getHeader(Exchange.ASYNC_WAIT, WaitForTaskToComplete.class);
+ if (exchange.getProperty(Exchange.ASYNC_WAIT) != null) {
+ wait = exchange.getProperty(Exchange.ASYNC_WAIT, WaitForTaskToComplete.class);
}
if (wait == WaitForTaskToComplete.Always) {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java?rev=785949&r1=785948&r2=785949&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java Thu Jun 18 08:29:08 2009
@@ -199,6 +199,12 @@
return value;
}
+ public static Object assertProperty(Exchange exchange, String name, Object expected) {
+ Object value = exchange.getProperty(name);
+ assertEquals("Property: " + name + " on Exchange: " + exchange, expected, value);
+ return value;
+ }
+
/**
* Asserts that the given expression when evaluated returns the given answer
*/
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java?rev=785949&r1=785948&r2=785949&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java Thu Jun 18 08:29:08 2009
@@ -48,9 +48,9 @@
mock.expectedBodiesReceivedInAnyOrder("Hello World", "Bye World");
// test header keys
- mock.message(0).header(Exchange.BATCH_SIZE).isEqualTo(2);
- mock.message(0).header(Exchange.BATCH_INDEX).isEqualTo(0);
- mock.message(1).header(Exchange.BATCH_INDEX).isEqualTo(1);
+ mock.message(0).property(Exchange.BATCH_SIZE).isEqualTo(2);
+ mock.message(0).property(Exchange.BATCH_INDEX).isEqualTo(0);
+ mock.message(1).property(Exchange.BATCH_INDEX).isEqualTo(1);
assertMockEndpointsSatisfied();
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelExceptionCausePropagatedTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelExceptionCausePropagatedTest.java?rev=785949&r1=785948&r2=785949&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelExceptionCausePropagatedTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelExceptionCausePropagatedTest.java Thu Jun 18 08:29:08 2009
@@ -31,7 +31,7 @@
MockEndpoint successEndpoint = getMockEndpoint("mock:success");
failedEndpoint.expectedBodiesReceived(body);
- failedEndpoint.message(0).header(Exchange.EXCEPTION_CAUGHT).isEqualTo(RUNTIME_EXCEPTION);
+ failedEndpoint.message(0).property(Exchange.EXCEPTION_CAUGHT).isEqualTo(RUNTIME_EXCEPTION);
failedEndpoint.expectedMessageCount(1);
successEndpoint.expectedMessageCount(0);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java?rev=785949&r1=785948&r2=785949&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java Thu Jun 18 08:29:08 2009
@@ -53,8 +53,8 @@
for (int i = 0; i < 4; i++) {
Exchange exchange = list.get(i);
Message in = exchange.getIn();
- assertMessageHeader(in, Exchange.SPLIT_INDEX, i);
- assertMessageHeader(in, Exchange.SPLIT_SIZE, 4);
+ assertProperty(exchange, Exchange.SPLIT_INDEX, i);
+ assertProperty(exchange, Exchange.SPLIT_SIZE, 4);
}
}
@@ -74,7 +74,7 @@
Message out = result.getOut();
assertEquals("Roman", out.getBody());
assertMessageHeader(out, "foo", "bar");
- assertMessageHeader(out, Exchange.SPLIT_INDEX, 4);
+ assertProperty(result, Exchange.SPLIT_INDEX, 4);
}
public void testEmptyBody() {
@@ -111,10 +111,10 @@
for (int i = 0; i < 4; i++) {
Exchange exchange = list.get(i);
Message in = exchange.getIn();
- Integer splitCounter = in.getHeader(Exchange.SPLIT_INDEX, Integer.class);
+ Integer splitCounter = exchange.getProperty(Exchange.SPLIT_INDEX, Integer.class);
numbersFound.add(splitCounter);
assertEquals(names[splitCounter], in.getBody());
- assertMessageHeader(in, Exchange.SPLIT_SIZE, 4);
+ assertProperty(exchange, Exchange.SPLIT_SIZE, 4);
}
assertEquals(4, numbersFound.size());
@@ -174,9 +174,9 @@
assertMockEndpointsSatisfied();
for (Exchange exchange : resultEndpoint.getReceivedExchanges()) {
- assertNotNull(exchange.getIn().getHeader(Exchange.SPLIT_INDEX));
+ assertNotNull(exchange.getProperty(Exchange.SPLIT_INDEX));
//this header cannot be set when streaming is used
- assertNull(exchange.getIn().getHeader(Exchange.SPLIT_SIZE));
+ assertNull(exchange.getProperty(Exchange.SPLIT_SIZE));
}
}
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java?rev=785949&r1=785948&r2=785949&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java Thu Jun 18 08:29:08 2009
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.jms;
-import static org.apache.camel.util.ObjectHelper.removeStartingCharacters;
-
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import javax.jms.ExceptionListener;
@@ -51,6 +49,9 @@
import org.springframework.jms.support.destination.DestinationResolver;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.util.Assert;
+
+import static org.apache.camel.util.ObjectHelper.removeStartingCharacters;
+
/**
* @version $Revision$
*/