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 2021/04/06 06:40:08 UTC
[camel] 07/09: CAMEL-16185 - AWS S3: improve multipart support -
streaming upload
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
commit 578dfe94fbdcb4719198e2cfc6779ee01063a15a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Apr 6 07:47:11 2021 +0200
CAMEL-16185 - AWS S3: improve multipart support - streaming upload
---
.../aws2/s3/stream/AWS2S3StreamUploadProducer.java | 12 ++++++------
.../localstack/S3StreamUploadTimeoutLocalstackTest.java | 16 ++++++++++++++++
2 files changed, 22 insertions(+), 6 deletions(-)
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 412df8f..b96a59b 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
@@ -70,6 +70,10 @@ public class AWS2S3StreamUploadProducer extends DefaultProducer {
private transient String s3ProducerToString;
private ScheduledExecutorService timeoutCheckerExecutorService;
+ public AWS2S3StreamUploadProducer(final Endpoint endpoint) {
+ super(endpoint);
+ }
+
@Override
protected void doStart() throws Exception {
super.doStart();
@@ -77,7 +81,7 @@ public class AWS2S3StreamUploadProducer extends DefaultProducer {
timeoutCheckerExecutorService
= getEndpoint().getCamelContext().getExecutorServiceManager().newSingleThreadScheduledExecutor(this,
"timeout_checker");
- timeoutCheckerExecutorService.scheduleAtFixedRate(new AggregationIntervalTask(),
+ timeoutCheckerExecutorService.scheduleAtFixedRate(new StreamingUploadTimeoutTask(),
getConfiguration().getStreamingUploadTimeout(), getConfiguration().getStreamingUploadTimeout(),
TimeUnit.MILLISECONDS);
}
@@ -104,7 +108,7 @@ public class AWS2S3StreamUploadProducer extends DefaultProducer {
/**
* Background task that triggers completion based on interval.
*/
- private final class AggregationIntervalTask implements Runnable {
+ private final class StreamingUploadTimeoutTask implements Runnable {
@Override
public void run() {
@@ -119,10 +123,6 @@ public class AWS2S3StreamUploadProducer extends DefaultProducer {
}
}
- public AWS2S3StreamUploadProducer(final Endpoint endpoint) {
- super(endpoint);
- }
-
@Override
public void process(final Exchange exchange) throws Exception {
InputStream is = exchange.getIn().getMandatoryBody(InputStream.class);
diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3StreamUploadTimeoutLocalstackTest.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3StreamUploadTimeoutLocalstackTest.java
index 1601256..b84445c 100644
--- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3StreamUploadTimeoutLocalstackTest.java
+++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3StreamUploadTimeoutLocalstackTest.java
@@ -1,3 +1,19 @@
+/*
+ * 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;