This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.19.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.19.x by this push:
new eb5d6b1 CAMEL-12256 - AWS S3 Consumer does not return custom headers in S3 Headers
eb5d6b1 is described below
commit eb5d6b150488ee46d0c021661b249dd1f0b0223d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 12 14:52:20 2018 +0100
CAMEL-12256 - AWS S3 Consumer does not return custom headers in S3 Headers
---
.../src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java | 1 +
.../test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java | 1 +
.../apache/camel/component/aws/s3/S3ComponentExistingBucketTest.java | 2 +-
.../java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java | 2 +-
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
index c5ebe43..5effc7b 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
@@ -185,6 +185,7 @@ public class S3Endpoint extends ScheduledPollEndpoint {
message.setHeader(S3Constants.CACHE_CONTROL, objectMetadata.getCacheControl());
message.setHeader(S3Constants.S3_HEADERS, objectMetadata.getRawMetadata());
message.setHeader(S3Constants.SERVER_SIDE_ENCRYPTION, objectMetadata.getSSEAlgorithm());
+ message.setHeader(S3Constants.USER_METADATA, objectMetadata.getUserMetadata());
/**
* If includeBody != true, it is safe to close the object here. If includeBody == true,
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
index 7dce3b8..c2c393e 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java
@@ -322,6 +322,7 @@ public class AmazonS3ClientMock extends AmazonS3Client {
S3Object s3Object = new S3Object();
s3Object.setBucketName(putObjectRequest.getBucketName());
s3Object.setKey(putObjectRequest.getKey());
+ s3Object.getObjectMetadata().setUserMetadata(putObjectRequest.getMetadata().getUserMetadata());
if (putObjectRequest.getFile() != null) {
try {
s3Object.setObjectContent(new FileInputStream(putObjectRequest.getFile()));
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentExistingBucketTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentExistingBucketTest.java
index 5204976..8a79e57 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentExistingBucketTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentExistingBucketTest.java
@@ -150,7 +150,7 @@ public class S3ComponentExistingBucketTest extends CamelTestSupport {
assertNull(resultExchange.getIn().getHeader(S3Constants.CONTENT_DISPOSITION));
assertNull(resultExchange.getIn().getHeader(S3Constants.CONTENT_MD5));
assertNull(resultExchange.getIn().getHeader(S3Constants.CACHE_CONTROL));
- assertNull(resultExchange.getIn().getHeader(S3Constants.USER_METADATA));
+ assertNotNull(resultExchange.getIn().getHeader(S3Constants.USER_METADATA));
assertEquals(0, resultExchange.getIn().getHeader(S3Constants.S3_HEADERS, Map.class).size());
}
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
index b32f3c9..f9c5dfd 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java
@@ -118,7 +118,7 @@ public class S3ComponentFileTest extends CamelTestSupport {
assertNull(resultExchange.getIn().getHeader(S3Constants.CONTENT_DISPOSITION));
assertNull(resultExchange.getIn().getHeader(S3Constants.CONTENT_MD5));
assertNull(resultExchange.getIn().getHeader(S3Constants.CACHE_CONTROL));
- assertNull(resultExchange.getIn().getHeader(S3Constants.USER_METADATA));
+ assertNotNull(resultExchange.getIn().getHeader(S3Constants.USER_METADATA));
assertEquals(0, resultExchange.getIn().getHeader(S3Constants.S3_HEADERS, Map.class).size());
}
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.