This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new 1fa7369 CAMEL-16185 - AWS S3: improve multipart support - streaming upload 1fa7369 is described below commit 1fa7369818f69c196e4846c111e8b97abb220bed Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Thu Apr 1 14:59:50 2021 +0200 CAMEL-16185 - AWS S3: improve multipart support - streaming upload --- .../aws2/s3/stream/AWS2S3StreamUploadProducer.java | 2 +- .../S3StreamUploadOperationLocalstackTest.java | 80 ++++++++++++++++++++++ 2 files changed, 81 insertions(+), 1 deletion(-) diff --git a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java index 20ff25a..dafc004 100644 --- a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java +++ b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java @@ -59,7 +59,7 @@ public class AWS2S3StreamUploadProducer extends DefaultProducer { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); CreateMultipartUploadResponse initResponse; - AtomicInteger index = new AtomicInteger(); + AtomicInteger index = new AtomicInteger(1); List<CompletedPart> completedParts; AtomicInteger part = new AtomicInteger(); UUID id; diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3StreamUploadOperationLocalstackTest.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3StreamUploadOperationLocalstackTest.java new file mode 100644 index 0000000..87cca16 --- /dev/null +++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3StreamUploadOperationLocalstackTest.java @@ -0,0 +1,80 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.aws2.s3.localstack; + +import java.util.List; + +import org.apache.camel.EndpointInject; +import org.apache.camel.Exchange; +import org.apache.camel.Processor; +import org.apache.camel.ProducerTemplate; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.aws2.s3.AWS2S3Constants; +import org.apache.camel.component.aws2.s3.AWS2S3Operations; +import org.apache.camel.component.mock.MockEndpoint; +import org.junit.jupiter.api.Test; +import software.amazon.awssdk.services.s3.model.S3Object; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class S3StreamUploadOperationLocalstackTest extends Aws2S3BaseTest { + + @EndpointInject + private ProducerTemplate template; + + @EndpointInject("mock:result") + private MockEndpoint result; + + @Test + public void sendIn() throws Exception { + result.expectedMessageCount(1000); + + for (int i = 0; i < 1000; i++) { + template.sendBody("direct:stream1", "Andrea\n"); + } + + assertMockEndpointsSatisfied(); + + Exchange ex = template.request("direct:listObjects", new Processor() { + + @Override + public void process(Exchange exchange) throws Exception { + exchange.getIn().setHeader(AWS2S3Constants.S3_OPERATION, AWS2S3Operations.listObjects); + } + }); + + List<S3Object> resp = ex.getMessage().getBody(List.class); + assertEquals(40, resp.size()); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + String awsEndpoint1 + = "aws2-s3://mycamel-1?autoCreateBucket=true&streamMode=true&keyName=fileTest.txt&batchMessageNumber=25&namingStrategy=random"; + + from("direct:stream1").to(awsEndpoint1).to("mock:result"); + + String awsEndpoint = "aws2-s3://mycamel-1?autoCreateBucket=true"; + + from("direct:listObjects").to(awsEndpoint); + } + }; + } +}