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 <claus.ib...@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);
}
