You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2018/01/18 15:16:09 UTC
nifi git commit: NIFI-4770 - ListAzureBlobStorage now properly writes
azure.container flowfile attribute
Repository: nifi
Updated Branches:
refs/heads/master ca54186b6 -> 94eb11bfa
NIFI-4770 - ListAzureBlobStorage now properly writes azure.container flowfile attribute
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #2402.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/94eb11bf
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/94eb11bf
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/94eb11bf
Branch: refs/heads/master
Commit: 94eb11bfa6428b46c7807b0607b94957d4230d89
Parents: ca54186
Author: zenfenaan <si...@gmail.com>
Authored: Fri Jan 12 22:45:13 2018 +0530
Committer: Pierre Villard <pi...@gmail.com>
Committed: Thu Jan 18 16:16:00 2018 +0100
----------------------------------------------------------------------
.../processors/azure/storage/ListAzureBlobStorage.java | 2 ++
.../nifi/processors/azure/storage/utils/BlobInfo.java | 12 ++++++++++++
2 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/94eb11bf/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 2cb6316..b9c1ecb 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
@@ -102,6 +102,7 @@ public class ListAzureBlobStorage extends AbstractListProcessor<BlobInfo> {
@Override
protected Map<String, String> createAttributes(BlobInfo entity, ProcessContext context) {
final Map<String, String> attributes = new HashMap<>();
+ attributes.put("azure.container", entity.getContainerName());
attributes.put("azure.etag", entity.getEtag());
attributes.put("azure.primaryUri", entity.getPrimaryUri());
attributes.put("azure.secondaryUri", entity.getSecondaryUri());
@@ -162,6 +163,7 @@ public class ListAzureBlobStorage extends AbstractListProcessor<BlobInfo> {
Builder builder = new BlobInfo.Builder()
.primaryUri(uri.getPrimaryUri().toString())
+ .containerName(containerName)
.contentType(properties.getContentType())
.contentLanguage(properties.getContentLanguage())
.etag(properties.getEtag())
http://git-wip-us.apache.org/repos/asf/nifi/blob/94eb11bf/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 28a47ea..36fb1df 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<BlobInfo>, Serializable, ListableEnt
private final long lastModifiedTime;
private final long length;
private final String blobType;
+ private final String containerName;
public static long getSerialversionuid() {
return serialVersionUID;
@@ -52,6 +53,10 @@ public class BlobInfo implements Comparable<BlobInfo>, Serializable, ListableEnt
return contentLanguage;
}
+ public String getContainerName() {
+ return containerName;
+ }
+
public String getEtag() {
return etag;
}
@@ -77,6 +82,7 @@ public class BlobInfo implements Comparable<BlobInfo>, Serializable, ListableEnt
private long lastModifiedTime;
private long length;
private String blobType;
+ private String containerName;
public Builder primaryUri(String primaryUri) {
this.primaryUri = primaryUri;
@@ -98,6 +104,11 @@ public class BlobInfo implements Comparable<BlobInfo>, Serializable, ListableEnt
return this;
}
+ public Builder containerName(String containerName) {
+ this.containerName = containerName;
+ return this;
+ }
+
public Builder etag(String etag) {
this.etag = etag;
return this;
@@ -164,6 +175,7 @@ public class BlobInfo implements Comparable<BlobInfo>, Serializable, ListableEnt
this.secondaryUri = builder.secondaryUri;
this.contentType = builder.contentType;
this.contentLanguage = builder.contentLanguage;
+ this.containerName = builder.containerName;
this.etag = builder.etag;
this.lastModifiedTime = builder.lastModifiedTime;
this.length = builder.length;