Repository: camel Updated Branches: refs/heads/master 72f44bb7f -> 6089f7169
CAMEL-8006 Fixed the test error of S3ComponentFileTest Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6089f716 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6089f716 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6089f716 Branch: refs/heads/master Commit: 6089f7169962b375fcd143ca786334d644470f43 Parents: 72f44bb Author: Willem Jiang <willem.ji...@gmail.com> Authored: Mon Nov 10 21:59:10 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Mon Nov 10 22:51:00 2014 +0800 ---------------------------------------------------------------------- .../camel/component/aws/s3/AmazonS3ClientMock.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6089f716/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java ---------------------------------------------------------------------- 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 33113df..de839b1 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 @@ -17,6 +17,8 @@ package org.apache.camel.component.aws.s3; import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.InputStream; import java.net.URL; import java.util.ArrayList; @@ -73,7 +75,6 @@ import com.amazonaws.services.s3.model.StorageClass; import com.amazonaws.services.s3.model.UploadPartRequest; import com.amazonaws.services.s3.model.UploadPartResult; import com.amazonaws.services.s3.model.VersionListing; - import org.junit.Assert; public class AmazonS3ClientMock extends AmazonS3Client { @@ -300,6 +301,7 @@ public class AmazonS3ClientMock extends AmazonS3Client { throw new UnsupportedOperationException(); } + @SuppressWarnings("resource") @Override public PutObjectResult putObject(PutObjectRequest putObjectRequest) throws AmazonClientException, AmazonServiceException { putObjectRequests.add(putObjectRequest); @@ -307,7 +309,15 @@ public class AmazonS3ClientMock extends AmazonS3Client { S3Object s3Object = new S3Object(); s3Object.setBucketName(putObjectRequest.getBucketName()); s3Object.setKey(putObjectRequest.getKey()); - s3Object.setObjectContent(putObjectRequest.getInputStream()); + if (putObjectRequest.getFile() != null) { + try { + s3Object.setObjectContent(new FileInputStream(putObjectRequest.getFile())); + } catch (FileNotFoundException e) { + throw new AmazonServiceException("Cannot store the file object.", e); + } + } else { + s3Object.setObjectContent(putObjectRequest.getInputStream()); + } objects.add(s3Object); PutObjectResult putObjectResult = new PutObjectResult();
