NIFI-11228 Removed deprecated Azure Blob Storage Processors

This closes apache#7234 Signed-off-by: Nandor Soma Abonyi <nsabonyi@apache.org>
shubhluck · May 12, 2023 · f7e36a0 · f7e36a0
1 parent fd2138b
commit f7e36a0
Show file tree

Hide file tree

Showing 21 changed files with 7 additions and 2,213 deletions.
diff --git a/...ime-manifest-test/src/test/java/org/apache/nifi/runtime/manifest/TestRuntimeManifest.java b/...ime-manifest-test/src/test/java/org/apache/nifi/runtime/manifest/TestRuntimeManifest.java
@@ -271,15 +271,6 @@ void testRuntimeManifest() throws IOException {
         assertNotNull(routeOnAttributeDef.getDynamicProperties().get(0).getValue());
         assertNotNull(routeOnAttributeDef.getDynamicProperties().get(0).getExpressionLanguageScope());
 
-        // Verify DeleteAzureBlobStorage is deprecated
-        final ProcessorDefinition deleteAzureBlobDef = getProcessorDefinition(bundles, "nifi-azure-nar",
-                "org.apache.nifi.processors.azure.storage.DeleteAzureBlobStorage");
-        assertNotNull(deleteAzureBlobDef.getDeprecated());
-        assertTrue(deleteAzureBlobDef.getDeprecated().booleanValue());
-        assertNotNull(deleteAzureBlobDef.getDeprecationReason());
-        assertNotNull(deleteAzureBlobDef.getDeprecationAlternatives());
-        assertFalse(deleteAzureBlobDef.getDeprecationAlternatives().isEmpty());
-
         // Verify SplitJson has @SystemResourceConsiderations
         final ProcessorDefinition splitJsonDef = getProcessorDefinition(bundles, "nifi-standard-nar",
                 "org.apache.nifi.processors.standard.SplitJson");

diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
@@ -19,9 +19,6 @@
     </parent>
     <artifactId>nifi-azure-processors</artifactId>
     <packaging>jar</packaging>
-    <properties>
-        <azure-keyvault.version>1.2.6</azure-keyvault.version>
-    </properties>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -96,11 +93,6 @@
             <artifactId>azure-security-keyvault-keys</artifactId>
         </dependency>
         <!-- Legacy Microsoft Azure Libraries -->
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-keyvault</artifactId>
-            <version>${azure-keyvault.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure-storage</artifactId>
@@ -113,6 +105,10 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>

diff --git a/...processors/src/main/java/org/apache/nifi/processors/azure/AbstractAzureBlobProcessor.java b/...processors/src/main/java/org/apache/nifi/processors/azure/AbstractAzureBlobProcessor.java
diff --git a/...essors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureBlobStorage.java b/...essors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureBlobStorage.java