You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/03/07 12:54:45 UTC
[camel] branch main updated (611845f -> 0da32da)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 611845f Upgrade to hazelcast 5 for osgi
new 7cd9117 CAMEL-15520: fixed deprecations in camel-zookeeper
new 8629c94 CAMEL-15520: fixed deprecations in camel-xstream
new 314638f CAMEL-15520: fixed deprecations in camel-web3j
new a7d87c0 CAMEL-15520: fixed deprecations in camel-vertx
new b7d11e2 CAMEL-15520: fixed deprecations in camel-thrift
new 96164ab CAMEL-15520: fixed deprecations in camel-syslog
new a2995c3 CAMEL-15520: fixed deprecations in camel-spring-ws
new 810d265 CAMEL-15520: fixed deprecations in camel-redis
new 34a56a2 CAMEL-15520: fixed deprecations in camel-spring-rabbitmq
new 08d92d8 CAMEL-15520: fixed deprecations in camel-schematron
new 3f54106 CAMEL-15520: fixed deprecations in camel-saxon
new 20b858f CAMEL-15520: fixed deprecations in camel-velocity
new 003c0d0 CAMEL-15520: fixed deprecations in camel-rxjava
new ea9f0bd CAMEL-15520: fixed deprecations in camel-reactor
new ca08fa4 CAMEL-15520: fixed deprecations in camel-rabbitmq
new 5b48655 CAMEL-15520: fixed deprecations in camel-quickfix
new 0038347 CAMEL-15520: fixed deprecations in camel-mvel
new 231c93a CAMEL-15520: fixed deprecations in camel-mustache
new 7478c53 CAMEL-15520: fixed deprecations in camel-mllp
new 862c39a CAMEL-15520: fixed deprecations in camel-ldif
new 4dbb62f CAMEL-15520: fixed deprecations in camel-ldap
new a270760 CAMEL-15520: fixed deprecations in camel-jt400
new 0da32da CAMEL-15520: fixed deprecations in camel-jclouds
The 23 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:
.../component/jclouds/JcloudsBlobStoreProducer.java | 6 +++---
.../camel/component/jclouds/JcloudsComputeProducer.java | 12 ++++++------
.../apache/camel/component/jt400/Jt400PgmProducer.java | 2 +-
.../org/apache/camel/component/ldap/LdapProducer.java | 4 ++--
.../org/apache/camel/component/ldif/LdifProducer.java | 6 +++---
.../processor/mllp/Hl7AcknowledgementGenerator.java | 7 +------
.../camel/component/mustache/MustacheEndpoint.java | 2 +-
.../org/apache/camel/component/mvel/MvelEndpoint.java | 2 +-
.../apache/camel/language/mvel/MvelComponentTest.java | 6 +++---
.../camel/component/quickfixj/QuickfixjProducer.java | 4 ++--
.../camel/component/quickfixj/QuickfixjProducerTest.java | 2 +-
.../apache/camel/component/rabbitmq/RabbitConsumer.java | 11 +++--------
.../component/rabbitmq/reply/ReplyManagerSupport.java | 9 ++-------
.../reactor/engine/ReactorStreamsServiceTest.java | 2 +-
.../rxjava/engine/RxJavaStreamsServiceTest.java | 2 +-
.../org/apache/camel/component/xquery/XQueryBuilder.java | 8 ++++----
.../camel/component/schematron/SchematronProducer.java | 4 ++--
.../schematron/processor/SchematronProcessor.java | 3 ++-
.../component/schematron/SchematronEndpointTest.java | 3 ++-
.../component/springrabbit/EndpointMessageListener.java | 6 +-----
.../apache/camel/component/redis/RedisConfiguration.java | 4 ++--
.../spring/ws/SoapAttachmentResponseProcessor.java | 6 +++---
.../component/spring/ws/SoapHeaderResponseProcessor.java | 2 +-
.../apache/camel/component/spring/ws/SoapHeaderTest.java | 2 +-
.../component/spring/ws/SoapResponseAttachmentTest.java | 6 +++---
.../component/spring/ws/StockQuoteResponseProcessor.java | 7 ++-----
.../spring/ws/processor/OkResponseProcessor.java | 4 ++--
.../spring/ws/processor/PrecedenceProcessor.java | 14 +++++++-------
.../apache/camel/component/syslog/SyslogDataFormat.java | 16 ++++++++--------
.../apache/camel/component/thrift/ThriftProducer.java | 2 +-
.../thrift/client/AsyncClientMethodCallback.java | 6 +++---
.../component/thrift/server/ThriftMethodHandler.java | 6 +-----
.../camel/component/velocity/VelocityEndpoint.java | 2 +-
.../org/apache/camel/component/vertx/VertxProducer.java | 2 +-
.../camel/component/web3j/Web3jMockTestSupport.java | 5 +++--
.../apache/camel/dataformat/xstream/JsonDataFormat.java | 6 +-----
.../camel/dataformat/xstream/XStreamDataFormat.java | 6 +-----
.../camel/component/zookeeper/ZooKeeperProducer.java | 2 +-
38 files changed, 84 insertions(+), 115 deletions(-)
[camel] 09/23: CAMEL-15520: fixed deprecations in camel-spring-rabbitmq
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 34a56a20dc8526269e44ad57258df28547ad71f6
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 11:45:35 2022 +0100
CAMEL-15520: fixed deprecations in camel-spring-rabbitmq
---
.../camel/component/springrabbit/EndpointMessageListener.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/EndpointMessageListener.java b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/EndpointMessageListener.java
index 84e5d59..81a9741 100644
--- a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/EndpointMessageListener.java
+++ b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/EndpointMessageListener.java
@@ -226,11 +226,7 @@ public class EndpointMessageListener implements ChannelAwareMessageListener {
// process OK so get the reply body if we are InOut and has a body
// If the ppl don't want to send the message back, he should use the InOnly
if (sendReply && exchange.getPattern().isOutCapable()) {
- if (exchange.hasOut()) {
- body = exchange.getOut();
- } else {
- body = exchange.getIn();
- }
+ body = exchange.getMessage();
}
}
[camel] 06/23: CAMEL-15520: fixed deprecations in camel-syslog
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 96164ab835313b23c3d8c3a336a9df1964689477
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 11:09:30 2022 +0100
CAMEL-15520: fixed deprecations in camel-syslog
---
.../apache/camel/component/syslog/SyslogDataFormat.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogDataFormat.java b/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogDataFormat.java
index f629f2a..0af4a87 100644
--- a/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogDataFormat.java
+++ b/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogDataFormat.java
@@ -46,13 +46,13 @@ public class SyslogDataFormat extends ServiceSupport implements DataFormat, Data
String body = ExchangeHelper.convertToMandatoryType(exchange, String.class, inputStream);
SyslogMessage message = SyslogConverter.parseMessage(body.getBytes());
- exchange.getOut().setHeader(SyslogConstants.SYSLOG_FACILITY, message.getFacility());
- exchange.getOut().setHeader(SyslogConstants.SYSLOG_SEVERITY, message.getSeverity());
- exchange.getOut().setHeader(SyslogConstants.SYSLOG_HOSTNAME, message.getHostname());
+ exchange.getMessage().setHeader(SyslogConstants.SYSLOG_FACILITY, message.getFacility());
+ exchange.getMessage().setHeader(SyslogConstants.SYSLOG_SEVERITY, message.getSeverity());
+ exchange.getMessage().setHeader(SyslogConstants.SYSLOG_HOSTNAME, message.getHostname());
// use java.util.Date as timestamp
Date time = message.getTimestamp() != null ? message.getTimestamp().getTime() : null;
if (time != null) {
- exchange.getOut().setHeader(SyslogConstants.SYSLOG_TIMESTAMP, time);
+ exchange.getMessage().setHeader(SyslogConstants.SYSLOG_TIMESTAMP, time);
}
// Since we are behind the fact of being in an Endpoint...
@@ -60,22 +60,22 @@ public class SyslogDataFormat extends ServiceSupport implements DataFormat, Data
if (exchange.getIn().getHeader("CamelMinaLocalAddress") != null) {
message.setLocalAddress(exchange.getIn().getHeader("CamelMinaLocalAddress", String.class));
- exchange.getOut().setHeader(SyslogConstants.SYSLOG_LOCAL_ADDRESS, message.getLocalAddress());
+ exchange.getMessage().setHeader(SyslogConstants.SYSLOG_LOCAL_ADDRESS, message.getLocalAddress());
}
if (exchange.getIn().getHeader("CamelMinaRemoteAddress") != null) {
message.setRemoteAddress(exchange.getIn().getHeader("CamelMinaRemoteAddress", String.class));
- exchange.getOut().setHeader(SyslogConstants.SYSLOG_REMOTE_ADDRESS, message.getRemoteAddress());
+ exchange.getMessage().setHeader(SyslogConstants.SYSLOG_REMOTE_ADDRESS, message.getRemoteAddress());
}
if (exchange.getIn().getHeader("CamelNettyLocalAddress") != null) {
message.setLocalAddress(exchange.getIn().getHeader("CamelNettyLocalAddress", String.class));
- exchange.getOut().setHeader(SyslogConstants.SYSLOG_LOCAL_ADDRESS, message.getLocalAddress());
+ exchange.getMessage().setHeader(SyslogConstants.SYSLOG_LOCAL_ADDRESS, message.getLocalAddress());
}
if (exchange.getIn().getHeader("CamelNettyRemoteAddress") != null) {
message.setRemoteAddress(exchange.getIn().getHeader("CamelNettyRemoteAddress", String.class));
- exchange.getOut().setHeader(SyslogConstants.SYSLOG_REMOTE_ADDRESS, message.getRemoteAddress());
+ exchange.getMessage().setHeader(SyslogConstants.SYSLOG_REMOTE_ADDRESS, message.getRemoteAddress());
}
return message;
[camel] 17/23: CAMEL-15520: fixed deprecations in camel-mvel
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0038347ab4d15d80d1ab66b0059d04c161feadce
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 12:24:47 2022 +0100
CAMEL-15520: fixed deprecations in camel-mvel
---
.../src/main/java/org/apache/camel/component/mvel/MvelEndpoint.java | 2 +-
.../test/java/org/apache/camel/language/mvel/MvelComponentTest.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/camel-mvel/src/main/java/org/apache/camel/component/mvel/MvelEndpoint.java b/components/camel-mvel/src/main/java/org/apache/camel/component/mvel/MvelEndpoint.java
index 6703adf..50dab51 100644
--- a/components/camel-mvel/src/main/java/org/apache/camel/component/mvel/MvelEndpoint.java
+++ b/components/camel-mvel/src/main/java/org/apache/camel/component/mvel/MvelEndpoint.java
@@ -145,7 +145,7 @@ public class MvelEndpoint extends ResourceEndpoint {
Object result = TemplateRuntime.execute(compiled, mvelContext, variableMap);
// now lets output the results to the exchange
- Message out = exchange.getOut();
+ Message out = exchange.getMessage();
out.setBody(result.toString());
out.setHeaders(exchange.getIn().getHeaders());
}
diff --git a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelComponentTest.java b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelComponentTest.java
index 26ab431..61773a2 100644
--- a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelComponentTest.java
+++ b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelComponentTest.java
@@ -38,7 +38,7 @@ public class MvelComponentTest extends CamelTestSupport {
}
});
- assertEquals("{ \"text\": \"The result is 14\" }", exchange.getOut().getBody());
+ assertEquals("{ \"text\": \"The result is 14\" }", exchange.getMessage().getBody());
}
@Test
@@ -52,7 +52,7 @@ public class MvelComponentTest extends CamelTestSupport {
}
});
- assertEquals("{ \"text\": \"The result is 21\" }", exchange.getOut().getBody());
+ assertEquals("{ \"text\": \"The result is 21\" }", exchange.getMessage().getBody());
}
@Test
@@ -66,7 +66,7 @@ public class MvelComponentTest extends CamelTestSupport {
}
});
- assertEquals("{ \"text\": \"The result is 28\" }", exchange.getOut().getBody());
+ assertEquals("{ \"text\": \"The result is 28\" }", exchange.getMessage().getBody());
}
@Override
[camel] 11/23: CAMEL-15520: fixed deprecations in camel-saxon
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3f54106ea398e6d194e217ec37e295ff214aebf9
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 11:57:03 2022 +0100
CAMEL-15520: fixed deprecations in camel-saxon
---
.../java/org/apache/camel/component/xquery/XQueryBuilder.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
index 63493ab..85eb51c 100644
--- a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
+++ b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
@@ -108,10 +108,10 @@ public abstract class XQueryBuilder implements Expression, Predicate, NamespaceA
@Override
public void process(Exchange exchange) throws Exception {
Object body = evaluate(exchange);
- exchange.getOut().setBody(body);
+ exchange.getMessage().setBody(body);
// propagate headers
- exchange.getOut().getHeaders().putAll(exchange.getIn().getHeaders());
+ exchange.getMessage().getHeaders().putAll(exchange.getIn().getHeaders());
}
@Override
@@ -223,7 +223,7 @@ public abstract class XQueryBuilder implements Expression, Predicate, NamespaceA
DOMResult result = new DOMResult();
DynamicQueryContext context = createDynamicContext(exchange);
XQueryExpression expression = getExpression();
- expression.pull(context, result, properties);
+ expression.run(context, result, properties);
return result.getNode();
}
@@ -232,7 +232,7 @@ public abstract class XQueryBuilder implements Expression, Predicate, NamespaceA
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
Result result = new StreamResult(buffer);
- getExpression().pull(createDynamicContext(exchange), result, properties);
+ getExpression().run(createDynamicContext(exchange), result, properties);
byte[] answer = buffer.toByteArray();
buffer.close();
[camel] 20/23: CAMEL-15520: fixed deprecations in camel-ldif
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 862c39adc1c68915dc8f0e3d93451438b2f79acd
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 12:33:11 2022 +0100
CAMEL-15520: fixed deprecations in camel-ldif
---
.../src/main/java/org/apache/camel/component/ldif/LdifProducer.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/camel-ldif/src/main/java/org/apache/camel/component/ldif/LdifProducer.java b/components/camel-ldif/src/main/java/org/apache/camel/component/ldif/LdifProducer.java
index 16ce5ac..f851c90 100644
--- a/components/camel-ldif/src/main/java/org/apache/camel/component/ldif/LdifProducer.java
+++ b/components/camel-ldif/src/main/java/org/apache/camel/component/ldif/LdifProducer.java
@@ -67,11 +67,11 @@ public class LdifProducer extends DefaultProducer {
List<String> result = null;
// Pass through everything
- exchange.setOut(exchange.getIn());
+ exchange.setMessage(exchange.getIn());
// If nothing to do, then return an empty body
if (ObjectHelper.isEmpty(body)) {
- exchange.getOut().setBody("");
+ exchange.getMessage().setBody("");
} else if (body.startsWith(LDIF_HEADER)) {
LOG.debug("Reading from LDIF body");
result = processLdif(new StringReader(body));
@@ -89,7 +89,7 @@ public class LdifProducer extends DefaultProducer {
}
}
- exchange.getOut().setBody(result);
+ exchange.getMessage().setBody(result);
}
/**
[camel] 03/23: CAMEL-15520: fixed deprecations in camel-web3j
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 314638f6ad1219f330fff283b87a87b5b4703c8f
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 10:51:07 2022 +0100
CAMEL-15520: fixed deprecations in camel-web3j
---
.../java/org/apache/camel/component/web3j/Web3jMockTestSupport.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java
index 237adda..31bc215 100755
--- a/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java
+++ b/components/camel-web3j/src/test/java/org/apache/camel/component/web3j/Web3jMockTestSupport.java
@@ -72,7 +72,8 @@ public class Web3jMockTestSupport extends CamelTestSupport {
@Override
@BeforeEach
public void setUp() throws Exception {
- MockitoAnnotations.initMocks(this);
- super.setUp();
+ try (AutoCloseable closeable = MockitoAnnotations.openMocks(this)) {
+ super.setUp();
+ }
}
}
[camel] 18/23: CAMEL-15520: fixed deprecations in camel-mustache
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 231c93a2750c3861336c7989db738201e9232dd3
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 12:25:39 2022 +0100
CAMEL-15520: fixed deprecations in camel-mustache
---
.../main/java/org/apache/camel/component/mustache/MustacheEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheEndpoint.java b/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheEndpoint.java
index 8657b02..a8da82b 100644
--- a/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheEndpoint.java
+++ b/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/MustacheEndpoint.java
@@ -116,7 +116,7 @@ public class MustacheEndpoint extends ResourceEndpoint {
writer.flush();
// Fill out message
- Message out = exchange.getOut();
+ Message out = exchange.getMessage();
out.setBody(writer.toString());
out.setHeaders(exchange.getIn().getHeaders());
}
[camel] 15/23: CAMEL-15520: fixed deprecations in camel-rabbitmq
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ca08fa4b045c866b856757d4ae9f6a9672f25493
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 12:13:33 2022 +0100
CAMEL-15520: fixed deprecations in camel-rabbitmq
---
.../org/apache/camel/component/rabbitmq/RabbitConsumer.java | 11 +++--------
.../camel/component/rabbitmq/reply/ReplyManagerSupport.java | 9 ++-------
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitConsumer.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitConsumer.java
index 91f12f3..797c93f 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitConsumer.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitConsumer.java
@@ -116,12 +116,7 @@ class RabbitConsumer extends ServiceSupport implements com.rabbitmq.client.Consu
}
// obtain the message after processing
- Message msg;
- if (exchange.hasOut()) {
- msg = exchange.getOut();
- } else {
- msg = exchange.getIn();
- }
+ Message msg = exchange.getMessage();
if (exchange.getException() != null) {
consumer.getExceptionHandler().handleException("Error processing exchange", exchange, exchange.getException());
@@ -167,8 +162,8 @@ class RabbitConsumer extends ServiceSupport implements com.rabbitmq.client.Consu
// the inOut exchange failed so put the exception in the body
// and send back
msg.setBody(exchange.getException());
- exchange.setOut(msg);
- exchange.getOut().setHeader(RabbitMQConstants.CORRELATIONID,
+ exchange.setMessage(msg);
+ exchange.getMessage().setHeader(RabbitMQConstants.CORRELATIONID,
exchange.getIn().getHeader(RabbitMQConstants.CORRELATIONID));
try {
consumer.getEndpoint().publishExchangeToChannel(exchange, channel, properties.getReplyTo());
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/ReplyManagerSupport.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/ReplyManagerSupport.java
index e8f7972..4005b45 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/ReplyManagerSupport.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/reply/ReplyManagerSupport.java
@@ -180,13 +180,8 @@ public abstract class ReplyManagerSupport extends ServiceSupport implements Repl
// restore correlation id in case the remote server messed
// with it
if (holder.getOriginalCorrelationId() != null) {
- if (exchange.hasOut()) {
- exchange.getOut().setHeader(RabbitMQConstants.CORRELATIONID,
- holder.getOriginalCorrelationId());
- } else {
- exchange.getIn().setHeader(RabbitMQConstants.CORRELATIONID,
- holder.getOriginalCorrelationId());
- }
+ exchange.getMessage().setHeader(RabbitMQConstants.CORRELATIONID,
+ holder.getOriginalCorrelationId());
}
}
} finally {
[camel] 16/23: CAMEL-15520: fixed deprecations in camel-quickfix
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5b486553ec7870591e6129bc2c9f423c8bb8dc12
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 12:15:07 2022 +0100
CAMEL-15520: fixed deprecations in camel-quickfix
---
.../java/org/apache/camel/component/quickfixj/QuickfixjProducer.java | 4 ++--
.../org/apache/camel/component/quickfixj/QuickfixjProducerTest.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjProducer.java b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjProducer.java
index 8738792..485bbfc 100644
--- a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjProducer.java
+++ b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjProducer.java
@@ -92,8 +92,8 @@ public class QuickfixjProducer extends DefaultProducer {
if (callable != null) {
Message reply = callable.call();
- exchange.getOut().getHeaders().putAll(camelMessage.getHeaders());
- exchange.getOut().setBody(reply);
+ exchange.getMessage().getHeaders().putAll(camelMessage.getHeaders());
+ exchange.getMessage().setBody(reply);
}
}
diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjProducerTest.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjProducerTest.java
index ff084b6..f1cfa3a 100644
--- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjProducerTest.java
+++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjProducerTest.java
@@ -125,7 +125,7 @@ public class QuickfixjProducerTest {
1000L, Long.class)).thenReturn(5000L);
org.apache.camel.Message mockOutboundCamelMessage = Mockito.mock(org.apache.camel.Message.class);
- Mockito.when(mockExchange.getOut()).thenReturn(mockOutboundCamelMessage);
+ Mockito.when(mockExchange.getMessage()).thenReturn(mockOutboundCamelMessage);
final Message outboundFixMessage = new Email();
outboundFixMessage.getHeader().setString(SenderCompID.FIELD, "TARGET");
[camel] 19/23: CAMEL-15520: fixed deprecations in camel-mllp
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7478c539fb40e62496d0fdcf6ce2fec16431dbcb
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 12:32:54 2022 +0100
CAMEL-15520: fixed deprecations in camel-mllp
---
.../apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java b/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java
index 5cc1f9f..877880a 100644
--- a/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java
+++ b/components/camel-mllp/src/main/java/org/apache/camel/processor/mllp/Hl7AcknowledgementGenerator.java
@@ -64,12 +64,7 @@ public class Hl7AcknowledgementGenerator extends ServiceSupport implements Proce
@Override
public void process(Exchange exchange) throws Exception {
- Message message;
- if (exchange.hasOut()) {
- message = exchange.getOut();
- } else {
- message = exchange.getIn();
- }
+ Message message = exchange.getMessage();
byte[] hl7Bytes = message.getMandatoryBody(byte[].class);
[camel] 10/23: CAMEL-15520: fixed deprecations in camel-schematron
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 08d92d87e9cb01efc4939e1547890d3652a6de59
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 11:53:16 2022 +0100
CAMEL-15520: fixed deprecations in camel-schematron
---
.../org/apache/camel/component/schematron/SchematronProducer.java | 4 ++--
.../camel/component/schematron/processor/SchematronProcessor.java | 3 ++-
.../org/apache/camel/component/schematron/SchematronEndpointTest.java | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java
index eba770b..4d412bd 100644
--- a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java
+++ b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java
@@ -85,8 +85,8 @@ public class SchematronProducer extends DefaultProducer {
headers.put(Constants.VALIDATION_STATUS, status);
headers.put(Constants.VALIDATION_REPORT, report);
if (exchange.getPattern().isOutCapable()) {
- exchange.getOut().setHeaders(exchange.getIn().getHeaders());
- exchange.getOut().getHeaders().putAll(headers);
+ exchange.getMessage().setHeaders(exchange.getIn().getHeaders());
+ exchange.getMessage().getHeaders().putAll(headers);
} else {
exchange.getIn().getHeaders().putAll(headers);
}
diff --git a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessor.java b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessor.java
index dfc41cc..f90389f 100644
--- a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessor.java
+++ b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessor.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.schematron.processor;
import java.io.StringWriter;
+import java.nio.charset.Charset;
import javax.xml.transform.Source;
import javax.xml.transform.Templates;
@@ -61,7 +62,7 @@ public class SchematronProcessor {
* @return
*/
public String validate(final String xml) {
- final Source source = new SAXSource(reader, new InputSource(IOUtils.toInputStream(xml)));
+ final Source source = new SAXSource(reader, new InputSource(IOUtils.toInputStream(xml, Charset.defaultCharset())));
return validate(source);
}
diff --git a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronEndpointTest.java b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronEndpointTest.java
index 7aa76a1..8749f20 100644
--- a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronEndpointTest.java
+++ b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronEndpointTest.java
@@ -39,7 +39,8 @@ public class SchematronEndpointTest extends CamelTestSupport {
@Test
public void testSchematronFileReadFromClassPath() throws Exception {
- String payload = IOUtils.toString(ClassLoader.getSystemResourceAsStream("xml/article-1.xml"));
+ String payload = IOUtils.toString(ClassLoader.getSystemResourceAsStream("xml/article-1.xml"),
+ Charset.defaultCharset());
Endpoint endpoint = context().getEndpoint("schematron://sch/schematron-1.sch");
Producer producer = endpoint.createProducer();
Exchange exchange = new DefaultExchange(context, ExchangePattern.InOut);
[camel] 01/23: CAMEL-15520: fixed deprecations in camel-zookeeper
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7cd911712d02d06b6c794530b3ab4e486a4220c6
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 10:37:48 2022 +0100
CAMEL-15520: fixed deprecations in camel-zookeeper
---
.../java/org/apache/camel/component/zookeeper/ZooKeeperProducer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperProducer.java b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperProducer.java
index 3141f38..f4f93ba 100644
--- a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperProducer.java
+++ b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperProducer.java
@@ -148,7 +148,7 @@ public class ZooKeeperProducer extends DefaultProducer {
context.exchange.setException(result.getException());
}
- context.exchange.setOut(out);
+ context.exchange.setMessage(out);
}
private OperationResult listChildren(ProductionContext context) throws Exception {
[camel] 02/23: CAMEL-15520: fixed deprecations in camel-xstream
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8629c9462e3b1067524bec5b94901f61e5dbdd6f
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 10:43:37 2022 +0100
CAMEL-15520: fixed deprecations in camel-xstream
---
.../java/org/apache/camel/dataformat/xstream/JsonDataFormat.java | 6 +-----
.../java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java | 6 +-----
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/JsonDataFormat.java b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/JsonDataFormat.java
index 2d0354f..a884754 100644
--- a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/JsonDataFormat.java
+++ b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/JsonDataFormat.java
@@ -79,11 +79,7 @@ public class JsonDataFormat extends AbstractXStreamWrapper {
super.marshal(exchange, body, stream);
if (isContentTypeHeader()) {
- if (exchange.hasOut()) {
- exchange.getOut().setHeader(Exchange.CONTENT_TYPE, "application/json");
- } else {
- exchange.getIn().setHeader(Exchange.CONTENT_TYPE, "application/json");
- }
+ exchange.getMessage().setHeader(Exchange.CONTENT_TYPE, "application/json");
}
}
diff --git a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java
index 93a10a4..5b365df 100644
--- a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java
+++ b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/XStreamDataFormat.java
@@ -69,11 +69,7 @@ public class XStreamDataFormat extends AbstractXStreamWrapper {
super.marshal(exchange, body, stream);
if (isContentTypeHeader()) {
- if (exchange.hasOut()) {
- exchange.getOut().setHeader(Exchange.CONTENT_TYPE, "application/xml");
- } else {
- exchange.getIn().setHeader(Exchange.CONTENT_TYPE, "application/xml");
- }
+ exchange.getMessage().setHeader(Exchange.CONTENT_TYPE, "application/xml");
}
}
[camel] 21/23: CAMEL-15520: fixed deprecations in camel-ldap
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4dbb62f32e6862ef85c86d9e9703dbc53ec7fcfd
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 12:34:20 2022 +0100
CAMEL-15520: fixed deprecations in camel-ldap
---
.../src/main/java/org/apache/camel/component/ldap/LdapProducer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapProducer.java b/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapProducer.java
index de085b2..0079167 100644
--- a/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapProducer.java
+++ b/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapProducer.java
@@ -84,8 +84,8 @@ public class LdapProducer extends DefaultProducer {
}
data = pagedSearch((LdapContext) dirContext, filter);
}
- exchange.getOut().setBody(data);
- exchange.getOut().setHeaders(exchange.getIn().getHeaders());
+ exchange.getMessage().setBody(data);
+ exchange.getMessage().setHeaders(exchange.getIn().getHeaders());
} finally {
if (dirContext != null) {
dirContext.close();
[camel] 07/23: CAMEL-15520: fixed deprecations in camel-spring-ws
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a2995c3ce21bde1a6f2c433035d1a72d4a5bb1a3
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 11:29:15 2022 +0100
CAMEL-15520: fixed deprecations in camel-spring-ws
---
.../spring/ws/SoapAttachmentResponseProcessor.java | 6 +++---
.../component/spring/ws/SoapHeaderResponseProcessor.java | 2 +-
.../apache/camel/component/spring/ws/SoapHeaderTest.java | 2 +-
.../component/spring/ws/SoapResponseAttachmentTest.java | 6 +++---
.../component/spring/ws/StockQuoteResponseProcessor.java | 7 ++-----
.../component/spring/ws/processor/OkResponseProcessor.java | 4 ++--
.../component/spring/ws/processor/PrecedenceProcessor.java | 14 +++++++-------
7 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapAttachmentResponseProcessor.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapAttachmentResponseProcessor.java
index 9875850..8ff68d6 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapAttachmentResponseProcessor.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapAttachmentResponseProcessor.java
@@ -30,10 +30,10 @@ public class SoapAttachmentResponseProcessor implements Processor {
@Override
public void process(Exchange exchange) throws Exception {
- exchange.setOut(exchange.getIn());
- exchange.getOut(AttachmentMessage.class).addAttachment("responseAttachment1.txt",
+ exchange.setMessage(exchange.getIn());
+ exchange.getMessage(AttachmentMessage.class).addAttachment("responseAttachment1.txt",
new DataHandler("responseAttachment1", "text/plain"));
- exchange.getOut(AttachmentMessage.class).addAttachment("responseAttachment2.xml",
+ exchange.getMessage(AttachmentMessage.class).addAttachment("responseAttachment2.xml",
new DataHandler("<responseAttachment2/>", "application/xml"));
}
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapHeaderResponseProcessor.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapHeaderResponseProcessor.java
index cfd08c4..ebfa1cf 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapHeaderResponseProcessor.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapHeaderResponseProcessor.java
@@ -27,7 +27,7 @@ public class SoapHeaderResponseProcessor implements Processor {
@Override
public void process(Exchange exchange) throws Exception {
- exchange.setOut(exchange.getIn());
+ exchange.setMessage(exchange.getIn());
}
}
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapHeaderTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapHeaderTest.java
index 729fe08..1588891 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapHeaderTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapHeaderTest.java
@@ -58,7 +58,7 @@ public class SoapHeaderTest {
}
});
assertNotNull(result);
- String header = result.getOut().getHeader(SpringWebserviceConstants.SPRING_WS_SOAP_HEADER, String.class);
+ String header = result.getMessage().getHeader(SpringWebserviceConstants.SPRING_WS_SOAP_HEADER, String.class);
assertEquals(soapHeader, header);
}
}
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java
index 564d431..3711de8 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/SoapResponseAttachmentTest.java
@@ -61,8 +61,8 @@ public class SoapResponseAttachmentTest {
}
});
assertNotNull(result);
- assertNotNull(result.getOut(AttachmentMessage.class).getAttachment("requestAttachment1.txt"));
- assertNotNull(result.getOut(AttachmentMessage.class).getAttachment("responseAttachment1.txt"));
- assertNotNull(result.getOut(AttachmentMessage.class).getAttachment("responseAttachment2.xml"));
+ assertNotNull(result.getMessage(AttachmentMessage.class).getAttachment("requestAttachment1.txt"));
+ assertNotNull(result.getMessage(AttachmentMessage.class).getAttachment("responseAttachment1.txt"));
+ assertNotNull(result.getMessage(AttachmentMessage.class).getAttachment("responseAttachment2.xml"));
}
}
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/StockQuoteResponseProcessor.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/StockQuoteResponseProcessor.java
index 423daff..e8cca64 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/StockQuoteResponseProcessor.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/StockQuoteResponseProcessor.java
@@ -42,11 +42,8 @@ public class StockQuoteResponseProcessor implements Processor {
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
DocumentBuilder db = dbf.newDocumentBuilder();
Document doc = db.parse(is);
- if (exchange.getIn().getHeader("setin") != null && exchange.getIn().getHeader("setin").equals("true")) {
- exchange.getIn().setBody(doc);
- } else {
- exchange.getOut().setBody(doc);
- }
+
+ exchange.getMessage().setBody(doc);
}
}
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/processor/OkResponseProcessor.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/processor/OkResponseProcessor.java
index 9ee2b9c..958a81a 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/processor/OkResponseProcessor.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/processor/OkResponseProcessor.java
@@ -42,8 +42,8 @@ public class OkResponseProcessor implements Processor {
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
DocumentBuilder db = dbf.newDocumentBuilder();
Document doc = db.parse(is);
- exchange.getOut().copyFrom(exchange.getIn());
- exchange.getOut().setBody(doc);
+ exchange.getMessage().copyFrom(exchange.getIn());
+ exchange.getMessage().setBody(doc);
}
}
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/processor/PrecedenceProcessor.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/processor/PrecedenceProcessor.java
index 6766fb1..e2ac18a 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/processor/PrecedenceProcessor.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/processor/PrecedenceProcessor.java
@@ -41,20 +41,20 @@ public class PrecedenceProcessor implements Processor {
DocumentBuilder db = dbf.newDocumentBuilder();
Document doc = db.parse(is);
- exchange.getIn().setHeader(SpringWebserviceConstants.SPRING_WS_ADDRESSING_ACTION,
+ exchange.getMessage().setHeader(SpringWebserviceConstants.SPRING_WS_ADDRESSING_ACTION,
new URI("http://actionPrecedence.com"));
- exchange.getIn().setHeader(SpringWebserviceConstants.SPRING_WS_ADDRESSING_PRODUCER_REPLY_TO,
+ exchange.getMessage().setHeader(SpringWebserviceConstants.SPRING_WS_ADDRESSING_PRODUCER_REPLY_TO,
new URI("http://replyPrecedence.to"));
- exchange.getIn().setHeader(SpringWebserviceConstants.SPRING_WS_ADDRESSING_PRODUCER_FAULT_TO,
+ exchange.getMessage().setHeader(SpringWebserviceConstants.SPRING_WS_ADDRESSING_PRODUCER_FAULT_TO,
new URI("http://faultPrecedence.to"));
- exchange.getIn().setHeader(SpringWebserviceConstants.SPRING_WS_ADDRESSING_CONSUMER_OUTPUT_ACTION,
+ exchange.getMessage().setHeader(SpringWebserviceConstants.SPRING_WS_ADDRESSING_CONSUMER_OUTPUT_ACTION,
new URI("http://outputHeader.com"));
- exchange.getIn().setHeader(SpringWebserviceConstants.SPRING_WS_ADDRESSING_CONSUMER_FAULT_ACTION,
+ exchange.getMessage().setHeader(SpringWebserviceConstants.SPRING_WS_ADDRESSING_CONSUMER_FAULT_ACTION,
new URI("http://faultHeader.com"));
- exchange.getOut().copyFrom(exchange.getIn());
- exchange.getOut().setBody(doc);
+ exchange.getMessage().copyFrom(exchange.getIn());
+ exchange.getMessage().setBody(doc);
}
}
[camel] 23/23: CAMEL-15520: fixed deprecations in camel-jclouds
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0da32dabed78ac14d5a07a851281004dcc61d5cc
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 12:56:35 2022 +0100
CAMEL-15520: fixed deprecations in camel-jclouds
---
.../camel/component/jclouds/JcloudsBlobStoreProducer.java | 6 +++---
.../camel/component/jclouds/JcloudsComputeProducer.java | 12 ++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducer.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducer.java
index c652676..a02f61a 100644
--- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducer.java
+++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducer.java
@@ -58,9 +58,9 @@ public class JcloudsBlobStoreProducer extends JcloudsProducer {
LOG.trace("Processing {} operation on '{}'", operation, container + "/" + blobName);
}
if (JcloudsConstants.GET.equals(operation)) {
- exchange.getOut().setBody(JcloudsBlobStoreHelper.readBlob(blobStore, container, blobName));
+ exchange.getMessage().setBody(JcloudsBlobStoreHelper.readBlob(blobStore, container, blobName));
} else if (JcloudsConstants.COUNT_BLOBS.equals(operation)) {
- exchange.getOut().setBody(JcloudsBlobStoreHelper.countBlob(blobStore, container));
+ exchange.getMessage().setBody(JcloudsBlobStoreHelper.countBlob(blobStore, container));
} else if (JcloudsConstants.REMOVE_BLOB.equals(operation)) {
JcloudsBlobStoreHelper.removeBlob(blobStore, container, blobName);
} else if (JcloudsConstants.CLEAR_CONTAINER.equals(operation)) {
@@ -68,7 +68,7 @@ public class JcloudsBlobStoreProducer extends JcloudsProducer {
} else if (JcloudsConstants.DELETE_CONTAINER.equals(operation)) {
JcloudsBlobStoreHelper.deleteContainer(blobStore, container);
} else if (JcloudsConstants.CONTAINER_EXISTS.equals(operation)) {
- exchange.getOut().setBody(JcloudsBlobStoreHelper.containerExists(blobStore, container));
+ exchange.getMessage().setBody(JcloudsBlobStoreHelper.containerExists(blobStore, container));
} else if (JcloudsConstants.REMOVE_BLOBS.equals(operation)) {
JcloudsBlobStoreHelper.removeBlobs(blobStore, container, blobNames);
} else {
diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java
index 039b80c..7f631b1 100644
--- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java
+++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java
@@ -107,8 +107,8 @@ public class JcloudsComputeProducer extends JcloudsProducer {
try {
Set<? extends NodeMetadata> nodeMetadatas = computeService.createNodesInGroup(group, 1, builder.build());
- exchange.getOut().setBody(nodeMetadatas);
- exchange.getOut().setHeaders(exchange.getIn().getHeaders());
+ exchange.getMessage().setBody(nodeMetadatas);
+ exchange.getMessage().setHeaders(exchange.getIn().getHeaders());
} catch (RunNodesException e) {
throw new CamelExchangeException("Error creating jclouds node.", exchange, e);
}
@@ -144,7 +144,7 @@ public class JcloudsComputeProducer extends JcloudsProducer {
exchange.setProperty(JcloudsConstants.RUN_SCRIPT_ERROR, execResponse.getError());
exchange.setProperty(JcloudsConstants.RUN_SCRIPT_EXIT_CODE, execResponse.getExitStatus());
- exchange.getOut().setBody(execResponse.getOutput());
+ exchange.getMessage().setBody(execResponse.getOutput());
}
/**
@@ -161,7 +161,7 @@ public class JcloudsComputeProducer extends JcloudsProducer {
protected void listNodes(Exchange exchange) {
Predicate<ComputeMetadata> predicate = getComputePredicate(exchange);
Set<? extends ComputeMetadata> computeMetadatas = computeService.listNodesDetailsMatching(predicate);
- exchange.getOut().setBody(computeMetadatas);
+ exchange.getMessage().setBody(computeMetadatas);
}
/**
@@ -169,7 +169,7 @@ public class JcloudsComputeProducer extends JcloudsProducer {
*/
protected void listImages(Exchange exchange) {
Set<? extends Image> images = computeService.listImages();
- exchange.getOut().setBody(images);
+ exchange.getMessage().setBody(images);
}
/**
@@ -177,7 +177,7 @@ public class JcloudsComputeProducer extends JcloudsProducer {
*/
protected void listHardware(Exchange exchange) {
Set<? extends Hardware> hardwareProfiles = computeService.listHardwareProfiles();
- exchange.getOut().setBody(hardwareProfiles);
+ exchange.getMessage().setBody(hardwareProfiles);
}
/**
[camel] 05/23: CAMEL-15520: fixed deprecations in camel-thrift
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b7d11e2986388dbb840a06387a414ceb28c49f83
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 11:05:09 2022 +0100
CAMEL-15520: fixed deprecations in camel-thrift
---
.../main/java/org/apache/camel/component/thrift/ThriftProducer.java | 2 +-
.../camel/component/thrift/client/AsyncClientMethodCallback.java | 6 +++---
.../apache/camel/component/thrift/server/ThriftMethodHandler.java | 6 +-----
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/ThriftProducer.java b/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/ThriftProducer.java
index 617ee00..444701a 100644
--- a/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/ThriftProducer.java
+++ b/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/ThriftProducer.java
@@ -81,7 +81,7 @@ public class ThriftProducer extends DefaultAsyncProducer implements AsyncProduce
Message message = exchange.getIn();
try {
Object outBody = ThriftUtils.invokeSyncMethod(thriftClient, configuration.getMethod(), message.getBody());
- exchange.getOut().setBody(outBody);
+ exchange.getMessage().setBody(outBody);
} catch (Exception e) {
if (e.getCause() instanceof TException) {
exchange.setException(e.getCause());
diff --git a/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/client/AsyncClientMethodCallback.java b/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/client/AsyncClientMethodCallback.java
index 7c1b8a6..759a6de 100644
--- a/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/client/AsyncClientMethodCallback.java
+++ b/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/client/AsyncClientMethodCallback.java
@@ -32,11 +32,11 @@ public class AsyncClientMethodCallback implements AsyncMethodCallback {
@Override
public void onComplete(Object response) {
- exchange.getOut().setHeaders(exchange.getIn().getHeaders());
+ exchange.getMessage().setHeaders(exchange.getIn().getHeaders());
if (response == null) {
- exchange.getOut().setBody(response);
+ exchange.getMessage().setBody(response);
} else {
- exchange.getOut().setBody(response, response.getClass());
+ exchange.getMessage().setBody(response, response.getClass());
}
callback.done(false);
}
diff --git a/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/server/ThriftMethodHandler.java b/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/server/ThriftMethodHandler.java
index eca3382..4ad7095 100644
--- a/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/server/ThriftMethodHandler.java
+++ b/components/camel-thrift/src/main/java/org/apache/camel/component/thrift/server/ThriftMethodHandler.java
@@ -67,11 +67,7 @@ public class ThriftMethodHandler implements MethodHandler {
callback.onError(exception);
}
- if (exchange.hasOut()) {
- message = exchange.getOut();
- } else {
- message = exchange.getIn();
- }
+ message = exchange.getMessage();
if (message != null) {
Class returnType = ThriftUtils.findMethodReturnType(args[args.length - 1].getClass(), "onComplete");
[camel] 22/23: CAMEL-15520: fixed deprecations in camel-jt400
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a270760f36ed3a3bc4783c2fcd61b707c11de8ec
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 12:40:37 2022 +0100
CAMEL-15520: fixed deprecations in camel-jt400
---
.../main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java b/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java
index 2c24ae1..045c36e 100644
--- a/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java
+++ b/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java
@@ -203,7 +203,7 @@ public class Jt400PgmProducer extends DefaultProducer {
Object[] bodyOUT = new Object[results.size()];
bodyOUT = results.toArray(bodyOUT);
- exchange.getOut().setBody(bodyOUT);
+ exchange.getMessage().setBody(bodyOUT);
}
private String getOutputMessages(ProgramCall pgmCall) throws Exception {
[camel] 04/23: CAMEL-15520: fixed deprecations in camel-vertx
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a7d87c0f1ddfcae7d286fb7b999d0b90ea90ce51
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 10:55:50 2022 +0100
CAMEL-15520: fixed deprecations in camel-vertx
---
.../src/main/java/org/apache/camel/component/vertx/VertxProducer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-vertx/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxProducer.java b/components/camel-vertx/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxProducer.java
index ace911c..ea4eb70 100644
--- a/components/camel-vertx/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxProducer.java
+++ b/components/camel-vertx/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxProducer.java
@@ -99,7 +99,7 @@ public class VertxProducer extends DefaultAsyncProducer {
if (e != null) {
exchange.setException(e);
} else {
- exchange.getOut().setBody(event.result().body());
+ exchange.getMessage().setBody(event.result().body());
}
} finally {
callback.done(false);
[camel] 08/23: CAMEL-15520: fixed deprecations in camel-redis
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 810d265b9503d70acaaebdae4b8f3bc181292cca
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 11:31:39 2022 +0100
CAMEL-15520: fixed deprecations in camel-redis
---
.../java/org/apache/camel/component/redis/RedisConfiguration.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java
index feaa4cb..417da7b 100644
--- a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java
+++ b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/RedisConfiguration.java
@@ -146,10 +146,10 @@ public class RedisConfiguration {
managedConnectionFactory = true;
if (host != null) {
- jedisConnectionFactory.setHostName(host);
+ jedisConnectionFactory.getStandaloneConfiguration().setHostName(host);
}
if (port != null) {
- jedisConnectionFactory.setPort(port);
+ jedisConnectionFactory.getStandaloneConfiguration().setPort(port);
}
jedisConnectionFactory.afterPropertiesSet();
connectionFactory = jedisConnectionFactory;
[camel] 13/23: CAMEL-15520: fixed deprecations in camel-rxjava
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 003c0d083e8f019091df7461f05d5ef1ea2cb3cc
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 12:01:32 2022 +0100
CAMEL-15520: fixed deprecations in camel-rxjava
---
.../apache/camel/component/rxjava/engine/RxJavaStreamsServiceTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTest.java b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTest.java
index 942ba2c..c5e8cec 100644
--- a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTest.java
+++ b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTest.java
@@ -192,7 +192,7 @@ public class RxJavaStreamsServiceTest extends RxJavaStreamsServiceTestSupport {
crs.process("direct:stream", publisher -> Flowable.fromPublisher(publisher).map(e -> {
int i = e.getIn().getBody(Integer.class);
- e.getOut().setBody(-i);
+ e.getMessage().setBody(-i);
return e;
}));
[camel] 12/23: CAMEL-15520: fixed deprecations in camel-velocity
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 20b858f205b103ed9d5a0090708d34f7fcddac99
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 11:58:39 2022 +0100
CAMEL-15520: fixed deprecations in camel-velocity
---
.../main/java/org/apache/camel/component/velocity/VelocityEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java b/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
index 9d39998..897873b 100644
--- a/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
+++ b/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
@@ -244,7 +244,7 @@ public class VelocityEndpoint extends ResourceEndpoint {
engine.evaluate(velocityContext, buffer, logTag, reader);
// now lets output the results to the exchange
- Message out = exchange.getOut();
+ Message out = exchange.getMessage();
out.setBody(buffer.toString());
out.setHeaders(exchange.getIn().getHeaders());
}
[camel] 14/23: CAMEL-15520: fixed deprecations in camel-reactor
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ea9f0bdfd83d5af3fa48aa1cb881680c3045ecac
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 7 12:04:42 2022 +0100
CAMEL-15520: fixed deprecations in camel-reactor
---
.../camel/component/reactor/engine/ReactorStreamsServiceTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-reactor/src/test/java/org/apache/camel/component/reactor/engine/ReactorStreamsServiceTest.java b/components/camel-reactor/src/test/java/org/apache/camel/component/reactor/engine/ReactorStreamsServiceTest.java
index 0b040bf..af386f6 100644
--- a/components/camel-reactor/src/test/java/org/apache/camel/component/reactor/engine/ReactorStreamsServiceTest.java
+++ b/components/camel-reactor/src/test/java/org/apache/camel/component/reactor/engine/ReactorStreamsServiceTest.java
@@ -217,7 +217,7 @@ public class ReactorStreamsServiceTest extends ReactorStreamsServiceTestSupport
publisher -> Flux.from(publisher)
.map(e -> {
int i = e.getIn().getBody(Integer.class);
- e.getOut().setBody(-i);
+ e.getMessage().setBody(-i);
return e;
}));