You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/07/16 10:17:45 UTC
[1/3] git commit: CAMEL-7603 camel-cxfrs need to store the security
context information into the message header
Repository: camel
Updated Branches:
refs/heads/master 5ec6adfc4 -> b9764cd6a
CAMEL-7603 camel-cxfrs need to store the security context information into the message header
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2b8fcdd4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2b8fcdd4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2b8fcdd4
Branch: refs/heads/master
Commit: 2b8fcdd4ec9789d69262603c633b035138766c27
Parents: 5ec6adf
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed Jul 16 15:42:07 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Jul 16 15:42:07 2014 +0800
----------------------------------------------------------------------
.../camel/component/cxf/jaxrs/DefaultCxfRsBinding.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2b8fcdd4/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
index 0a08471..e31cdac 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
@@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.security.auth.Subject;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
@@ -34,6 +35,7 @@ import org.apache.camel.spi.HeaderFilterStrategyAware;
import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.apache.cxf.jaxrs.model.OperationResourceInfoStack;
import org.apache.cxf.message.MessageContentsList;
+import org.apache.cxf.security.SecurityContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -117,7 +119,15 @@ public class DefaultCxfRsBinding implements CxfRsBinding, HeaderFilterStrategyAw
camelMessage.setHeader(CxfConstants.CAMEL_CXF_MESSAGE, cxfMessage);
- camelMessage.setBody(new MessageContentsList(paramArray));
+ camelMessage.setBody(new MessageContentsList(paramArray));
+
+ // propagate the security subject from CXF security context
+ SecurityContext securityContext = cxfMessage.get(SecurityContext.class);
+ if (securityContext != null && securityContext.getUserPrincipal() != null) {
+ Subject subject = new Subject();
+ subject.getPrincipals().add(securityContext.getUserPrincipal());
+ camelExchange.getIn().getHeaders().put(Exchange.AUTHENTICATION, subject);
+ }
}
[3/3] git commit: CAMEL-7602 Added MessageAttribute support in
aws-sqs with thanks to MEL
Posted by ni...@apache.org.
CAMEL-7602 Added MessageAttribute support in aws-sqs with thanks to MEL
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b9764cd6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b9764cd6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b9764cd6
Branch: refs/heads/master
Commit: b9764cd6a2fe7054d50bec607d3183dc8f38347c
Parents: 477f9d4
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed Jul 16 16:16:54 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Jul 16 16:16:54 2014 +0800
----------------------------------------------------------------------
.../apache/camel/component/aws/sqs/SqsConfiguration.java | 10 ++++++++++
.../org/apache/camel/component/aws/sqs/SqsConstants.java | 1 +
.../org/apache/camel/component/aws/sqs/SqsConsumer.java | 1 +
.../org/apache/camel/component/aws/sqs/SqsEndpoint.java | 2 +-
.../component/aws/sqs/SqsComponentConfigurationTest.java | 11 +++++++++--
.../camel/component/aws/sqs/SqsComponentSpringTest.java | 2 ++
.../apache/camel/component/aws/sqs/SqsComponentTest.java | 2 ++
.../aws/sqs/integration/SqsComponentIntegrationTest.java | 2 ++
8 files changed, 28 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b9764cd6/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
index 2c587cf..de24cc5 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
@@ -39,6 +39,7 @@ public class SqsConfiguration {
private Boolean deleteIfFiltered = Boolean.TRUE;
private Integer visibilityTimeout;
private Collection<String> attributeNames;
+ private Collection<String> messageAttributeNames;
private Integer waitTimeSeconds;
private Integer defaultVisibilityTimeout;
private Boolean extendMessageVisibility = Boolean.FALSE;
@@ -116,6 +117,14 @@ public class SqsConfiguration {
this.attributeNames = attributeNames;
}
+ public Collection<String> getMessageAttributeNames() {
+ return messageAttributeNames;
+ }
+
+ public void setMessageAttributeNames(Collection<String> messageAttributeNames) {
+ this.messageAttributeNames = messageAttributeNames;
+ }
+
public Integer getDefaultVisibilityTimeout() {
return defaultVisibilityTimeout;
}
@@ -214,6 +223,7 @@ public class SqsConfiguration {
+ ", deleteIfFiltered=" + deleteIfFiltered
+ ", visibilityTimeout=" + visibilityTimeout
+ ", attributeNames=" + attributeNames
+ + ", messageAttributeNames=" + messageAttributeNames
+ ", waitTimeSeconds=" + waitTimeSeconds
+ ", defaultVisibilityTimeout=" + defaultVisibilityTimeout
+ ", maximumMessageSize=" + maximumMessageSize
http://git-wip-us.apache.org/repos/asf/camel/blob/b9764cd6/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConstants.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConstants.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConstants.java
index 5ae2b28..61891c9 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConstants.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConstants.java
@@ -23,6 +23,7 @@ package org.apache.camel.component.aws.sqs;
public interface SqsConstants {
String ATTRIBUTES = "CamelAwsSqsAttributes";
+ String MESSAGE_ATTRIBUTES = "CamelAwsSqsMessageAttributes";
String MD5_OF_BODY = "CamelAwsSqsMD5OfBody";
String MESSAGE_ID = "CamelAwsSqsMessageId";
String RECEIPT_HANDLE = "CamelAwsSqsReceiptHandle";
http://git-wip-us.apache.org/repos/asf/camel/blob/b9764cd6/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
index 7daa8a8..0a8d024 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
@@ -73,6 +73,7 @@ public class SqsConsumer extends ScheduledBatchPollingConsumer {
request.setMaxNumberOfMessages(getMaxMessagesPerPoll() > 0 ? getMaxMessagesPerPoll() : null);
request.setVisibilityTimeout(getConfiguration().getVisibilityTimeout() != null ? getConfiguration().getVisibilityTimeout() : null);
request.setAttributeNames(getConfiguration().getAttributeNames() != null ? getConfiguration().getAttributeNames() : null);
+ request.setMessageAttributeNames(getConfiguration().getMessageAttributeNames() != null ? getConfiguration().getMessageAttributeNames() : null);
request.setWaitTimeSeconds(getConfiguration().getWaitTimeSeconds() != null ? getConfiguration().getWaitTimeSeconds() : null);
LOG.trace("Receiving messages with request [{}]...", request);
http://git-wip-us.apache.org/repos/asf/camel/blob/b9764cd6/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
index caf3c56..6447d7b 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
@@ -187,7 +187,7 @@ public class SqsEndpoint extends ScheduledPollEndpoint {
message.setHeader(SqsConstants.MD5_OF_BODY, msg.getMD5OfBody());
message.setHeader(SqsConstants.RECEIPT_HANDLE, msg.getReceiptHandle());
message.setHeader(SqsConstants.ATTRIBUTES, msg.getAttributes());
-
+ message.setHeader(SqsConstants.MESSAGE_ATTRIBUTES, msg.getMessageAttributes());
return exchange;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/b9764cd6/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurationTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurationTest.java
index 9414cee..e7fb9dc 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurationTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurationTest.java
@@ -36,6 +36,7 @@ public class SqsComponentConfigurationTest extends CamelTestSupport {
assertEquals("yyy", endpoint.getConfiguration().getSecretKey());
assertNull(endpoint.getConfiguration().getAmazonSQSClient());
assertNull(endpoint.getConfiguration().getAttributeNames());
+ assertNull(endpoint.getConfiguration().getMessageAttributeNames());
assertNull(endpoint.getConfiguration().getDefaultVisibilityTimeout());
assertNull(endpoint.getConfiguration().getVisibilityTimeout());
assertNull(endpoint.getConfiguration().getAmazonSQSEndpoint());
@@ -59,6 +60,7 @@ public class SqsComponentConfigurationTest extends CamelTestSupport {
assertNull(endpoint.getConfiguration().getSecretKey());
assertSame(mock, endpoint.getConfiguration().getAmazonSQSClient());
assertNull(endpoint.getConfiguration().getAttributeNames());
+ assertNull(endpoint.getConfiguration().getMessageAttributeNames());
assertNull(endpoint.getConfiguration().getDefaultVisibilityTimeout());
assertNull(endpoint.getConfiguration().getVisibilityTimeout());
assertNull(endpoint.getConfiguration().getAmazonSQSEndpoint());
@@ -73,12 +75,16 @@ public class SqsComponentConfigurationTest extends CamelTestSupport {
List<String> attributeNames = new ArrayList<String>();
attributeNames.add("color");
attributeNames.add("size");
+ List<String> messageAttributeNames = new ArrayList<String>();
+ messageAttributeNames.add("msgColor");
+ messageAttributeNames.add("msgSize");
((JndiRegistry) ((PropertyPlaceholderDelegateRegistry) context.getRegistry()).getRegistry()).bind("attributeNames", attributeNames);
-
+ ((JndiRegistry) ((PropertyPlaceholderDelegateRegistry) context.getRegistry()).getRegistry()).bind("messageAttributeNames", messageAttributeNames);
+
SqsComponent component = new SqsComponent(context);
SqsEndpoint endpoint = (SqsEndpoint) component.createEndpoint("aws-sqs://MyQueue?amazonSQSEndpoint=sns.eu-west-1.amazonaws.com&accessKey=xxx&secretKey=yyy&attributeNames=#attributeNames"
- + "&DefaultVisibilityTimeout=1000&visibilityTimeout=2000&maximumMessageSize=65536&messageRetentionPeriod=1209600&policy="
+ + "&messageAttributeNames=#messageAttributeNames&DefaultVisibilityTimeout=1000&visibilityTimeout=2000&maximumMessageSize=65536&messageRetentionPeriod=1209600&policy="
+ "%7B%22Version%22%3A%222008-10-17%22%2C%22Id%22%3A%22%2F195004372649%2FMyQueue%2FSQSDefaultPolicy%22%2C%22Statement%22%3A%5B%7B%22Sid%22%3A%22Queue1ReceiveMessage%22%2C%22"
+ "Effect%22%3A%22Allow%22%2C%22Principal%22%3A%7B%22AWS%22%3A%22*%22%7D%2C%22Action%22%3A%22SQS%3AReceiveMessage%22%2C%22Resource%22%3A%22%2F195004372649%2FMyQueue%22%7D%5D%7D"
+ "&delaySeconds=123&receiveMessageWaitTimeSeconds=10&waitTimeSeconds=20"
@@ -89,6 +95,7 @@ public class SqsComponentConfigurationTest extends CamelTestSupport {
assertEquals("yyy", endpoint.getConfiguration().getSecretKey());
assertNull(endpoint.getConfiguration().getAmazonSQSClient());
assertSame(attributeNames, endpoint.getConfiguration().getAttributeNames());
+ assertSame(messageAttributeNames, endpoint.getConfiguration().getMessageAttributeNames());
assertEquals(new Integer(1000), endpoint.getConfiguration().getDefaultVisibilityTimeout());
assertEquals(new Integer(2000), endpoint.getConfiguration().getVisibilityTimeout());
assertEquals("sns.eu-west-1.amazonaws.com", endpoint.getConfiguration().getAmazonSQSEndpoint());
http://git-wip-us.apache.org/repos/asf/camel/blob/b9764cd6/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentSpringTest.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentSpringTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentSpringTest.java
index 9078f46..8635715 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentSpringTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentSpringTest.java
@@ -52,6 +52,7 @@ public class SqsComponentSpringTest extends CamelSpringTestSupport {
assertNotNull(resultExchange.getIn().getHeader(SqsConstants.RECEIPT_HANDLE));
assertEquals("6a1559560f67c5e7a7d5d838bf0272ee", resultExchange.getIn().getHeader(SqsConstants.MD5_OF_BODY));
assertNotNull(resultExchange.getIn().getHeader(SqsConstants.ATTRIBUTES));
+ assertNotNull(resultExchange.getIn().getHeader(SqsConstants.MESSAGE_ATTRIBUTES));
assertNotNull(exchange.getIn().getHeader(SqsConstants.MESSAGE_ID));
assertEquals("6a1559560f67c5e7a7d5d838bf0272ee", resultExchange.getIn().getHeader(SqsConstants.MD5_OF_BODY));
@@ -75,6 +76,7 @@ public class SqsComponentSpringTest extends CamelSpringTestSupport {
assertNotNull(resultExchange.getIn().getHeader(SqsConstants.MESSAGE_ID));
assertEquals("6a1559560f67c5e7a7d5d838bf0272ee", resultExchange.getIn().getHeader(SqsConstants.MD5_OF_BODY));
assertNotNull(resultExchange.getIn().getHeader(SqsConstants.ATTRIBUTES));
+ assertNotNull(resultExchange.getIn().getHeader(SqsConstants.MESSAGE_ATTRIBUTES));
assertNotNull(exchange.getOut().getHeader(SqsConstants.MESSAGE_ID));
assertEquals("6a1559560f67c5e7a7d5d838bf0272ee", exchange.getOut().getHeader(SqsConstants.MD5_OF_BODY));
http://git-wip-us.apache.org/repos/asf/camel/blob/b9764cd6/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentTest.java
index 086f0fd..71e1ab4 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsComponentTest.java
@@ -53,6 +53,7 @@ public class SqsComponentTest extends CamelTestSupport {
assertNotNull(resultExchange.getIn().getHeader(SqsConstants.RECEIPT_HANDLE));
assertEquals("6a1559560f67c5e7a7d5d838bf0272ee", resultExchange.getIn().getHeader(SqsConstants.MD5_OF_BODY));
assertNotNull(resultExchange.getIn().getHeader(SqsConstants.ATTRIBUTES));
+ assertNotNull(resultExchange.getIn().getHeader(SqsConstants.MESSAGE_ATTRIBUTES));
assertEquals("This is my message text.", exchange.getIn().getBody());
assertNotNull(exchange.getIn().getHeader(SqsConstants.MESSAGE_ID));
@@ -77,6 +78,7 @@ public class SqsComponentTest extends CamelTestSupport {
assertNotNull(resultExchange.getIn().getHeader(SqsConstants.MESSAGE_ID));
assertEquals("6a1559560f67c5e7a7d5d838bf0272ee", resultExchange.getIn().getHeader(SqsConstants.MD5_OF_BODY));
assertNotNull(resultExchange.getIn().getHeader(SqsConstants.ATTRIBUTES));
+ assertNotNull(resultExchange.getIn().getHeader(SqsConstants.MESSAGE_ATTRIBUTES));
assertEquals("This is my message text.", exchange.getOut().getBody());
assertNotNull(exchange.getOut().getHeader(SqsConstants.MESSAGE_ID));
http://git-wip-us.apache.org/repos/asf/camel/blob/b9764cd6/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java
index a7f86d2..d8bcbdb 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/integration/SqsComponentIntegrationTest.java
@@ -58,6 +58,7 @@ public class SqsComponentIntegrationTest extends CamelTestSupport {
assertNotNull(resultExchange.getIn().getHeader(SqsConstants.RECEIPT_HANDLE));
assertEquals("6a1559560f67c5e7a7d5d838bf0272ee", resultExchange.getIn().getHeader(SqsConstants.MD5_OF_BODY));
assertNotNull(resultExchange.getIn().getHeader(SqsConstants.ATTRIBUTES));
+ assertNotNull(resultExchange.getIn().getHeader(SqsConstants.MESSAGE_ATTRIBUTES));
assertNotNull(exchange.getIn().getHeader(SqsConstants.MESSAGE_ID));
assertEquals("6a1559560f67c5e7a7d5d838bf0272ee", exchange.getIn().getHeader(SqsConstants.MD5_OF_BODY));
@@ -81,6 +82,7 @@ public class SqsComponentIntegrationTest extends CamelTestSupport {
assertNotNull(resultExchange.getIn().getHeader(SqsConstants.MESSAGE_ID));
assertEquals("6a1559560f67c5e7a7d5d838bf0272ee", resultExchange.getIn().getHeader(SqsConstants.MD5_OF_BODY));
assertNotNull(resultExchange.getIn().getHeader(SqsConstants.ATTRIBUTES));
+ assertNotNull(resultExchange.getIn().getHeader(SqsConstants.MESSAGE_ATTRIBUTES));
assertNotNull(exchange.getOut().getHeader(SqsConstants.MESSAGE_ID));
assertEquals("6a1559560f67c5e7a7d5d838bf0272ee", exchange.getOut().getHeader(SqsConstants.MD5_OF_BODY));
[2/3] git commit: Fixed the unit test issue when testing CXF 3.0.1
Posted by ni...@apache.org.
Fixed the unit test issue when testing CXF 3.0.1
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/477f9d44
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/477f9d44
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/477f9d44
Branch: refs/heads/master
Commit: 477f9d44439f96d4279c5d909bc44d4237832365
Parents: 2b8fcdd
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed Jul 16 15:42:51 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Jul 16 15:42:51 2014 +0800
----------------------------------------------------------------------
.../cxf/mtom/CxfMtomProducerPayloadModeTest.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/477f9d44/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
index f1a70a1..794e39e 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.cxf.mtom;
import java.awt.image.BufferedImage;
import java.io.StringReader;
+import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -124,16 +125,17 @@ public class CxfMtomProducerPayloadModeTest extends AbstractJUnit4SpringContextT
Element ele = (Element)xu.getValue("//ns:DetailResponse/ns:photo/xop:Include", oute,
XPathConstants.NODE);
String photoId = ele.getAttribute("href").substring(4); // skip "cid:"
-
+
ele = (Element)xu.getValue("//ns:DetailResponse/ns:image/xop:Include", oute,
XPathConstants.NODE);
String imageId = ele.getAttribute("href").substring(4); // skip "cid:"
- DataHandler dr = exchange.getOut().getAttachment(photoId);
+
+ DataHandler dr = exchange.getOut().getAttachment(decodingReference(photoId));
Assert.assertEquals("application/octet-stream", dr.getContentType());
MtomTestHelper.assertEquals(MtomTestHelper.RESP_PHOTO_DATA, IOUtils.readBytesFromStream(dr.getInputStream()));
- dr = exchange.getOut().getAttachment(imageId);
+ dr = exchange.getOut().getAttachment(decodingReference(imageId));
Assert.assertEquals("image/jpeg", dr.getContentType());
BufferedImage image = ImageIO.read(dr.getInputStream());
@@ -144,6 +146,11 @@ public class CxfMtomProducerPayloadModeTest extends AbstractJUnit4SpringContextT
}
+ // CXF encoding the XOP reference since 3.0.1
+ private String decodingReference(String reference) throws UnsupportedEncodingException {
+ return java.net.URLDecoder.decode(reference, "UTF-8");
+ }
+
protected boolean isMtomEnabled() {
return true;
}