[camel] 08/13: CAMEL-13678: Move attachments out of camel-core into camel-attachments.

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch CAMEL-13678
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 44f3e23187c42db4706ebfb21a80ea9e470b959f
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Jul 8 10:26:30 2019 +0200

    CAMEL-13678: Move attachments out of camel-core into camel-attachments.
---
 .../camel/component/spring/ws/SpringWebserviceConsumer.java    |  2 +-
 .../camel/component/spring/ws/SpringWebserviceMessage.java     |  1 +
 .../camel/component/spring/ws/SpringWebserviceProducer.java    |  2 +-
 .../spring/ws/filter/impl/BasicMessageFilterTest.java          | 10 +++++++---
 4 files changed, 10 insertions(+), 5 deletions(-)

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 394638e..23e680e 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
@@ -124,9 +124,9 @@ public class SpringWebserviceConsumer extends 
DefaultConsumer implements Message
         // create inbound message
         WebServiceMessage request = messageContext.getRequest();
         SpringWebserviceMessage inMessage = new 
SpringWebserviceMessage(exchange.getContext(), request);
+        exchange.setIn(inMessage);
         extractSourceFromSoapHeader(inMessage.getHeaders(), request);
         extractAttachmentsFromRequest(request, new 
DefaultAttachmentMessage(inMessage));
-        exchange.setIn(inMessage);
     }
 
     private void 
populateExchangeWithPropertiesFromMessageContext(MessageContext messageContext,
diff --git 
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceMessage.java
 
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceMessage.java
index 6101345..143e8d8 100644
--- 
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceMessage.java
+++ 
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceMessage.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.spring.ws;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
 import org.apache.camel.support.DefaultMessage;
 import org.springframework.ws.WebServiceMessage;
 
diff --git 
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
 
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
index d389d8e..eef3a0e 100644
--- 
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
+++ 
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
@@ -146,7 +146,7 @@ public class SpringWebserviceProducer extends 
DefaultProducer {
     private void populateMessageAttachmentsFromResponse(AttachmentMessage 
inOrOut, Iterator<Attachment> attachments) {
         while (attachments.hasNext()) {
             Attachment attachment = attachments.next();
-            inOrOut.getAttachments().put(attachment.getContentId(), 
attachment.getDataHandler());
+            inOrOut.addAttachment(attachment.getContentId(), 
attachment.getDataHandler());
         }
     }    
     
diff --git 
a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java
 
b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java
index 2e89afe..2b81508 100644
--- 
a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java
+++ 
b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java
@@ -71,8 +71,12 @@ public class BasicMessageFilterTest extends 
ExchangeTestSupport {
         exchange.getIn().getHeaders().clear();
         exchange.getOut().getHeaders().clear();
 
-        exchange.getIn(AttachmentMessage.class).getAttachments().clear();
-        exchange.getOut(AttachmentMessage.class).getAttachments().clear();
+        if (exchange.getIn(AttachmentMessage.class).hasAttachments()) {
+            exchange.getIn(AttachmentMessage.class).getAttachments().clear();
+        }
+        if (exchange.getOut(AttachmentMessage.class).hasAttachments()) {
+            exchange.getOut(AttachmentMessage.class).getAttachments().clear();
+        }
 
         filter.filterProducer(exchange, message);
         filter.filterConsumer(exchange, message);
@@ -153,7 +157,7 @@ public class BasicMessageFilterTest extends 
ExchangeTestSupport {
 
     @Test
     public void consumerWithAttachment() throws Exception {
-        
exchange.getOut(AttachmentMessage.class).addAttachment("testAttachment", new 
DataHandler(this.getClass().getResource("/sampleAttachment.txt")));
+        
exchange.getMessage(AttachmentMessage.class).addAttachment("testAttachment", 
new DataHandler(this.getClass().getResource("/sampleAttachment.txt")));
 
         filter.filterConsumer(exchange, message);