This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 064082149b85cdf2cc4994947f80a9f28e0814f1
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Jul 26 09:08:23 2019 +0200
CAMEL-13788: Deprecate OUT in favour of getMessage on Message API.
---
.../component/infinispan/InfinispanConsumer.java | 10 ++++-----
.../InfinispanClusteredConsumerTest.java | 24 +++++++++++-----------
.../InfinispanConsumerEntryCreatedTest.java | 18 ++++++++--------
.../InfinispanConsumerEntryRemovedTest.java | 18 ++++++++--------
.../InfinispanConsumerEntryUpdatedTest.java | 18 ++++++++--------
.../InfinispanConsumerEntryVisitedTest.java | 18 ++++++++--------
.../infinispan/InfinispanContinuousQueryIT.java | 14 ++++++-------
.../InfinispanLocalConsumerCustomListenerIT.java | 6 +++---
.../infinispan/InfinispanLocalConsumerTest.java | 24 +++++++++++-----------
.../spring/processor/onexception/OrderService.java | 17 ++++++---------
.../modules/ROOT/pages/simple-language.adoc | 14 -------------
11 files changed, 81 insertions(+), 100 deletions(-)
diff --git
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConsumer.java
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConsumer.java
index 4f41c5e..5dc7066 100644
---
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConsumer.java
+++
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConsumer.java
@@ -54,12 +54,12 @@ public class InfinispanConsumer extends DefaultConsumer {
public void processEvent(String eventType, boolean isPre, String
cacheName, Object key, Object eventData) {
Exchange exchange = getEndpoint().createExchange();
- exchange.getOut().setHeader(InfinispanConstants.EVENT_TYPE, eventType);
- exchange.getOut().setHeader(InfinispanConstants.IS_PRE, isPre);
- exchange.getOut().setHeader(InfinispanConstants.CACHE_NAME, cacheName);
- exchange.getOut().setHeader(InfinispanConstants.KEY, key);
+ exchange.getMessage().setHeader(InfinispanConstants.EVENT_TYPE,
eventType);
+ exchange.getMessage().setHeader(InfinispanConstants.IS_PRE, isPre);
+ exchange.getMessage().setHeader(InfinispanConstants.CACHE_NAME,
cacheName);
+ exchange.getMessage().setHeader(InfinispanConstants.KEY, key);
if (eventData != null) {
- exchange.getOut().setHeader(InfinispanConstants.EVENT_DATA,
eventData);
+ exchange.getMessage().setHeader(InfinispanConstants.EVENT_DATA,
eventData);
}
try {
diff --git
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusteredConsumerTest.java
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusteredConsumerTest.java
index 7d8836f..c73798a 100644
---
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusteredConsumerTest.java
+++
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusteredConsumerTest.java
@@ -52,10 +52,10 @@ public class InfinispanClusteredConsumerTest extends
InfinispanClusterTestSuppor
mockResultCreatedEvents.expectedMessageCount(1);
-
mockResultCreatedEvents.message(0).outHeader(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_CREATED");
-
mockResultCreatedEvents.message(0).outHeader(InfinispanConstants.IS_PRE).isEqualTo(false);
-
mockResultCreatedEvents.message(0).outHeader(InfinispanConstants.CACHE_NAME).isNotNull();
-
mockResultCreatedEvents.message(0).outHeader(InfinispanConstants.KEY).isEqualTo(key.toString());
+
mockResultCreatedEvents.message(0).header(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_CREATED");
+
mockResultCreatedEvents.message(0).header(InfinispanConstants.IS_PRE).isEqualTo(false);
+
mockResultCreatedEvents.message(0).header(InfinispanConstants.CACHE_NAME).isNotNull();
+
mockResultCreatedEvents.message(0).header(InfinispanConstants.KEY).isEqualTo(key.toString());
defaultCache(1).put(key, "value");
mockResultCreatedEvents.assertIsSatisfied();
@@ -68,15 +68,15 @@ public class InfinispanClusteredConsumerTest extends
InfinispanClusterTestSuppor
mockResultCreatedEvents.expectedMessageCount(1);
mockResultExpiredEvents.expectedMessageCount(1);
-
mockResultCreatedEvents.message(0).outHeader(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_CREATED");
-
mockResultCreatedEvents.message(0).outHeader(InfinispanConstants.IS_PRE).isEqualTo(false);
-
mockResultCreatedEvents.message(0).outHeader(InfinispanConstants.CACHE_NAME).isNotNull();
-
mockResultCreatedEvents.message(0).outHeader(InfinispanConstants.KEY).isEqualTo(key.toString());
+
mockResultCreatedEvents.message(0).header(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_CREATED");
+
mockResultCreatedEvents.message(0).header(InfinispanConstants.IS_PRE).isEqualTo(false);
+
mockResultCreatedEvents.message(0).header(InfinispanConstants.CACHE_NAME).isNotNull();
+
mockResultCreatedEvents.message(0).header(InfinispanConstants.KEY).isEqualTo(key.toString());
-
mockResultExpiredEvents.message(0).outHeader(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_EXPIRED");
-
mockResultExpiredEvents.message(0).outHeader(InfinispanConstants.IS_PRE).isEqualTo(false);
-
mockResultExpiredEvents.message(0).outHeader(InfinispanConstants.CACHE_NAME).isNotNull();
-
mockResultExpiredEvents.message(0).outHeader(InfinispanConstants.KEY).isEqualTo(key.toString());
+
mockResultExpiredEvents.message(0).header(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_EXPIRED");
+
mockResultExpiredEvents.message(0).header(InfinispanConstants.IS_PRE).isEqualTo(false);
+
mockResultExpiredEvents.message(0).header(InfinispanConstants.CACHE_NAME).isNotNull();
+
mockResultExpiredEvents.message(0).header(InfinispanConstants.KEY).isEqualTo(key.toString());
injectTimeService();
diff --git
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryCreatedTest.java
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryCreatedTest.java
index 165ba83..66e6922 100644
---
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryCreatedTest.java
+++
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryCreatedTest.java
@@ -30,15 +30,15 @@ public class InfinispanConsumerEntryCreatedTest extends
InfinispanTestSupport {
public void consumerReceivedPreAndPostEntryCreatedEventNotifications()
throws Exception {
mockResult.expectedMessageCount(2);
-
mockResult.message(0).outHeader(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_CREATED");
-
mockResult.message(0).outHeader(InfinispanConstants.IS_PRE).isEqualTo(true);
-
mockResult.message(0).outHeader(InfinispanConstants.CACHE_NAME).isNotNull();
-
mockResult.message(0).outHeader(InfinispanConstants.KEY).isEqualTo(KEY_ONE);
-
-
mockResult.message(1).outHeader(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_CREATED");
-
mockResult.message(1).outHeader(InfinispanConstants.IS_PRE).isEqualTo(false);
-
mockResult.message(1).outHeader(InfinispanConstants.CACHE_NAME).isNotNull();
-
mockResult.message(1).outHeader(InfinispanConstants.KEY).isEqualTo(KEY_ONE);
+
mockResult.message(0).header(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_CREATED");
+
mockResult.message(0).header(InfinispanConstants.IS_PRE).isEqualTo(true);
+
mockResult.message(0).header(InfinispanConstants.CACHE_NAME).isNotNull();
+
mockResult.message(0).header(InfinispanConstants.KEY).isEqualTo(KEY_ONE);
+
+
mockResult.message(1).header(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_CREATED");
+
mockResult.message(1).header(InfinispanConstants.IS_PRE).isEqualTo(false);
+
mockResult.message(1).header(InfinispanConstants.CACHE_NAME).isNotNull();
+
mockResult.message(1).header(InfinispanConstants.KEY).isEqualTo(KEY_ONE);
currentCache().put(KEY_ONE, VALUE_ONE);
mockResult.assertIsSatisfied();
diff --git
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryRemovedTest.java
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryRemovedTest.java
index f0ad24d..3c996de 100644
---
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryRemovedTest.java
+++
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryRemovedTest.java
@@ -32,15 +32,15 @@ public class InfinispanConsumerEntryRemovedTest extends
InfinispanTestSupport {
mockResult.expectedMessageCount(2);
-
mockResult.message(0).outHeader(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_REMOVED");
-
mockResult.message(0).outHeader(InfinispanConstants.IS_PRE).isEqualTo(true);
-
mockResult.message(0).outHeader(InfinispanConstants.CACHE_NAME).isNotNull();
-
mockResult.message(0).outHeader(InfinispanConstants.KEY).isEqualTo(KEY_ONE);
-
-
mockResult.message(1).outHeader(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_REMOVED");
-
mockResult.message(1).outHeader(InfinispanConstants.IS_PRE).isEqualTo(false);
-
mockResult.message(1).outHeader(InfinispanConstants.CACHE_NAME).isNotNull();
-
mockResult.message(1).outHeader(InfinispanConstants.KEY).isEqualTo(KEY_ONE);
+
mockResult.message(0).header(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_REMOVED");
+
mockResult.message(0).header(InfinispanConstants.IS_PRE).isEqualTo(true);
+
mockResult.message(0).header(InfinispanConstants.CACHE_NAME).isNotNull();
+
mockResult.message(0).header(InfinispanConstants.KEY).isEqualTo(KEY_ONE);
+
+
mockResult.message(1).header(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_REMOVED");
+
mockResult.message(1).header(InfinispanConstants.IS_PRE).isEqualTo(false);
+
mockResult.message(1).header(InfinispanConstants.CACHE_NAME).isNotNull();
+
mockResult.message(1).header(InfinispanConstants.KEY).isEqualTo(KEY_ONE);
currentCache().remove(KEY_ONE);
mockResult.assertIsSatisfied();
diff --git
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryUpdatedTest.java
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryUpdatedTest.java
index b8a4309..14099f9 100644
---
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryUpdatedTest.java
+++
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryUpdatedTest.java
@@ -32,15 +32,15 @@ public class InfinispanConsumerEntryUpdatedTest extends
InfinispanTestSupport {
mockResult.expectedMessageCount(2);
-
mockResult.message(0).outHeader(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_MODIFIED");
-
mockResult.message(0).outHeader(InfinispanConstants.IS_PRE).isEqualTo(true);
-
mockResult.message(0).outHeader(InfinispanConstants.CACHE_NAME).isNotNull();
-
mockResult.message(0).outHeader(InfinispanConstants.KEY).isEqualTo(KEY_ONE);
-
-
mockResult.message(1).outHeader(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_MODIFIED");
-
mockResult.message(1).outHeader(InfinispanConstants.IS_PRE).isEqualTo(false);
-
mockResult.message(1).outHeader(InfinispanConstants.CACHE_NAME).isNotNull();
-
mockResult.message(1).outHeader(InfinispanConstants.KEY).isEqualTo(KEY_ONE);
+
mockResult.message(0).header(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_MODIFIED");
+
mockResult.message(0).header(InfinispanConstants.IS_PRE).isEqualTo(true);
+
mockResult.message(0).header(InfinispanConstants.CACHE_NAME).isNotNull();
+
mockResult.message(0).header(InfinispanConstants.KEY).isEqualTo(KEY_ONE);
+
+
mockResult.message(1).header(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_MODIFIED");
+
mockResult.message(1).header(InfinispanConstants.IS_PRE).isEqualTo(false);
+
mockResult.message(1).header(InfinispanConstants.CACHE_NAME).isNotNull();
+
mockResult.message(1).header(InfinispanConstants.KEY).isEqualTo(KEY_ONE);
currentCache().replace(KEY_ONE, VALUE_TWO);
mockResult.assertIsSatisfied();
diff --git
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryVisitedTest.java
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryVisitedTest.java
index e39eac2..5506976 100644
---
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryVisitedTest.java
+++
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerEntryVisitedTest.java
@@ -32,15 +32,15 @@ public class InfinispanConsumerEntryVisitedTest extends
InfinispanTestSupport {
mockResult.expectedMessageCount(2);
-
mockResult.message(0).outHeader(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_VISITED");
-
mockResult.message(0).outHeader(InfinispanConstants.IS_PRE).isEqualTo(true);
-
mockResult.message(0).outHeader(InfinispanConstants.CACHE_NAME).isNotNull();
-
mockResult.message(0).outHeader(InfinispanConstants.KEY).isEqualTo(KEY_ONE);
-
-
mockResult.message(1).outHeader(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_VISITED");
-
mockResult.message(1).outHeader(InfinispanConstants.IS_PRE).isEqualTo(false);
-
mockResult.message(1).outHeader(InfinispanConstants.CACHE_NAME).isNotNull();
-
mockResult.message(1).outHeader(InfinispanConstants.KEY).isEqualTo(KEY_ONE);
+
mockResult.message(0).header(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_VISITED");
+
mockResult.message(0).header(InfinispanConstants.IS_PRE).isEqualTo(true);
+
mockResult.message(0).header(InfinispanConstants.CACHE_NAME).isNotNull();
+
mockResult.message(0).header(InfinispanConstants.KEY).isEqualTo(KEY_ONE);
+
+
mockResult.message(1).header(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_VISITED");
+
mockResult.message(1).header(InfinispanConstants.IS_PRE).isEqualTo(false);
+
mockResult.message(1).header(InfinispanConstants.CACHE_NAME).isNotNull();
+
mockResult.message(1).header(InfinispanConstants.KEY).isEqualTo(KEY_ONE);
currentCache().get(KEY_ONE);
mockResult.assertIsSatisfied();
diff --git
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanContinuousQueryIT.java
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanContinuousQueryIT.java
index 2004a8c..b5f7ac9 100644
---
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanContinuousQueryIT.java
+++
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanContinuousQueryIT.java
@@ -121,15 +121,15 @@ public class InfinispanContinuousQueryIT extends
CamelTestSupport {
continuousQuery.expectedMessageCount(4);
for (int i = 0; i < 4; i++) {
-
continuousQuery.message(i).outHeader(InfinispanConstants.KEY).isEqualTo(createKey(CQ_USERS[i
% 2]));
-
continuousQuery.message(i).outHeader(InfinispanConstants.CACHE_NAME).isEqualTo(cache.getName());
+
continuousQuery.message(i).header(InfinispanConstants.KEY).isEqualTo(createKey(CQ_USERS[i
% 2]));
+
continuousQuery.message(i).header(InfinispanConstants.CACHE_NAME).isEqualTo(cache.getName());
if (i >= 2) {
-
continuousQuery.message(i).outHeader(InfinispanConstants.EVENT_TYPE).isEqualTo(InfinispanConstants.CACHE_ENTRY_LEAVING);
-
continuousQuery.message(i).outHeader(InfinispanConstants.EVENT_DATA).isNull();
+
continuousQuery.message(i).header(InfinispanConstants.EVENT_TYPE).isEqualTo(InfinispanConstants.CACHE_ENTRY_LEAVING);
+
continuousQuery.message(i).header(InfinispanConstants.EVENT_DATA).isNull();
} else {
-
continuousQuery.message(i).outHeader(InfinispanConstants.EVENT_TYPE).isEqualTo(InfinispanConstants.CACHE_ENTRY_JOINING);
-
continuousQuery.message(i).outHeader(InfinispanConstants.EVENT_DATA).isNotNull();
-
continuousQuery.message(i).outHeader(InfinispanConstants.EVENT_DATA).isInstanceOf(User.class);
+
continuousQuery.message(i).header(InfinispanConstants.EVENT_TYPE).isEqualTo(InfinispanConstants.CACHE_ENTRY_JOINING);
+
continuousQuery.message(i).header(InfinispanConstants.EVENT_DATA).isNotNull();
+
continuousQuery.message(i).header(InfinispanConstants.EVENT_DATA).isInstanceOf(User.class);
}
}
diff --git
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanLocalConsumerCustomListenerIT.java
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanLocalConsumerCustomListenerIT.java
index c2fbc22..d299c93 100644
---
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanLocalConsumerCustomListenerIT.java
+++
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanLocalConsumerCustomListenerIT.java
@@ -53,9 +53,9 @@ public class InfinispanLocalConsumerCustomListenerIT extends
InfinispanTestSuppo
basicCacheContainer.getCache(CUSTOM_CACHE_NAME).put("newKey",
"newValue");
-
mockResult.message(0).outHeader(InfinispanConstants.IS_PRE).isEqualTo(true);
-
mockResult.message(0).outHeader(InfinispanConstants.KEY).isEqualTo("newKey");
-
mockResult.message(1).outHeader(InfinispanConstants.IS_PRE).isEqualTo(false);
+
mockResult.message(0).header(InfinispanConstants.IS_PRE).isEqualTo(true);
+
mockResult.message(0).header(InfinispanConstants.KEY).isEqualTo("newKey");
+
mockResult.message(1).header(InfinispanConstants.IS_PRE).isEqualTo(false);
mockResult.assertIsSatisfied();
}
diff --git
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanLocalConsumerTest.java
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanLocalConsumerTest.java
index 296fae3..285f24b 100644
---
a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanLocalConsumerTest.java
+++
b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanLocalConsumerTest.java
@@ -35,15 +35,15 @@ public class InfinispanLocalConsumerTest extends
InfinispanTestSupport {
public void consumerReceivedPreAndPostEntryCreatedEventNotifications()
throws Exception {
mockResult.expectedMessageCount(2);
-
mockResult.message(0).outHeader(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_CREATED");
-
mockResult.message(0).outHeader(InfinispanConstants.IS_PRE).isEqualTo(true);
-
mockResult.message(0).outHeader(InfinispanConstants.CACHE_NAME).isNotNull();
-
mockResult.message(0).outHeader(InfinispanConstants.KEY).isEqualTo(KEY_ONE);
+
mockResult.message(0).header(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_CREATED");
+
mockResult.message(0).header(InfinispanConstants.IS_PRE).isEqualTo(true);
+
mockResult.message(0).header(InfinispanConstants.CACHE_NAME).isNotNull();
+
mockResult.message(0).header(InfinispanConstants.KEY).isEqualTo(KEY_ONE);
-
mockResult.message(1).outHeader(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_CREATED");
-
mockResult.message(1).outHeader(InfinispanConstants.IS_PRE).isEqualTo(false);
-
mockResult.message(1).outHeader(InfinispanConstants.CACHE_NAME).isNotNull();
-
mockResult.message(1).outHeader(InfinispanConstants.KEY).isEqualTo(KEY_ONE);
+
mockResult.message(1).header(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_CREATED");
+
mockResult.message(1).header(InfinispanConstants.IS_PRE).isEqualTo(false);
+
mockResult.message(1).header(InfinispanConstants.CACHE_NAME).isNotNull();
+
mockResult.message(1).header(InfinispanConstants.KEY).isEqualTo(KEY_ONE);
currentCache().put(KEY_ONE, VALUE_ONE);
mockResult.assertIsSatisfied();
@@ -53,10 +53,10 @@ public class InfinispanLocalConsumerTest extends
InfinispanTestSupport {
public void consumerReceivedExpirationEventNotification() throws Exception
{
mockResult2.expectedMessageCount(1);
-
mockResult2.message(0).outHeader(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_EXPIRED");
-
mockResult2.message(0).outHeader(InfinispanConstants.IS_PRE).isEqualTo(false);
-
mockResult2.message(0).outHeader(InfinispanConstants.CACHE_NAME).isNotNull();
-
mockResult2.message(0).outHeader(InfinispanConstants.KEY).isEqualTo("keyTwo");
+
mockResult2.message(0).header(InfinispanConstants.EVENT_TYPE).isEqualTo("CACHE_ENTRY_EXPIRED");
+
mockResult2.message(0).header(InfinispanConstants.IS_PRE).isEqualTo(false);
+
mockResult2.message(0).header(InfinispanConstants.CACHE_NAME).isNotNull();
+
mockResult2.message(0).header(InfinispanConstants.KEY).isEqualTo("keyTwo");
injectTimeService();
currentCache().put("keyTwo", "valueTwo", 1000, TimeUnit.MILLISECONDS);
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/OrderService.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/OrderService.java
index 1f1b1a5..81e4856 100644
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/OrderService.java
+++
b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/OrderService.java
@@ -20,7 +20,6 @@ import java.util.Map;
import org.apache.camel.Body;
import org.apache.camel.Headers;
-import org.apache.camel.OutHeaders;
/**
* Order service as a plain POJO class
@@ -30,19 +29,17 @@ public class OrderService {
/**
* This method handle our order input and return the order
*
- * @param in the in headers
+ * @param headers the in headers
* @param payload the in payload
- * @param out the out headers
* @return the out payload
* @throws OrderFailedException is thrown if the order cannot be processed
*/
- public Object handleOrder(@Headers Map<String, Object> in, @Body String
payload, @OutHeaders Map<String, Object> out)
+ public Object handleOrder(@Headers Map<String, Object> headers, @Body
String payload)
throws OrderFailedException {
- out.put("customerid", in.get("customerid"));
if ("Order: kaboom".equals(payload)) {
throw new OrderFailedException("Cannot order: kaboom");
} else {
- out.put("orderid", "123");
+ headers.put("orderid", "123");
return "Order OK";
}
}
@@ -51,14 +48,12 @@ public class OrderService {
* This method creates the response to the caller if the order could not be
* processed
*
- * @param in the in headers
+ * @param headers the in headers
* @param payload the in payload
- * @param out the out headers
* @return the out payload
*/
- public Object orderFailed(@Headers Map<String, Object> in, @Body String
payload, @OutHeaders Map<String, Object> out) {
- out.put("customerid", in.get("customerid"));
- out.put("orderid", "failed");
+ public Object orderFailed(@Headers Map<String, Object> headers, @Body
String payload) {
+ headers.put("orderid", "failed");
return "Order ERROR";
}
}
diff --git a/docs/user-manual/modules/ROOT/pages/simple-language.adoc
b/docs/user-manual/modules/ROOT/pages/simple-language.adoc
index 4366e30..ab07cc6 100644
--- a/docs/user-manual/modules/ROOT/pages/simple-language.adoc
+++ b/docs/user-manual/modules/ROOT/pages/simple-language.adoc
@@ -86,8 +86,6 @@ classname, and expects the body to be not null.
|mandatoryBodyAs(_type_).*OGNL* |Object |Converts the body to the given type
determined by its
classname and then invoke methods using a Camel OGNL expression.
-|out.body |Object |*deprecated* the output body
-
|header.foo |Object |refer to the input foo header
|header:foo |Object |refer to the input foo header
@@ -130,18 +128,6 @@ Camel OGNL expression.
|in.headers.foo.*OGNL* |Object |*deprecated* refer to the input foo header and
invoke its value using a
Camel OGNL expression.
-|out.header.foo |Object |*deprecated* refer to the out header foo
-
-|out.header:foo |Object |*deprecated* refer to the out header foo
-
-|out.header[foo] |Object |*deprecated* refer to the out header foo
-
-|out.headers.foo |Object |*deprecated* refer to the out header foo
-
-|out.headers:foo |Object |*deprecated* refer to the out header foo
-
-|out.headers[foo] |Object |*deprecated* refer to the out header foo
-
|headerAs(_key_,_type_) |Type |converts the header to the given type
determined by its
classname
