You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/10/13 17:39:01 UTC
[camel] branch camel-3.4.x updated (db3667b -> 1ac104c)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch camel-3.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from db3667b CAMEL-15682: Fixed aggregate EIP to use long value for default timeout value as that can cause class cast exception. Thanks to David Borsos for reporting and suggested fix.
new fe67634 CAMEL-15678: camel-aws2-s3 multipart upload multiplies file by number of parts * change multipart upload to use inputStream
new 1ac104c Update AWS2S3Producer.java
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/camel/component/aws2/s3/AWS2S3Producer.java | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
[camel] 01/02: CAMEL-15678: camel-aws2-s3 multipart upload
multiplies file by number of parts * change multipart upload to use
inputStream
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-3.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fe676343cc5cb936db71177c13a5f483649c6549
Author: Kiril Nugmanov <ki...@zenitech.co.uk>
AuthorDate: Tue Oct 13 15:50:17 2020 +0300
CAMEL-15678: camel-aws2-s3 multipart upload multiplies file by number of parts
* change multipart upload to use inputStream
---
.../apache/camel/component/aws2/s3/AWS2S3Producer.java | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
index 7f37aa2..b834609 100644
--- a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
+++ b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
@@ -68,8 +68,10 @@ import software.amazon.awssdk.services.s3.model.PutObjectResponse;
import software.amazon.awssdk.services.s3.model.UploadPartRequest;
/**
- * A Producer which sends messages to the Amazon Web Service Simple Storage
- * Service <a href="http://aws.amazon.com/s3/">AWS S3</a>
+ * A Producer which sends messages to the Amazon Web Service Simple Storage Service
+ * <a href="http://aws.amazon.com/s3/">AWS S3</a>
+ *
+ * @author Kiril Nugmanov
*/
public class AWS2S3Producer extends DefaultProducer {
@@ -197,10 +199,14 @@ public class AWS2S3Producer extends DefaultProducer {
.partNumber(part).build();
LOG.trace("Uploading part [{}] for {}", part, keyName);
- String etag = getEndpoint().getS3Client().uploadPart(uploadRequest, RequestBody.fromFile(filePayload)).eTag();
- CompletedPart partUpload = CompletedPart.builder().partNumber(part).eTag(etag).build();
- completedParts.add(partUpload);
- filePosition += partSize;
+ try (InputStream fileInputStream = new FileInputStream(filePayload)) {
+ fileInputStream.skip(filePosition);
+
+ String etag = getEndpoint().getS3Client().uploadPart(uploadRequest, RequestBody.fromInputStream(fileInputStream, partSize)).eTag();
+ CompletedPart partUpload = CompletedPart.builder().partNumber(part).eTag(etag).build();
+ completedParts.add(partUpload);
+ filePosition += partSize;
+ }
}
CompletedMultipartUpload completeMultipartUpload = CompletedMultipartUpload.builder().parts(completedParts).build();
CompleteMultipartUploadRequest compRequest = CompleteMultipartUploadRequest.builder().multipartUpload(completeMultipartUpload)
[camel] 02/02: Update AWS2S3Producer.java
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-3.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1ac104c06ff9630a373841c1abc817022a3cd825
Author: Kiril Nugmanov <k....@mail.com>
AuthorDate: Tue Oct 13 17:16:08 2020 +0300
Update AWS2S3Producer.java
Removed author
---
.../src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
index b834609..b362b66 100644
--- a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
+++ b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java
@@ -71,7 +71,6 @@ import software.amazon.awssdk.services.s3.model.UploadPartRequest;
* A Producer which sends messages to the Amazon Web Service Simple Storage Service
* <a href="http://aws.amazon.com/s3/">AWS S3</a>
*
- * @author Kiril Nugmanov
*/
public class AWS2S3Producer extends DefaultProducer {