From commits-return-37427-archive-asf-public=cust-asf.ponee.io@nifi.apache.org Fri Feb 2 16:00:07 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 D4F32180608 for ; Fri, 2 Feb 2018 16:00:07 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C4252160C49; Fri, 2 Feb 2018 15:00:07 +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 19B93160C41 for ; Fri, 2 Feb 2018 16:00:06 +0100 (CET) Received: (qmail 52559 invoked by uid 500); 2 Feb 2018 15:00:06 -0000 Mailing-List: contact commits-help@nifi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@nifi.apache.org Delivered-To: mailing list commits@nifi.apache.org Received: (qmail 52545 invoked by uid 99); 2 Feb 2018 15:00:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Feb 2018 15:00:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2E9BDDFD81; Fri, 2 Feb 2018 15:00:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pvillard@apache.org To: commits@nifi.apache.org Message-Id: <6bef57d917f84ce8b2cf3234ab86a547@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: nifi git commit: NIFI-4826 - Fixed azure.blobname in ListAzureBlobStorage Date: Fri, 2 Feb 2018 15:00:06 +0000 (UTC) Repository: nifi Updated Branches: refs/heads/master 4df3eb567 -> 9bc00b6b6 NIFI-4826 - Fixed azure.blobname in ListAzureBlobStorage Signed-off-by: Pierre Villard This closes #2440. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/9bc00b6b Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/9bc00b6b Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/9bc00b6b Branch: refs/heads/master Commit: 9bc00b6b6475a0bc65dea4c1d299b583cd50bea9 Parents: 4df3eb5 Author: zenfenan Authored: Mon Jan 29 15:22:32 2018 +0530 Committer: Pierre Villard Committed: Fri Feb 2 15:59:54 2018 +0100 ---------------------------------------------------------------------- .../processors/azure/storage/ListAzureBlobStorage.java | 4 +++- .../nifi/processors/azure/storage/utils/BlobInfo.java | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/9bc00b6b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureBlobStorage.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureBlobStorage.java b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureBlobStorage.java index b9c1ecb..cdbb59a 100644 --- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureBlobStorage.java +++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureBlobStorage.java @@ -106,7 +106,8 @@ public class ListAzureBlobStorage extends AbstractListProcessor { attributes.put("azure.etag", entity.getEtag()); attributes.put("azure.primaryUri", entity.getPrimaryUri()); attributes.put("azure.secondaryUri", entity.getSecondaryUri()); - attributes.put("azure.blobname", entity.getName()); + attributes.put("azure.blobname", entity.getBlobName()); + attributes.put("filename", entity.getName()); attributes.put("azure.blobtype", entity.getBlobType()); attributes.put("azure.length", String.valueOf(entity.getLength())); attributes.put("azure.timestamp", String.valueOf(entity.getTimestamp())); @@ -163,6 +164,7 @@ public class ListAzureBlobStorage extends AbstractListProcessor { Builder builder = new BlobInfo.Builder() .primaryUri(uri.getPrimaryUri().toString()) + .blobName(cloudBlob.getName()) .containerName(containerName) .contentType(properties.getContentType()) .contentLanguage(properties.getContentLanguage()) http://git-wip-us.apache.org/repos/asf/nifi/blob/9bc00b6b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/utils/BlobInfo.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/utils/BlobInfo.java b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/utils/BlobInfo.java index 36fb1df..6343dc8 100644 --- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/utils/BlobInfo.java +++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/utils/BlobInfo.java @@ -31,6 +31,7 @@ public class BlobInfo implements Comparable, Serializable, ListableEnt private final long lastModifiedTime; private final long length; private final String blobType; + private final String blobName; private final String containerName; public static long getSerialversionuid() { @@ -57,6 +58,10 @@ public class BlobInfo implements Comparable, Serializable, ListableEnt return containerName; } + public String getBlobName() { + return blobName; + } + public String getEtag() { return etag; } @@ -83,6 +88,7 @@ public class BlobInfo implements Comparable, Serializable, ListableEnt private long length; private String blobType; private String containerName; + private String blobName; public Builder primaryUri(String primaryUri) { this.primaryUri = primaryUri; @@ -129,6 +135,11 @@ public class BlobInfo implements Comparable, Serializable, ListableEnt return this; } + public Builder blobName(String blobName) { + this.blobName = blobName; + return this; + } + public BlobInfo build() { return new BlobInfo(this); } @@ -180,6 +191,7 @@ public class BlobInfo implements Comparable, Serializable, ListableEnt this.lastModifiedTime = builder.lastModifiedTime; this.length = builder.length; this.blobType = builder.blobType; + this.blobName = builder.blobName; } @Override