This is an automated email from the ASF dual-hosted git repository. turcsanyi pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git
commit b9a0216ee6bac1531e9cc19e15003bcc4ece6faf Author: Nandor Soma Abonyi <[email protected]> AuthorDate: Mon Feb 13 17:29:52 2023 +0100 NIFI-11173 Add default values to DeleteAzureBlobStorage_v12 This closes #6945. Signed-off-by: Peter Turcsanyi <[email protected]> --- .../azure/storage/DeleteAzureBlobStorage_v12.java | 15 ++++++++++++++- .../azure/storage/FetchAzureBlobStorage_v12.java | 4 ++-- .../azure/storage/ITListAzureBlobStorage_v12.java | 3 ++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureBlobStorage_v12.java b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureBlobStorage_v12.java index 1ba5f7c7d7..b49cbd0247 100644 --- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureBlobStorage_v12.java +++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureBlobStorage_v12.java @@ -40,6 +40,9 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; +import static org.apache.nifi.processors.azure.storage.utils.BlobAttributes.ATTR_NAME_BLOBNAME; +import static org.apache.nifi.processors.azure.storage.utils.BlobAttributes.ATTR_NAME_CONTAINER; + @Tags({"azure", "microsoft", "cloud", "storage", "blob"}) @SeeAlso({ListAzureBlobStorage_v12.class, FetchAzureBlobStorage_v12.class, PutAzureBlobStorage_v12.class}) @CapabilityDescription("Deletes the specified blob from Azure Blob Storage. The processor uses Azure Blob Storage client library v12.") @@ -52,6 +55,16 @@ public class DeleteAzureBlobStorage_v12 extends AbstractAzureBlobProcessor_v12 { public static final AllowableValue DELETE_SNAPSHOTS_ONLY = new AllowableValue(DeleteSnapshotsOptionType.ONLY.name(), "Delete Snapshots Only", "Delete only the blob's snapshots."); + public static final PropertyDescriptor CONTAINER = new PropertyDescriptor.Builder() + .fromPropertyDescriptor(AzureStorageUtils.CONTAINER) + .defaultValue(String.format("${%s}", ATTR_NAME_CONTAINER)) + .build(); + + public static final PropertyDescriptor BLOB_NAME = new PropertyDescriptor.Builder() + .fromPropertyDescriptor(AbstractAzureBlobProcessor_v12.BLOB_NAME) + .defaultValue(String.format("${%s}", ATTR_NAME_BLOBNAME)) + .build(); + public static final PropertyDescriptor DELETE_SNAPSHOTS_OPTION = new PropertyDescriptor.Builder() .name("delete-snapshots-option") .displayName("Delete Snapshots Option") @@ -64,7 +77,7 @@ public class DeleteAzureBlobStorage_v12 extends AbstractAzureBlobProcessor_v12 { private static final List<PropertyDescriptor> PROPERTIES = Collections.unmodifiableList(Arrays.asList( STORAGE_CREDENTIALS_SERVICE, - AzureStorageUtils.CONTAINER, + CONTAINER, BLOB_NAME, DELETE_SNAPSHOTS_OPTION, AzureStorageUtils.PROXY_CONFIGURATION_SERVICE diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/FetchAzureBlobStorage_v12.java b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/FetchAzureBlobStorage_v12.java index ac6dcae8b3..0a12de3051 100644 --- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/FetchAzureBlobStorage_v12.java +++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/FetchAzureBlobStorage_v12.java @@ -80,12 +80,12 @@ public class FetchAzureBlobStorage_v12 extends AbstractAzureBlobProcessor_v12 { public static final PropertyDescriptor CONTAINER = new PropertyDescriptor.Builder() .fromPropertyDescriptor(AzureStorageUtils.CONTAINER) - .defaultValue("${azure.container}") + .defaultValue(String.format("${%s}", ATTR_NAME_CONTAINER)) .build(); public static final PropertyDescriptor BLOB_NAME = new PropertyDescriptor.Builder() .fromPropertyDescriptor(AbstractAzureBlobProcessor_v12.BLOB_NAME) - .defaultValue("${azure.blobname}") + .defaultValue(String.format("${%s}", ATTR_NAME_BLOBNAME)) .build(); public static final PropertyDescriptor RANGE_START = new PropertyDescriptor.Builder() diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/ITListAzureBlobStorage_v12.java b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/ITListAzureBlobStorage_v12.java index 7421b5f74d..8064ff77e9 100644 --- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/ITListAzureBlobStorage_v12.java +++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/ITListAzureBlobStorage_v12.java @@ -19,6 +19,7 @@ package org.apache.nifi.processors.azure.storage; import org.apache.nifi.flowfile.attributes.CoreAttributes; import org.apache.nifi.processor.Processor; import org.apache.nifi.processors.azure.storage.utils.AzureStorageUtils; +import org.apache.nifi.processors.azure.storage.utils.BlobAttributes; import org.apache.nifi.serialization.record.MockRecordWriter; import org.apache.nifi.util.MockFlowFile; import org.junit.jupiter.api.Test; @@ -198,7 +199,7 @@ public class ITListAzureBlobStorage_v12 extends AbstractAzureBlobStorage_v12IT { Set<String> expectedBlobNames = new HashSet<>(Arrays.asList(blobNames)); for (MockFlowFile flowFile : flowFiles) { - String blobName = flowFile.getAttribute("azure.blobname"); + String blobName = flowFile.getAttribute(BlobAttributes.ATTR_NAME_BLOBNAME); assertTrue(expectedBlobNames.remove(blobName), "Blob should not be listed: " + blobName); assertFlowFile(flowFile, blobName);
