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:52 UTC
[camel] 07/23: CAMEL-15520: fixed deprecations in camel-spring-ws
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);
}
}