From commits-return-60642-archive-asf-public=cust-asf.ponee.io@camel.apache.org Thu Jan 4 10:20:27 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 07AF918077B for ; Thu, 4 Jan 2018 10:20:27 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id EC319160C28; Thu, 4 Jan 2018 09:20:26 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4499A160C2B for ; Thu, 4 Jan 2018 10:20:26 +0100 (CET) Received: (qmail 51169 invoked by uid 500); 4 Jan 2018 09:20:25 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 51099 invoked by uid 99); 4 Jan 2018 09:20:25 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Jan 2018 09:20:25 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id BF1E08560E; Thu, 4 Jan 2018 09:20:22 +0000 (UTC) Date: Thu, 04 Jan 2018 09:20:23 +0000 To: "commits@camel.apache.org" Subject: [camel] 01/01: CAMEL-12122 - Fixed CS MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: acosentino@apache.org In-Reply-To: <151505762237.17735.8975909413570248669@gitbox.apache.org> References: <151505762237.17735.8975909413570248669@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: camel X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: f253c4a8495a7469663edacb8ab9a090453a41a6 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180104092022.BF1E08560E@gitbox.apache.org> 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 f253c4a8495a7469663edacb8ab9a090453a41a6 Author: Andrea Cosentino AuthorDate: Thu Jan 4 10:19:41 2018 +0100 CAMEL-12122 - Fixed CS --- .../apache/camel/component/aws/s3/S3Producer.java | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java index 4467bc2..c7a2120 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java @@ -16,8 +16,6 @@ */ package org.apache.camel.component.aws.s3; -import static org.apache.camel.component.aws.common.AwsExchangeUtil.getMessageForResponse; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -30,19 +28,6 @@ import java.util.Date; import java.util.List; import java.util.Map; -import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; -import org.apache.camel.Message; -import org.apache.camel.WrappedFile; -import org.apache.camel.impl.DefaultProducer; -import org.apache.camel.util.CastUtils; -import org.apache.camel.util.FileUtil; -import org.apache.camel.util.IOHelper; -import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.URISupport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.amazonaws.HttpMethod; import com.amazonaws.services.cloudfront.model.InvalidArgumentException; import com.amazonaws.services.s3.AmazonS3; @@ -66,6 +51,21 @@ import com.amazonaws.services.s3.model.PutObjectResult; import com.amazonaws.services.s3.model.StorageClass; import com.amazonaws.services.s3.model.UploadPartRequest; +import org.apache.camel.Endpoint; +import org.apache.camel.Exchange; +import org.apache.camel.Message; +import org.apache.camel.WrappedFile; +import org.apache.camel.impl.DefaultProducer; +import org.apache.camel.util.CastUtils; +import org.apache.camel.util.FileUtil; +import org.apache.camel.util.IOHelper; +import org.apache.camel.util.ObjectHelper; +import org.apache.camel.util.URISupport; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.apache.camel.component.aws.common.AwsExchangeUtil.getMessageForResponse; + /** * A Producer which sends messages to the Amazon Web Service Simple Storage * Service AWS S3 @@ -455,7 +455,7 @@ public class S3Producer extends DefaultProducer { long milliSeconds = expiration.getTime(); Long expirationMillis = exchange.getIn().getHeader(S3Constants.DOWNLOAD_LINK_EXPIRATION, Long.class); - if(expirationMillis != null) { + if (expirationMillis != null) { milliSeconds += expirationMillis; } else { milliSeconds += 1000 * 60 * 60; // Default: Add 1 hour. -- To stop receiving notification emails like this one, please contact "commits@camel.apache.org" .