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 2019/07/26 07:53:26 UTC
[camel] branch master updated (4c1166a -> 63e18d7)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 4c1166a Removed unused imports
new 48f8323 CAMEL-13788: Deprecate OUT in favour of getMessage on Message API.
new 4f2cebe CAMEL-13788: Deprecate OUT in favour of getMessage on Message API.
new d552f04 CAMEL-13788: Deprecate OUT in favour of getMessage on Message API.
new cdf57ec CAMEL-13788: Deprecate OUT in favour of getMessage on Message API.
new 089ce0d CAMEL-13750: Omit JMSCorrelationID when sending with useMessageIDAsCorrelationID
new 3692137 CAMEL-13788: Deprecate OUT in favour of getMessage on Message API.
new 0640821 CAMEL-13788: Deprecate OUT in favour of getMessage on Message API.
new 63e18d7 CAMEL-13788: Deprecate OUT in favour of getMessage on Message API.
The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
MIGRATION.md | 13 +++
.../converter/InvokeMessageListenerTest.java | 4 +-
.../camel-bean/src/main/docs/bean-language.adoc | 21 +++-
.../bean/AbstractCamelInvocationHandler.java | 15 +--
.../org/apache/camel/component/bean/BeanInfo.java | 3 -
.../apache/camel/language/bean/BeanExpression.java | 3 +-
.../org/apache/camel/coap/CamelCoapResource.java | 2 +-
.../camel/component/crypto/SignatureTest.java | 4 +-
.../component/cxf/jaxrs/SimpleCxfRsBinding.java | 2 +-
.../camel/component/directvm/DirectVmProducer.java | 2 +-
.../component/disruptor/DisruptorProducer.java | 4 +-
.../camel/component/dozer/DozerProducer.java | 2 +-
.../component/fastjson/FastjsonDataFormat.java | 2 +-
.../camel/http/common/DefaultHttpBinding.java | 2 +-
.../hystrix/processor/HystrixProcessorCommand.java | 6 +-
.../HystrixProcessorCommandFallbackViaNetwork.java | 2 +-
.../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 ++--
.../org/apache/camel/component/jms/JmsBinding.java | 4 +-
.../camel-log/src/main/docs/log-component.adoc | 3 +-
.../component/mllp/MllpTcpClientProducer.java | 2 +-
.../component/mllp/MllpTcpServerConsumer.java | 2 +-
.../camel/component/mock/AssertionClause.java | 2 +-
.../camel/component/mock/MockExpressionClause.java | 35 ------
.../mock/MockExpressionClauseSupport.java | 35 ------
.../component/netty4/http/NettyHttpProducer.java | 2 +-
.../rabbitmq/RabbitMQMessagePublisher.java | 2 +-
.../camel/component/rest/DefaultRestRegistry.java | 2 +-
.../rest/RestProducerBindingProcessor.java | 2 +-
.../component/restlet/DefaultRestletBinding.java | 4 +-
.../apache/camel/component/seda/SedaProducer.java | 4 +-
.../sjms/consumer/InOutMessageHandler.java | 3 +-
.../camel/component/sparkrest/CamelSparkRoute.java | 2 +-
.../spring/ws/SpringWebserviceConsumer.java | 2 +-
.../spring/ws/filter/impl/BasicMessageFilter.java | 2 +-
.../impl/HeaderTransformationMessageFilter.java | 2 +-
.../org/apache/camel/language/spel/RootObject.java | 5 +
.../apache/camel/language/spel/SpelRouteTest.java | 2 +-
.../org/apache/camel/language/spel/SpelTest.java | 2 +
.../processor/SpringComplexBlockWithEndTest.java | 2 +-
.../spring/processor/onexception/OrderService.java | 17 +--
.../apache/camel/component/vertx/VertxHelper.java | 2 +-
.../camel/zipkin/ZipkinClientRequestAdapter.java | 2 +-
.../camel/zipkin/ZipkinClientResponseAdaptor.java | 4 +-
.../java/org/apache/camel/zipkin/ZipkinHelper.java | 2 +-
.../camel/zipkin/ZipkinServerRequestAdapter.java | 2 +-
.../camel/zipkin/ZipkinServerResponseAdapter.java | 4 +-
.../src/main/java/org/apache/camel/Exchange.java | 8 ++
.../src/main/java/org/apache/camel/OutHeaders.java | 34 ------
core/camel-base/src/main/docs/simple-language.adoc | 14 ---
.../org/apache/camel/converter/CamelConverter.java | 3 +-
.../camel/impl/engine/DefaultConsumerTemplate.java | 8 +-
.../impl/engine/DefaultFluentProducerTemplate.java | 2 +-
.../impl/engine/DefaultStreamCachingStrategy.java | 2 +-
.../apache/camel/impl/engine/MDCUnitOfWork.java | 2 +-
.../impl/transformer/ProcessorTransformer.java | 2 +-
.../language/simple/SimpleExpressionBuilder.java | 2 +-
.../simple/ast/SimpleFunctionExpression.java | 17 ---
.../camel/processor/CamelInternalProcessor.java | 7 +-
.../org/apache/camel/processor/ContractAdvice.java | 2 +-
.../camel/processor/ConvertBodyProcessor.java | 3 +-
.../camel/processor/MethodCallProcessor.java | 3 +-
.../java/org/apache/camel/processor/Pipeline.java | 5 +-
.../org/apache/camel/processor/PipelineHelper.java | 24 +---
.../org/apache/camel/processor/PollEnricher.java | 24 +---
.../camel/processor/RemoveHeaderProcessor.java | 3 +-
.../camel/processor/RemoveHeadersProcessor.java | 3 +-
.../apache/camel/processor/RestBindingAdvice.java | 28 +++--
.../org/apache/camel/processor/RoutingSlip.java | 7 +-
.../apache/camel/processor/SetBodyProcessor.java | 3 +-
.../apache/camel/processor/SetHeaderProcessor.java | 3 +-
.../org/apache/camel/processor/SortProcessor.java | 9 +-
.../apache/camel/processor/TransformProcessor.java | 3 +-
.../apache/camel/processor/WireTapProcessor.java | 2 +-
.../processor/interceptor/BacklogDebugger.java | 59 ++--------
.../org/apache/camel/builder/ExpressionClause.java | 94 ---------------
.../camel/builder/ExpressionClauseSupport.java | 35 ------
.../test/java/org/apache/camel/TestSupport.java | 2 +
.../apache/camel/builder/ExceptionBuilderTest.java | 2 +-
.../ExceptionBuilderWithHandledExceptionTest.java | 2 +-
.../camel/component/bean/BeanPipelineTest.java | 4 +-
.../bean/BeanWithHeadersAndBodyInject3Test.java | 10 +-
.../camel/component/bean/MyServiceProxyTest.java | 2 +-
.../camel/component/direct/DirectNoToTypeTest.java | 2 +-
.../directvm/DirectVmHeaderFilterStrategyTest.java | 4 +-
.../file/FileConsumerFailureHandledTest.java | 2 +-
.../camel/component/file/ToFileRouteTest.java | 4 +-
.../log/DefaultExchangeFormatterTest.java | 22 +---
.../camel/component/mock/MockPredicateTest.java | 16 ---
.../component/rest/FromRestGetContentTypeTest.java | 4 +-
.../rest/FromRestGetCorsAllowCredentialsTest.java | 20 ++--
.../component/rest/FromRestGetCorsCustomTest.java | 8 +-
.../camel/component/rest/FromRestGetCorsTest.java | 8 +-
.../rest/FromRestGetHttpErrorCodeTest.java | 4 +-
.../rest/RestProducerBindingProcessorTest.java | 4 +-
.../component/seda/SedaAsyncProducerTest.java | 4 +-
.../vm/VmWaitForTaskIfReplyExpectedTest.java | 2 +-
.../apache/camel/converter/CamelConverterTest.java | 4 +-
.../camel/impl/DefaultConsumerTemplateTest.java | 2 +-
.../impl/DefaultProducerTemplateAsyncTest.java | 14 +--
.../impl/PojoProduceInterceptEndpointTest.java | 2 +-
.../impl/transformer/TransformerRouteTest.java | 8 +-
.../camel/impl/validator/ValidatorRouteTest.java | 4 +-
.../org/apache/camel/issues/DavidSiefertTest.java | 2 +-
.../issues/DoCatchCaughExceptionIssueTest.java | 2 +-
.../camel/issues/SetHeaderInDoCatchIssueTest.java | 4 +-
.../camel/language/FileLanguageExtSingleTest.java | 2 +-
.../apache/camel/language/simple/SimpleTest.java | 15 ---
.../processor/BodyOutAggregatingStrategy.java | 2 +-
.../DeadLetterChannelHandledExampleTest.java | 19 ++-
.../FailOverLoadBalancerSetFaultTest.java | 4 +-
.../org/apache/camel/processor/MDCResetTest.java | 4 +-
.../MultiCastParallelAndStreamCachingTest.java | 8 +-
.../MultiCastStreamCachingInSubRouteTest.java | 2 +-
.../org/apache/camel/processor/MyNormalizer.java | 4 +-
.../processor/NewProcessorAndServiceTest.java | 2 +-
.../camel/processor/PipelineConcurrentTest.java | 2 +-
.../apache/camel/processor/PipelineMEPTest.java | 2 +-
.../org/apache/camel/processor/PipelineTest.java | 12 +-
.../camel/processor/SimpleProcessorTest.java | 2 +-
.../processor/SimpleProcessorTraceableTest.java | 2 +-
.../org/apache/camel/processor/SimulatorTest.java | 2 +-
.../SplitterStreamCachingInSubRouteTest.java | 2 +-
.../org/apache/camel/processor/SplitterTest.java | 8 +-
.../aggregator/AggregateLostGroupIssueTest.java | 4 +-
.../aggregator/AggregatorExceptionHandleTest.java | 2 +-
.../async/AsyncEndpointRecipientList3Test.java | 2 +-
.../async/AsyncEndpointRecipientList4Test.java | 2 +-
.../async/AsyncEndpointRecipientListBean3Test.java | 2 +-
.../async/AsyncEndpointRecipientListBean4Test.java | 2 +-
.../AsyncEndpointRecipientListParallel3Test.java | 2 +-
.../AsyncEndpointRecipientListParallel4Test.java | 2 +-
.../async/AsyncEndpointRoutingSlip3Test.java | 2 +-
.../async/AsyncEndpointRoutingSlipBean3Test.java | 2 +-
...syncEndpointRoutingSlipBeanNonBlockingTest.java | 2 +-
.../camel/processor/async/MyAsyncProducer.java | 4 +-
.../camel/processor/enricher/EnricherRefTest.java | 2 +-
.../camel/processor/enricher/PollEnricherTest.java | 2 +-
.../CustomExceptionPolicyStrategyTest.java | 2 +-
...ltExceptionPolicyStrategyUsingOnlyWhenTest.java | 2 +-
...efaultExceptionPolicyStrategyUsingWhenTest.java | 2 +-
.../OnExceptionUseOriginalMessageTest.java | 2 +-
.../processor/routingslip/RoutingSlipPOJOTest.java | 2 +-
.../endpoint/dsl/LogEndpointBuilderFactory.java | 22 ----
.../management/mbean/ManagedBrowsableEndpoint.java | 11 +-
.../management/ManagedInlinedProcessorTest.java | 2 +-
.../camel/support/DefaultExchangeHolder.java | 1 +
.../support/DefaultScheduledPollConsumer.java | 10 +-
.../org/apache/camel/support/ExchangeHelper.java | 6 +-
.../camel/support/builder/ExpressionBuilder.java | 129 ---------------------
.../support/component/AbstractApiProducer.java | 4 +-
.../processor/DefaultExchangeFormatter.java | 46 --------
.../modules/ROOT/pages/bean-language.adoc | 21 +++-
.../modules/ROOT/pages/log-component.adoc | 3 +-
.../modules/ROOT/pages/simple-language.adoc | 14 ---
162 files changed, 383 insertions(+), 992 deletions(-)
delete mode 100644 core/camel-api/src/main/java/org/apache/camel/OutHeaders.java
[camel] 08/08: CAMEL-13788: Deprecate OUT in favour of getMessage
on Message API.
Posted by da...@apache.org.
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 63e18d7c3a5fb82d0efb77f44a7db8b68ce24b0a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jul 26 09:44:39 2019 +0200
CAMEL-13788: Deprecate OUT in favour of getMessage on Message API.
---
.../src/main/java/org/apache/camel/coap/CamelCoapResource.java | 2 +-
.../test/java/org/apache/camel/component/crypto/SignatureTest.java | 4 ++--
.../org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java | 2 +-
.../java/org/apache/camel/component/directvm/DirectVmProducer.java | 2 +-
.../org/apache/camel/component/disruptor/DisruptorProducer.java | 4 ++--
.../main/java/org/apache/camel/component/dozer/DozerProducer.java | 2 +-
.../org/apache/camel/component/fastjson/FastjsonDataFormat.java | 2 +-
.../main/java/org/apache/camel/http/common/DefaultHttpBinding.java | 2 +-
.../camel/component/hystrix/processor/HystrixProcessorCommand.java | 6 +++---
.../processor/HystrixProcessorCommandFallbackViaNetwork.java | 2 +-
.../java/org/apache/camel/component/mllp/MllpTcpClientProducer.java | 2 +-
.../java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java | 2 +-
.../main/java/org/apache/camel/component/mock/AssertionClause.java | 2 +-
.../org/apache/camel/component/netty4/http/NettyHttpProducer.java | 2 +-
.../apache/camel/component/rabbitmq/RabbitMQMessagePublisher.java | 2 +-
.../java/org/apache/camel/component/rest/DefaultRestRegistry.java | 2 +-
.../apache/camel/component/rest/RestProducerBindingProcessor.java | 2 +-
.../org/apache/camel/component/restlet/DefaultRestletBinding.java | 4 ++--
.../src/main/java/org/apache/camel/component/seda/SedaProducer.java | 2 +-
.../apache/camel/component/sjms/consumer/InOutMessageHandler.java | 3 +--
.../java/org/apache/camel/component/sparkrest/CamelSparkRoute.java | 2 +-
.../apache/camel/component/spring/ws/SpringWebserviceConsumer.java | 2 +-
.../camel/component/spring/ws/filter/impl/BasicMessageFilter.java | 2 +-
.../spring/ws/filter/impl/HeaderTransformationMessageFilter.java | 2 +-
.../src/main/java/org/apache/camel/component/vertx/VertxHelper.java | 2 +-
.../java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java | 2 +-
.../java/org/apache/camel/zipkin/ZipkinClientResponseAdaptor.java | 4 ++--
.../src/main/java/org/apache/camel/zipkin/ZipkinHelper.java | 2 +-
.../java/org/apache/camel/zipkin/ZipkinServerRequestAdapter.java | 2 +-
.../java/org/apache/camel/zipkin/ZipkinServerResponseAdapter.java | 4 ++--
30 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/components/camel-coap/src/main/java/org/apache/camel/coap/CamelCoapResource.java b/components/camel-coap/src/main/java/org/apache/camel/coap/CamelCoapResource.java
index f1fc065..0f130a0 100644
--- a/components/camel-coap/src/main/java/org/apache/camel/coap/CamelCoapResource.java
+++ b/components/camel-coap/src/main/java/org/apache/camel/coap/CamelCoapResource.java
@@ -132,7 +132,7 @@ final class CamelCoapResource extends CoapResource {
camelExchange.getIn().setBody(bytes);
consumer.getProcessor().process(camelExchange);
- Message target = camelExchange.hasOut() ? camelExchange.getOut() : camelExchange.getIn();
+ Message target = camelExchange.getMessage();
int format = MediaTypeRegistry.parse(target.getHeader(org.apache.camel.Exchange.CONTENT_TYPE, String.class));
cexchange.respond(ResponseCode.CONTENT, target.getBody(byte[].class), format);
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java
index 4b693a9..76ec31e 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java
@@ -190,7 +190,7 @@ public class SignatureTest extends CamelTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
Exchange e = mock.getExchanges().get(0);
- Message result = e == null ? null : e.hasOut() ? e.getOut() : e.getIn();
+ Message result = e == null ? null : e.getMessage();
assertNull(result.getHeader(DigitalSignatureConstants.SIGNATURE));
}
@@ -347,7 +347,7 @@ public class SignatureTest extends CamelTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
Exchange e = mock.getExchanges().get(0);
- Message result = e == null ? null : e.hasOut() ? e.getOut() : e.getIn();
+ Message result = e == null ? null : e.getMessage();
assertNotNull(result.getHeader(DigitalSignatureConstants.SIGNATURE));
}
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
index f582c7a..fdb0fc8 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
@@ -164,7 +164,7 @@ public class SimpleCxfRsBinding extends DefaultCxfRsBinding {
* @return
*/
protected Object buildResponse(org.apache.camel.Exchange camelExchange, Object base) {
- Message m = camelExchange.hasOut() ? camelExchange.getOut() : camelExchange.getIn();
+ Message m = camelExchange.getMessage();
ResponseBuilder response;
// if the body is different to Response, it's an entity; therefore, check
diff --git a/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmProducer.java b/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmProducer.java
index 09317ba..88fd51a 100644
--- a/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmProducer.java
+++ b/components/camel-directvm/src/main/java/org/apache/camel/component/directvm/DirectVmProducer.java
@@ -65,7 +65,7 @@ public class DirectVmProducer extends DefaultAsyncProducer {
}
return consumer.getAsyncProcessor().process(submitted, done -> {
- Message msg = submitted.hasOut() ? submitted.getOut() : submitted.getIn();
+ Message msg = submitted.getMessage();
if (headerFilterStrategy != null) {
msg.getHeaders().entrySet().removeIf(e -> headerFilterStrategy.applyFilterToExternalHeaders(e.getKey(), e.getValue(), submitted));
diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorProducer.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorProducer.java
index c1baa9a..9e736d0 100644
--- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorProducer.java
+++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorProducer.java
@@ -88,12 +88,12 @@ public class DisruptorProducer extends DefaultAsyncProducer {
if (latch.getCount() == 0) {
if (log.isTraceEnabled()) {
log.trace("{}. Timeout occurred so response will be ignored: {}", this,
- response.hasOut() ? response.getOut() : response.getIn());
+ response.getMessage());
}
} else {
if (log.isTraceEnabled()) {
log.trace("{} with response: {}", this,
- response.hasOut() ? response.getOut() : response.getIn());
+ response.getMessage());
}
try {
ExchangeHelper.copyResults(exchange, response);
diff --git a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerProducer.java b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerProducer.java
index 6038d75..f12291c 100644
--- a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerProducer.java
+++ b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/DozerProducer.java
@@ -58,7 +58,7 @@ public class DozerProducer extends DefaultProducer {
endpoint.getConfiguration().getTargetModel());
// If an unmarshaller was used, the unmarshalled message is the OUT message.
- Message msg = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ Message msg = exchange.getMessage();
// Convert to source model, if specified
String sourceType = endpoint.getConfiguration().getSourceModel();
diff --git a/components/camel-fastjson/src/main/java/org/apache/camel/component/fastjson/FastjsonDataFormat.java b/components/camel-fastjson/src/main/java/org/apache/camel/component/fastjson/FastjsonDataFormat.java
index 83e21cd..ebff729 100644
--- a/components/camel-fastjson/src/main/java/org/apache/camel/component/fastjson/FastjsonDataFormat.java
+++ b/components/camel-fastjson/src/main/java/org/apache/camel/component/fastjson/FastjsonDataFormat.java
@@ -86,7 +86,7 @@ public class FastjsonDataFormat extends ServiceSupport implements DataFormat, Da
config.getSerializerFeatures());
if (contentTypeHeader) {
- Message message = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ Message message = exchange.getMessage();
message.setHeader(Exchange.CONTENT_TYPE, "application/json");
message.setHeader(Exchange.CONTENT_LENGTH, len);
}
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
index 320fd2a..ed0f569 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
@@ -327,7 +327,7 @@ public class DefaultHttpBinding implements HttpBinding {
}
public void writeResponse(Exchange exchange, HttpServletResponse response) throws IOException {
- Message target = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ Message target = exchange.getMessage();
if (exchange.isFailed()) {
if (exchange.getException() != null) {
doWriteExceptionResponse(exchange.getException(), response);
diff --git a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java
index efa9c9b..f9fb8ec 100644
--- a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java
+++ b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java
@@ -99,7 +99,7 @@ public class HystrixProcessorCommand extends HystrixCommand {
exchange.setException(e);
}
- return exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ return exchange.getMessage();
}
@Override
@@ -154,7 +154,7 @@ public class HystrixProcessorCommand extends HystrixCommand {
// special for HystrixBadRequestException which should not trigger fallback
if (camelExchangeException instanceof HystrixBadRequestException) {
LOG.debug("Running processor: {} with exchange: {} done as bad request", processor, exchange);
- return exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ return exchange.getMessage();
}
// copy the result before its regarded as success
@@ -168,7 +168,7 @@ public class HystrixProcessorCommand extends HystrixCommand {
}
LOG.debug("Running processor: {} with exchange: {} done", processor, exchange);
- return exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ return exchange.getMessage();
}
}
diff --git a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommandFallbackViaNetwork.java b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommandFallbackViaNetwork.java
index c2f831d..15be102 100644
--- a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommandFallbackViaNetwork.java
+++ b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommandFallbackViaNetwork.java
@@ -63,6 +63,6 @@ public class HystrixProcessorCommandFallbackViaNetwork extends HystrixCommand<Me
LOG.debug("Running fallback processor: {} with exchange: {} done", processor, exchange);
// no fallback then we are done
- return exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ return exchange.getMessage();
}
}
diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
index 2aac1c2..524a5ea 100644
--- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
+++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
@@ -129,7 +129,7 @@ public class MllpTcpClientProducer extends DefaultProducer implements Runnable {
log.trace("process({}) [{}] - entering", exchange.getExchangeId(), socket);
getEndpoint().updateLastConnectionActivityTicks();
- Message message = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ Message message = exchange.getMessage();
getEndpoint().checkBeforeSendProperties(exchange, socket, log);
diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
index 89b8c9a..b5ba736 100644
--- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
+++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
@@ -516,7 +516,7 @@ public class MllpTcpServerConsumer extends DefaultConsumer {
}
}
- Message message = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ Message message = exchange.getMessage();
if (acknowledgementMessageType != null && !acknowledgementMessageType.isEmpty()) {
message.setHeader(MllpConstants.MLLP_ACKNOWLEDGEMENT_TYPE, acknowledgementMessageType);
}
diff --git a/components/camel-mock/src/main/java/org/apache/camel/component/mock/AssertionClause.java b/components/camel-mock/src/main/java/org/apache/camel/component/mock/AssertionClause.java
index ab502ed..3009090 100644
--- a/components/camel-mock/src/main/java/org/apache/camel/component/mock/AssertionClause.java
+++ b/components/camel-mock/src/main/java/org/apache/camel/component/mock/AssertionClause.java
@@ -100,7 +100,7 @@ public abstract class AssertionClause extends MockExpressionClauseSupport<MockVa
for (Predicate predicate : predicates) {
currentIndex = index;
- Object value = exchange.hasOut() ? exchange.getOut().getBody() : exchange.getIn().getBody();
+ Object value = exchange.getMessage().getBody();
// if the value is StreamCache then ensure its readable before evaluating any predicates
// by resetting it (this is also what StreamCachingAdvice does)
if (value instanceof StreamCache) {
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
index 0d821f0..1352105 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
+++ b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
@@ -111,7 +111,7 @@ public class NettyHttpProducer extends NettyProducer {
try {
// only handle when we are done asynchronous as then the netty producer is done sending, and we have a response
if (!doneSync) {
- NettyHttpMessage nettyMessage = exchange.hasOut() ? exchange.getOut(NettyHttpMessage.class) : exchange.getIn(NettyHttpMessage.class);
+ NettyHttpMessage nettyMessage = exchange.getMessage(NettyHttpMessage.class);
if (nettyMessage != null) {
final FullHttpResponse response = nettyMessage.getHttpResponse();
// Need to retain the ByteBuffer for producer to consumer
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessagePublisher.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessagePublisher.java
index 32ce837..aed1740 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessagePublisher.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessagePublisher.java
@@ -62,7 +62,7 @@ public class RabbitMQMessagePublisher {
}
private Message resolveMessageFrom(final Exchange camelExchange) {
- Message message = camelExchange.hasOut() ? camelExchange.getOut() : camelExchange.getIn();
+ Message message = camelExchange.getMessage();
// Remove the SERIALIZE_HEADER in case it was previously set
if (message.getHeaders() != null && message.getHeaders().containsKey(RabbitMQEndpoint.SERIALIZE_HEADER)) {
diff --git a/components/camel-rest/src/main/java/org/apache/camel/component/rest/DefaultRestRegistry.java b/components/camel-rest/src/main/java/org/apache/camel/component/rest/DefaultRestRegistry.java
index 7532935..278a0df 100644
--- a/components/camel-rest/src/main/java/org/apache/camel/component/rest/DefaultRestRegistry.java
+++ b/components/camel-rest/src/main/java/org/apache/camel/component/rest/DefaultRestRegistry.java
@@ -111,7 +111,7 @@ public class DefaultRestRegistry extends ServiceSupport implements StaticService
Exchange dummy = apiProducer.getEndpoint().createExchange();
apiProducer.process(dummy);
- String json = dummy.hasOut() ? dummy.getOut().getBody(String.class) : dummy.getIn().getBody(String.class);
+ String json = dummy.getMessage().getBody(String.class);
return json;
} catch (Exception e) {
throw RuntimeCamelException.wrapRuntimeCamelException(e);
diff --git a/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestProducerBindingProcessor.java b/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestProducerBindingProcessor.java
index b9f0202..12c5c60 100644
--- a/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestProducerBindingProcessor.java
+++ b/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestProducerBindingProcessor.java
@@ -268,7 +268,7 @@ public class RestProducerBindingProcessor extends DelegateAsyncProcessor {
}
if (skipBindingOnErrorCode) {
- Integer code = exchange.hasOut() ? exchange.getOut().getHeader(Exchange.HTTP_RESPONSE_CODE, Integer.class) : exchange.getIn().getHeader(Exchange.HTTP_RESPONSE_CODE, Integer.class);
+ Integer code = exchange.getMessage().getHeader(Exchange.HTTP_RESPONSE_CODE, Integer.class);
// if there is a custom http error code then skip binding
if (code != null && code >= 300) {
return;
diff --git a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
index dc7e0ec..ed1f2c3 100644
--- a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
+++ b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
@@ -397,7 +397,7 @@ public class DefaultRestletBinding implements RestletBinding, HeaderFilterStrate
if (exchange.isFailed()) {
// 500 for internal server error which can be overridden by response code in header
response.setStatus(Status.valueOf(500));
- Message msg = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ Message msg = exchange.getMessage();
// print exception as message and stacktrace
Exception t = exchange.getException();
StringWriter sw = new StringWriter();
@@ -406,7 +406,7 @@ public class DefaultRestletBinding implements RestletBinding, HeaderFilterStrate
response.setEntity(sw.toString(), MediaType.TEXT_PLAIN);
return;
} else {
- out = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ out = exchange.getMessage();
}
// get content type
diff --git a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaProducer.java b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaProducer.java
index a43abae..35b4a5c 100644
--- a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaProducer.java
+++ b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaProducer.java
@@ -75,7 +75,7 @@ public class SedaProducer extends DefaultAsyncProducer {
return;
} else {
if (log.isTraceEnabled()) {
- log.trace("{} with response: {}", this, response.hasOut() ? response.getOut() : response.getIn());
+ log.trace("{} with response: {}", this, response.getMessage());
}
try {
ExchangeHelper.copyResults(exchange, response);
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java
index 7ccbe2e..c97105f 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java
@@ -158,8 +158,7 @@ public class InOutMessageHandler extends AbstractMessageHandler {
@Override
public void done(boolean sync) {
try {
- // the response can either be in OUT or IN
- org.apache.camel.Message msg = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ org.apache.camel.Message msg = exchange.getMessage();
Message response = getEndpoint().getBinding().makeJmsMessage(exchange, msg.getBody(), msg.getHeaders(), getSession(), null);
response.setJMSCorrelationID(exchange.getIn().getHeader(JmsConstants.JMS_CORRELATION_ID, String.class));
localProducer.send(response);
diff --git a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSparkRoute.java b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSparkRoute.java
index 6044e83..6a3691f 100644
--- a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSparkRoute.java
+++ b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSparkRoute.java
@@ -48,7 +48,7 @@ public class CamelSparkRoute implements Route {
exchange.setException(e);
}
- Message msg = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ Message msg = exchange.getMessage();
try {
endpoint.getSparkBinding().toSparkResponse(msg, response, endpoint.getSparkConfiguration());
diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConsumer.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConsumer.java
index 23e680e..ce04599 100644
--- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConsumer.java
+++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConsumer.java
@@ -71,7 +71,7 @@ public class SpringWebserviceConsumer extends DefaultConsumer implements Message
if (exchange.getException() != null) {
throw exchange.getException();
} else if (exchange.getPattern().isOutCapable()) {
- Message responseMessage = exchange.hasOut() ? exchange.getOut(Message.class) : exchange.getIn(Message.class);
+ Message responseMessage = exchange.getMessage(Message.class);
if (responseMessage != null) {
Source responseBody = responseMessage.getBody(Source.class);
WebServiceMessage response = messageContext.getResponse();
diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilter.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilter.java
index 58abe23..78dfbcc 100644
--- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilter.java
+++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilter.java
@@ -47,7 +47,7 @@ public class BasicMessageFilter implements MessageFilter {
@Override
public void filterConsumer(Exchange exchange, WebServiceMessage response) {
if (exchange != null) {
- AttachmentMessage responseMessage = exchange.hasOut() ? exchange.getOut(AttachmentMessage.class) : exchange.getIn(AttachmentMessage.class);
+ AttachmentMessage responseMessage = exchange.getMessage(AttachmentMessage.class);
processHeaderAndAttachments(responseMessage, response);
}
}
diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/filter/impl/HeaderTransformationMessageFilter.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/filter/impl/HeaderTransformationMessageFilter.java
index a8f8604..59f80a1 100644
--- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/filter/impl/HeaderTransformationMessageFilter.java
+++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/filter/impl/HeaderTransformationMessageFilter.java
@@ -67,7 +67,7 @@ public class HeaderTransformationMessageFilter implements MessageFilter {
@Override
public void filterConsumer(Exchange exchange, WebServiceMessage webServiceMessage) {
if (exchange != null) {
- Message responseMessage = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ Message responseMessage = exchange.getMessage();
processHeader(exchange.getContext(), responseMessage, webServiceMessage);
}
}
diff --git a/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxHelper.java b/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxHelper.java
index d1b0e45..e4967b2 100644
--- a/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxHelper.java
+++ b/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxHelper.java
@@ -27,7 +27,7 @@ public final class VertxHelper {
}
public static Object getVertxBody(Exchange exchange) {
- Message msg = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ Message msg = exchange.getMessage();
Object body = msg.getBody(JsonObject.class);
if (body == null) {
body = msg.getBody(JsonArray.class);
diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java
index e404539..3e88674 100644
--- a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java
+++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java
@@ -50,7 +50,7 @@ final class ZipkinClientRequestAdapter {
if (eventNotifier.isIncludeMessageBody() || eventNotifier.isIncludeMessageBodyStreams()) {
boolean streams = eventNotifier.isIncludeMessageBodyStreams();
StreamCache cache = prepareBodyForLogging(exchange, streams);
- String body = MessageHelper.extractBodyForLogging(exchange.hasOut() ? exchange.getOut() : exchange.getIn(), "", streams, streams);
+ String body = MessageHelper.extractBodyForLogging(exchange.getMessage(), "", streams, streams);
span.tag("camel.client.exchange.message.request.body", body);
if (cache != null) {
cache.reset();
diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientResponseAdaptor.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientResponseAdaptor.java
index e03af3b..824bd73 100644
--- a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientResponseAdaptor.java
+++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientResponseAdaptor.java
@@ -43,7 +43,7 @@ class ZipkinClientResponseAdaptor {
if (eventNotifier.isIncludeMessageBody() || eventNotifier.isIncludeMessageBodyStreams()) {
boolean streams = eventNotifier.isIncludeMessageBodyStreams();
StreamCache cache = prepareBodyForLogging(exchange, streams);
- String body = MessageHelper.extractBodyForLogging(exchange.hasOut() ? exchange.getOut() : exchange.getIn(), "", streams, streams);
+ String body = MessageHelper.extractBodyForLogging(exchange.getMessage(), "", streams, streams);
span.tag("camel.client.exchange.message.response.body", body);
if (cache != null) {
cache.reset();
@@ -51,7 +51,7 @@ class ZipkinClientResponseAdaptor {
}
// lets capture http response code for http based components
- String responseCode = exchange.hasOut() ? exchange.getOut().getHeader(Exchange.HTTP_RESPONSE_CODE, String.class) : exchange.getIn().getHeader(Exchange.HTTP_RESPONSE_CODE, String.class);
+ String responseCode = exchange.getMessage().getHeader(Exchange.HTTP_RESPONSE_CODE, String.class);
if (responseCode != null) {
span.tag("camel.client.exchange.message.response.code", responseCode);
}
diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinHelper.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinHelper.java
index 17724f0..db9ee7e 100644
--- a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinHelper.java
+++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinHelper.java
@@ -34,7 +34,7 @@ public final class ZipkinHelper {
return null;
}
- Message message = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ Message message = exchange.getMessage();
// check if body is already cached
Object body = message.getBody();
if (body == null) {
diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinServerRequestAdapter.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinServerRequestAdapter.java
index e373fe6..392fe88 100644
--- a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinServerRequestAdapter.java
+++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinServerRequestAdapter.java
@@ -50,7 +50,7 @@ class ZipkinServerRequestAdapter {
if (eventNotifier.isIncludeMessageBody() || eventNotifier.isIncludeMessageBodyStreams()) {
boolean streams = eventNotifier.isIncludeMessageBodyStreams();
StreamCache cache = prepareBodyForLogging(exchange, streams);
- String body = MessageHelper.extractBodyForLogging(exchange.hasOut() ? exchange.getOut() : exchange.getIn(), "", streams, streams);
+ String body = MessageHelper.extractBodyForLogging(exchange.getMessage(), "", streams, streams);
span.tag("camel.server.exchange.message.request.body", body);
if (cache != null) {
cache.reset();
diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinServerResponseAdapter.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinServerResponseAdapter.java
index b633ec1..f5d8509 100644
--- a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinServerResponseAdapter.java
+++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinServerResponseAdapter.java
@@ -51,7 +51,7 @@ class ZipkinServerResponseAdapter {
} else if (eventNotifier.isIncludeMessageBody() || eventNotifier.isIncludeMessageBodyStreams()) {
boolean streams = eventNotifier.isIncludeMessageBodyStreams();
StreamCache cache = prepareBodyForLogging(exchange, streams);
- String body = MessageHelper.extractBodyForLogging(exchange.hasOut() ? exchange.getOut() : exchange.getIn(), "", streams, streams);
+ String body = MessageHelper.extractBodyForLogging(exchange.getMessage(), "", streams, streams);
span.tag("camel.server.exchange.message.response.body", body);
if (cache != null) {
cache.reset();
@@ -59,7 +59,7 @@ class ZipkinServerResponseAdapter {
}
// lets capture http response code for http based components
- String responseCode = exchange.hasOut() ? exchange.getOut().getHeader(Exchange.HTTP_RESPONSE_CODE, String.class) : exchange.getIn().getHeader(Exchange.HTTP_RESPONSE_CODE, String.class);
+ String responseCode = exchange.getMessage().getHeader(Exchange.HTTP_RESPONSE_CODE, String.class);
if (responseCode != null) {
span.tag("camel.server.exchange.message.response.code", responseCode);
}
[camel] 01/08: CAMEL-13788: Deprecate OUT in favour of getMessage
on Message API.
Posted by da...@apache.org.
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 48f8323af030186e9c5349dea6da1361cec3303f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jul 25 14:01:05 2019 +0200
CAMEL-13788: Deprecate OUT in favour of getMessage on Message API.
---
.../src/main/java/org/apache/camel/Exchange.java | 8 +++
.../org/apache/camel/converter/CamelConverter.java | 8 +--
.../camel/impl/engine/DefaultConsumerTemplate.java | 8 +--
.../impl/engine/DefaultFluentProducerTemplate.java | 2 +-
.../impl/engine/DefaultStreamCachingStrategy.java | 2 +-
.../apache/camel/impl/engine/MDCUnitOfWork.java | 2 +-
.../impl/transformer/ProcessorTransformer.java | 2 +-
.../language/simple/SimpleExpressionBuilder.java | 2 +-
.../camel/processor/CamelInternalProcessor.java | 7 +--
.../org/apache/camel/processor/ContractAdvice.java | 2 +-
.../camel/processor/ConvertBodyProcessor.java | 3 +-
.../camel/processor/MethodCallProcessor.java | 3 +-
.../java/org/apache/camel/processor/Pipeline.java | 5 +-
.../org/apache/camel/processor/PipelineHelper.java | 24 +--------
.../org/apache/camel/processor/PollEnricher.java | 24 ++-------
.../camel/processor/RemoveHeaderProcessor.java | 3 +-
.../camel/processor/RemoveHeadersProcessor.java | 3 +-
.../apache/camel/processor/RestBindingAdvice.java | 24 ++++-----
.../org/apache/camel/processor/RoutingSlip.java | 7 +--
.../apache/camel/processor/SetBodyProcessor.java | 3 +-
.../apache/camel/processor/SetHeaderProcessor.java | 3 +-
.../org/apache/camel/processor/SortProcessor.java | 9 +---
.../apache/camel/processor/TransformProcessor.java | 3 +-
.../apache/camel/processor/WireTapProcessor.java | 2 +-
.../processor/interceptor/BacklogDebugger.java | 59 +++++-----------------
.../org/apache/camel/builder/ExpressionClause.java | 5 ++
.../test/java/org/apache/camel/TestSupport.java | 2 +
.../apache/camel/builder/ExceptionBuilderTest.java | 2 +-
.../ExceptionBuilderWithHandledExceptionTest.java | 2 +-
.../camel/component/bean/BeanPipelineTest.java | 4 +-
.../camel/component/bean/MyServiceProxyTest.java | 2 +-
.../camel/component/direct/DirectNoToTypeTest.java | 2 +-
.../directvm/DirectVmHeaderFilterStrategyTest.java | 4 +-
.../file/FileConsumerFailureHandledTest.java | 2 +-
.../camel/component/file/ToFileRouteTest.java | 4 +-
.../log/DefaultExchangeFormatterTest.java | 22 +-------
.../component/rest/FromRestGetContentTypeTest.java | 4 +-
.../rest/FromRestGetCorsAllowCredentialsTest.java | 20 ++++----
.../component/rest/FromRestGetCorsCustomTest.java | 8 +--
.../camel/component/rest/FromRestGetCorsTest.java | 8 +--
.../rest/FromRestGetHttpErrorCodeTest.java | 4 +-
.../rest/RestProducerBindingProcessorTest.java | 4 +-
.../component/seda/SedaAsyncProducerTest.java | 4 +-
.../vm/VmWaitForTaskIfReplyExpectedTest.java | 2 +-
.../apache/camel/converter/CamelConverterTest.java | 4 +-
.../camel/impl/DefaultConsumerTemplateTest.java | 2 +-
.../impl/DefaultProducerTemplateAsyncTest.java | 14 ++---
.../impl/PojoProduceInterceptEndpointTest.java | 2 +-
.../impl/transformer/TransformerRouteTest.java | 8 +--
.../camel/impl/validator/ValidatorRouteTest.java | 4 +-
.../org/apache/camel/issues/DavidSiefertTest.java | 2 +-
.../issues/DoCatchCaughExceptionIssueTest.java | 2 +-
.../camel/issues/SetHeaderInDoCatchIssueTest.java | 4 +-
.../camel/language/FileLanguageExtSingleTest.java | 2 +-
.../processor/BodyOutAggregatingStrategy.java | 2 +-
.../FailOverLoadBalancerSetFaultTest.java | 4 +-
.../org/apache/camel/processor/MDCResetTest.java | 4 +-
.../MultiCastParallelAndStreamCachingTest.java | 8 +--
.../MultiCastStreamCachingInSubRouteTest.java | 2 +-
.../org/apache/camel/processor/MyNormalizer.java | 4 +-
.../processor/NewProcessorAndServiceTest.java | 2 +-
.../camel/processor/PipelineConcurrentTest.java | 2 +-
.../apache/camel/processor/PipelineMEPTest.java | 2 +-
.../org/apache/camel/processor/PipelineTest.java | 12 ++---
.../camel/processor/SimpleProcessorTest.java | 2 +-
.../processor/SimpleProcessorTraceableTest.java | 2 +-
.../org/apache/camel/processor/SimulatorTest.java | 2 +-
.../SplitterStreamCachingInSubRouteTest.java | 2 +-
.../org/apache/camel/processor/SplitterTest.java | 8 +--
.../aggregator/AggregateLostGroupIssueTest.java | 4 +-
.../aggregator/AggregatorExceptionHandleTest.java | 2 +-
.../async/AsyncEndpointRecipientList3Test.java | 2 +-
.../async/AsyncEndpointRecipientList4Test.java | 2 +-
.../async/AsyncEndpointRecipientListBean3Test.java | 2 +-
.../async/AsyncEndpointRecipientListBean4Test.java | 2 +-
.../AsyncEndpointRecipientListParallel3Test.java | 2 +-
.../AsyncEndpointRecipientListParallel4Test.java | 2 +-
.../async/AsyncEndpointRoutingSlip3Test.java | 2 +-
.../async/AsyncEndpointRoutingSlipBean3Test.java | 2 +-
...syncEndpointRoutingSlipBeanNonBlockingTest.java | 2 +-
.../camel/processor/async/MyAsyncProducer.java | 4 +-
.../camel/processor/enricher/EnricherRefTest.java | 2 +-
.../camel/processor/enricher/PollEnricherTest.java | 2 +-
.../CustomExceptionPolicyStrategyTest.java | 2 +-
...ltExceptionPolicyStrategyUsingOnlyWhenTest.java | 2 +-
...efaultExceptionPolicyStrategyUsingWhenTest.java | 2 +-
.../OnExceptionUseOriginalMessageTest.java | 2 +-
.../processor/routingslip/RoutingSlipPOJOTest.java | 2 +-
.../management/mbean/ManagedBrowsableEndpoint.java | 11 ++--
.../management/ManagedInlinedProcessorTest.java | 2 +-
.../camel/support/DefaultExchangeHolder.java | 1 +
.../support/DefaultScheduledPollConsumer.java | 10 +---
.../org/apache/camel/support/ExchangeHelper.java | 6 +--
.../camel/support/builder/ExpressionBuilder.java | 6 +++
.../support/component/AbstractApiProducer.java | 4 +-
.../processor/DefaultExchangeFormatter.java | 46 -----------------
96 files changed, 193 insertions(+), 360 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/Exchange.java b/core/camel-api/src/main/java/org/apache/camel/Exchange.java
index 35b5551..99a2f16 100644
--- a/core/camel-api/src/main/java/org/apache/camel/Exchange.java
+++ b/core/camel-api/src/main/java/org/apache/camel/Exchange.java
@@ -417,7 +417,9 @@ public interface Exchange {
*
* @return the response
* @see #getIn()
+ * @deprecated use {@link #getMessage()}
*/
+ @Deprecated
Message getOut();
/**
@@ -435,21 +437,27 @@ public interface Exchange {
* @param type the given type
* @return the message as the given type or <tt>null</tt> if not possible to covert to given type
* @see #getIn(Class)
+ * @deprecated use {@link #getMessage(Class)}
*/
+ @Deprecated
<T> T getOut(Class<T> type);
/**
* Returns whether an OUT message has been set or not.
*
* @return <tt>true</tt> if an OUT message exists, <tt>false</tt> otherwise.
+ * @deprecated use {@link #getMessage()}
*/
+ @Deprecated
boolean hasOut();
/**
* Sets the outbound message
*
* @param out the outbound message
+ * @deprecated use {@link #setMessage(Message)}
*/
+ @Deprecated
void setOut(Message out);
/**
diff --git a/core/camel-base/src/main/java/org/apache/camel/converter/CamelConverter.java b/core/camel-base/src/main/java/org/apache/camel/converter/CamelConverter.java
index c774a7b..1459406 100644
--- a/core/camel-base/src/main/java/org/apache/camel/converter/CamelConverter.java
+++ b/core/camel-base/src/main/java/org/apache/camel/converter/CamelConverter.java
@@ -39,9 +39,7 @@ public final class CamelConverter {
public static Processor toProcessor(final Predicate predicate) {
return exchange -> {
boolean answer = predicate.matches(exchange);
- Message out = exchange.getOut();
- out.copyFrom(exchange.getIn());
- out.setBody(answer);
+ exchange.getMessage().setBody(answer);
};
}
@@ -50,9 +48,7 @@ public final class CamelConverter {
public static Processor toProcessor(final Expression expression) {
return exchange -> {
Object answer = expression.evaluate(exchange, Object.class);
- Message out = exchange.getOut();
- out.copyFrom(exchange.getIn());
- out.setBody(answer);
+ exchange.getMessage().setBody(answer);
};
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java
index 187712a..b18e702 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java
@@ -234,13 +234,7 @@ public class DefaultConsumerTemplate extends ServiceSupport implements ConsumerT
}
// okay no fault then return the response
- if (result.hasOut()) {
- // use OUT as the response
- answer = result.getOut().getBody();
- } else {
- // use IN as the response
- answer = result.getIn().getBody();
- }
+ answer = result.getMessage().getBody();
}
return answer;
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultFluentProducerTemplate.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultFluentProducerTemplate.java
index 23266ce..0d8c579 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultFluentProducerTemplate.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultFluentProducerTemplate.java
@@ -245,7 +245,7 @@ public class DefaultFluentProducerTemplate extends ServiceSupport implements Flu
result = (T)template().request(target, processorSupplier.get());
} else if (type == Message.class) {
Exchange exchange = template().request(target, processorSupplier.get());
- result = exchange.hasOut() ? (T)exchange.getOut() : (T)exchange.getIn();
+ result = (T)exchange.getMessage();
} else {
Exchange exchange = template().send(
target,
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultStreamCachingStrategy.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultStreamCachingStrategy.java
index e04c6e5..03db5a6 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultStreamCachingStrategy.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultStreamCachingStrategy.java
@@ -175,7 +175,7 @@ public class DefaultStreamCachingStrategy extends ServiceSupport implements Came
}
public StreamCache cache(Exchange exchange) {
- Message message = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ Message message = exchange.getMessage();
StreamCache cache = message.getBody(StreamCache.class);
if (cache != null) {
if (log.isTraceEnabled()) {
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java
index d34e170..5a4b719 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/MDCUnitOfWork.java
@@ -56,7 +56,7 @@ public class MDCUnitOfWork extends DefaultUnitOfWork {
// must add exchange and message id in constructor
MDC.put(MDC_EXCHANGE_ID, exchange.getExchangeId());
- String msgId = exchange.hasOut() ? exchange.getOut().getMessageId() : exchange.getIn().getMessageId();
+ String msgId = exchange.getMessage().getMessageId();
MDC.put(MDC_MESSAGE_ID, msgId);
// the camel context id is from exchange
MDC.put(MDC_CAMEL_CONTEXT_ID, exchange.getContext().getName());
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/transformer/ProcessorTransformer.java b/core/camel-base/src/main/java/org/apache/camel/impl/transformer/ProcessorTransformer.java
index c627f9f..4d1d80a 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/transformer/ProcessorTransformer.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/transformer/ProcessorTransformer.java
@@ -65,7 +65,7 @@ public class ProcessorTransformer extends Transformer {
transformExchange.setIn(message);
transformExchange.setProperties(exchange.getProperties());
processor.process(transformExchange);
- Message answer = transformExchange.hasOut() ? transformExchange.getOut() : transformExchange.getIn();
+ Message answer = transformExchange.getMessage();
if (to.isJavaType()) {
Object answerBody = answer.getBody();
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java b/core/camel-base/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
index 9a0cc77..21bfceb 100644
--- a/core/camel-base/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
+++ b/core/camel-base/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
@@ -432,7 +432,7 @@ public final class SimpleExpressionBuilder {
}
} else if (command.startsWith("out.header.")) {
String key = command.substring(command.lastIndexOf('.') + 1);
- date = exchange.getOut().getHeader(key, Date.class);
+ date = exchange.getMessage().getHeader(key, Date.class);
if (date == null) {
throw new IllegalArgumentException("Cannot find java.util.Date object at command: " + command);
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index 78753e1..f23aea3 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -722,12 +722,7 @@ public class CamelInternalProcessor extends DelegateAsyncProcessor {
@Override
public void after(Exchange exchange, StreamCache sc) throws Exception {
- Object body;
- if (exchange.hasOut()) {
- body = exchange.getOut().getBody();
- } else {
- body = exchange.getIn().getBody();
- }
+ Object body = exchange.getMessage().getBody();
if (body instanceof StreamCache) {
// reset so the cache is ready to be reused after processing
((StreamCache) body).reset();
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/ContractAdvice.java b/core/camel-base/src/main/java/org/apache/camel/processor/ContractAdvice.java
index 435cee9..8035f55 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/ContractAdvice.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/ContractAdvice.java
@@ -88,7 +88,7 @@ public class ContractAdvice implements CamelInternalProcessorAdvice {
return;
}
- Message target = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ Message target = exchange.getMessage();
if (!(target instanceof DataTypeAware)) {
return;
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java
index 7872758..298662a 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java
@@ -66,8 +66,7 @@ public class ConvertBodyProcessor extends ServiceSupport implements AsyncProcess
}
public void process(Exchange exchange) throws Exception {
- boolean out = exchange.hasOut();
- Message old = out ? exchange.getOut() : exchange.getIn();
+ Message old = exchange.getMessage();
if (old.getBody() == null) {
// only convert if there is a body
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/MethodCallProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/MethodCallProcessor.java
index f1f1986..ba0bdb1 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/MethodCallProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/MethodCallProcessor.java
@@ -52,8 +52,7 @@ public class MethodCallProcessor extends AsyncProcessorSupport implements Tracea
// if null/empty response its due to void / no-response, then dont change the body
if (newBody != null) {
- boolean out = exchange.hasOut();
- Message old = out ? exchange.getOut() : exchange.getIn();
+ Message old = exchange.getMessage();
// create a new message container so we do not drag specialized message objects along
// but that is only needed if the old message is a specialized message
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/Pipeline.java b/core/camel-base/src/main/java/org/apache/camel/processor/Pipeline.java
index 9ffe248..315f9df 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/Pipeline.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/Pipeline.java
@@ -95,10 +95,7 @@ public class Pipeline extends AsyncProcessorSupport implements Navigate<Processo
&& (first || continueProcessing(exchange, "so breaking out of pipeline", log))) {
// prepare for next run
- if (exchange.hasOut()) {
- exchange.setIn(exchange.getOut());
- exchange.setOut(null);
- }
+ ExchangeHelper.prepareOutToIn(exchange);
// get the next processor
AsyncProcessor processor = processors.next();
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/PipelineHelper.java b/core/camel-base/src/main/java/org/apache/camel/processor/PipelineHelper.java
index 274185f..7ffcbbe 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/PipelineHelper.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/PipelineHelper.java
@@ -43,13 +43,11 @@ public final class PipelineHelper {
// check for error if so we should break out
boolean exceptionHandled = hasExceptionBeenHandledByErrorHandler(exchange);
if (exchange.isFailed() || exchange.isRollbackOnly() || exceptionHandled) {
- // We need to write a warning message when the exception and fault message be set at the same time
- Message msg = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
// The Exchange.ERRORHANDLED_HANDLED property is only set if satisfactory handling was done
// by the error handler. It's still an exception, the exchange still failed.
if (log.isDebugEnabled()) {
StringBuilder sb = new StringBuilder();
- sb.append("Message exchange has failed: " + message + " for exchange: ").append(exchange);
+ sb.append("Message exchange has failed: ").append(message).append(" for exchange: ").append(exchange);
if (exchange.isRollbackOnly()) {
sb.append(" Marked as rollback only.");
}
@@ -78,24 +76,4 @@ public final class PipelineHelper {
return true;
}
- /**
- * Strategy method to create the next exchange from the previous exchange.
- * <p/>
- * Remember to copy the original exchange id otherwise correlation of ids in the log is a problem
- *
- * @param previousExchange the previous exchange
- * @return a new exchange
- */
- public static Exchange createNextExchange(Exchange previousExchange) {
- Exchange answer = previousExchange;
-
- // now lets set the input of the next exchange to the output of the
- // previous message if it is not null
- if (answer.hasOut()) {
- answer.setIn(answer.getOut());
- answer.setOut(null);
- }
- return answer;
- }
-
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/PollEnricher.java b/core/camel-base/src/main/java/org/apache/camel/processor/PollEnricher.java
index e384f20..676f049 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/PollEnricher.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/PollEnricher.java
@@ -288,34 +288,18 @@ public class PollEnricher extends AsyncProcessorSupport implements IdAware, Came
// preserve the redelivery stats
if (redeliveried != null) {
- if (exchange.hasOut()) {
- exchange.getOut().setHeader(Exchange.REDELIVERED, redeliveried);
- } else {
- exchange.getIn().setHeader(Exchange.REDELIVERED, redeliveried);
- }
+ exchange.getMessage().setHeader(Exchange.REDELIVERED, redeliveried);
}
if (redeliveryCounter != null) {
- if (exchange.hasOut()) {
- exchange.getOut().setHeader(Exchange.REDELIVERY_COUNTER, redeliveryCounter);
- } else {
- exchange.getIn().setHeader(Exchange.REDELIVERY_COUNTER, redeliveryCounter);
- }
+ exchange.getMessage().setHeader(Exchange.REDELIVERY_COUNTER, redeliveryCounter);
}
if (redeliveryMaxCounter != null) {
- if (exchange.hasOut()) {
- exchange.getOut().setHeader(Exchange.REDELIVERY_MAX_COUNTER, redeliveryMaxCounter);
- } else {
- exchange.getIn().setHeader(Exchange.REDELIVERY_MAX_COUNTER, redeliveryMaxCounter);
- }
+ exchange.getMessage().setHeader(Exchange.REDELIVERY_MAX_COUNTER, redeliveryMaxCounter);
}
}
// set header with the uri of the endpoint enriched so we can use that for tracing etc
- if (exchange.hasOut()) {
- exchange.getOut().setHeader(Exchange.TO_ENDPOINT, consumer.getEndpoint().getEndpointUri());
- } else {
- exchange.getIn().setHeader(Exchange.TO_ENDPOINT, consumer.getEndpoint().getEndpointUri());
- }
+ exchange.getMessage().setHeader(Exchange.TO_ENDPOINT, consumer.getEndpoint().getEndpointUri());
} catch (Throwable e) {
exchange.setException(new CamelExchangeException("Error occurred during aggregation", exchange, e));
callback.done(true);
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/RemoveHeaderProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/RemoveHeaderProcessor.java
index 2787aae..9f71e28 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/RemoveHeaderProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/RemoveHeaderProcessor.java
@@ -37,8 +37,7 @@ public class RemoveHeaderProcessor extends AsyncProcessorSupport implements Trac
@Override
public boolean process(Exchange exchange, AsyncCallback callback) {
try {
- Message message = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
- message.removeHeader(headerName);
+ exchange.getMessage().removeHeader(headerName);
} catch (Exception e) {
exchange.setException(e);
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/RemoveHeadersProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/RemoveHeadersProcessor.java
index 3c8d644..09fb878 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/RemoveHeadersProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/RemoveHeadersProcessor.java
@@ -39,8 +39,7 @@ public class RemoveHeadersProcessor extends AsyncProcessorSupport implements Tra
@Override
public boolean process(Exchange exchange, AsyncCallback callback) {
try {
- Message message = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
- message.removeHeaders(pattern, excludePattern);
+ exchange.getMessage().removeHeaders(pattern, excludePattern);
} catch (Exception e) {
exchange.setException(e);
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/RestBindingAdvice.java b/core/camel-base/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
index 4a7ee4f..409d807 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
@@ -207,7 +207,7 @@ public class RestBindingAdvice implements CamelInternalProcessorAdvice<Map<Strin
if (!isValidOrAcceptedContentType(consumes, contentType)) {
LOG.trace("Consuming content type does not match contentType header {}. Stopping routing.", contentType);
// the content-type is not something we can process so its a HTTP_ERROR 415
- exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, 415);
+ exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 415);
// stop routing and return
exchange.setProperty(Exchange.ROUTE_STOP, true);
return;
@@ -217,7 +217,7 @@ public class RestBindingAdvice implements CamelInternalProcessorAdvice<Map<Strin
if (!isValidOrAcceptedContentType(produces, accept)) {
LOG.trace("Produced content type does not match accept header {}. Stopping routing.", contentType);
// the response type is not accepted by the client so its a HTTP_ERROR 406
- exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, 406);
+ exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 406);
// stop routing and return
exchange.setProperty(Exchange.ROUTE_STOP, true);
return;
@@ -271,8 +271,8 @@ public class RestBindingAdvice implements CamelInternalProcessorAdvice<Map<Strin
}
if (body == null) {
// this is a bad request, the client did not include a message body
- exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, 400);
- exchange.getOut().setBody("The request body is missing.");
+ exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 400);
+ exchange.getMessage().setBody("The request body is missing.");
// stop routing and return
exchange.setProperty(Exchange.ROUTE_STOP, true);
return;
@@ -280,16 +280,16 @@ public class RestBindingAdvice implements CamelInternalProcessorAdvice<Map<Strin
}
if (requiredQueryParameters != null && !exchange.getIn().getHeaders().keySet().containsAll(requiredQueryParameters)) {
// this is a bad request, the client did not include some of the required query parameters
- exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, 400);
- exchange.getOut().setBody("Some of the required query parameters are missing.");
+ exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 400);
+ exchange.getMessage().setBody("Some of the required query parameters are missing.");
// stop routing and return
exchange.setProperty(Exchange.ROUTE_STOP, true);
return;
}
if (requiredHeaders != null && !exchange.getIn().getHeaders().keySet().containsAll(requiredHeaders)) {
// this is a bad request, the client did not include some of the required http headers
- exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, 400);
- exchange.getOut().setBody("Some of the required HTTP headers are missing.");
+ exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 400);
+ exchange.getMessage().setBody("Some of the required HTTP headers are missing.");
// stop routing and return
exchange.setProperty(Exchange.ROUTE_STOP, true);
return;
@@ -336,7 +336,7 @@ public class RestBindingAdvice implements CamelInternalProcessorAdvice<Map<Strin
}
if (skipBindingOnErrorCode) {
- Integer code = exchange.hasOut() ? exchange.getOut().getHeader(Exchange.HTTP_RESPONSE_CODE, Integer.class) : exchange.getIn().getHeader(Exchange.HTTP_RESPONSE_CODE, Integer.class);
+ Integer code = exchange.getMessage().getHeader(Exchange.HTTP_RESPONSE_CODE, Integer.class);
// if there is a custom http error code then skip binding
if (code != null && code >= 300) {
return;
@@ -402,7 +402,7 @@ public class RestBindingAdvice implements CamelInternalProcessorAdvice<Map<Strin
}
// is the body empty
- if ((exchange.hasOut() && exchange.getOut().getBody() == null) || (!exchange.hasOut() && exchange.getIn().getBody() == null)) {
+ if (exchange.getMessage().getBody() == null) {
return;
}
@@ -441,7 +441,7 @@ public class RestBindingAdvice implements CamelInternalProcessorAdvice<Map<Strin
}
private void setOutputDataType(Exchange exchange, DataType type) {
- Message target = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ Message target = exchange.getMessage();
if (target instanceof DataTypeAware) {
((DataTypeAware)target).setDataType(type);
}
@@ -474,7 +474,7 @@ public class RestBindingAdvice implements CamelInternalProcessorAdvice<Map<Strin
private void setCORSHeaders(Exchange exchange, Map<String, Object> state) {
// add the CORS headers after routing, but before the consumer writes the response
- Message msg = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ Message msg = exchange.getMessage();
// use default value if none has been configured
String allowOrigin = corsHeaders != null ? corsHeaders.get("Access-Control-Allow-Origin") : null;
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/RoutingSlip.java b/core/camel-base/src/main/java/org/apache/camel/processor/RoutingSlip.java
index 348a39e..76d6c33 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/RoutingSlip.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/RoutingSlip.java
@@ -452,12 +452,7 @@ public class RoutingSlip extends AsyncProcessorSupport implements Traceable, IdA
* Returns the outbound message if available. Otherwise return the inbound message.
*/
private Message getResultMessage(Exchange exchange) {
- if (exchange.hasOut()) {
- return exchange.getOut();
- } else {
- // if this endpoint had no out (like a mock endpoint) just take the in
- return exchange.getIn();
- }
+ return exchange.getMessage();
}
/**
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/SetBodyProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
index 7eb9df8..d739f71 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
@@ -48,8 +48,7 @@ public class SetBodyProcessor extends AsyncProcessorSupport implements Traceable
return true;
}
- boolean out = exchange.hasOut();
- Message old = out ? exchange.getOut() : exchange.getIn();
+ Message old = exchange.getMessage();
// create a new message container so we do not drag specialized message objects along
// but that is only needed if the old message is a specialized message
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/SetHeaderProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/SetHeaderProcessor.java
index 406961c..a40d296 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/SetHeaderProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/SetHeaderProcessor.java
@@ -51,8 +51,7 @@ public class SetHeaderProcessor extends AsyncProcessorSupport implements Traceab
return true;
}
- boolean out = exchange.hasOut();
- Message old = out ? exchange.getOut() : exchange.getIn();
+ Message old = exchange.getMessage();
String key = headerName.evaluate(exchange, String.class);
old.setHeader(key, newHeader);
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/SortProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/SortProcessor.java
index b477adb..8aab42e 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/SortProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/SortProcessor.java
@@ -43,18 +43,11 @@ public class SortProcessor<T> extends AsyncProcessorSupport implements IdAware,
@Override
public boolean process(Exchange exchange, AsyncCallback callback) {
try {
- Message in = exchange.getIn();
-
@SuppressWarnings("unchecked")
List<T> list = expression.evaluate(exchange, List.class);
list.sort(comparator);
- if (exchange.getPattern().isOutCapable()) {
- Message out = exchange.getOut();
- out.copyFromWithNewBody(in, list);
- } else {
- in.setBody(list);
- }
+ exchange.getMessage().setBody(list);
} catch (Exception e) {
exchange.setException(e);
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/TransformProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/TransformProcessor.java
index c21b137..3199b5c 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/TransformProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/TransformProcessor.java
@@ -49,8 +49,7 @@ public class TransformProcessor extends AsyncProcessorSupport implements Traceab
return true;
}
- boolean out = exchange.hasOut();
- Message old = out ? exchange.getOut() : exchange.getIn();
+ Message old = exchange.getMessage();
// create a new message container so we do not drag specialized message objects along
// but that is only needed if the old message is a specialized message
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/WireTapProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/WireTapProcessor.java
index 395eada..ce795a8 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/WireTapProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/WireTapProcessor.java
@@ -189,7 +189,7 @@ public class WireTapProcessor extends AsyncProcessorSupport implements Traceable
}
// if the body is a stream cache we must use a copy of the stream in the wire tapped exchange
- Message msg = answer.hasOut() ? answer.getOut() : answer.getIn();
+ Message msg = answer.getMessage();
if (msg.getBody() instanceof StreamCache) {
// in parallel processing case, the stream must be copied, therefore get the stream
StreamCache cache = (StreamCache) msg.getBody();
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java b/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java
index d9a49a0..806c456 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java
@@ -253,12 +253,7 @@ public final class BacklogDebugger extends ServiceSupport {
if (remove) {
removeMessageBodyOnBreakpoint(nodeId);
} else {
- Class<?> oldType;
- if (se.getExchange().hasOut()) {
- oldType = se.getExchange().getOut().getBody() != null ? se.getExchange().getOut().getBody().getClass() : null;
- } else {
- oldType = se.getExchange().getIn().getBody() != null ? se.getExchange().getIn().getBody().getClass() : null;
- }
+ Class<?> oldType = se.getExchange().getMessage().getBody() != null ? se.getExchange().getMessage().getBody().getClass() : null;
setMessageBodyOnBreakpoint(nodeId, body, oldType);
}
}
@@ -272,19 +267,11 @@ public final class BacklogDebugger extends ServiceSupport {
removeMessageBodyOnBreakpoint(nodeId);
} else {
logger.log("Breakpoint at node " + nodeId + " is updating message body on exchangeId: " + se.getExchange().getExchangeId() + " with new body: " + body);
- if (se.getExchange().hasOut()) {
- // preserve type
- if (type != null) {
- se.getExchange().getOut().setBody(body, type);
- } else {
- se.getExchange().getOut().setBody(body);
- }
+ // preserve type
+ if (type != null) {
+ se.getExchange().getMessage().setBody(body, type);
} else {
- if (type != null) {
- se.getExchange().getIn().setBody(body, type);
- } else {
- se.getExchange().getIn().setBody(body);
- }
+ se.getExchange().getMessage().setBody(body);
}
}
}
@@ -294,23 +281,14 @@ public final class BacklogDebugger extends ServiceSupport {
SuspendedExchange se = suspendedBreakpoints.get(nodeId);
if (se != null) {
logger.log("Breakpoint at node " + nodeId + " is removing message body on exchangeId: " + se.getExchange().getExchangeId());
- if (se.getExchange().hasOut()) {
- se.getExchange().getOut().setBody(null);
- } else {
- se.getExchange().getIn().setBody(null);
- }
+ se.getExchange().getMessage().setBody(null);
}
}
public void setMessageHeaderOnBreakpoint(String nodeId, String headerName, Object value) throws NoTypeConversionAvailableException {
SuspendedExchange se = suspendedBreakpoints.get(nodeId);
if (se != null) {
- Class<?> oldType;
- if (se.getExchange().hasOut()) {
- oldType = se.getExchange().getOut().getHeader(headerName) != null ? se.getExchange().getOut().getHeader(headerName).getClass() : null;
- } else {
- oldType = se.getExchange().getIn().getHeader(headerName) != null ? se.getExchange().getIn().getHeader(headerName).getClass() : null;
- }
+ Class<?> oldType = se.getExchange().getMessage().getHeader(headerName) != null ? se.getExchange().getMessage().getHeader(headerName).getClass() : null;
setMessageHeaderOnBreakpoint(nodeId, headerName, value, oldType);
}
}
@@ -319,20 +297,11 @@ public final class BacklogDebugger extends ServiceSupport {
SuspendedExchange se = suspendedBreakpoints.get(nodeId);
if (se != null) {
logger.log("Breakpoint at node " + nodeId + " is updating message header on exchangeId: " + se.getExchange().getExchangeId() + " with header: " + headerName + " and value: " + value);
- if (se.getExchange().hasOut()) {
- if (type != null) {
- Object convertedValue = se.getExchange().getContext().getTypeConverter().mandatoryConvertTo(type, se.getExchange(), value);
- se.getExchange().getOut().setHeader(headerName, convertedValue);
- } else {
- se.getExchange().getOut().setHeader(headerName, value);
- }
+ if (type != null) {
+ Object convertedValue = se.getExchange().getContext().getTypeConverter().mandatoryConvertTo(type, se.getExchange(), value);
+ se.getExchange().getMessage().setHeader(headerName, convertedValue);
} else {
- if (type != null) {
- Object convertedValue = se.getExchange().getContext().getTypeConverter().mandatoryConvertTo(type, se.getExchange(), value);
- se.getExchange().getIn().setHeader(headerName, convertedValue);
- } else {
- se.getExchange().getIn().setHeader(headerName, value);
- }
+ se.getExchange().getMessage().setHeader(headerName, value);
}
}
}
@@ -349,11 +318,7 @@ public final class BacklogDebugger extends ServiceSupport {
SuspendedExchange se = suspendedBreakpoints.get(nodeId);
if (se != null) {
logger.log("Breakpoint at node " + nodeId + " is removing message header on exchangeId: " + se.getExchange().getExchangeId() + " with header: " + headerName);
- if (se.getExchange().hasOut()) {
- se.getExchange().getOut().removeHeader(headerName);
- } else {
- se.getExchange().getIn().removeHeader(headerName);
- }
+ se.getExchange().getMessage().removeHeader(headerName);
}
}
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java b/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
index 1f7a354..b5b4d24 100644
--- a/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
+++ b/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
@@ -121,6 +121,7 @@ public class ExpressionClause<T> implements Expression, Predicate {
/**
* A functional expression of an outbound message
*/
+ @Deprecated
public T outMessage(final Function<Message, Object> function) {
return delegate.expression(new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
@@ -212,6 +213,7 @@ public class ExpressionClause<T> implements Expression, Predicate {
/**
* A functional expression of an outbound message body
*/
+ @Deprecated
public T outBody(final Function<Object, Object> function) {
return delegate.expression(new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
@@ -223,6 +225,7 @@ public class ExpressionClause<T> implements Expression, Predicate {
/**
* A functional expression of an outbound message body and headers
*/
+ @Deprecated
public T outBody(final BiFunction<Object, Map<String, Object>, Object> function) {
return delegate.expression(new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
@@ -243,6 +246,7 @@ public class ExpressionClause<T> implements Expression, Predicate {
/**
* A functional expression of an outbound message body converted to the expected type
*/
+ @Deprecated
public <B> T outBody(Class<B> expectedType, final Function<B, Object> function) {
return delegate.expression(new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
@@ -254,6 +258,7 @@ public class ExpressionClause<T> implements Expression, Predicate {
/**
* A functional expression of an outbound message body converted to the expected type and headers
*/
+ @Deprecated
public <B> T outBody(Class<B> expectedType, final BiFunction<B, Map<String, Object>, Object> function) {
return delegate.expression(new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/TestSupport.java b/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
index 0dfe8bf..2ec15e3 100644
--- a/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
+++ b/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
@@ -148,6 +148,7 @@ public abstract class TestSupport extends Assert {
/**
* Asserts the Out message on the exchange contains the expected value
*/
+ @Deprecated
public static Object assertOutMessageHeader(Exchange exchange, String name, Object expected) {
return assertMessageHeader(exchange.getOut(), name, expected);
}
@@ -181,6 +182,7 @@ public abstract class TestSupport extends Assert {
* @param expected the expected value of the OUT message
* @throws InvalidPayloadException is thrown if the payload is not the expected class type
*/
+ @Deprecated
public static void assertOutMessageBodyEquals(Exchange exchange, Object expected) throws InvalidPayloadException {
assertNotNull("Should have a response exchange!", exchange);
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java
index f594fcf..bbfa215 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderTest.java
@@ -225,7 +225,7 @@ public class ExceptionBuilderTest extends ContextTestSupport {
} else if ("I am not allowed to access this".equals(s)) {
throw new IllegalAccessException();
}
- exchange.getOut().setBody("Hello World");
+ exchange.getMessage().setBody("Hello World");
}
}).to("mock:result");
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithHandledExceptionTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithHandledExceptionTest.java
index f1a1c7f..e36669f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithHandledExceptionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/ExceptionBuilderWithHandledExceptionTest.java
@@ -106,7 +106,7 @@ public class ExceptionBuilderWithHandledExceptionTest extends ContextTestSupport
// specialized IOException
throw new ConnectException("Forced for testing - cannot connect to remote server");
}
- exchange.getOut().setBody("Hello World");
+ exchange.getMessage().setBody("Hello World");
}
}).to("mock:result");
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPipelineTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPipelineTest.java
index 5152bca..a401aa9 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPipelineTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanPipelineTest.java
@@ -77,8 +77,8 @@ public class BeanPipelineTest extends ContextTestSupport {
String body = exchange.getIn().getBody(String.class);
assertEquals("Hello World", body);
assertEquals("Claus", exchange.getIn().getHeader("from"));
- exchange.getOut().setHeader("from", "James");
- exchange.getOut().setBody("Hello World from James");
+ exchange.getMessage().setHeader("from", "James");
+ exchange.getMessage().setBody("Hello World from James");
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/MyServiceProxyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/MyServiceProxyTest.java
index 869b896..14e6709 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/MyServiceProxyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/MyServiceProxyTest.java
@@ -112,7 +112,7 @@ public class MyServiceProxyTest extends ContextTestSupport {
response.id = request.id;
response.response = "Hi " + request.request;
// we need to setup the body as a response
- exchange.getOut().setBody(response);
+ exchange.getMessage().setBody(response);
}
});
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoToTypeTest.java b/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoToTypeTest.java
index a344f75..468d710 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoToTypeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/direct/DirectNoToTypeTest.java
@@ -39,7 +39,7 @@ public class DirectNoToTypeTest extends ContextTestSupport {
from("direct:in").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
- exchange.getOut().setBody(body + " World");
+ exchange.getMessage().setBody(body + " World");
}
});
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmHeaderFilterStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmHeaderFilterStrategyTest.java
index 6351054..7e9e6bc 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmHeaderFilterStrategyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/directvm/DirectVmHeaderFilterStrategyTest.java
@@ -48,7 +48,7 @@ public class DirectVmHeaderFilterStrategyTest extends ContextTestSupport {
});
assertNull(response.getException());
- assertNull(response.getOut().getHeader("Header2"));
+ assertNull(response.getMessage().getHeader("Header2"));
response = template.request("direct-vm:start.nofilter", exchange -> {
exchange.getIn().setBody("Hello World");
@@ -56,7 +56,7 @@ public class DirectVmHeaderFilterStrategyTest extends ContextTestSupport {
});
assertNull(response.getException());
- assertEquals("Value2", response.getOut().getHeader("Header2", String.class));
+ assertEquals("Value2", response.getMessage().getHeader("Header2", String.class));
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java
index d22cec9..49ee054 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java
@@ -141,7 +141,7 @@ public class FileConsumerFailureHandledTest extends ContextTestSupport {
} else if ("Dublin".equals(body)) {
throw new ValidationException(exchange, "Dublin have good beer");
}
- exchange.getOut().setBody("Hello " + body);
+ exchange.getMessage().setBody("Hello " + body);
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java
index 1353d2d..9507318 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/ToFileRouteTest.java
@@ -65,11 +65,11 @@ public class ToFileRouteTest extends ContextTestSupport {
// do some business logic here
// set the output to the file
- exchange.getOut().setBody(body);
+ exchange.getMessage().setBody(body);
// set the output filename using java code logic, notice that this is done by setting
// a special header property of the out exchange
- exchange.getOut().setHeader(Exchange.FILE_NAME, "report.txt");
+ exchange.getMessage().setHeader(Exchange.FILE_NAME, "report.txt");
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/log/DefaultExchangeFormatterTest.java b/core/camel-core/src/test/java/org/apache/camel/component/log/DefaultExchangeFormatterTest.java
index 5756b7b..b57f554 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/log/DefaultExchangeFormatterTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/log/DefaultExchangeFormatterTest.java
@@ -51,10 +51,6 @@ public class DefaultExchangeFormatterTest extends ContextTestSupport {
template.sendBody("log:org.apache.camel.TEST?showHeaders=true", "Hello World");
template.sendBody("log:org.apache.camel.TEST?showBodyType=true", "Hello World");
template.sendBody("log:org.apache.camel.TEST?showBody=true", "Hello World");
- template.sendBody("log:org.apache.camel.TEST?showOut=true", "Hello World");
- template.sendBody("log:org.apache.camel.TEST?showOut=true&showHeaders=true", "Hello World");
- template.sendBody("log:org.apache.camel.TEST?showOut=true&showBodyType=true", "Hello World");
- template.sendBody("log:org.apache.camel.TEST?showOut=true&showBody=true", "Hello World");
template.sendBody("log:org.apache.camel.TEST?showAll=true", "Hello World");
template.sendBody("log:org.apache.camel.TEST?showFuture=true", new MyFuture(new Callable<String>() {
@@ -71,8 +67,8 @@ public class DefaultExchangeFormatterTest extends ContextTestSupport {
@Test
public void testSendMessageToLogMultiOptions() throws Exception {
- template.sendBody("log:org.apache.camel.TEST?showHeaders=true&showOut=true", "Hello World");
- template.sendBody("log:org.apache.camel.TEST?showProperties=true&showHeaders=true&showOut=true", "Hello World");
+ template.sendBody("log:org.apache.camel.TEST?showHeaders=true", "Hello World");
+ template.sendBody("log:org.apache.camel.TEST?showProperties=true&showHeaders=true", "Hello World");
}
@Test
@@ -103,19 +99,6 @@ public class DefaultExchangeFormatterTest extends ContextTestSupport {
}
@Test
- public void testSendExchangeWithOut() throws Exception {
- Endpoint endpoint = resolveMandatoryEndpoint("log:org.apache.camel.TEST?showAll=true&multiline=true");
- Exchange exchange = endpoint.createExchange();
- exchange.getIn().setBody("Hello World");
- exchange.getOut().setBody(22);
-
- Producer producer = endpoint.createProducer();
- producer.start();
- producer.process(exchange);
- producer.stop();
- }
-
- @Test
public void testSendExchangeWithException() throws Exception {
Endpoint endpoint = resolveMandatoryEndpoint("log:org.apache.camel.TEST?showException=true");
Exchange exchange = endpoint.createExchange();
@@ -189,7 +172,6 @@ public class DefaultExchangeFormatterTest extends ContextTestSupport {
assertFalse(formatter.isShowHeaders());
assertTrue(formatter.isShowBodyType());
assertTrue(formatter.isShowBody());
- assertFalse(formatter.isShowOut());
assertFalse(formatter.isShowException());
assertFalse(formatter.isShowCaughtException());
assertFalse(formatter.isShowStackTrace());
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetContentTypeTest.java b/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetContentTypeTest.java
index 14425cf..ce96c88 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetContentTypeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetContentTypeTest.java
@@ -42,8 +42,8 @@ public class FromRestGetContentTypeTest extends ContextTestSupport {
});
assertNotNull(out);
- assertEquals("{ \"name\" : \"Donald\" }", out.getOut().getBody());
- assertEquals("application/json", out.getOut().getHeader(Exchange.CONTENT_TYPE));
+ assertEquals("{ \"name\" : \"Donald\" }", out.getMessage().getBody());
+ assertEquals("application/json", out.getMessage().getHeader(Exchange.CONTENT_TYPE));
}
@Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetCorsAllowCredentialsTest.java b/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetCorsAllowCredentialsTest.java
index cc417b3..ea87fe6 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetCorsAllowCredentialsTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetCorsAllowCredentialsTest.java
@@ -46,11 +46,11 @@ public class FromRestGetCorsAllowCredentialsTest extends ContextTestSupport {
});
assertNotNull(out);
- assertEquals(RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_ORIGIN, out.getOut().getHeader("Access-Control-Allow-Origin"));
- assertEquals(RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_METHODS, out.getOut().getHeader("Access-Control-Allow-Methods"));
- assertEquals(RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_HEADERS, out.getOut().getHeader("Access-Control-Allow-Headers"));
- assertEquals(RestConfiguration.CORS_ACCESS_CONTROL_MAX_AGE, out.getOut().getHeader("Access-Control-Max-Age"));
- assertEquals("true", out.getOut().getHeader("Access-Control-Allow-Credentials"));
+ assertEquals(RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_ORIGIN, out.getMessage().getHeader("Access-Control-Allow-Origin"));
+ assertEquals(RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_METHODS, out.getMessage().getHeader("Access-Control-Allow-Methods"));
+ assertEquals(RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_HEADERS, out.getMessage().getHeader("Access-Control-Allow-Headers"));
+ assertEquals(RestConfiguration.CORS_ACCESS_CONTROL_MAX_AGE, out.getMessage().getHeader("Access-Control-Max-Age"));
+ assertEquals("true", out.getMessage().getHeader("Access-Control-Allow-Credentials"));
assertMockEndpointsSatisfied();
}
@@ -69,11 +69,11 @@ public class FromRestGetCorsAllowCredentialsTest extends ContextTestSupport {
});
assertNotNull(out);
- assertEquals(RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_METHODS, out.getOut().getHeader("Access-Control-Allow-Methods"));
- assertEquals(RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_HEADERS, out.getOut().getHeader("Access-Control-Allow-Headers"));
- assertEquals(RestConfiguration.CORS_ACCESS_CONTROL_MAX_AGE, out.getOut().getHeader("Access-Control-Max-Age"));
- assertEquals("true", out.getOut().getHeader("Access-Control-Allow-Credentials"));
- assertEquals("mydomain", out.getOut().getHeader("Access-Control-Allow-Origin"));
+ assertEquals(RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_METHODS, out.getMessage().getHeader("Access-Control-Allow-Methods"));
+ assertEquals(RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_HEADERS, out.getMessage().getHeader("Access-Control-Allow-Headers"));
+ assertEquals(RestConfiguration.CORS_ACCESS_CONTROL_MAX_AGE, out.getMessage().getHeader("Access-Control-Max-Age"));
+ assertEquals("true", out.getMessage().getHeader("Access-Control-Allow-Credentials"));
+ assertEquals("mydomain", out.getMessage().getHeader("Access-Control-Allow-Origin"));
assertMockEndpointsSatisfied();
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetCorsCustomTest.java b/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetCorsCustomTest.java
index 0db362e..b7c32bf 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetCorsCustomTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetCorsCustomTest.java
@@ -46,10 +46,10 @@ public class FromRestGetCorsCustomTest extends ContextTestSupport {
});
assertNotNull(out);
- assertEquals(out.getOut().getHeader("Access-Control-Allow-Origin"), "myserver");
- assertEquals(out.getOut().getHeader("Access-Control-Allow-Methods"), RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_METHODS);
- assertEquals(out.getOut().getHeader("Access-Control-Allow-Headers"), RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_HEADERS);
- assertEquals(out.getOut().getHeader("Access-Control-Max-Age"), "180");
+ assertEquals(out.getMessage().getHeader("Access-Control-Allow-Origin"), "myserver");
+ assertEquals(out.getMessage().getHeader("Access-Control-Allow-Methods"), RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_METHODS);
+ assertEquals(out.getMessage().getHeader("Access-Control-Allow-Headers"), RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_HEADERS);
+ assertEquals(out.getMessage().getHeader("Access-Control-Max-Age"), "180");
assertMockEndpointsSatisfied();
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetCorsTest.java b/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetCorsTest.java
index 558de2a..02b46a7 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetCorsTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetCorsTest.java
@@ -46,10 +46,10 @@ public class FromRestGetCorsTest extends ContextTestSupport {
});
assertNotNull(out);
- assertEquals(out.getOut().getHeader("Access-Control-Allow-Origin"), RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_ORIGIN);
- assertEquals(out.getOut().getHeader("Access-Control-Allow-Methods"), RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_METHODS);
- assertEquals(out.getOut().getHeader("Access-Control-Allow-Headers"), RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_HEADERS);
- assertEquals(out.getOut().getHeader("Access-Control-Max-Age"), RestConfiguration.CORS_ACCESS_CONTROL_MAX_AGE);
+ assertEquals(out.getMessage().getHeader("Access-Control-Allow-Origin"), RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_ORIGIN);
+ assertEquals(out.getMessage().getHeader("Access-Control-Allow-Methods"), RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_METHODS);
+ assertEquals(out.getMessage().getHeader("Access-Control-Allow-Headers"), RestConfiguration.CORS_ACCESS_CONTROL_ALLOW_HEADERS);
+ assertEquals(out.getMessage().getHeader("Access-Control-Max-Age"), RestConfiguration.CORS_ACCESS_CONTROL_MAX_AGE);
assertMockEndpointsSatisfied();
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetHttpErrorCodeTest.java b/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetHttpErrorCodeTest.java
index db2fd9c..9bbc602 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetHttpErrorCodeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetHttpErrorCodeTest.java
@@ -44,8 +44,8 @@ public class FromRestGetHttpErrorCodeTest extends ContextTestSupport {
}
});
assertNotNull(reply);
- assertEquals(404, reply.getOut().getHeader(Exchange.HTTP_RESPONSE_CODE));
- assertEquals("text/plain", reply.getOut().getHeader(Exchange.CONTENT_TYPE));
+ assertEquals(404, reply.getMessage().getHeader(Exchange.HTTP_RESPONSE_CODE));
+ assertEquals("text/plain", reply.getMessage().getHeader(Exchange.CONTENT_TYPE));
}
@Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/rest/RestProducerBindingProcessorTest.java b/core/camel-core/src/test/java/org/apache/camel/component/rest/RestProducerBindingProcessorTest.java
index ea7a9a1..33b3c8a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/rest/RestProducerBindingProcessorTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/rest/RestProducerBindingProcessorTest.java
@@ -87,7 +87,7 @@ public class RestProducerBindingProcessorTest {
that.done(false);
- Assert.assertSame(response, exchange.getOut().getBody());
+ Assert.assertSame(response, exchange.getMessage().getBody());
}
@Test
@@ -121,7 +121,7 @@ public class RestProducerBindingProcessorTest {
that.done(false);
- Assert.assertSame(response, exchange.getOut().getBody());
+ Assert.assertSame(response, exchange.getMessage().getBody());
}
@Test
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/seda/SedaAsyncProducerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/seda/SedaAsyncProducerTest.java
index 8ecbeff..ea73cd5 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/seda/SedaAsyncProducerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/seda/SedaAsyncProducerTest.java
@@ -76,7 +76,7 @@ public class SedaAsyncProducerTest extends ContextTestSupport {
assertEquals("Send should occur before processor", "processsend", route);
- String response = exchange.getOut().getBody(String.class);
+ String response = exchange.getMessage().getBody(String.class);
assertEquals("Bye World", response);
}
@@ -92,7 +92,7 @@ public class SedaAsyncProducerTest extends ContextTestSupport {
public void process(Exchange exchange) throws Exception {
route = route + "process";
// set the response
- exchange.getOut().setBody("Bye World");
+ exchange.getMessage().setBody("Bye World");
}
})
.to("mock:result");
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/vm/VmWaitForTaskIfReplyExpectedTest.java b/core/camel-core/src/test/java/org/apache/camel/component/vm/VmWaitForTaskIfReplyExpectedTest.java
index 65ff2e4..0d6441d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/vm/VmWaitForTaskIfReplyExpectedTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/vm/VmWaitForTaskIfReplyExpectedTest.java
@@ -44,7 +44,7 @@ public class VmWaitForTaskIfReplyExpectedTest extends AbstractVmTestSupport {
exchange.setPattern(ExchangePattern.InOnly);
}
});
- // we do not expecy a reply and thus do no wait so we just get our own input back
+ // we do not expect a reply and thus do no wait so we just get our own input back
assertEquals("Hello World", out.getIn().getBody());
assertNull(out.getOut().getBody());
diff --git a/core/camel-core/src/test/java/org/apache/camel/converter/CamelConverterTest.java b/core/camel-core/src/test/java/org/apache/camel/converter/CamelConverterTest.java
index 77fd21e..b2983e3 100644
--- a/core/camel-core/src/test/java/org/apache/camel/converter/CamelConverterTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/converter/CamelConverterTest.java
@@ -43,7 +43,7 @@ public class CamelConverterTest extends ContextTestSupport {
pro.process(exchange);
- assertEquals("bar", exchange.getOut().getBody());
+ assertEquals("bar", exchange.getMessage().getBody());
}
@Test
@@ -58,6 +58,6 @@ public class CamelConverterTest extends ContextTestSupport {
pro.process(exchange);
- assertEquals(true, exchange.getOut().getBody());
+ assertEquals(true, exchange.getMessage().getBody());
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateTest.java
index 4a25364..0c113c6 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultConsumerTemplateTest.java
@@ -320,7 +320,7 @@ public class DefaultConsumerTemplateTest extends ContextTestSupport {
@Test
public void testReceiveOut() throws Exception {
Exchange exchange = new DefaultExchange(context);
- exchange.getOut().setBody("Bye World");
+ exchange.getMessage().setBody("Bye World");
template.send("seda:foo", exchange);
String out = consumer.receiveBody("seda:foo", String.class);
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateAsyncTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateAsyncTest.java
index 8002bbe..6e456f7 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateAsyncTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateAsyncTest.java
@@ -297,7 +297,7 @@ public class DefaultProducerTemplateAsyncTest extends ContextTestSupport {
template.asyncCallback("direct:echo", exchange, new SynchronizationAdapter() {
@Override
public void onDone(Exchange exchange) {
- assertEquals("HelloHello", exchange.getOut().getBody());
+ assertEquals("HelloHello", exchange.getMessage().getBody());
ORDER.addAndGet(2);
latch.countDown();
}
@@ -347,7 +347,7 @@ public class DefaultProducerTemplateAsyncTest extends ContextTestSupport {
Future<Exchange> future = template.asyncCallback("direct:echo", exchange, new SynchronizationAdapter() {
@Override
public void onDone(Exchange exchange) {
- assertEquals("HelloHello", exchange.getOut().getBody());
+ assertEquals("HelloHello", exchange.getMessage().getBody());
ORDER.addAndGet(2);
}
});
@@ -358,7 +358,7 @@ public class DefaultProducerTemplateAsyncTest extends ContextTestSupport {
assertEquals(7, ORDER.get());
assertNotNull(reply);
- assertEquals("HelloHello", reply.getOut().getBody());
+ assertEquals("HelloHello", reply.getMessage().getBody());
}
@Test
@@ -395,7 +395,7 @@ public class DefaultProducerTemplateAsyncTest extends ContextTestSupport {
template.asyncCallbackRequestBody("direct:echo", "Hello", new SynchronizationAdapter() {
@Override
public void onDone(Exchange exchange) {
- assertEquals("HelloHello", exchange.getOut().getBody());
+ assertEquals("HelloHello", exchange.getMessage().getBody());
ORDER.addAndGet(2);
latch.countDown();
}
@@ -439,7 +439,7 @@ public class DefaultProducerTemplateAsyncTest extends ContextTestSupport {
Future<Object> future = template.asyncCallbackRequestBody("direct:echo", "Hello", new SynchronizationAdapter() {
@Override
public void onDone(Exchange exchange) {
- assertEquals("HelloHello", exchange.getOut().getBody());
+ assertEquals("HelloHello", exchange.getMessage().getBody());
ORDER.addAndGet(2);
}
});
@@ -495,7 +495,7 @@ public class DefaultProducerTemplateAsyncTest extends ContextTestSupport {
}, new SynchronizationAdapter() {
@Override
public void onDone(Exchange exchange) {
- assertEquals("HelloHello", exchange.getOut().getBody());
+ assertEquals("HelloHello", exchange.getMessage().getBody());
ORDER.addAndGet(2);
latch.countDown();
}
@@ -522,7 +522,7 @@ public class DefaultProducerTemplateAsyncTest extends ContextTestSupport {
}, new SynchronizationAdapter() {
@Override
public void onDone(Exchange exchange) {
- assertEquals("ByeBye", exchange.getOut().getBody());
+ assertEquals("ByeBye", exchange.getMessage().getBody());
ORDER.addAndGet(2);
latch.countDown();
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/PojoProduceInterceptEndpointTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/PojoProduceInterceptEndpointTest.java
index b244e9c..cea9824 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/PojoProduceInterceptEndpointTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/PojoProduceInterceptEndpointTest.java
@@ -103,7 +103,7 @@ public class PojoProduceInterceptEndpointTest extends Assert {
Exchange exchange = producer.getEndpoint().createExchange();
exchange.getIn().setBody(body);
producer.process(exchange);
- return exchange.hasOut() ? exchange.getOut().getBody() : exchange.getIn().getBody();
+ return exchange.getMessage().getBody();
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/transformer/TransformerRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/transformer/TransformerRouteTest.java
index 174145f..16d5fc0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/transformer/TransformerRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/transformer/TransformerRouteTest.java
@@ -84,7 +84,7 @@ public class TransformerRouteTest extends ContextTestSupport {
if (answerEx.getException() != null) {
throw answerEx.getException();
}
- assertEquals(AOrderResponse.class, answerEx.getOut().getBody().getClass());
+ assertEquals(AOrderResponse.class, answerEx.getMessage().getBody().getClass());
assertMockEndpointsSatisfied();
}
@@ -106,7 +106,7 @@ public class TransformerRouteTest extends ContextTestSupport {
if (answerEx.getException() != null) {
throw answerEx.getException();
}
- assertEquals("{name:XOrderResponse}", answerEx.getOut().getBody(String.class));
+ assertEquals("{name:XOrderResponse}", answerEx.getMessage().getBody(String.class));
assertMockEndpointsSatisfied();
}
@@ -128,7 +128,7 @@ public class TransformerRouteTest extends ContextTestSupport {
if (answerEx.getException() != null) {
throw answerEx.getException();
}
- assertEquals("<XOrderResponse/>", answerEx.getOut().getBody(String.class));
+ assertEquals("<XOrderResponse/>", answerEx.getMessage().getBody(String.class));
assertMockEndpointsSatisfied();
}
@@ -150,7 +150,7 @@ public class TransformerRouteTest extends ContextTestSupport {
if (answerEx.getException() != null) {
throw answerEx.getException();
}
- assertEquals("name=XOrderResponse", answerEx.getOut().getBody(String.class));
+ assertEquals("name=XOrderResponse", answerEx.getMessage().getBody(String.class));
assertMockEndpointsSatisfied();
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorRouteTest.java
index cc2f7a2..327e825 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorRouteTest.java
@@ -66,7 +66,7 @@ public class ValidatorRouteTest extends ContextTestSupport {
if (answerEx.getException() != null) {
throw answerEx.getException();
}
- assertEquals("<XOrderResponse/>", answerEx.getOut().getBody(String.class));
+ assertEquals("<XOrderResponse/>", answerEx.getMessage().getBody(String.class));
assertEquals(MyXmlEndpoint.class, answerEx.getProperty(VALIDATOR_INVOKED));
}
@@ -78,7 +78,7 @@ public class ValidatorRouteTest extends ContextTestSupport {
if (answerEx.getException() != null) {
throw answerEx.getException();
}
- assertEquals("name=XOrderResponse", answerEx.getOut().getBody(String.class));
+ assertEquals("name=XOrderResponse", answerEx.getMessage().getBody(String.class));
assertEquals(OtherXOrderResponseValidator.class, answerEx.getProperty(VALIDATOR_INVOKED));
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/DavidSiefertTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/DavidSiefertTest.java
index 7fafe62..71ee888 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/DavidSiefertTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/DavidSiefertTest.java
@@ -63,7 +63,7 @@ public class DavidSiefertTest extends ContextTestSupport {
public void process(Exchange exchange) throws Exception {
exchange.getIn().getBody(String.class);
- Message output = exchange.getOut();
+ Message output = exchange.getMessage();
output.setHeader("sample.name", "myValue");
output.setBody(expectedBody);
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/DoCatchCaughExceptionIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/DoCatchCaughExceptionIssueTest.java
index f76a8fe..5bc2287 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/DoCatchCaughExceptionIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/DoCatchCaughExceptionIssueTest.java
@@ -48,7 +48,7 @@ public class DoCatchCaughExceptionIssueTest extends ContextTestSupport {
public void process(Exchange exchange) throws Exception {
Exception error = exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class);
assertEquals("Forced by me", error.getMessage());
- exchange.getOut().setBody(error.getMessage() + " but I fixed it");
+ exchange.getMessage().setBody(error.getMessage() + " but I fixed it");
}
})
.end();
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/SetHeaderInDoCatchIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/SetHeaderInDoCatchIssueTest.java
index 327a1f8..49760db 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/SetHeaderInDoCatchIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/SetHeaderInDoCatchIssueTest.java
@@ -45,7 +45,7 @@ public class SetHeaderInDoCatchIssueTest extends ContextTestSupport {
}
});
- assertEquals("TimeOut", exchange.getOut().getHeader("Status"));
+ assertEquals("TimeOut", exchange.getMessage().getHeader("Status"));
}
@Test
@@ -56,7 +56,7 @@ public class SetHeaderInDoCatchIssueTest extends ContextTestSupport {
}
});
- assertEquals("ExceptionGeneral", exchange.getOut().getHeader("Status"));
+ assertEquals("ExceptionGeneral", exchange.getMessage().getHeader("Status"));
}
protected JndiRegistry createRegistry() throws Exception {
diff --git a/core/camel-core/src/test/java/org/apache/camel/language/FileLanguageExtSingleTest.java b/core/camel-core/src/test/java/org/apache/camel/language/FileLanguageExtSingleTest.java
index 07c3ba1..9e08f3b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/language/FileLanguageExtSingleTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/language/FileLanguageExtSingleTest.java
@@ -68,7 +68,7 @@ public class FileLanguageExtSingleTest extends LanguageTestSupport {
answer.getIn().setHeader("birthday", cal.getTime());
cal.set(2008, Calendar.AUGUST, 8);
- answer.getOut().setHeader("special", cal.getTime());
+ answer.getMessage().setHeader("special", cal.getTime());
return answer;
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/BodyOutAggregatingStrategy.java b/core/camel-core/src/test/java/org/apache/camel/processor/BodyOutAggregatingStrategy.java
index 93f9cfe..42962c2 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/BodyOutAggregatingStrategy.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/BodyOutAggregatingStrategy.java
@@ -25,7 +25,7 @@ public class BodyOutAggregatingStrategy implements AggregationStrategy {
if (oldExchange != null) {
String oldBody = oldExchange.getIn().getBody(String.class);
String newBody = newExchange.getIn().getBody(String.class);
- newExchange.getOut().setBody(oldBody + "+" + newBody);
+ newExchange.getMessage().setBody(oldBody + "+" + newBody);
}
return newExchange;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/FailOverLoadBalancerSetFaultTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/FailOverLoadBalancerSetFaultTest.java
index 621d2fd..6ec1fd5 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/FailOverLoadBalancerSetFaultTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/FailOverLoadBalancerSetFaultTest.java
@@ -55,7 +55,7 @@ public class FailOverLoadBalancerSetFaultTest extends ContextTestSupport {
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
// mutate the message
- exchange.getOut().setBody("Hi Camel");
+ exchange.getMessage().setBody("Hi Camel");
exchange.setException(new IOException("Forced exception for test"));
}
});
@@ -64,7 +64,7 @@ public class FailOverLoadBalancerSetFaultTest extends ContextTestSupport {
.to("mock:failover2")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
- exchange.getOut().setBody("Bye Camel");
+ exchange.getMessage().setBody("Bye Camel");
}
});
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/MDCResetTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/MDCResetTest.java
index f51ca79..c34ae62 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/MDCResetTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/MDCResetTest.java
@@ -72,7 +72,7 @@ public class MDCResetTest extends ContextTestSupport {
String body = exchange.getIn().getBody(String.class);
// use a producer template to send to b, instead of in the route DSL
body = template.requestBody("direct:b", body, String.class);
- exchange.getOut().setBody(body);
+ exchange.getMessage().setBody(body);
}
})
.process(new Processor() {
@@ -89,7 +89,7 @@ public class MDCResetTest extends ContextTestSupport {
assertEquals("route-b", MDC.get("camel.routeId"));
assertEquals(exchange.getExchangeId(), MDC.get("camel.exchangeId"));
- exchange.getOut().setBody("Good Afternoon World");
+ exchange.getMessage().setBody("Good Afternoon World");
}
})
.to("log:bar");
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingTest.java
index c5788a5..0f82bd4 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingTest.java
@@ -82,7 +82,7 @@ public class MultiCastParallelAndStreamCachingTest extends ContextTestSupport {
if (body instanceof InputStream) {
ByteArrayOutputStream output = new ByteArrayOutputStream();
IOHelper.copy((InputStream) body, output);
- exchange.getOut().setBody(output.toByteArray());
+ exchange.getMessage().setBody(output.toByteArray());
} else if (body instanceof Reader) {
Reader reader = (Reader) body;
StringBuilder sb = new StringBuilder();
@@ -90,13 +90,13 @@ public class MultiCastParallelAndStreamCachingTest extends ContextTestSupport {
sb.append((char) i);
}
reader.close();
- exchange.getOut().setBody(sb.toString());
+ exchange.getMessage().setBody(sb.toString());
} else if (body instanceof StreamSource) {
StreamSource ss = (StreamSource) body;
if (ss.getInputStream() != null) {
ByteArrayOutputStream output = new ByteArrayOutputStream();
IOHelper.copy(ss.getInputStream(), output);
- exchange.getOut().setBody(output.toByteArray());
+ exchange.getMessage().setBody(output.toByteArray());
} else if (ss.getReader() != null) {
Reader reader = ss.getReader();
StringBuilder sb = new StringBuilder();
@@ -104,7 +104,7 @@ public class MultiCastParallelAndStreamCachingTest extends ContextTestSupport {
sb.append((char) i);
}
reader.close();
- exchange.getOut().setBody(sb.toString());
+ exchange.getMessage().setBody(sb.toString());
} else {
throw new RuntimeException("StreamSource without InputStream and without Reader not supported");
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastStreamCachingInSubRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastStreamCachingInSubRouteTest.java
index 5c5626c..c01c743 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastStreamCachingInSubRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastStreamCachingInSubRouteTest.java
@@ -91,7 +91,7 @@ public class MultiCastStreamCachingInSubRouteTest extends ContextTestSupport {
cos.write(s.getBytes(Charset.forName("UTF-8")));
cos.close();
InputStream is = (InputStream) cos.newStreamCache();
- exchange.getOut().setBody(is);
+ exchange.getMessage().setBody(is);
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/MyNormalizer.java b/core/camel-core/src/test/java/org/apache/camel/processor/MyNormalizer.java
index 4c73f82..ade4c0f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/MyNormalizer.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/MyNormalizer.java
@@ -22,11 +22,11 @@ import org.apache.camel.language.xpath.XPath;
// START SNIPPET: example
public class MyNormalizer {
public void employeeToPerson(Exchange exchange, @XPath("/employee/name/text()") String name) {
- exchange.getOut().setBody(createPerson(name));
+ exchange.getMessage().setBody(createPerson(name));
}
public void customerToPerson(Exchange exchange, @XPath("/customer/@name") String name) {
- exchange.getOut().setBody(createPerson(name));
+ exchange.getMessage().setBody(createPerson(name));
}
private String createPerson(String name) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/NewProcessorAndServiceTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/NewProcessorAndServiceTest.java
index 3c430df..dab55c0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/NewProcessorAndServiceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/NewProcessorAndServiceTest.java
@@ -50,7 +50,7 @@ public class NewProcessorAndServiceTest extends ContextTestSupport {
private boolean started;
public void process(Exchange exchange) throws Exception {
- exchange.getOut().setBody("Bye World");
+ exchange.getMessage().setBody("Bye World");
}
public void start() {
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/PipelineConcurrentTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/PipelineConcurrentTest.java
index 8605d6b..1074a68 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/PipelineConcurrentTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/PipelineConcurrentTest.java
@@ -78,7 +78,7 @@ public class PipelineConcurrentTest extends ContextTestSupport {
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
- exchange.getOut().setBody("Bye " + body);
+ exchange.getMessage().setBody("Bye " + body);
}
});
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/PipelineMEPTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/PipelineMEPTest.java
index 546cc58..b62e68a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/PipelineMEPTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/PipelineMEPTest.java
@@ -89,7 +89,7 @@ public class PipelineMEPTest extends ContextTestSupport {
// however the exchange will carry body IN and OUT when the route completes, as
// we operate on the original exchange in this processor
// (= we are the first node in the route after the from consumer)
- exchange.getOut().setBody(number);
+ exchange.getMessage().setBody(number);
}
};
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java
index 14e1030..a9c34f0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java
@@ -60,7 +60,7 @@ public class PipelineTest extends ContextTestSupport {
resultEndpoint.assertIsSatisfied();
- assertEquals("Result body", 4, results.getOut().getBody());
+ assertEquals("Result body", 4, results.getMessage().getBody());
}
@@ -72,8 +72,8 @@ public class PipelineTest extends ContextTestSupport {
}
});
- assertEquals("Hello World", exchange.getOut().getBody());
- assertEquals(3, exchange.getOut().getHeader("copy-counter"));
+ assertEquals("Hello World", exchange.getMessage().getBody());
+ assertEquals(3, exchange.getMessage().getHeader("copy-counter"));
}
@Test
@@ -84,8 +84,8 @@ public class PipelineTest extends ContextTestSupport {
}
});
- assertEquals("headerValue", exchange.getOut().getHeader("header"));
- assertEquals(3, exchange.getOut().getHeader("copy-counter"));
+ assertEquals("headerValue", exchange.getMessage().getHeader("header"));
+ assertEquals(3, exchange.getMessage().getHeader("copy-counter"));
}
@Override
@@ -103,7 +103,7 @@ public class PipelineTest extends ContextTestSupport {
number = 0;
}
number = number + 1;
- exchange.getOut().setBody(number);
+ exchange.getMessage().setBody(number);
}
};
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SimpleProcessorTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SimpleProcessorTest.java
index 862a960..a367fdf 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/SimpleProcessorTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/SimpleProcessorTest.java
@@ -37,7 +37,7 @@ public class SimpleProcessorTest extends ContextTestSupport {
public void configure() throws Exception {
from("direct:start").process(new Processor() {
public void process(Exchange exchange) throws Exception {
- exchange.getOut().setBody("Bye World");
+ exchange.getMessage().setBody("Bye World");
}
});
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SimpleProcessorTraceableTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SimpleProcessorTraceableTest.java
index 9880823..f88140f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/SimpleProcessorTraceableTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/SimpleProcessorTraceableTest.java
@@ -46,7 +46,7 @@ public class SimpleProcessorTraceableTest extends ContextTestSupport {
@Override
public void process(Exchange exchange) throws Exception {
- exchange.getOut().setBody("Bye World");
+ exchange.getMessage().setBody("Bye World");
}
@Override
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SimulatorTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SimulatorTest.java
index 34d90c3..7c1fb81 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/SimulatorTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/SimulatorTest.java
@@ -58,7 +58,7 @@ public class SimulatorTest extends ContextTestSupport {
assertNotNull("Should receive a response!", response);
- String text = response.getOut().getMandatoryBody(String.class);
+ String text = response.getMessage().getMandatoryBody(String.class);
assertStringContains(text, containedText);
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamCachingInSubRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamCachingInSubRouteTest.java
index f9a3eaf..f3461ed 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamCachingInSubRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamCachingInSubRouteTest.java
@@ -100,7 +100,7 @@ public class SplitterStreamCachingInSubRouteTest extends ContextTestSupport {
cos.close();
InputStream is = (InputStream) cos.newStreamCache();
- exchange.getOut().setBody(is);
+ exchange.getMessage().setBody(is);
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java
index d177c77..73fb81f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java
@@ -85,7 +85,7 @@ public class SplitterTest extends ContextTestSupport {
});
assertMockEndpointsSatisfied();
- Message out = result.getOut();
+ Message out = result.getMessage();
assertEquals("Roman", out.getBody());
assertMessageHeader(out, "foo", "bar");
assertProperty(result, Exchange.SPLIT_INDEX, 4);
@@ -150,7 +150,7 @@ public class SplitterTest extends ContextTestSupport {
});
assertMockEndpointsSatisfied();
- Message out = result.getOut();
+ Message out = result.getMessage();
assertMessageHeader(out, "foo", "bar");
assertEquals((Integer) 5, result.getProperty("aggregated", Integer.class));
@@ -171,7 +171,7 @@ public class SplitterTest extends ContextTestSupport {
});
assertMockEndpointsSatisfied();
- Message out = result.getOut();
+ Message out = result.getMessage();
assertMessageHeader(out, "foo", "bar");
assertEquals((Integer) 5, result.getProperty("aggregated", Integer.class));
@@ -192,7 +192,7 @@ public class SplitterTest extends ContextTestSupport {
});
assertMockEndpointsSatisfied();
- Message out = result.getOut();
+ Message out = result.getMessage();
assertMessageHeader(out, "foo", "bar");
// we aggregate parallel and therefore its not thread-safe when setting values
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateLostGroupIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateLostGroupIssueTest.java
index 92260b9..8e2de8c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateLostGroupIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateLostGroupIssueTest.java
@@ -51,8 +51,8 @@ public class AggregateLostGroupIssueTest extends ContextTestSupport {
from("timer://foo?period=10&delay=0").startupOrder(2)
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
- exchange.getOut().setBody(messageIndex++);
- exchange.getOut().setHeader("aggregateGroup", "group1");
+ exchange.getMessage().setBody(messageIndex++);
+ exchange.getMessage().setHeader("aggregateGroup", "group1");
}
}).to("direct:aggregator");
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorExceptionHandleTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorExceptionHandleTest.java
index 4c40821..fbecabf 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorExceptionHandleTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorExceptionHandleTest.java
@@ -72,7 +72,7 @@ public class AggregatorExceptionHandleTest extends ContextTestSupport {
if ("Damn".equals(body)) {
throw new IllegalArgumentException("Damn");
}
- exchange.getOut().setBody("Bye World");
+ exchange.getMessage().setBody("Bye World");
}
})
.to("mock:result");
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientList3Test.java b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientList3Test.java
index 68d3945..574d103 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientList3Test.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientList3Test.java
@@ -62,7 +62,7 @@ public class AsyncEndpointRecipientList3Test extends ContextTestSupport {
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
afterThreadName = Thread.currentThread().getName();
- exchange.getOut().setBody("Bye Camel");
+ exchange.getMessage().setBody("Bye Camel");
}
})
.to("log:after")
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientList4Test.java b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientList4Test.java
index 26607a1..df4a41c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientList4Test.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientList4Test.java
@@ -62,7 +62,7 @@ public class AsyncEndpointRecipientList4Test extends ContextTestSupport {
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
afterThreadId = Thread.currentThread().getId();
- exchange.getOut().setBody("Bye Camel");
+ exchange.getMessage().setBody("Bye Camel");
}
})
.to("log:after")
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean3Test.java b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean3Test.java
index ef46d5a..54811c1 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean3Test.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean3Test.java
@@ -69,7 +69,7 @@ public class AsyncEndpointRecipientListBean3Test extends ContextTestSupport {
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
afterThreadName = Thread.currentThread().getName();
- exchange.getOut().setBody("Bye Camel");
+ exchange.getMessage().setBody("Bye Camel");
}
})
.to("log:after")
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean4Test.java b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean4Test.java
index 4ec1e4c..72b39a6 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean4Test.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean4Test.java
@@ -69,7 +69,7 @@ public class AsyncEndpointRecipientListBean4Test extends ContextTestSupport {
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
afterThreadName = Thread.currentThread().getName();
- exchange.getOut().setBody("Bye Camel");
+ exchange.getMessage().setBody("Bye Camel");
}
})
.to("log:after")
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListParallel3Test.java b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListParallel3Test.java
index 7e96d8f..04a4867 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListParallel3Test.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListParallel3Test.java
@@ -62,7 +62,7 @@ public class AsyncEndpointRecipientListParallel3Test extends ContextTestSupport
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
afterThreadName = Thread.currentThread().getName();
- exchange.getOut().setBody("Bye Camel");
+ exchange.getMessage().setBody("Bye Camel");
}
})
.to("log:after")
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListParallel4Test.java b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListParallel4Test.java
index 2a0d301..ab683b9 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListParallel4Test.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListParallel4Test.java
@@ -62,7 +62,7 @@ public class AsyncEndpointRecipientListParallel4Test extends ContextTestSupport
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
afterThreadName = Thread.currentThread().getName();
- exchange.getOut().setBody("Bye Camel");
+ exchange.getMessage().setBody("Bye Camel");
}
})
.to("log:after")
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlip3Test.java b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlip3Test.java
index 1f894c8..e7cfffa 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlip3Test.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlip3Test.java
@@ -64,7 +64,7 @@ public class AsyncEndpointRoutingSlip3Test extends ContextTestSupport {
afterThreadName = Thread.currentThread().getName();
String body = exchange.getIn().getBody(String.class);
assertEquals("Hi World", body);
- exchange.getOut().setBody("Bye Camel");
+ exchange.getMessage().setBody("Bye Camel");
}
})
.to("log:after")
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean3Test.java b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean3Test.java
index 5eae71f..b4813c5 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean3Test.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBean3Test.java
@@ -73,7 +73,7 @@ public class AsyncEndpointRoutingSlipBean3Test extends ContextTestSupport {
afterThreadName = Thread.currentThread().getName();
String body = exchange.getIn().getBody(String.class);
assertEquals("Hi World", body);
- exchange.getOut().setBody("Bye Camel");
+ exchange.getMessage().setBody("Bye Camel");
}
})
.to("log:after")
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBeanNonBlockingTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBeanNonBlockingTest.java
index cf34d94..28b319b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBeanNonBlockingTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlipBeanNonBlockingTest.java
@@ -57,7 +57,7 @@ public class AsyncEndpointRoutingSlipBeanNonBlockingTest extends ContextTestSupp
try {
Future<Boolean> asyncFuture = executorService.submit(new ExchangeSubmitter(startEndpoint, asyncSender));
Assert.assertFalse(asyncFuture.get(5, TimeUnit.SECONDS));
- innerExchange.getOut().setBody("Bye Camel");
+ innerExchange.getMessage().setBody("Bye Camel");
innerCallback.done(false);
assertMockEndpointsSatisfied();
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/async/MyAsyncProducer.java b/core/camel-core/src/test/java/org/apache/camel/processor/async/MyAsyncProducer.java
index 7d7fc46..84d631b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/async/MyAsyncProducer.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/async/MyAsyncProducer.java
@@ -56,9 +56,7 @@ public class MyAsyncProducer extends DefaultAsyncProducer {
} else {
String reply = getEndpoint().getReply();
reply = getEndpoint().isAppend() ? exchange.getIn().getBody() + " " + reply : reply;
- exchange.getOut().setBody(reply);
- // propagate headers
- exchange.getOut().setHeaders(exchange.getIn().getHeaders());
+ exchange.getMessage().setBody(reply);
LOG.info("Setting reply " + reply);
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherRefTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherRefTest.java
index d283898..43b1119 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherRefTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherRefTest.java
@@ -42,7 +42,7 @@ public class EnricherRefTest extends ContextTestSupport {
public void testEnrichRef() throws Exception {
cool.whenAnyExchangeReceived(new Processor() {
public void process(Exchange exchange) throws Exception {
- exchange.getOut().setBody("Bye World");
+ exchange.getMessage().setBody("Bye World");
}
});
cool.expectedBodiesReceived("Hello World");
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java
index d6ea69b..77f9401 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java
@@ -118,7 +118,7 @@ public class PollEnricherTest extends ContextTestSupport {
});
assertEquals("bar", exchange.getIn().getHeader("foo"));
assertEquals("test:blah", exchange.getIn().getBody());
- assertEquals("seda://foo4", exchange.getOut().getHeader(Exchange.TO_ENDPOINT));
+ assertEquals("seda://foo4", exchange.getMessage().getHeader(Exchange.TO_ENDPOINT));
assertNull(exchange.getException());
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java
index a969348..233ce40 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java
@@ -96,7 +96,7 @@ public class CustomExceptionPolicyStrategyTest extends ContextTestSupport {
if ("Hello Camel".equals(s)) {
throw new CamelExchangeException("Forced for testing", exchange);
}
- exchange.getOut().setBody("Hello World");
+ exchange.getMessage().setBody("Hello World");
}
}).to("mock:result");
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingOnlyWhenTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingOnlyWhenTest.java
index 0dee651..25a5aee 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingOnlyWhenTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingOnlyWhenTest.java
@@ -81,7 +81,7 @@ public class DefaultExceptionPolicyStrategyUsingOnlyWhenTest extends ContextTest
if ("Hello Camel".equals(s)) {
throw new MyUserException("Forced for testing");
}
- exchange.getOut().setBody("Hello World");
+ exchange.getMessage().setBody("Hello World");
}
}).to("mock:result");
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java
index c60407f..755847d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java
@@ -101,7 +101,7 @@ public class DefaultExceptionPolicyStrategyUsingWhenTest extends ContextTestSupp
if ("Hello Camel".equals(s)) {
throw new MyUserException("Forced for testing");
}
- exchange.getOut().setBody("Hello World");
+ exchange.getMessage().setBody("Hello World");
}
}).to("mock:result");
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalMessageTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalMessageTest.java
index 4ae0b5a..894e6fd 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalMessageTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalMessageTest.java
@@ -90,7 +90,7 @@ public class OnExceptionUseOriginalMessageTest extends ContextTestSupport {
exchange.getIn().setBody(HELLO_WORLD);
}
// set the out message
- exchange.getOut().setBody("Error body");
+ exchange.getMessage().setBody("Error body");
throw new IllegalArgumentException("Get a wrong message");
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipPOJOTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipPOJOTest.java
index 4f388fc..de9be27 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipPOJOTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipPOJOTest.java
@@ -46,7 +46,7 @@ public class RoutingSlipPOJOTest extends ContextTestSupport {
from("direct:b").process(new Processor() {
public void process(Exchange exchange) throws Exception {
- exchange.getOut().setBody(exchange.getIn().getBody() + " is processed!");
+ exchange.getMessage().setBody(exchange.getIn().getBody() + " is processed!");
}
});
}
diff --git a/core/camel-management-impl/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java b/core/camel-management-impl/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java
index 3454cf9..e64359f 100644
--- a/core/camel-management-impl/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java
+++ b/core/camel-management-impl/src/main/java/org/apache/camel/management/mbean/ManagedBrowsableEndpoint.java
@@ -75,12 +75,7 @@ public class ManagedBrowsableEndpoint extends ManagedEndpoint implements Managed
}
// must use java type with JMX such as java.lang.String
- String body;
- if (exchange.hasOut()) {
- body = exchange.getOut().getBody(String.class);
- } else {
- body = exchange.getIn().getBody(String.class);
- }
+ String body = exchange.getMessage().getBody(String.class);
return body;
}
@@ -97,7 +92,7 @@ public class ManagedBrowsableEndpoint extends ManagedEndpoint implements Managed
return null;
}
- Message msg = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ Message msg = exchange.getMessage();
String xml = MessageHelper.dumpAsXml(msg, includeBody);
return xml;
@@ -129,7 +124,7 @@ public class ManagedBrowsableEndpoint extends ManagedEndpoint implements Managed
sb.append("<messages>");
for (int i = fromIndex; i < exchanges.size() && i <= toIndex; i++) {
Exchange exchange = exchanges.get(i);
- Message msg = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ Message msg = exchange.getMessage();
String xml = MessageHelper.dumpAsXml(msg, includeBody);
sb.append("\n").append(xml);
}
diff --git a/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedInlinedProcessorTest.java b/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedInlinedProcessorTest.java
index c346be9..79325c1 100644
--- a/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedInlinedProcessorTest.java
+++ b/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedInlinedProcessorTest.java
@@ -56,7 +56,7 @@ public class ManagedInlinedProcessorTest extends ManagementTestSupport {
@Override
public void configure() throws Exception {
from("direct:start").routeId("foo")
- .process(exchange -> exchange.getOut().setBody("Bye World")).id("custom")
+ .process(exchange -> exchange.getMessage().setBody("Bye World")).id("custom")
.to("mock:result");
}
};
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchangeHolder.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchangeHolder.java
index b3aaead..c3801d6 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchangeHolder.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchangeHolder.java
@@ -219,6 +219,7 @@ public class DefaultExchangeHolder implements Serializable {
return null;
}
+ @Deprecated
private Map<String, Object> safeSetOutHeaders(Exchange exchange, boolean allowSerializedHeaders) {
if (exchange.hasOut() && exchange.getOut().hasHeaders()) {
Map<String, Object> map = checkValidHeaderObjects("out headers", exchange, exchange.getOut().getHeaders(), allowSerializedHeaders);
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumer.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumer.java
index 5434c44..4cc3d2f 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumer.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumer.java
@@ -60,14 +60,8 @@ public class DefaultScheduledPollConsumer extends ScheduledPollConsumer {
messagesPolled++;
log.trace("Polled {} {}", messagesPolled, exchange);
- // if the result of the polled exchange has output we should create a new exchange and
- // use the output as input to the next processor
- if (exchange.hasOut()) {
- // lets create a new exchange
- Exchange newExchange = getEndpoint().createExchange();
- newExchange.getIn().copyFrom(exchange.getOut());
- exchange = newExchange;
- }
+ // prepare for processing where message should be IN
+ ExchangeHelper.prepareOutToIn(exchange);
getProcessor().process(exchange);
}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
index 093a43d..effe40a 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
@@ -452,7 +452,7 @@ public final class ExchangeHelper {
// if we are out capable then set out and response as well
// however only grab OUT if it exists, otherwise reuse IN
// this prevents side effects to alter the Exchange if we force creating an OUT message
- Message msg = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ Message msg = exchange.getMessage();
map.put("out", msg);
map.put("response", msg);
}
@@ -806,7 +806,7 @@ public final class ExchangeHelper {
* @return a log message with both the messageId and exchangeId
*/
public static String logIds(Exchange exchange) {
- String msgId = exchange.hasOut() ? exchange.getOut().getMessageId() : exchange.getIn().getMessageId();
+ String msgId = exchange.getMessage().getMessageId();
return "(MessageId: " + msgId + " on ExchangeId: " + exchange.getExchangeId() + ")";
}
@@ -854,7 +854,7 @@ public final class ExchangeHelper {
* @param outOnly whether to replace the message as OUT message
*/
public static void replaceMessage(Exchange exchange, Message newMessage, boolean outOnly) {
- Message old = exchange.hasOut() ? exchange.getOut() : exchange.getIn();
+ Message old = exchange.getMessage();
if (outOnly || exchange.hasOut()) {
exchange.setOut(newMessage);
} else {
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
index 1c3209a7..20f3ff8 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
@@ -174,6 +174,7 @@ public class ExpressionBuilder {
* @param headerName the name of the header the expression will return
* @return an expression object which will return the header value
*/
+ @Deprecated
public static Expression outHeaderExpression(final String headerName) {
return new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
@@ -204,6 +205,7 @@ public class ExpressionBuilder {
* @return an expression object which will return the headers, will be <tt>null</tt> if the
* exchange is not out capable.
*/
+ @Deprecated
public static Expression outHeadersExpression() {
return new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
@@ -866,6 +868,7 @@ public class ExpressionBuilder {
/**
* Returns the expression for the out messages body
*/
+ @Deprecated
public static Expression outBodyExpression() {
return new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
@@ -887,6 +890,7 @@ public class ExpressionBuilder {
* Returns the expression for the exchanges outbound message body converted
* to the given type
*/
+ @Deprecated
public static <T> Expression outBodyExpression(final Class<T> type) {
return new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
@@ -985,6 +989,7 @@ public class ExpressionBuilder {
/**
* Returns the expression for the OUT message
*/
+ @Deprecated
public static Expression outMessageExpression() {
return new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
@@ -1001,6 +1006,7 @@ public class ExpressionBuilder {
/**
* Returns a functional expression for the OUT message
*/
+ @Deprecated
public static Expression outMessageExpression(final Function<Message, Object> function) {
return new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/component/AbstractApiProducer.java b/core/camel-support/src/main/java/org/apache/camel/support/component/AbstractApiProducer.java
index ab520ae..093df1a 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/component/AbstractApiProducer.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/component/AbstractApiProducer.java
@@ -85,9 +85,7 @@ public abstract class AbstractApiProducer<E extends Enum<E> & ApiName, T>
Object result = doInvokeMethod(method, properties);
// producer returns a single response, even for methods with List return types
- exchange.getOut().setBody(result);
- // copy headers
- exchange.getOut().setHeaders(exchange.getIn().getHeaders());
+ exchange.getMessage().setBody(result);
interceptResult(result, exchange);
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/processor/DefaultExchangeFormatter.java b/core/camel-support/src/main/java/org/apache/camel/support/processor/DefaultExchangeFormatter.java
index b91dbc9..0952547 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/processor/DefaultExchangeFormatter.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/processor/DefaultExchangeFormatter.java
@@ -57,8 +57,6 @@ public class DefaultExchangeFormatter implements ExchangeFormatter {
private boolean showBody = true;
@UriParam(label = "formatting", defaultValue = "true", description = "Show the body Java type.")
private boolean showBodyType = true;
- @UriParam(label = "formatting", description = "If the exchange has an out message, show the out message.")
- private boolean showOut;
@UriParam(label = "formatting", description = "If the exchange has an exception, show the exception message (no stacktrace)")
private boolean showException;
@UriParam(label = "formatting", description = "f the exchange has a caught exception, show the exception message (no stack trace)."
@@ -169,39 +167,6 @@ public class DefaultExchangeFormatter implements ExchangeFormatter {
}
}
- if (showAll || showOut) {
- if (exchange.hasOut()) {
- Message out = exchange.getOut();
- if (showAll || showHeaders) {
- if (multiline) {
- sb.append(SEPARATOR);
- }
- sb.append(style("OutHeaders")).append(sortMap(filterHeaderAndProperties(out.getHeaders())));
- }
- if (showAll || showBodyType) {
- if (multiline) {
- sb.append(SEPARATOR);
- }
- sb.append(style("OutBodyType")).append(getBodyTypeAsString(out));
- }
- if (showAll || showBody) {
- if (multiline) {
- sb.append(SEPARATOR);
- }
- String body = getBodyAsString(out);
- if (skipBodyLineSeparator) {
- body = StringHelper.replaceAll(body, LS, "");
- }
- sb.append(style("OutBody")).append(body);
- }
- } else {
- if (multiline) {
- sb.append(SEPARATOR);
- }
- sb.append(style("Out: null"));
- }
- }
-
if (maxChars > 0) {
StringBuilder answer = new StringBuilder();
for (String s : sb.toString().split(SEPARATOR)) {
@@ -313,17 +278,6 @@ public class DefaultExchangeFormatter implements ExchangeFormatter {
this.showBody = showBody;
}
- public boolean isShowOut() {
- return showOut;
- }
-
- /**
- * If the exchange has an out message, show the out message.
- */
- public void setShowOut(boolean showOut) {
- this.showOut = showOut;
- }
-
public boolean isShowAll() {
return showAll;
}
[camel] 05/08: CAMEL-13750: Omit JMSCorrelationID when sending with
useMessageIDAsCorrelationID
Posted by da...@apache.org.
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 089ce0d25dda36d0f20f67b5680459861b2624e9
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jul 26 06:09:13 2019 +0200
CAMEL-13750: Omit JMSCorrelationID when sending with useMessageIDAsCorrelationID
---
.../camel/component/activemq/converter/InvokeMessageListenerTest.java | 4 +---
.../src/main/java/org/apache/camel/component/jms/JmsBinding.java | 4 ++--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java
index b3cb966..892a4c5 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java
@@ -24,7 +24,6 @@ import javax.jms.TextMessage;
import org.apache.activemq.spring.ConsumerBean;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -34,7 +33,6 @@ import static org.apache.camel.component.activemq.ActiveMQComponent.activeMQComp
*
*/
public class InvokeMessageListenerTest extends CamelTestSupport {
- protected MockEndpoint resultEndpoint;
protected String startEndpointUri = "activemq:queue:test.a";
protected ConsumerBean listener = new ConsumerBean();
@@ -44,7 +42,7 @@ public class InvokeMessageListenerTest extends CamelTestSupport {
template.sendBodyAndHeader(startEndpointUri, expectedBody, "cheese", 123);
- listener.assertMessagesArrived(1);
+ listener.assertMessagesArrived(1, 5000);
List<Message> list = listener.flushMessages();
assertTrue("Should have received some messages!", !list.isEmpty());
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
index 8499fe8..fcfacd6 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
@@ -374,7 +374,7 @@ public class JmsBinding {
public void appendJmsProperty(Message jmsMessage, Exchange exchange, org.apache.camel.Message in,
String headerName, Object headerValue) throws JMSException {
if (isStandardJMSHeader(headerName)) {
- if (headerName.equals("JMSCorrelationID") && !endpoint.isUseMessageIDAsCorrelationID()) {
+ if (headerName.equals("JMSCorrelationID") && (endpoint == null || !endpoint.isUseMessageIDAsCorrelationID())) {
jmsMessage.setJMSCorrelationID(ExchangeHelper.convertToType(exchange, String.class, headerValue));
} else if (headerName.equals("JMSReplyTo") && headerValue != null) {
if (headerValue instanceof String) {
@@ -405,7 +405,7 @@ public class JmsBinding {
// see message properties: http://java.sun.com/j2ee/1.4/docs/api/javax/jms/Message.html
Object value = getValidJMSHeaderValue(headerName, headerValue);
// if the value was null, then it may be allowed as an additional header
- if (value == null && endpoint.getConfiguration().getAllowAdditionalHeaders() != null) {
+ if (value == null && (endpoint != null && endpoint.getConfiguration().getAllowAdditionalHeaders() != null)) {
Iterator it = ObjectHelper.createIterator(endpoint.getConfiguration().getAllowAdditionalHeaders());
while (it.hasNext()) {
String pattern = (String) it.next();
[camel] 06/08: CAMEL-13788: Deprecate OUT in favour of getMessage
on Message API.
Posted by da...@apache.org.
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 369213719a1ba438b80f51fd95a6e1ea326079ab
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jul 26 07:41:45 2019 +0200
CAMEL-13788: Deprecate OUT in favour of getMessage on Message API.
---
MIGRATION.md | 13 ++
.../org/apache/camel/component/bean/BeanInfo.java | 3 -
.../camel/component/mock/MockExpressionClause.java | 35 ------
.../mock/MockExpressionClauseSupport.java | 35 ------
.../src/main/java/org/apache/camel/OutHeaders.java | 34 ------
core/camel-base/src/main/docs/simple-language.adoc | 14 ---
.../simple/ast/SimpleFunctionExpression.java | 17 ---
.../org/apache/camel/builder/ExpressionClause.java | 99 ---------------
.../camel/builder/ExpressionClauseSupport.java | 35 ------
.../bean/BeanWithHeadersAndBodyInject3Test.java | 10 +-
.../camel/component/mock/MockPredicateTest.java | 16 ---
.../apache/camel/language/simple/SimpleTest.java | 15 ---
.../DeadLetterChannelHandledExampleTest.java | 19 ++-
.../camel/support/builder/ExpressionBuilder.java | 135 ---------------------
14 files changed, 23 insertions(+), 457 deletions(-)
diff --git a/MIGRATION.md b/MIGRATION.md
index 105e464..1251c57 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -147,6 +147,19 @@ To use this API you can get it via the `getMessage` method on `Exchange`:
The fault API has been removed from `org.apache.camel.Message` as it was only used for SOAP-WS fault message. The `camel-cxf` and `camel-spring-ws` components for SOAP-WS has been modified to support fault messages from their components. The option `handleFault` has also been removed and you now need to turn this on as endpoint or component option on `camel-cxf` or `camel-spring-ws`.
+### getOut on Message
+
+The `hasOut` and `getOut` methods on `Message` has been deprecated in favour of using `getMessage` instead. (sidenote: The camel-core are still using these methods in a few places to be backwards compatible and rely on this logic as Camel was initially designed with the concepts of IN and OUT message inspired from the JBI and SOAP-WS specifications).
+
+### OUT message removed from Simple language and Mock component
+
+The simple language has removed the OUT message concepts eg `${out.body}`.
+Also the mock component has removed OUT message from its assertion API, eg
+
+ mock.message(0).outBody()...
+
+Also the `@OutHeaders` annotation for bean parameter binding has been removed, instead use `@Headers` instead.
+
### Mock component
The `mock` component has been moved out of `camel-core` and as part of this work, we had to remove a number of methods on its _assertion clause builder_ that were seldom in use.
diff --git a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java
index 088ca1f..1c7a4fb 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java
@@ -41,7 +41,6 @@ import org.apache.camel.Handler;
import org.apache.camel.Header;
import org.apache.camel.Headers;
import org.apache.camel.Message;
-import org.apache.camel.OutHeaders;
import org.apache.camel.PropertyInject;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.IntrospectionSupport;
@@ -973,8 +972,6 @@ public class BeanInfo {
return ExpressionBuilder.headerExpression(headerAnnotation.value());
} else if (annotation instanceof Headers) {
return ExpressionBuilder.headersExpression();
- } else if (annotation instanceof OutHeaders) {
- return ExpressionBuilder.outHeadersExpression();
} else if (annotation instanceof ExchangeException) {
return ExpressionBuilder.exchangeExceptionExpression(CastUtils.cast(parameterType, Exception.class));
} else if (annotation instanceof PropertyInject) {
diff --git a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClause.java b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClause.java
index f21f86b..aa3c77d 100644
--- a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClause.java
+++ b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClause.java
@@ -114,13 +114,6 @@ public class MockExpressionClause<T> implements Expression, Predicate {
}
/**
- * An expression of an outbound message
- */
- public T outMessage() {
- return delegate.outMessage();
- }
-
- /**
* A functional expression of an outbound message
*/
public T outMessage(final Function<Message, Object> function) {
@@ -205,13 +198,6 @@ public class MockExpressionClause<T> implements Expression, Predicate {
}
/**
- * An expression of an outbound message body
- */
- public T outBody() {
- return delegate.outBody();
- }
-
- /**
* A functional expression of an outbound message body
*/
public T outBody(final Function<Object, Object> function) {
@@ -236,13 +222,6 @@ public class MockExpressionClause<T> implements Expression, Predicate {
}
/**
- * An expression of an outbound message body converted to the expected type
- */
- public T outBody(Class<?> expectedType) {
- return delegate.outBody(expectedType);
- }
-
- /**
* A functional expression of an outbound message body converted to the expected type
*/
public <B> T outBody(Class<B> expectedType, final Function<B, Object> function) {
@@ -281,20 +260,6 @@ public class MockExpressionClause<T> implements Expression, Predicate {
}
/**
- * An expression of an outbound message header of the given name
- */
- public T outHeader(String name) {
- return delegate.outHeader(name);
- }
-
- /**
- * An expression of the outbound headers
- */
- public T outHeaders() {
- return delegate.outHeaders();
- }
-
- /**
* An expression of an exchange property of the given name
*/
public T exchangeProperty(String name) {
diff --git a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClauseSupport.java b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClauseSupport.java
index f06d764..80ce1f1 100644
--- a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClauseSupport.java
+++ b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClauseSupport.java
@@ -84,13 +84,6 @@ public class MockExpressionClauseSupport<T> {
}
/**
- * An expression of an inbound message
- */
- public T outMessage() {
- return expression(ExpressionBuilder.outMessageExpression());
- }
-
- /**
* An expression of an inbound message body
*/
public T body() {
@@ -105,20 +98,6 @@ public class MockExpressionClauseSupport<T> {
}
/**
- * An expression of an outbound message body
- */
- public T outBody() {
- return expression(ExpressionBuilder.outBodyExpression());
- }
-
- /**
- * An expression of an outbound message body converted to the expected type
- */
- public T outBody(Class<?> expectedType) {
- return expression(ExpressionBuilder.outBodyExpression(expectedType));
- }
-
- /**
* An expression of an inbound message header of the given name
*/
public T header(String name) {
@@ -133,20 +112,6 @@ public class MockExpressionClauseSupport<T> {
}
/**
- * An expression of an outbound message header of the given name
- */
- public T outHeader(String name) {
- return expression(ExpressionBuilder.outHeaderExpression(name));
- }
-
- /**
- * An expression of the outbound headers
- */
- public T outHeaders() {
- return expression(ExpressionBuilder.outHeadersExpression());
- }
-
- /**
* An expression of the exchange pattern
*/
public T exchangePattern() {
diff --git a/core/camel-api/src/main/java/org/apache/camel/OutHeaders.java b/core/camel-api/src/main/java/org/apache/camel/OutHeaders.java
deleted file mode 100644
index 41f711a..0000000
--- a/core/camel-api/src/main/java/org/apache/camel/OutHeaders.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marks a parameter as being an injection point of the headers of an outbound {@link Message}
- *
- * @see Message#getHeaders()
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Target({ElementType.PARAMETER })
-public @interface OutHeaders {
-}
\ No newline at end of file
diff --git a/core/camel-base/src/main/docs/simple-language.adoc b/core/camel-base/src/main/docs/simple-language.adoc
index 4366e30..ab07cc6 100644
--- a/core/camel-base/src/main/docs/simple-language.adoc
+++ b/core/camel-base/src/main/docs/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
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java b/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
index c0a0575..adabcdc 100644
--- a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
+++ b/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
@@ -368,29 +368,12 @@ public class SimpleFunctionExpression extends LiteralExpression {
}
}
- // out header function
- remainder = ifStartsWithReturnRemainder("out.header.", function);
- if (remainder == null) {
- remainder = ifStartsWithReturnRemainder("out.header:", function);
- }
- if (remainder == null) {
- remainder = ifStartsWithReturnRemainder("out.headers.", function);
- }
- if (remainder == null) {
- remainder = ifStartsWithReturnRemainder("out.headers:", function);
- }
- if (remainder != null) {
- return ExpressionBuilder.outHeaderExpression(remainder);
- }
-
return null;
}
private Expression createSimpleExpressionDirectly(String expression) {
if (ObjectHelper.isEqualToAny(expression, "body", "in.body")) {
return ExpressionBuilder.bodyExpression();
- } else if (ObjectHelper.equal(expression, "out.body")) {
- return ExpressionBuilder.outBodyExpression();
} else if (ObjectHelper.equal(expression, "bodyOneLine")) {
return ExpressionBuilder.bodyOneLine();
} else if (ObjectHelper.equal(expression, "id")) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java b/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
index b5b4d24..cdef4c2 100644
--- a/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
+++ b/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
@@ -112,25 +112,6 @@ public class ExpressionClause<T> implements Expression, Predicate {
}
/**
- * An expression of an outbound message
- */
- public T outMessage() {
- return delegate.outMessage();
- }
-
- /**
- * A functional expression of an outbound message
- */
- @Deprecated
- public T outMessage(final Function<Message, Object> function) {
- return delegate.expression(new ExpressionAdapter() {
- public Object evaluate(Exchange exchange) {
- return function.apply(exchange.getOut());
- }
- });
- }
-
- /**
* An expression of an inbound message body
*/
public T body() {
@@ -204,72 +185,6 @@ public class ExpressionClause<T> implements Expression, Predicate {
}
/**
- * An expression of an outbound message body
- */
- public T outBody() {
- return delegate.outBody();
- }
-
- /**
- * A functional expression of an outbound message body
- */
- @Deprecated
- public T outBody(final Function<Object, Object> function) {
- return delegate.expression(new ExpressionAdapter() {
- public Object evaluate(Exchange exchange) {
- return function.apply(exchange.getOut().getBody());
- }
- });
- }
-
- /**
- * A functional expression of an outbound message body and headers
- */
- @Deprecated
- public T outBody(final BiFunction<Object, Map<String, Object>, Object> function) {
- return delegate.expression(new ExpressionAdapter() {
- public Object evaluate(Exchange exchange) {
- return function.apply(
- exchange.getOut().getBody(),
- exchange.getOut().getHeaders());
- }
- });
- }
-
- /**
- * An expression of an outbound message body converted to the expected type
- */
- public T outBody(Class<?> expectedType) {
- return delegate.outBody(expectedType);
- }
-
- /**
- * A functional expression of an outbound message body converted to the expected type
- */
- @Deprecated
- public <B> T outBody(Class<B> expectedType, final Function<B, Object> function) {
- return delegate.expression(new ExpressionAdapter() {
- public Object evaluate(Exchange exchange) {
- return function.apply(exchange.getOut().getBody(expectedType));
- }
- });
- }
-
- /**
- * A functional expression of an outbound message body converted to the expected type and headers
- */
- @Deprecated
- public <B> T outBody(Class<B> expectedType, final BiFunction<B, Map<String, Object>, Object> function) {
- return delegate.expression(new ExpressionAdapter() {
- public Object evaluate(Exchange exchange) {
- return function.apply(
- exchange.getOut().getBody(expectedType),
- exchange.getOut().getHeaders());
- }
- });
- }
-
- /**
* An expression of an inbound message header of the given name
*/
public T header(String name) {
@@ -284,20 +199,6 @@ public class ExpressionClause<T> implements Expression, Predicate {
}
/**
- * An expression of an outbound message header of the given name
- */
- public T outHeader(String name) {
- return delegate.outHeader(name);
- }
-
- /**
- * An expression of the outbound headers
- */
- public T outHeaders() {
- return delegate.outHeaders();
- }
-
- /**
* An expression of an exchange property of the given name
*/
public T exchangeProperty(String name) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java b/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
index 1693722..6ba1a5c 100644
--- a/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
+++ b/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
@@ -107,13 +107,6 @@ public class ExpressionClauseSupport<T> {
}
/**
- * An expression of an inbound message
- */
- public T outMessage() {
- return expression(ExpressionBuilder.outMessageExpression());
- }
-
- /**
* An expression of an inbound message body
*/
public T body() {
@@ -129,20 +122,6 @@ public class ExpressionClauseSupport<T> {
}
/**
- * An expression of an outbound message body
- */
- public T outBody() {
- return expression(ExpressionBuilder.outBodyExpression());
- }
-
- /**
- * An expression of an outbound message body converted to the expected type
- */
- public T outBody(Class<?> expectedType) {
- return expression(ExpressionBuilder.outBodyExpression(expectedType));
- }
-
- /**
* An expression of an inbound message header of the given name
*/
public T header(String name) {
@@ -157,20 +136,6 @@ public class ExpressionClauseSupport<T> {
}
/**
- * An expression of an outbound message header of the given name
- */
- public T outHeader(String name) {
- return expression(ExpressionBuilder.outHeaderExpression(name));
- }
-
- /**
- * An expression of the outbound headers
- */
- public T outHeaders() {
- return expression(ExpressionBuilder.outHeadersExpression());
- }
-
- /**
* An expression of the exchange pattern
*/
public T exchangePattern() {
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject3Test.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject3Test.java
index 1564df8..c7e2ad5 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject3Test.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithHeadersAndBodyInject3Test.java
@@ -23,7 +23,6 @@ import javax.naming.Context;
import org.apache.camel.Body;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Headers;
-import org.apache.camel.OutHeaders;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.jndi.JndiContext;
@@ -44,7 +43,6 @@ public class BeanWithHeadersAndBodyInject3Test extends ContextTestSupport {
public void testInOnly() throws Exception {
MockEndpoint end = getMockEndpoint("mock:finish");
end.expectedBodiesReceived("Hello!");
- end.message(0).header("out").isNull();
sendBody("direct:start", "Test Input");
@@ -79,12 +77,8 @@ public class BeanWithHeadersAndBodyInject3Test extends ContextTestSupport {
public static class MyBean {
- public String doSomething(@Body String body, @Headers Map<?, ?> headers,
- @OutHeaders Map<String, Object> outHeaders) {
- if (outHeaders != null) {
- outHeaders.put("out", 123);
- }
-
+ public String doSomething(@Body String body, @Headers Map headers) {
+ headers.put("out", 123);
return "Hello!";
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/mock/MockPredicateTest.java b/core/camel-core/src/test/java/org/apache/camel/component/mock/MockPredicateTest.java
index 3cce51a..d0ed558 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/mock/MockPredicateTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/mock/MockPredicateTest.java
@@ -49,22 +49,6 @@ public class MockPredicateTest extends ContextTestSupport {
assertMockEndpointsSatisfied();
}
- @Test
- public void testOutBodyType() throws Exception {
- MockEndpoint mock = getMockEndpoint("mock:foo");
- mock.message(0).outBody(String.class).isEqualTo("Bye World");
- mock.expectedMessageCount(1);
-
- template.send("direct:start", new Processor() {
- public void process(Exchange exchange) throws Exception {
- exchange.getIn().setBody("Hello World");
- exchange.getOut().setBody("Bye World");
- }
- });
-
- assertMockEndpointsSatisfied();
- }
-
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
diff --git a/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java b/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
index 529f8e0..af249ed 100644
--- a/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
@@ -243,17 +243,6 @@ public class SimpleTest extends LanguageTestSupport {
}
@Test
- public void testSimpleOutExpressions() throws Exception {
- exchange.getOut().setBody("Bye World");
- exchange.getOut().setHeader("quote", "Camel rocks");
- assertExpression("${out.body}", "Bye World");
- assertExpression("${out.header.quote}", "Camel rocks");
- assertExpression("${out.header:quote}", "Camel rocks");
- assertExpression("${out.headers.quote}", "Camel rocks");
- assertExpression("${out.headers:quote}", "Camel rocks");
- }
-
- @Test
public void testSimpleExchangePropertyExpressions() throws Exception {
exchange.setProperty("medal", "gold");
assertExpression("${exchangeProperty.medal}", "gold");
@@ -576,10 +565,6 @@ public class SimpleTest extends LanguageTestSupport {
assertExpression("${date:in.header.birthday:yyyyMMdd}", "19740420");
assertExpression("${date:in.header.birthday+24h:yyyyMMdd}", "19740421");
- assertExpression("${date:out.header.birthday}", outHeaderCalendar.getTime());
- assertExpression("${date:out.header.birthday:yyyyMMdd}", "19750521");
- assertExpression("${date:out.header.birthday+24h:yyyyMMdd}", "19750522");
-
assertExpression("${date:exchangeProperty.birthday}", propertyCalendar.getTime());
assertExpression("${date:exchangeProperty.birthday:yyyyMMdd}", "19760622");
assertExpression("${date:exchangeProperty.birthday+24h:yyyyMMdd}", "19760623");
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelHandledExampleTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelHandledExampleTest.java
index 3b6845f..1c867f0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelHandledExampleTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelHandledExampleTest.java
@@ -21,7 +21,6 @@ import java.util.Map;
import org.apache.camel.Body;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Headers;
-import org.apache.camel.OutHeaders;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
@@ -100,33 +99,31 @@ public class DeadLetterChannelHandledExampleTest extends ContextTestSupport {
/**
* 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<?, ?> in, @Body String payload, @OutHeaders Map<String, Object> out)
+ public Object handleOrder(@Headers Map headers, @Body String payload)
throws OrderFailedException {
- out.put("customerid", in.get("customerid"));
+ headers.put("customerid", headers.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";
}
}
/**
* 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<?, ?> in, @Body String payload, @OutHeaders Map<String, Object> out) {
- out.put("customerid", in.get("customerid"));
- out.put("orderid", "failed");
+ public Object orderFailed(@Headers Map headers, @Body String payload) {
+ headers.put("customerid", headers.get("customerid"));
+ headers.put("orderid", "failed");
return "Order ERROR";
}
}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
index 20f3ff8..ef8abc9 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
@@ -167,64 +167,6 @@ public class ExpressionBuilder {
}
/**
- * Returns an expression for the out header value with the given name
- * <p/>
- * Will fallback and look in properties if not found in headers.
- *
- * @param headerName the name of the header the expression will return
- * @return an expression object which will return the header value
- */
- @Deprecated
- public static Expression outHeaderExpression(final String headerName) {
- return new ExpressionAdapter() {
- public Object evaluate(Exchange exchange) {
- if (!exchange.hasOut()) {
- return null;
- }
-
- String text = simpleExpression(headerName).evaluate(exchange, String.class);
- Message out = exchange.getOut();
- Object header = out.getHeader(text);
- if (header == null) {
- // let's try the exchange header
- header = exchange.getProperty(text);
- }
- return header;
- }
-
- @Override
- public String toString() {
- return "outHeader(" + headerName + ")";
- }
- };
- }
-
- /**
- * Returns an expression for the outbound message headers
- *
- * @return an expression object which will return the headers, will be <tt>null</tt> if the
- * exchange is not out capable.
- */
- @Deprecated
- public static Expression outHeadersExpression() {
- return new ExpressionAdapter() {
- public Object evaluate(Exchange exchange) {
- // only get out headers if the MEP is out capable
- if (ExchangeHelper.isOutCapable(exchange)) {
- return exchange.getOut().getHeaders();
- } else {
- return null;
- }
- }
-
- @Override
- public String toString() {
- return "outHeaders";
- }
- };
- }
-
- /**
* Returns an expression for the exchange pattern
*
* @see Exchange#getPattern()
@@ -866,49 +808,6 @@ public class ExpressionBuilder {
}
/**
- * Returns the expression for the out messages body
- */
- @Deprecated
- public static Expression outBodyExpression() {
- return new ExpressionAdapter() {
- public Object evaluate(Exchange exchange) {
- if (exchange.hasOut()) {
- return exchange.getOut().getBody();
- } else {
- return null;
- }
- }
-
- @Override
- public String toString() {
- return "outBody";
- }
- };
- }
-
- /**
- * Returns the expression for the exchanges outbound message body converted
- * to the given type
- */
- @Deprecated
- public static <T> Expression outBodyExpression(final Class<T> type) {
- return new ExpressionAdapter() {
- public Object evaluate(Exchange exchange) {
- if (exchange.hasOut()) {
- return exchange.getOut().getBody(type);
- } else {
- return null;
- }
- }
-
- @Override
- public String toString() {
- return "outBodyAs[" + type.getName() + "]";
- }
- };
- }
-
- /**
* Returns the expression for the exchange
*/
public static Expression exchangeExpression() {
@@ -987,40 +886,6 @@ public class ExpressionBuilder {
}
/**
- * Returns the expression for the OUT message
- */
- @Deprecated
- public static Expression outMessageExpression() {
- return new ExpressionAdapter() {
- public Object evaluate(Exchange exchange) {
- return exchange.getOut();
- }
-
- @Override
- public String toString() {
- return "outMessage";
- }
- };
- }
-
- /**
- * Returns a functional expression for the OUT message
- */
- @Deprecated
- public static Expression outMessageExpression(final Function<Message, Object> function) {
- return new ExpressionAdapter() {
- public Object evaluate(Exchange exchange) {
- return function.apply(exchange.getOut());
- }
-
- @Override
- public String toString() {
- return "outMessageExpression";
- }
- };
- }
-
- /**
* Returns an expression which converts the given expression to the given type
*/
public static Expression convertToExpression(final Expression expression, final Class<?> type) {
[camel] 03/08: CAMEL-13788: Deprecate OUT in favour of getMessage
on Message API.
Posted by da...@apache.org.
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 d552f0491bae7eeacabb0c86c546404c0444032f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jul 26 04:54:20 2019 +0200
CAMEL-13788: Deprecate OUT in favour of getMessage on Message API.
---
.../camel-log/src/main/docs/log-component.adoc | 3 +--
.../endpoint/dsl/LogEndpointBuilderFactory.java | 22 ----------------------
2 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/components/camel-log/src/main/docs/log-component.adoc b/components/camel-log/src/main/docs/log-component.adoc
index 37ca27d..f52a8d0 100644
--- a/components/camel-log/src/main/docs/log-component.adoc
+++ b/components/camel-log/src/main/docs/log-component.adoc
@@ -94,7 +94,7 @@ with the following path and query parameters:
|===
-==== Query Parameters (28 parameters):
+==== Query Parameters (27 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -122,7 +122,6 @@ with the following path and query parameters:
| *showFiles* (formatting) | If enabled Camel will output files | false | boolean
| *showFuture* (formatting) | If enabled Camel will on Future objects wait for it to complete to obtain the payload to be logged. | false | boolean
| *showHeaders* (formatting) | Show the message headers. | false | boolean
-| *showOut* (formatting) | If the exchange has an out message, show the out message. | false | boolean
| *showProperties* (formatting) | Show the exchange properties. | false | boolean
| *showStackTrace* (formatting) | Show the stack trace, if an exchange has an exception. Only effective if one of showAll, showException or showCaughtException are enabled. | false | boolean
| *showStreams* (formatting) | Whether Camel should show stream bodies or not (eg such as java.io.InputStream). Beware if you enable this option then you may not be able later to access the message body as the stream have already been read by this logger. To remedy this you will have to use Stream Caching. | false | boolean
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LogEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LogEndpointBuilderFactory.java
index 06cacd4..9d85afa 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LogEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/LogEndpointBuilderFactory.java
@@ -459,28 +459,6 @@ public interface LogEndpointBuilderFactory {
return this;
}
/**
- * If the exchange has an out message, show the out message.
- *
- * The option is a: <code>boolean</code> type.
- *
- * Group: formatting
- */
- default LogEndpointBuilder showOut(boolean showOut) {
- setProperty("showOut", showOut);
- return this;
- }
- /**
- * If the exchange has an out message, show the out message.
- *
- * The option will be converted to a <code>boolean</code> type.
- *
- * Group: formatting
- */
- default LogEndpointBuilder showOut(String showOut) {
- setProperty("showOut", showOut);
- return this;
- }
- /**
* Show the exchange properties.
*
* The option is a: <code>boolean</code> type.
[camel] 04/08: CAMEL-13788: Deprecate OUT in favour of getMessage
on Message API.
Posted by da...@apache.org.
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 cdf57ecc87253a6c4dc3b5029ec8e2b0880b439f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jul 26 05:42:02 2019 +0200
CAMEL-13788: Deprecate OUT in favour of getMessage on Message API.
---
.../apache/camel/processor/RestBindingAdvice.java | 4 ++++
.../modules/ROOT/pages/bean-language.adoc | 21 ++++++++++++++++++---
.../modules/ROOT/pages/log-component.adoc | 3 +--
3 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/RestBindingAdvice.java b/core/camel-base/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
index 409d807..a62c13b 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
@@ -208,6 +208,8 @@ public class RestBindingAdvice implements CamelInternalProcessorAdvice<Map<Strin
LOG.trace("Consuming content type does not match contentType header {}. Stopping routing.", contentType);
// the content-type is not something we can process so its a HTTP_ERROR 415
exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 415);
+ // set empty response body as http error code indicate the problem
+ exchange.getMessage().setBody(null);
// stop routing and return
exchange.setProperty(Exchange.ROUTE_STOP, true);
return;
@@ -218,6 +220,8 @@ public class RestBindingAdvice implements CamelInternalProcessorAdvice<Map<Strin
LOG.trace("Produced content type does not match accept header {}. Stopping routing.", contentType);
// the response type is not accepted by the client so its a HTTP_ERROR 406
exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 406);
+ // set empty response body as http error code indicate the problem
+ exchange.getMessage().setBody(null);
// stop routing and return
exchange.setProperty(Exchange.ROUTE_STOP, true);
return;
diff --git a/docs/components/modules/ROOT/pages/bean-language.adoc b/docs/components/modules/ROOT/pages/bean-language.adoc
index ce5a1c4..08023f6 100644
--- a/docs/components/modules/ROOT/pages/bean-language.adoc
+++ b/docs/components/modules/ROOT/pages/bean-language.adoc
@@ -3,9 +3,6 @@
== Bean Language
*Available as of Camel version 1.3*
-
-*Available as of Camel version 1.3*
-
The purpose of the Bean Language is to be able to implement an
xref:manual::expression.adoc[Expression] or xref:manual::predicate.adoc[Predicate] using
a simple method on a bean. The bean name is resolved using a xref:manual::registry.adoc[Registry], such as the
@@ -21,6 +18,24 @@ xref:manual::message.adoc[Message] Exchange to the method parameters; so you can
annotate the bean to extract headers or other expressions such as
xref:components::xpath-language.adoc[XPath] or xref:components::xquery-language.adoc[XQuery] from the message.
+=== Bean Language options
+
+// language options: START
+The Bean method language supports 4 options, which are listed below.
+
+
+
+[width="100%",cols="2,1m,1m,6",options="header"]
+|===
+| Name | Default | Java Type | Description
+| ref | | String | Reference to bean to lookup in the registry
+| method | | String | Name of method to call
+| beanType | | String | Class name of the bean to use
+| trim | true | Boolean | Whether to trim the value to remove leading and trailing whitespaces and line breaks
+|===
+// language options: END
+
+
[[BeanLanguage-UsingBeanExpressionsinJava]]
=== Using Bean Expressions in Java
diff --git a/docs/components/modules/ROOT/pages/log-component.adoc b/docs/components/modules/ROOT/pages/log-component.adoc
index 37ca27d..f52a8d0 100644
--- a/docs/components/modules/ROOT/pages/log-component.adoc
+++ b/docs/components/modules/ROOT/pages/log-component.adoc
@@ -94,7 +94,7 @@ with the following path and query parameters:
|===
-==== Query Parameters (28 parameters):
+==== Query Parameters (27 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -122,7 +122,6 @@ with the following path and query parameters:
| *showFiles* (formatting) | If enabled Camel will output files | false | boolean
| *showFuture* (formatting) | If enabled Camel will on Future objects wait for it to complete to obtain the payload to be logged. | false | boolean
| *showHeaders* (formatting) | Show the message headers. | false | boolean
-| *showOut* (formatting) | If the exchange has an out message, show the out message. | false | boolean
| *showProperties* (formatting) | Show the exchange properties. | false | boolean
| *showStackTrace* (formatting) | Show the stack trace, if an exchange has an exception. Only effective if one of showAll, showException or showCaughtException are enabled. | false | boolean
| *showStreams* (formatting) | Whether Camel should show stream bodies or not (eg such as java.io.InputStream). Beware if you enable this option then you may not be able later to access the message body as the stream have already been read by this logger. To remedy this you will have to use Stream Caching. | false | boolean
[camel] 02/08: CAMEL-13788: Deprecate OUT in favour of getMessage
on Message API.
Posted by da...@apache.org.
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 4f2cebe1b11e8091a91a64a1cff42e231ec9787e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jul 25 16:15:42 2019 +0200
CAMEL-13788: Deprecate OUT in favour of getMessage on Message API.
---
.../camel-bean/src/main/docs/bean-language.adoc | 21 ++++++++++++++++++---
.../bean/AbstractCamelInvocationHandler.java | 15 +++------------
.../apache/camel/language/bean/BeanExpression.java | 3 ++-
.../apache/camel/component/seda/SedaProducer.java | 2 +-
.../org/apache/camel/language/spel/RootObject.java | 5 +++++
.../apache/camel/language/spel/SpelRouteTest.java | 2 +-
.../org/apache/camel/language/spel/SpelTest.java | 2 ++
.../processor/SpringComplexBlockWithEndTest.java | 2 +-
.../org/apache/camel/converter/CamelConverter.java | 11 ++++++++---
9 files changed, 41 insertions(+), 22 deletions(-)
diff --git a/components/camel-bean/src/main/docs/bean-language.adoc b/components/camel-bean/src/main/docs/bean-language.adoc
index ce5a1c4..08023f6 100644
--- a/components/camel-bean/src/main/docs/bean-language.adoc
+++ b/components/camel-bean/src/main/docs/bean-language.adoc
@@ -3,9 +3,6 @@
== Bean Language
*Available as of Camel version 1.3*
-
-*Available as of Camel version 1.3*
-
The purpose of the Bean Language is to be able to implement an
xref:manual::expression.adoc[Expression] or xref:manual::predicate.adoc[Predicate] using
a simple method on a bean. The bean name is resolved using a xref:manual::registry.adoc[Registry], such as the
@@ -21,6 +18,24 @@ xref:manual::message.adoc[Message] Exchange to the method parameters; so you can
annotate the bean to extract headers or other expressions such as
xref:components::xpath-language.adoc[XPath] or xref:components::xquery-language.adoc[XQuery] from the message.
+=== Bean Language options
+
+// language options: START
+The Bean method language supports 4 options, which are listed below.
+
+
+
+[width="100%",cols="2,1m,1m,6",options="header"]
+|===
+| Name | Default | Java Type | Description
+| ref | | String | Reference to bean to lookup in the registry
+| method | | String | Name of method to call
+| beanType | | String | Class name of the bean to use
+| trim | true | Boolean | Whether to trim the value to remove leading and trailing whitespaces and line breaks
+|===
+// language options: END
+
+
[[BeanLanguage-UsingBeanExpressionsinJava]]
=== Using Bean Expressions in Java
diff --git a/components/camel-bean/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java b/components/camel-bean/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java
index ec92342..3ab758a 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java
@@ -68,19 +68,10 @@ public abstract class AbstractCamelInvocationHandler implements InvocationHandle
}
private static Object getBody(Exchange exchange, Class<?> type) throws InvalidPayloadException {
- // get the body from the Exchange from either OUT or IN
- if (exchange.hasOut()) {
- if (exchange.getOut().getBody() != null) {
- return exchange.getOut().getMandatoryBody(type);
- } else {
- return null;
- }
+ if (exchange.getMessage().getBody() != null) {
+ return exchange.getMessage().getMandatoryBody(type);
} else {
- if (exchange.getIn().getBody() != null) {
- return exchange.getIn().getMandatoryBody(type);
- } else {
- return null;
- }
+ return null;
}
}
diff --git a/components/camel-bean/src/main/java/org/apache/camel/language/bean/BeanExpression.java b/components/camel-bean/src/main/java/org/apache/camel/language/bean/BeanExpression.java
index c38c3f2..b39ca6f 100644
--- a/components/camel-bean/src/main/java/org/apache/camel/language/bean/BeanExpression.java
+++ b/components/camel-bean/src/main/java/org/apache/camel/language/bean/BeanExpression.java
@@ -293,7 +293,8 @@ public class BeanExpression implements Expression, Predicate, AfterPropertiesCon
// force to use InOut to retrieve the result on the OUT message
resultExchange.setPattern(ExchangePattern.InOut);
processor.process(resultExchange);
- result = resultExchange.getOut().getBody();
+ // the response is always stored in OUT
+ result = resultExchange.hasOut() ? resultExchange.getOut().getBody() : null;
// propagate properties and headers from result
if (resultExchange.hasProperties()) {
diff --git a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaProducer.java b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaProducer.java
index 8f9cde3..a43abae 100644
--- a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaProducer.java
+++ b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaProducer.java
@@ -70,7 +70,7 @@ public class SedaProducer extends DefaultAsyncProducer {
// check for timeout, which then already would have invoked the latch
if (latch.getCount() == 0) {
if (log.isTraceEnabled()) {
- log.trace("{}. Timeout occurred so response will be ignored: {}", this, response.hasOut() ? response.getOut() : response.getIn());
+ log.trace("{}. Timeout occurred so response will be ignored: {}", this, response.getMessage());
}
return;
} else {
diff --git a/components/camel-spring/src/main/java/org/apache/camel/language/spel/RootObject.java b/components/camel-spring/src/main/java/org/apache/camel/language/spel/RootObject.java
index 25c6557..7725ae4 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/language/spel/RootObject.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/language/spel/RootObject.java
@@ -53,6 +53,11 @@ public final class RootObject {
return exchange.getIn();
}
+ public Message getMessage() {
+ return exchange.getMessage();
+ }
+
+ @Deprecated
public Message getResponse() {
return exchange.getOut();
}
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelRouteTest.java b/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelRouteTest.java
index 0b02876..03b0d5c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelRouteTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelRouteTest.java
@@ -46,7 +46,7 @@ public class SpelRouteTest extends ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- from("direct:test").setBody(spel("Hello #{request.body}! What a beautiful #{request.headers['dayOrNight']}")).to("mock:result");
+ from("direct:test").setBody(spel("Hello #{message.body}! What a beautiful #{request.headers['dayOrNight']}")).to("mock:result");
from("direct:loop").loop(4).setBody(spel("#{body + ':' + properties['CamelLoopIndex']}")).to("mock:loopResult");
}
};
diff --git a/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelTest.java b/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelTest.java
index 529238e..e8d6880 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/language/spel/SpelTest.java
@@ -27,6 +27,7 @@ public class SpelTest extends LanguageTestSupport {
assertExpression("#{exchange.getIn().body}", "<hello id='m123'>world!</hello>");
assertExpression("#{getRequest().body}", "<hello id='m123'>world!</hello>");
assertExpression("#{request.body}", "<hello id='m123'>world!</hello>");
+ assertExpression("#{message.body}", "<hello id='m123'>world!</hello>");
assertExpression("#{request.Headers['foo']}", "abc");
assertExpression("#{getRequest().Headers['foo']}", "abc");
assertExpression("#{request.Headers['foo'] == 'abc'}", true);
@@ -48,6 +49,7 @@ public class SpelTest extends LanguageTestSupport {
assertPredicate("#{request.headers.foo.startsWith('a')}");
assertPredicate("#{request.headers.foo == 'abc'}");
assertPredicateFails("#{request.headers.foo == 'badString'}");
+ assertPredicate("#{message.headers.foo == 'abc'}");
}
@Test
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringComplexBlockWithEndTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringComplexBlockWithEndTest.java
index 9b2fcb1..c592aac 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringComplexBlockWithEndTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringComplexBlockWithEndTest.java
@@ -71,7 +71,7 @@ public class SpringComplexBlockWithEndTest extends ContextTestSupport {
public static class SplitAggregate implements AggregationStrategy {
public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
- newExchange.getOut().setBody("Cowboys");
+ newExchange.getMessage().setBody("Cowboys");
return newExchange;
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/converter/CamelConverter.java b/core/camel-base/src/main/java/org/apache/camel/converter/CamelConverter.java
index 1459406..1dd114b 100644
--- a/core/camel-base/src/main/java/org/apache/camel/converter/CamelConverter.java
+++ b/core/camel-base/src/main/java/org/apache/camel/converter/CamelConverter.java
@@ -38,17 +38,22 @@ public final class CamelConverter {
@Converter
public static Processor toProcessor(final Predicate predicate) {
return exchange -> {
+ // the response from a predicate should be set on OUT
boolean answer = predicate.matches(exchange);
- exchange.getMessage().setBody(answer);
+ Message out = exchange.getOut();
+ out.copyFrom(exchange.getIn());
+ out.setBody(answer);
};
-
}
@Converter
public static Processor toProcessor(final Expression expression) {
return exchange -> {
+ // the response from a expression should be set on OUT
Object answer = expression.evaluate(exchange, Object.class);
- exchange.getMessage().setBody(answer);
+ Message out = exchange.getOut();
+ out.copyFrom(exchange.getIn());
+ out.setBody(answer);
};
}
[camel] 07/08: CAMEL-13788: Deprecate OUT in favour of getMessage
on Message API.
Posted by da...@apache.org.
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 <cl...@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