Repository: nifi Updated Branches: refs/heads/master 2ea8b4122 -> 16898668c
NIFI-3228 added s3.contenttype in PutS3Object Signed-off-by: James Wing <[email protected]> This closes #1362. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/16898668 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/16898668 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/16898668 Branch: refs/heads/master Commit: 16898668c26c6445e2454a844a638858b4bff000 Parents: 2ea8b41 Author: Pierre Villard <[email protected]> Authored: Wed Dec 28 15:26:28 2016 +0100 Committer: James Wing <[email protected]> Committed: Wed Dec 28 10:54:21 2016 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/16898668/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java index 7dc5778..817b2e5 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java @@ -39,7 +39,6 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import com.amazonaws.services.s3.model.AmazonS3Exception; import org.apache.nifi.annotation.behavior.DynamicProperty; import org.apache.nifi.annotation.behavior.InputRequirement; import org.apache.nifi.annotation.behavior.InputRequirement.Requirement; @@ -64,6 +63,7 @@ import com.amazonaws.AmazonClientException; import com.amazonaws.services.s3.AmazonS3Client; import com.amazonaws.services.s3.model.AbortMultipartUploadRequest; import com.amazonaws.services.s3.model.AccessControlList; +import com.amazonaws.services.s3.model.AmazonS3Exception; import com.amazonaws.services.s3.model.CannedAccessControlList; import com.amazonaws.services.s3.model.CompleteMultipartUploadRequest; import com.amazonaws.services.s3.model.CompleteMultipartUploadResult; @@ -426,6 +426,7 @@ public class PutS3Object extends AbstractS3Processor { .evaluateAttributeExpressions(ff).getValue(); if (contentType != null) { objectMetadata.setContentType(contentType); + attributes.put(S3_CONTENT_TYPE, contentType); } final String expirationRule = context.getProperty(EXPIRATION_RULE_ID) @@ -882,6 +883,7 @@ public class PutS3Object extends AbstractS3Processor { _timestamp = timestamp; } + @Override public String toString() { StringBuilder buf = new StringBuilder(); buf.append(_uploadId).append(SEPARATOR)
