This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new f918193a09 NIFI-15300 Fix missing migrateProperties() for Proxy
Service configuration (#10607)
f918193a09 is described below
commit f918193a0943d2b425ae70fb15053f86a51aa40a
Author: Pierre Villard <[email protected]>
AuthorDate: Sat Dec 6 19:18:21 2025 +0100
NIFI-15300 Fix missing migrateProperties() for Proxy Service configuration
(#10607)
Signed-off-by: David Handermann <[email protected]>
---
.../nifi-aws-bundle/nifi-aws-kinesis/pom.xml | 5 +++++
.../processors/aws/kinesis/ConsumeKinesis.java | 7 ++++++
.../nifi-aws-schema-registry-service/pom.xml | 5 +++++
.../schemaregistry/AmazonGlueSchemaRegistry.java | 2 ++
.../nifi-azure-processors/pom.xml | 5 +++++
.../azure/AbstractAzureBlobProcessor_v12.java | 7 ++++++
.../AbstractAzureDataLakeStorageProcessor.java | 2 ++
.../azure/eventhub/ConsumeAzureEventHub.java | 2 ++
.../azure/eventhub/GetAzureEventHub.java | 2 ++
.../azure/eventhub/PutAzureEventHub.java | 2 ++
.../azure/storage/AbstractListAzureProcessor.java | 8 +++++++
.../azure/storage/CopyAzureBlobStorage_v12.java | 1 +
.../azure/storage/DeleteAzureBlobStorage_v12.java | 1 +
.../azure/storage/FetchAzureBlobStorage_v12.java | 1 +
.../azure/storage/PutAzureBlobStorage_v12.java | 2 +-
.../queue/AbstractAzureQueueStorage_v12.java | 8 +++++++
.../storage/queue/GetAzureQueueStorage_v12.java | 5 +----
.../storage/queue/PutAzureQueueStorage_v12.java | 5 +----
.../storage/ADLSCredentialsControllerService.java | 2 ++
...ureStorageCredentialsControllerService_v12.java | 2 ++
.../azure/eventhub/GetAzureEventHubTest.java | 16 ++++++++------
.../azure/eventhub/PutAzureEventHubTest.java | 4 +++-
.../azure/eventhub/TestConsumeAzureEventHub.java | 4 +++-
.../storage/TestCopyAzureBlobStorage_v12.java | 4 +++-
.../storage/TestDeleteAzureBlobStorage_v12.java | 4 +++-
.../storage/TestDeleteAzureDataLakeStorage.java | 4 +++-
.../storage/TestFetchAzureBlobStorage_v12.java | 4 +++-
.../storage/TestFetchAzureDataLakeStorage.java | 17 +++++++++------
.../storage/TestMoveAzureDataLakeStorage.java | 18 +++++++++-------
.../azure/storage/TestPutAzureBlobStorage_v12.java | 4 +++-
.../azure/storage/TestPutAzureDataLakeStorage.java | 18 +++++++++-------
.../queue/TestGetAzureQueueStorage_v12.java | 4 +++-
.../queue/TestPutAzureQueueStorage_v12.java | 4 +++-
.../nifi-box-bundle/nifi-box-services/pom.xml | 5 +++++
.../JsonConfigBasedBoxClientService.java | 2 ++
.../nifi-dropbox-processors/pom.xml | 5 +++++
.../nifi/processors/dropbox/FetchDropbox.java | 2 ++
.../nifi/processors/dropbox/ListDropbox.java | 2 ++
.../apache/nifi/processors/dropbox/PutDropbox.java | 2 ++
.../nifi/migration/ProxyServiceMigration.java | 25 ++++++++++++++++++++++
.../service/GCPCredentialsControllerService.java | 2 ++
.../processors/gcp/drive/FetchGoogleDrive.java | 2 ++
.../nifi/processors/gcp/drive/ListGoogleDrive.java | 2 ++
.../nifi/processors/gcp/drive/PutGoogleDrive.java | 3 ++-
.../nifi/processors/standard/InvokeHTTP.java | 2 ++
45 files changed, 184 insertions(+), 49 deletions(-)
diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-kinesis/pom.xml
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-kinesis/pom.xml
index f4f737f7ab..5b02b2bdb5 100644
--- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-kinesis/pom.xml
+++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-kinesis/pom.xml
@@ -41,6 +41,11 @@
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-proxy-configuration-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-migration-utils</artifactId>
+ <version>2.7.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-serialization-service-api</artifactId>
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-kinesis/src/main/java/org/apache/nifi/processors/aws/kinesis/ConsumeKinesis.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-kinesis/src/main/java/org/apache/nifi/processors/aws/kinesis/ConsumeKinesis.java
index 91d1982fe8..67d2f3589c 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-kinesis/src/main/java/org/apache/nifi/processors/aws/kinesis/ConsumeKinesis.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-kinesis/src/main/java/org/apache/nifi/processors/aws/kinesis/ConsumeKinesis.java
@@ -32,6 +32,8 @@ import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.controller.NodeTypeProvider;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.migration.PropertyConfiguration;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.processor.ProcessContext;
@@ -346,6 +348,11 @@ public class ConsumeKinesis extends AbstractProcessor {
return PROPERTY_DESCRIPTORS;
}
+ @Override
+ public void migrateProperties(final PropertyConfiguration config) {
+ ProxyServiceMigration.renameProxyConfigurationServiceProperty(config);
+ }
+
@Override
public Set<Relationship> getRelationships() {
return switch (processingStrategy) {
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/pom.xml
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/pom.xml
index 0d31cdcbf6..1dfcc02d9b 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/pom.xml
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/pom.xml
@@ -91,6 +91,11 @@
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-proxy-configuration-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-migration-utils</artifactId>
+ <version>2.7.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-aws-service-api</artifactId>
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/src/main/java/org/apache/nifi/aws/schemaregistry/AmazonGlueSchemaRegistry.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/src/main/java/org/apache/nifi/aws/schemaregistry/AmazonGlueSchemaRegistry.java
index fca6b28290..4166355d2d 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/src/main/java/org/apache/nifi/aws/schemaregistry/AmazonGlueSchemaRegistry.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/src/main/java/org/apache/nifi/aws/schemaregistry/AmazonGlueSchemaRegistry.java
@@ -28,6 +28,7 @@ import org.apache.nifi.controller.AbstractControllerService;
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.migration.PropertyConfiguration;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processor.util.StandardValidators;
import
org.apache.nifi.processors.aws.credentials.provider.AwsCredentialsProviderService;
import org.apache.nifi.proxy.ProxyConfiguration;
@@ -150,6 +151,7 @@ public class AmazonGlueSchemaRegistry extends
AbstractControllerService implemen
propertyConfiguration.renameProperty("cache-expiration",
CACHE_EXPIRATION.getName());
propertyConfiguration.renameProperty("aws-credentials-provider-service",
AWS_CREDENTIALS_PROVIDER_SERVICE.getName());
propertyConfiguration.renameProperty("ssl-context-service",
SSL_CONTEXT_SERVICE.getName());
+
ProxyServiceMigration.renameProxyConfigurationServiceProperty(propertyConfiguration);
}
@Override
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
index 26a41fa5cb..5fcc9b8bd9 100644
--- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
+++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
@@ -60,6 +60,11 @@
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-proxy-configuration-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-migration-utils</artifactId>
+ <version>2.7.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-azure-services-api</artifactId>
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/AbstractAzureBlobProcessor_v12.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/AbstractAzureBlobProcessor_v12.java
index 49552c3142..438d8cd36f 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/AbstractAzureBlobProcessor_v12.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/AbstractAzureBlobProcessor_v12.java
@@ -25,6 +25,8 @@ import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.context.PropertyContext;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.migration.PropertyConfiguration;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.Relationship;
@@ -84,6 +86,11 @@ public abstract class AbstractAzureBlobProcessor_v12 extends
AbstractProcessor {
return RELATIONSHIPS;
}
+ @Override
+ public void migrateProperties(PropertyConfiguration config) {
+ ProxyServiceMigration.renameProxyConfigurationServiceProperty(config);
+ }
+
@OnScheduled
public void onScheduled(ProcessContext context) {
clientFactory = new BlobServiceClientFactory(getLogger(),
getProxyOptions(context));
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/AbstractAzureDataLakeStorageProcessor.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/AbstractAzureDataLakeStorageProcessor.java
index b06e4449fc..474a5bb762 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/AbstractAzureDataLakeStorageProcessor.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/AbstractAzureDataLakeStorageProcessor.java
@@ -22,6 +22,7 @@ import org.apache.nifi.annotation.lifecycle.OnStopped;
import org.apache.nifi.context.PropertyContext;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.migration.PropertyConfiguration;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.Relationship;
@@ -83,5 +84,6 @@ public abstract class AbstractAzureDataLakeStorageProcessor
extends AbstractProc
@Override
public void migrateProperties(PropertyConfiguration config) {
config.renameProperty(AzureStorageUtils.OLD_ADLS_CREDENTIALS_SERVICE_DESCRIPTOR_NAME,
AzureStorageUtils.ADLS_CREDENTIALS_SERVICE.getName());
+ ProxyServiceMigration.renameProxyConfigurationServiceProperty(config);
}
}
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/ConsumeAzureEventHub.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/ConsumeAzureEventHub.java
index d9e07843a7..925de43de2 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/ConsumeAzureEventHub.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/ConsumeAzureEventHub.java
@@ -59,6 +59,7 @@ import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.migration.PropertyConfiguration;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.oauth2.OAuth2AccessTokenProvider;
import org.apache.nifi.processor.AbstractSessionFactoryProcessor;
import org.apache.nifi.processor.ProcessContext;
@@ -418,6 +419,7 @@ public class ConsumeAzureEventHub extends
AbstractSessionFactoryProcessor implem
}
config.removeProperty(AzureEventHubUtils.LEGACY_USE_MANAGED_IDENTITY_PROPERTY_NAME);
+ ProxyServiceMigration.renameProxyConfigurationServiceProperty(config);
}
private boolean hasConfiguredValue(final PropertyConfiguration config,
final PropertyDescriptor descriptor) {
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/GetAzureEventHub.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/GetAzureEventHub.java
index d8dc8b4611..89005b6287 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/GetAzureEventHub.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/GetAzureEventHub.java
@@ -48,6 +48,7 @@ import org.apache.nifi.controller.NodeTypeProvider;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.migration.PropertyConfiguration;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -342,6 +343,7 @@ public class GetAzureEventHub extends AbstractProcessor
implements AzureEventHub
}
config.removeProperty(AzureEventHubUtils.LEGACY_USE_MANAGED_IDENTITY_PROPERTY_NAME);
+ ProxyServiceMigration.renameProxyConfigurationServiceProperty(config);
}
/**
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/PutAzureEventHub.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/PutAzureEventHub.java
index d34b3a872d..8e2aaad287 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/PutAzureEventHub.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/PutAzureEventHub.java
@@ -41,6 +41,7 @@ import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.migration.PropertyConfiguration;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.oauth2.OAuth2AccessTokenProvider;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
@@ -218,6 +219,7 @@ public class PutAzureEventHub extends AbstractProcessor
implements AzureEventHub
}
config.removeProperty(AzureEventHubUtils.LEGACY_USE_MANAGED_IDENTITY_PROPERTY_NAME);
+ ProxyServiceMigration.renameProxyConfigurationServiceProperty(config);
}
private boolean hasConfiguredValue(final PropertyConfiguration config,
final PropertyDescriptor descriptor) {
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/AbstractListAzureProcessor.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/AbstractListAzureProcessor.java
index a58a2e96f3..2386af7382 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/AbstractListAzureProcessor.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/AbstractListAzureProcessor.java
@@ -17,6 +17,8 @@
package org.apache.nifi.processors.azure.storage;
import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.migration.PropertyConfiguration;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.util.StandardValidators;
@@ -82,4 +84,10 @@ public abstract class AbstractListAzureProcessor<T extends
ListableEntity> exten
}
return true;
}
+
+ @Override
+ public void migrateProperties(PropertyConfiguration config) {
+ super.migrateProperties(config);
+ ProxyServiceMigration.renameProxyConfigurationServiceProperty(config);
+ }
}
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/CopyAzureBlobStorage_v12.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/CopyAzureBlobStorage_v12.java
index ea4078dc42..28cf7802ef 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/CopyAzureBlobStorage_v12.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/CopyAzureBlobStorage_v12.java
@@ -281,6 +281,7 @@ public class CopyAzureBlobStorage_v12 extends
AbstractAzureBlobProcessor_v12 {
@Override
public void migrateProperties(PropertyConfiguration config) {
+ super.migrateProperties(config);
config.renameProperty(OLD_BLOB_NAME_PROPERTY_DESCRIPTOR_NAME,
DESTINATION_BLOB_NAME.getName());
config.renameProperty(AzureStorageUtils.OLD_CONFLICT_RESOLUTION_DESCRIPTOR_NAME,
AzureStorageUtils.CONFLICT_RESOLUTION.getName());
config.renameProperty(AzureStorageUtils.OLD_CREATE_CONTAINER_DESCRIPTOR_NAME,
AzureStorageUtils.CREATE_CONTAINER.getName());
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureBlobStorage_v12.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureBlobStorage_v12.java
index 2e6e95807e..d7f9bfdf4b 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureBlobStorage_v12.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureBlobStorage_v12.java
@@ -125,6 +125,7 @@ public class DeleteAzureBlobStorage_v12 extends
AbstractAzureBlobProcessor_v12 {
@Override
public void migrateProperties(PropertyConfiguration config) {
+ super.migrateProperties(config);
config.renameProperty(AbstractAzureBlobProcessor_v12.OLD_BLOB_NAME_PROPERTY_DESCRIPTOR_NAME,
BLOB_NAME.getName());
config.renameProperty("delete-snapshots-option",
DELETE_SNAPSHOTS_OPTION.getName());
config.renameProperty(AzureStorageUtils.OLD_CONTAINER_DESCRIPTOR_NAME,
CONTAINER.getName());
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/FetchAzureBlobStorage_v12.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/FetchAzureBlobStorage_v12.java
index a06c491531..e9965d841e 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/FetchAzureBlobStorage_v12.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/FetchAzureBlobStorage_v12.java
@@ -206,6 +206,7 @@ public class FetchAzureBlobStorage_v12 extends
AbstractAzureBlobProcessor_v12 im
@Override
public void migrateProperties(PropertyConfiguration config) {
+ super.migrateProperties(config);
config.renameProperty(AbstractAzureBlobProcessor_v12.OLD_BLOB_NAME_PROPERTY_DESCRIPTOR_NAME,
BLOB_NAME.getName());
config.renameProperty(AzureStorageUtils.OLD_CONTAINER_DESCRIPTOR_NAME,
CONTAINER.getName());
config.renameProperty(AzureStorageUtils.OLD_BLOB_STORAGE_CREDENTIALS_SERVICE_DESCRIPTOR_NAME,
AzureStorageUtils.BLOB_STORAGE_CREDENTIALS_SERVICE.getName());
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/PutAzureBlobStorage_v12.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/PutAzureBlobStorage_v12.java
index c984a727c8..a53c2a71c6 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/PutAzureBlobStorage_v12.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/PutAzureBlobStorage_v12.java
@@ -217,12 +217,12 @@ public class PutAzureBlobStorage_v12 extends
AbstractAzureBlobProcessor_v12 impl
@Override
public void migrateProperties(PropertyConfiguration config) {
+ super.migrateProperties(config);
config.renameProperty(AbstractAzureBlobProcessor_v12.OLD_BLOB_NAME_PROPERTY_DESCRIPTOR_NAME,
BLOB_NAME.getName());
config.renameProperty(AzureStorageUtils.OLD_CONFLICT_RESOLUTION_DESCRIPTOR_NAME,
AzureStorageUtils.CONFLICT_RESOLUTION.getName());
config.renameProperty(AzureStorageUtils.OLD_CREATE_CONTAINER_DESCRIPTOR_NAME,
AzureStorageUtils.CREATE_CONTAINER.getName());
config.renameProperty(AzureStorageUtils.OLD_CONTAINER_DESCRIPTOR_NAME,
AzureStorageUtils.CONTAINER.getName());
config.renameProperty(AzureStorageUtils.OLD_BLOB_STORAGE_CREDENTIALS_SERVICE_DESCRIPTOR_NAME,
AzureStorageUtils.BLOB_STORAGE_CREDENTIALS_SERVICE.getName());
-
}
private static void applyUploadResultAttributes(final Map<String, String>
attributes, final BlockBlobItem blob, final BlobType blobType, final long
length) {
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/queue/AbstractAzureQueueStorage_v12.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/queue/AbstractAzureQueueStorage_v12.java
index 37c7429d74..3318c8b817 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/queue/AbstractAzureQueueStorage_v12.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/queue/AbstractAzureQueueStorage_v12.java
@@ -33,12 +33,15 @@ import org.apache.nifi.context.PropertyContext;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.migration.PropertyConfiguration;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.Relationship;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.processors.azure.AzureServiceEndpoints;
import org.apache.nifi.processors.azure.storage.utils.AzureStorageUtils;
+import org.apache.nifi.proxy.ProxyConfiguration;
+import org.apache.nifi.proxy.ProxySpec;
import
org.apache.nifi.services.azure.storage.AzureStorageCredentialsDetails_v12;
import
org.apache.nifi.services.azure.storage.AzureStorageCredentialsService_v12;
import reactor.core.publisher.Mono;
@@ -81,6 +84,10 @@ public abstract class AbstractAzureQueueStorage_v12 extends
AbstractProcessor {
.addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
.build();
+ protected static final ProxySpec[] PROXY_SPECS = {ProxySpec.HTTP,
ProxySpec.SOCKS};
+
+ public static final PropertyDescriptor PROXY_CONFIGURATION_SERVICE =
ProxyConfiguration.createProxyConfigPropertyDescriptor(PROXY_SPECS);
+
public static final Relationship REL_SUCCESS = new Relationship.Builder()
.name("success")
.description("All successfully processed FlowFiles are routed to
this relationship")
@@ -110,6 +117,7 @@ public abstract class AbstractAzureQueueStorage_v12 extends
AbstractProcessor {
@Override
public void migrateProperties(PropertyConfiguration config) {
config.renameProperty(AzureStorageUtils.STORAGE_ENDPOINT_SUFFIX_PROPERTY_DESCRIPTOR_NAME,
ENDPOINT_SUFFIX.getName());
+ ProxyServiceMigration.renameProxyConfigurationServiceProperty(config);
}
@Override
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/queue/GetAzureQueueStorage_v12.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/queue/GetAzureQueueStorage_v12.java
index 5979af5be6..3e0b48907d 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/queue/GetAzureQueueStorage_v12.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/queue/GetAzureQueueStorage_v12.java
@@ -36,8 +36,6 @@ import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.Relationship;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processor.util.StandardValidators;
-import org.apache.nifi.proxy.ProxyConfiguration;
-import org.apache.nifi.proxy.ProxySpec;
import java.time.Duration;
import java.util.Collection;
@@ -92,7 +90,6 @@ public class GetAzureQueueStorage_v12 extends
AbstractAzureQueueStorage_v12 {
.addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
.build();
- private static final ProxySpec[] PROXY_SPECS = {ProxySpec.HTTP,
ProxySpec.SOCKS};
private static final List<PropertyDescriptor> PROPERTY_DESCRIPTORS =
List.of(
QUEUE_NAME,
ENDPOINT_SUFFIX,
@@ -101,7 +98,7 @@ public class GetAzureQueueStorage_v12 extends
AbstractAzureQueueStorage_v12 {
MESSAGE_BATCH_SIZE,
VISIBILITY_TIMEOUT,
REQUEST_TIMEOUT,
- ProxyConfiguration.createProxyConfigPropertyDescriptor(PROXY_SPECS)
+ PROXY_CONFIGURATION_SERVICE
);
private static final Set<Relationship> RELATIONSHIPS = Set.of(
REL_SUCCESS
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/queue/PutAzureQueueStorage_v12.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/queue/PutAzureQueueStorage_v12.java
index 7e86c41a33..8274e70c57 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/queue/PutAzureQueueStorage_v12.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/queue/PutAzureQueueStorage_v12.java
@@ -31,8 +31,6 @@ import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processor.util.StandardValidators;
-import org.apache.nifi.proxy.ProxyConfiguration;
-import org.apache.nifi.proxy.ProxySpec;
import java.io.ByteArrayOutputStream;
import java.time.Duration;
@@ -62,7 +60,6 @@ public class PutAzureQueueStorage_v12 extends
AbstractAzureQueueStorage_v12 {
.addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
.build();
- private static final ProxySpec[] PROXY_SPECS = {ProxySpec.HTTP,
ProxySpec.SOCKS};
private static final List<PropertyDescriptor> PROPERTY_DESCRIPTORS =
List.of(
QUEUE_NAME,
ENDPOINT_SUFFIX,
@@ -70,7 +67,7 @@ public class PutAzureQueueStorage_v12 extends
AbstractAzureQueueStorage_v12 {
MESSAGE_TIME_TO_LIVE,
VISIBILITY_TIMEOUT,
REQUEST_TIMEOUT,
- ProxyConfiguration.createProxyConfigPropertyDescriptor(PROXY_SPECS)
+ PROXY_CONFIGURATION_SERVICE
);
// 7 days is the maximum timeout as per
https://learn.microsoft.com/en-us/rest/api/storageservices/get-messages
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/ADLSCredentialsControllerService.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/ADLSCredentialsControllerService.java
index 83737ee581..6a223fcaae 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/ADLSCredentialsControllerService.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/ADLSCredentialsControllerService.java
@@ -25,6 +25,7 @@ import org.apache.nifi.controller.AbstractControllerService;
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.migration.PropertyConfiguration;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processors.azure.AzureServiceEndpoints;
import org.apache.nifi.processors.azure.storage.utils.AzureStorageUtils;
@@ -128,6 +129,7 @@ public class ADLSCredentialsControllerService extends
AbstractControllerService
config.removeProperty(propNameUseManagedIdentity);
}
+ ProxyServiceMigration.renameProxyConfigurationServiceProperty(config);
}
@OnEnabled
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/AzureStorageCredentialsControllerService_v12.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/AzureStorageCredentialsControllerService_v12.java
index fd5d6db8e4..9c761b0e97 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/AzureStorageCredentialsControllerService_v12.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/AzureStorageCredentialsControllerService_v12.java
@@ -24,6 +24,7 @@ import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.controller.AbstractControllerService;
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.migration.PropertyConfiguration;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processors.azure.AzureServiceEndpoints;
import org.apache.nifi.processors.azure.storage.utils.AzureStorageUtils;
@@ -122,5 +123,6 @@ public class AzureStorageCredentialsControllerService_v12
extends AbstractContro
config.renameProperty(AzureStorageUtils.OLD_SERVICE_PRINCIPAL_TENANT_ID_DESCRIPTOR_NAME,
SERVICE_PRINCIPAL_TENANT_ID.getName());
config.renameProperty(AzureStorageUtils.OLD_SERVICE_PRINCIPAL_CLIENT_ID_DESCRIPTOR_NAME,
SERVICE_PRINCIPAL_CLIENT_ID.getName());
config.renameProperty(AzureStorageUtils.OLD_SERVICE_PRINCIPAL_CLIENT_SECRET_DESCRIPTOR_NAME,
SERVICE_PRINCIPAL_CLIENT_SECRET.getName());
+ ProxyServiceMigration.renameProxyConfigurationServiceProperty(config);
}
}
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/eventhub/GetAzureEventHubTest.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/eventhub/GetAzureEventHubTest.java
index c6f2c4cf80..9c088e1bdb 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/eventhub/GetAzureEventHubTest.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/eventhub/GetAzureEventHubTest.java
@@ -22,6 +22,7 @@ import com.azure.messaging.eventhubs.models.PartitionContext;
import com.azure.messaging.eventhubs.models.PartitionEvent;
import org.apache.nifi.annotation.notification.PrimaryNodeState;
import org.apache.nifi.controller.AbstractControllerService;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.oauth2.AccessToken;
import org.apache.nifi.oauth2.OAuth2AccessTokenProvider;
import org.apache.nifi.processor.ProcessContext;
@@ -109,13 +110,14 @@ public class GetAzureEventHubTest {
void testMigration() {
TestRunner testRunner =
TestRunners.newTestRunner(GetAzureEventHub.class);
final PropertyMigrationResult propertyMigrationResult =
testRunner.migrateProperties();
- final Map<String, String> expected = Map.of(
- "Event Hub Consumer Group",
GetAzureEventHub.CONSUMER_GROUP.getName(),
- "Event Hub Message Enqueue Time",
GetAzureEventHub.ENQUEUE_TIME.getName(),
- "Partition Recivier Fetch Size",
GetAzureEventHub.RECEIVER_FETCH_SIZE.getName(),
- "Partition Receiver Timeout (millseconds)",
GetAzureEventHub.RECEIVER_FETCH_TIMEOUT.getName(),
- AzureEventHubUtils.OLD_POLICY_PRIMARY_KEY_DESCRIPTOR_NAME,
GetAzureEventHub.POLICY_PRIMARY_KEY.getName(),
- AzureEventHubUtils.OLD_USE_MANAGED_IDENTITY_DESCRIPTOR_NAME,
AzureEventHubUtils.LEGACY_USE_MANAGED_IDENTITY_PROPERTY_NAME
+ final Map<String, String> expected = Map.ofEntries(
+ Map.entry("Event Hub Consumer Group",
GetAzureEventHub.CONSUMER_GROUP.getName()),
+ Map.entry("Event Hub Message Enqueue Time",
GetAzureEventHub.ENQUEUE_TIME.getName()),
+ Map.entry("Partition Recivier Fetch Size",
GetAzureEventHub.RECEIVER_FETCH_SIZE.getName()),
+ Map.entry("Partition Receiver Timeout (millseconds)",
GetAzureEventHub.RECEIVER_FETCH_TIMEOUT.getName()),
+
Map.entry(AzureEventHubUtils.OLD_POLICY_PRIMARY_KEY_DESCRIPTOR_NAME,
GetAzureEventHub.POLICY_PRIMARY_KEY.getName()),
+
Map.entry(AzureEventHubUtils.OLD_USE_MANAGED_IDENTITY_DESCRIPTOR_NAME,
AzureEventHubUtils.LEGACY_USE_MANAGED_IDENTITY_PROPERTY_NAME),
+
Map.entry(ProxyServiceMigration.OBSOLETE_PROXY_CONFIGURATION_SERVICE,
ProxyServiceMigration.PROXY_CONFIGURATION_SERVICE)
);
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/eventhub/PutAzureEventHubTest.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/eventhub/PutAzureEventHubTest.java
index 777743ab04..5dffa9350f 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/eventhub/PutAzureEventHubTest.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/eventhub/PutAzureEventHubTest.java
@@ -19,6 +19,7 @@ package org.apache.nifi.processors.azure.eventhub;
import com.azure.messaging.eventhubs.EventHubProducerClient;
import com.azure.messaging.eventhubs.models.SendOptions;
import org.apache.nifi.controller.AbstractControllerService;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.oauth2.AccessToken;
import org.apache.nifi.oauth2.OAuth2AccessTokenProvider;
import org.apache.nifi.processor.ProcessContext;
@@ -105,7 +106,8 @@ public class PutAzureEventHubTest {
"partitioning-key-attribute-name",
PutAzureEventHub.PARTITIONING_KEY_ATTRIBUTE_NAME.getName(),
"max-batch-size", PutAzureEventHub.MAX_BATCH_SIZE.getName(),
AzureEventHubUtils.OLD_POLICY_PRIMARY_KEY_DESCRIPTOR_NAME,
PutAzureEventHub.POLICY_PRIMARY_KEY.getName(),
- AzureEventHubUtils.OLD_USE_MANAGED_IDENTITY_DESCRIPTOR_NAME,
AzureEventHubUtils.LEGACY_USE_MANAGED_IDENTITY_PROPERTY_NAME
+ AzureEventHubUtils.OLD_USE_MANAGED_IDENTITY_DESCRIPTOR_NAME,
AzureEventHubUtils.LEGACY_USE_MANAGED_IDENTITY_PROPERTY_NAME,
+ ProxyServiceMigration.OBSOLETE_PROXY_CONFIGURATION_SERVICE,
ProxyServiceMigration.PROXY_CONFIGURATION_SERVICE
);
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/eventhub/TestConsumeAzureEventHub.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/eventhub/TestConsumeAzureEventHub.java
index 32aed258e2..50a9c8cdf1 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/eventhub/TestConsumeAzureEventHub.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/eventhub/TestConsumeAzureEventHub.java
@@ -24,6 +24,7 @@ import com.azure.messaging.eventhubs.models.EventBatchContext;
import com.azure.messaging.eventhubs.models.PartitionContext;
import org.apache.nifi.controller.AbstractControllerService;
import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.oauth2.AccessToken;
import org.apache.nifi.oauth2.OAuth2AccessTokenProvider;
import org.apache.nifi.processor.ProcessContext;
@@ -479,7 +480,8 @@ public class TestConsumeAzureEventHub {
Map.entry("storage-sas-token",
ConsumeAzureEventHub.STORAGE_SAS_TOKEN.getName()),
Map.entry("storage-container-name",
ConsumeAzureEventHub.STORAGE_CONTAINER_NAME.getName()),
Map.entry("event-hub-shared-access-policy-primary-key",
ConsumeAzureEventHub.POLICY_PRIMARY_KEY.getName()),
-
Map.entry(AzureEventHubUtils.OLD_USE_MANAGED_IDENTITY_DESCRIPTOR_NAME,
AzureEventHubUtils.LEGACY_USE_MANAGED_IDENTITY_PROPERTY_NAME)
+
Map.entry(AzureEventHubUtils.OLD_USE_MANAGED_IDENTITY_DESCRIPTOR_NAME,
AzureEventHubUtils.LEGACY_USE_MANAGED_IDENTITY_PROPERTY_NAME),
+
Map.entry(ProxyServiceMigration.OBSOLETE_PROXY_CONFIGURATION_SERVICE,
ProxyServiceMigration.PROXY_CONFIGURATION_SERVICE)
);
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestCopyAzureBlobStorage_v12.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestCopyAzureBlobStorage_v12.java
index 003925e883..4517d1ba7b 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestCopyAzureBlobStorage_v12.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestCopyAzureBlobStorage_v12.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.processors.azure.storage;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processors.azure.AbstractAzureBlobProcessor_v12;
import org.apache.nifi.processors.azure.storage.utils.AzureStorageUtils;
import org.apache.nifi.util.PropertyMigrationResult;
@@ -37,7 +38,8 @@ public class TestCopyAzureBlobStorage_v12 {
AzureStorageUtils.OLD_CONFLICT_RESOLUTION_DESCRIPTOR_NAME,
AzureStorageUtils.CONFLICT_RESOLUTION.getName(),
AzureStorageUtils.OLD_CREATE_CONTAINER_DESCRIPTOR_NAME,
AzureStorageUtils.CREATE_CONTAINER.getName(),
AzureStorageUtils.OLD_CONTAINER_DESCRIPTOR_NAME,
CopyAzureBlobStorage_v12.DESTINATION_CONTAINER_NAME.getName(),
-
AzureStorageUtils.OLD_BLOB_STORAGE_CREDENTIALS_SERVICE_DESCRIPTOR_NAME,
CopyAzureBlobStorage_v12.DESTINATION_STORAGE_CREDENTIALS_SERVICE.getName());
+
AzureStorageUtils.OLD_BLOB_STORAGE_CREDENTIALS_SERVICE_DESCRIPTOR_NAME,
CopyAzureBlobStorage_v12.DESTINATION_STORAGE_CREDENTIALS_SERVICE.getName(),
+
ProxyServiceMigration.OBSOLETE_PROXY_CONFIGURATION_SERVICE,
ProxyServiceMigration.PROXY_CONFIGURATION_SERVICE);
assertEquals(expectedRenamed,
propertyMigrationResult.getPropertiesRenamed());
}
}
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestDeleteAzureBlobStorage_v12.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestDeleteAzureBlobStorage_v12.java
index 95ec9d36fd..cf165d58ce 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestDeleteAzureBlobStorage_v12.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestDeleteAzureBlobStorage_v12.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.processors.azure.storage;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processors.azure.AbstractAzureBlobProcessor_v12;
import org.apache.nifi.processors.azure.storage.utils.AzureStorageUtils;
import org.apache.nifi.util.PropertyMigrationResult;
@@ -36,7 +37,8 @@ public class TestDeleteAzureBlobStorage_v12 {
Map.of(AbstractAzureBlobProcessor_v12.OLD_BLOB_NAME_PROPERTY_DESCRIPTOR_NAME,
DeleteAzureBlobStorage_v12.BLOB_NAME.getName(),
"delete-snapshots-option",
DeleteAzureBlobStorage_v12.DELETE_SNAPSHOTS_OPTION.getName(),
AzureStorageUtils.OLD_CONTAINER_DESCRIPTOR_NAME,
DeleteAzureBlobStorage_v12.CONTAINER.getName(),
-
AzureStorageUtils.OLD_BLOB_STORAGE_CREDENTIALS_SERVICE_DESCRIPTOR_NAME,
AzureStorageUtils.BLOB_STORAGE_CREDENTIALS_SERVICE.getName());
+
AzureStorageUtils.OLD_BLOB_STORAGE_CREDENTIALS_SERVICE_DESCRIPTOR_NAME,
AzureStorageUtils.BLOB_STORAGE_CREDENTIALS_SERVICE.getName(),
+
ProxyServiceMigration.OBSOLETE_PROXY_CONFIGURATION_SERVICE,
ProxyServiceMigration.PROXY_CONFIGURATION_SERVICE);
assertEquals(expectedRenamed,
propertyMigrationResult.getPropertiesRenamed());
}
}
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestDeleteAzureDataLakeStorage.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestDeleteAzureDataLakeStorage.java
index 190f23b69f..c78c18dcc7 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestDeleteAzureDataLakeStorage.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestDeleteAzureDataLakeStorage.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.processors.azure.storage;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processors.azure.storage.utils.AzureStorageUtils;
import org.apache.nifi.util.PropertyMigrationResult;
import org.apache.nifi.util.TestRunner;
@@ -36,7 +37,8 @@ public class TestDeleteAzureDataLakeStorage {
AzureStorageUtils.OLD_FILESYSTEM_DESCRIPTOR_NAME,
AzureStorageUtils.FILESYSTEM.getName(),
AzureStorageUtils.OLD_DIRECTORY_DESCRIPTOR_NAME,
AzureStorageUtils.DIRECTORY.getName(),
"filesystem-object-type",
DeleteAzureDataLakeStorage.FILESYSTEM_OBJECT_TYPE.getName(),
- AzureStorageUtils.OLD_FILE_DESCRIPTOR_NAME,
DeleteAzureDataLakeStorage.FILE.getName()
+ AzureStorageUtils.OLD_FILE_DESCRIPTOR_NAME,
DeleteAzureDataLakeStorage.FILE.getName(),
+
ProxyServiceMigration.OBSOLETE_PROXY_CONFIGURATION_SERVICE,
ProxyServiceMigration.PROXY_CONFIGURATION_SERVICE
);
assertEquals(expectedRenamed,
propertyMigrationResult.getPropertiesRenamed());
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestFetchAzureBlobStorage_v12.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestFetchAzureBlobStorage_v12.java
index 8b6c2f5a82..7704ff0239 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestFetchAzureBlobStorage_v12.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestFetchAzureBlobStorage_v12.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.processors.azure.storage;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processors.azure.AbstractAzureBlobProcessor_v12;
import org.apache.nifi.processors.azure.storage.utils.AzureStorageUtils;
import org.apache.nifi.util.PropertyMigrationResult;
@@ -37,7 +38,8 @@ public class TestFetchAzureBlobStorage_v12 {
AzureStorageUtils.OLD_CONTAINER_DESCRIPTOR_NAME,
FetchAzureBlobStorage_v12.CONTAINER.getName(),
AzureStorageUtils.OLD_BLOB_STORAGE_CREDENTIALS_SERVICE_DESCRIPTOR_NAME,
AzureStorageUtils.BLOB_STORAGE_CREDENTIALS_SERVICE.getName(),
"range-start",
FetchAzureBlobStorage_v12.RANGE_START.getName(),
- "range-length",
FetchAzureBlobStorage_v12.RANGE_LENGTH.getName());
+ "range-length",
FetchAzureBlobStorage_v12.RANGE_LENGTH.getName(),
+
ProxyServiceMigration.OBSOLETE_PROXY_CONFIGURATION_SERVICE,
ProxyServiceMigration.PROXY_CONFIGURATION_SERVICE);
assertEquals(expectedRenamed,
propertyMigrationResult.getPropertiesRenamed());
}
}
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestFetchAzureDataLakeStorage.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestFetchAzureDataLakeStorage.java
index ecfaf1cf65..ceae0b5aaf 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestFetchAzureDataLakeStorage.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestFetchAzureDataLakeStorage.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.processors.azure.storage;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processors.azure.storage.utils.AzureStorageUtils;
import org.apache.nifi.util.PropertyMigrationResult;
import org.apache.nifi.util.TestRunner;
@@ -32,13 +33,15 @@ public class TestFetchAzureDataLakeStorage {
TestRunner runner =
TestRunners.newTestRunner(FetchAzureDataLakeStorage.class);
final PropertyMigrationResult propertyMigrationResult =
runner.migrateProperties();
final Map<String, String> expectedRenamed =
-
Map.of(AzureStorageUtils.OLD_ADLS_CREDENTIALS_SERVICE_DESCRIPTOR_NAME,
AzureStorageUtils.ADLS_CREDENTIALS_SERVICE.getName(),
- AzureStorageUtils.OLD_FILESYSTEM_DESCRIPTOR_NAME,
AzureStorageUtils.FILESYSTEM.getName(),
- AzureStorageUtils.OLD_DIRECTORY_DESCRIPTOR_NAME,
AzureStorageUtils.DIRECTORY.getName(),
- AzureStorageUtils.OLD_FILE_DESCRIPTOR_NAME,
AzureStorageUtils.FILE.getName(),
- "number-of-retries",
FetchAzureDataLakeStorage.NUM_RETRIES.getName(),
- "range-start",
FetchAzureDataLakeStorage.RANGE_START.getName(),
- "range-length",
FetchAzureDataLakeStorage.RANGE_LENGTH.getName()
+ Map.ofEntries(
+
Map.entry(AzureStorageUtils.OLD_ADLS_CREDENTIALS_SERVICE_DESCRIPTOR_NAME,
AzureStorageUtils.ADLS_CREDENTIALS_SERVICE.getName()),
+
Map.entry(AzureStorageUtils.OLD_FILESYSTEM_DESCRIPTOR_NAME,
AzureStorageUtils.FILESYSTEM.getName()),
+
Map.entry(AzureStorageUtils.OLD_DIRECTORY_DESCRIPTOR_NAME,
AzureStorageUtils.DIRECTORY.getName()),
+ Map.entry(AzureStorageUtils.OLD_FILE_DESCRIPTOR_NAME,
AzureStorageUtils.FILE.getName()),
+ Map.entry("number-of-retries",
FetchAzureDataLakeStorage.NUM_RETRIES.getName()),
+ Map.entry("range-start",
FetchAzureDataLakeStorage.RANGE_START.getName()),
+ Map.entry("range-length",
FetchAzureDataLakeStorage.RANGE_LENGTH.getName()),
+
Map.entry(ProxyServiceMigration.OBSOLETE_PROXY_CONFIGURATION_SERVICE,
ProxyServiceMigration.PROXY_CONFIGURATION_SERVICE)
);
assertEquals(expectedRenamed,
propertyMigrationResult.getPropertiesRenamed());
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestMoveAzureDataLakeStorage.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestMoveAzureDataLakeStorage.java
index 26a054c3db..fcbe30cadf 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestMoveAzureDataLakeStorage.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestMoveAzureDataLakeStorage.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.processors.azure.storage;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processors.azure.storage.utils.AzureStorageUtils;
import org.apache.nifi.util.PropertyMigrationResult;
import org.apache.nifi.util.TestRunner;
@@ -31,14 +32,15 @@ public class TestMoveAzureDataLakeStorage {
void testMigration() {
TestRunner runner =
TestRunners.newTestRunner(MoveAzureDataLakeStorage.class);
final PropertyMigrationResult propertyMigrationResult =
runner.migrateProperties();
- final Map<String, String> expectedRenamed = Map.of(
-
AzureStorageUtils.OLD_ADLS_CREDENTIALS_SERVICE_DESCRIPTOR_NAME,
AzureStorageUtils.ADLS_CREDENTIALS_SERVICE.getName(),
- AzureStorageUtils.OLD_DIRECTORY_DESCRIPTOR_NAME,
MoveAzureDataLakeStorage.DESTINATION_DIRECTORY.getName(),
- AzureStorageUtils.OLD_FILESYSTEM_DESCRIPTOR_NAME,
MoveAzureDataLakeStorage.DESTINATION_FILESYSTEM.getName(),
- AzureStorageUtils.OLD_FILE_DESCRIPTOR_NAME,
AzureStorageUtils.FILE.getName(),
- "conflict-resolution-strategy",
MoveAzureDataLakeStorage.CONFLICT_RESOLUTION.getName(),
- "source-filesystem-name",
MoveAzureDataLakeStorage.SOURCE_FILESYSTEM.getName(),
- "source-directory-name",
MoveAzureDataLakeStorage.SOURCE_DIRECTORY.getName()
+ final Map<String, String> expectedRenamed = Map.ofEntries(
+
Map.entry(AzureStorageUtils.OLD_ADLS_CREDENTIALS_SERVICE_DESCRIPTOR_NAME,
AzureStorageUtils.ADLS_CREDENTIALS_SERVICE.getName()),
+ Map.entry(AzureStorageUtils.OLD_DIRECTORY_DESCRIPTOR_NAME,
MoveAzureDataLakeStorage.DESTINATION_DIRECTORY.getName()),
+ Map.entry(AzureStorageUtils.OLD_FILESYSTEM_DESCRIPTOR_NAME,
MoveAzureDataLakeStorage.DESTINATION_FILESYSTEM.getName()),
+ Map.entry(AzureStorageUtils.OLD_FILE_DESCRIPTOR_NAME,
AzureStorageUtils.FILE.getName()),
+ Map.entry("conflict-resolution-strategy",
MoveAzureDataLakeStorage.CONFLICT_RESOLUTION.getName()),
+ Map.entry("source-filesystem-name",
MoveAzureDataLakeStorage.SOURCE_FILESYSTEM.getName()),
+ Map.entry("source-directory-name",
MoveAzureDataLakeStorage.SOURCE_DIRECTORY.getName()),
+
Map.entry(ProxyServiceMigration.OBSOLETE_PROXY_CONFIGURATION_SERVICE,
ProxyServiceMigration.PROXY_CONFIGURATION_SERVICE)
);
assertEquals(expectedRenamed,
propertyMigrationResult.getPropertiesRenamed());
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestPutAzureBlobStorage_v12.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestPutAzureBlobStorage_v12.java
index 85d2f55b92..74f78e6664 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestPutAzureBlobStorage_v12.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestPutAzureBlobStorage_v12.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.processors.azure.storage;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processors.azure.AbstractAzureBlobProcessor_v12;
import org.apache.nifi.processors.azure.storage.utils.AzureStorageUtils;
import org.apache.nifi.util.PropertyMigrationResult;
@@ -37,7 +38,8 @@ public class TestPutAzureBlobStorage_v12 {
Map.entry(AzureStorageUtils.OLD_CONFLICT_RESOLUTION_DESCRIPTOR_NAME,
AzureStorageUtils.CONFLICT_RESOLUTION.getName()),
Map.entry(AzureStorageUtils.OLD_CREATE_CONTAINER_DESCRIPTOR_NAME,
AzureStorageUtils.CREATE_CONTAINER.getName()),
Map.entry(AzureStorageUtils.OLD_CONTAINER_DESCRIPTOR_NAME,
AzureStorageUtils.CONTAINER.getName()),
-
Map.entry(AzureStorageUtils.OLD_BLOB_STORAGE_CREDENTIALS_SERVICE_DESCRIPTOR_NAME,
AzureStorageUtils.BLOB_STORAGE_CREDENTIALS_SERVICE.getName()));
+
Map.entry(AzureStorageUtils.OLD_BLOB_STORAGE_CREDENTIALS_SERVICE_DESCRIPTOR_NAME,
AzureStorageUtils.BLOB_STORAGE_CREDENTIALS_SERVICE.getName()),
+
Map.entry(ProxyServiceMigration.OBSOLETE_PROXY_CONFIGURATION_SERVICE,
ProxyServiceMigration.PROXY_CONFIGURATION_SERVICE));
assertEquals(expectedRenamed,
propertyMigrationResult.getPropertiesRenamed());
}
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestPutAzureDataLakeStorage.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestPutAzureDataLakeStorage.java
index 6259258667..97669737fd 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestPutAzureDataLakeStorage.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/TestPutAzureDataLakeStorage.java
@@ -20,6 +20,7 @@ import com.azure.core.http.rest.Response;
import com.azure.storage.file.datalake.DataLakeFileClient;
import com.azure.storage.file.datalake.models.DataLakeRequestConditions;
import com.azure.storage.file.datalake.models.DataLakeStorageException;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processor.ProcessorInitializationContext;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processors.azure.storage.utils.AzureStorageUtils;
@@ -76,14 +77,15 @@ public class TestPutAzureDataLakeStorage {
void testMigration() {
TestRunner runner =
TestRunners.newTestRunner(PutAzureDataLakeStorage.class);
final PropertyMigrationResult propertyMigrationResult =
runner.migrateProperties();
- final Map<String, String> expectedRenamed = Map.of(
-
AzureStorageUtils.OLD_ADLS_CREDENTIALS_SERVICE_DESCRIPTOR_NAME,
AzureStorageUtils.ADLS_CREDENTIALS_SERVICE.getName(),
- AzureStorageUtils.OLD_FILESYSTEM_DESCRIPTOR_NAME,
AzureStorageUtils.FILESYSTEM.getName(),
- AzureStorageUtils.OLD_DIRECTORY_DESCRIPTOR_NAME,
AzureStorageUtils.DIRECTORY.getName(),
- AzureStorageUtils.OLD_FILE_DESCRIPTOR_NAME,
AzureStorageUtils.FILE.getName(),
- "conflict-resolution-strategy",
PutAzureDataLakeStorage.CONFLICT_RESOLUTION.getName(),
- "writing-strategy",
PutAzureDataLakeStorage.WRITING_STRATEGY.getName(),
- "base-temporary-path",
PutAzureDataLakeStorage.BASE_TEMPORARY_PATH.getName()
+ final Map<String, String> expectedRenamed = Map.ofEntries(
+
Map.entry(AzureStorageUtils.OLD_ADLS_CREDENTIALS_SERVICE_DESCRIPTOR_NAME,
AzureStorageUtils.ADLS_CREDENTIALS_SERVICE.getName()),
+ Map.entry(AzureStorageUtils.OLD_FILESYSTEM_DESCRIPTOR_NAME,
AzureStorageUtils.FILESYSTEM.getName()),
+ Map.entry(AzureStorageUtils.OLD_DIRECTORY_DESCRIPTOR_NAME,
AzureStorageUtils.DIRECTORY.getName()),
+ Map.entry(AzureStorageUtils.OLD_FILE_DESCRIPTOR_NAME,
AzureStorageUtils.FILE.getName()),
+ Map.entry("conflict-resolution-strategy",
PutAzureDataLakeStorage.CONFLICT_RESOLUTION.getName()),
+ Map.entry("writing-strategy",
PutAzureDataLakeStorage.WRITING_STRATEGY.getName()),
+ Map.entry("base-temporary-path",
PutAzureDataLakeStorage.BASE_TEMPORARY_PATH.getName()),
+
Map.entry(ProxyServiceMigration.OBSOLETE_PROXY_CONFIGURATION_SERVICE,
ProxyServiceMigration.PROXY_CONFIGURATION_SERVICE)
);
assertEquals(expectedRenamed,
propertyMigrationResult.getPropertiesRenamed());
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/queue/TestGetAzureQueueStorage_v12.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/queue/TestGetAzureQueueStorage_v12.java
index 310a762d1b..64bbfe32df 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/queue/TestGetAzureQueueStorage_v12.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/queue/TestGetAzureQueueStorage_v12.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.processors.azure.storage.queue;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processors.azure.storage.utils.AzureStorageUtils;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.util.PropertyMigrationResult;
@@ -87,7 +88,8 @@ public class TestGetAzureQueueStorage_v12 extends
AbstractTestAzureQueueStorage_
void testMigration() {
final PropertyMigrationResult propertyMigrationResult =
runner.migrateProperties();
final Map<String, String> expected = Map.of(
-
AzureStorageUtils.STORAGE_ENDPOINT_SUFFIX_PROPERTY_DESCRIPTOR_NAME,
GetAzureQueueStorage_v12.ENDPOINT_SUFFIX.getName()
+
AzureStorageUtils.STORAGE_ENDPOINT_SUFFIX_PROPERTY_DESCRIPTOR_NAME,
GetAzureQueueStorage_v12.ENDPOINT_SUFFIX.getName(),
+ ProxyServiceMigration.OBSOLETE_PROXY_CONFIGURATION_SERVICE,
ProxyServiceMigration.PROXY_CONFIGURATION_SERVICE
);
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/queue/TestPutAzureQueueStorage_v12.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/queue/TestPutAzureQueueStorage_v12.java
index 5b1edff218..b8338ed04e 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/queue/TestPutAzureQueueStorage_v12.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/queue/TestPutAzureQueueStorage_v12.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.processors.azure.storage.queue;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processors.azure.storage.utils.AzureStorageUtils;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.util.PropertyMigrationResult;
@@ -108,7 +109,8 @@ public class TestPutAzureQueueStorage_v12 extends
AbstractTestAzureQueueStorage_
void testMigration() {
final PropertyMigrationResult propertyMigrationResult =
runner.migrateProperties();
final Map<String, String> expected = Map.of(
-
AzureStorageUtils.STORAGE_ENDPOINT_SUFFIX_PROPERTY_DESCRIPTOR_NAME,
GetAzureQueueStorage_v12.ENDPOINT_SUFFIX.getName()
+
AzureStorageUtils.STORAGE_ENDPOINT_SUFFIX_PROPERTY_DESCRIPTOR_NAME,
PutAzureQueueStorage_v12.ENDPOINT_SUFFIX.getName(),
+ ProxyServiceMigration.OBSOLETE_PROXY_CONFIGURATION_SERVICE,
ProxyServiceMigration.PROXY_CONFIGURATION_SERVICE
);
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());
diff --git a/nifi-extension-bundles/nifi-box-bundle/nifi-box-services/pom.xml
b/nifi-extension-bundles/nifi-box-bundle/nifi-box-services/pom.xml
index d040ec47c2..13a22c5a06 100644
--- a/nifi-extension-bundles/nifi-box-bundle/nifi-box-services/pom.xml
+++ b/nifi-extension-bundles/nifi-box-bundle/nifi-box-services/pom.xml
@@ -50,5 +50,10 @@
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-proxy-configuration-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-migration-utils</artifactId>
+ <version>2.7.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git
a/nifi-extension-bundles/nifi-box-bundle/nifi-box-services/src/main/java/org/apache/nifi/box/controllerservices/JsonConfigBasedBoxClientService.java
b/nifi-extension-bundles/nifi-box-bundle/nifi-box-services/src/main/java/org/apache/nifi/box/controllerservices/JsonConfigBasedBoxClientService.java
index aaeed267c4..149e1c0f3f 100644
---
a/nifi-extension-bundles/nifi-box-bundle/nifi-box-services/src/main/java/org/apache/nifi/box/controllerservices/JsonConfigBasedBoxClientService.java
+++
b/nifi-extension-bundles/nifi-box-bundle/nifi-box-services/src/main/java/org/apache/nifi/box/controllerservices/JsonConfigBasedBoxClientService.java
@@ -45,6 +45,7 @@ import org.apache.nifi.controller.VerifiableControllerService;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.migration.PropertyConfiguration;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processor.util.JsonValidator;
import org.apache.nifi.processor.util.StandardValidators;
@@ -255,5 +256,6 @@ public class JsonConfigBasedBoxClientService extends
AbstractControllerService i
config.renameProperty("box-account-id", ACCOUNT_ID.getName());
config.renameProperty("app-config-file", APP_CONFIG_FILE.getName());
config.renameProperty("app-config-json", APP_CONFIG_JSON.getName());
+ ProxyServiceMigration.renameProxyConfigurationServiceProperty(config);
}
}
diff --git
a/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/pom.xml
b/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/pom.xml
index a887c076b9..f1127a515f 100644
--- a/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/pom.xml
+++ b/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/pom.xml
@@ -34,6 +34,11 @@
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-proxy-configuration-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-migration-utils</artifactId>
+ <version>2.7.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-listed-entity</artifactId>
diff --git
a/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/FetchDropbox.java
b/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/FetchDropbox.java
index a066eaca6c..967f646779 100644
---
a/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/FetchDropbox.java
+++
b/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/FetchDropbox.java
@@ -52,6 +52,7 @@ import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.migration.PropertyConfiguration;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -159,6 +160,7 @@ public class FetchDropbox extends AbstractProcessor
implements DropboxTrait {
public void migrateProperties(PropertyConfiguration config) {
config.renameProperty(OLD_CREDENTIAL_SERVICE_PROPERTY_NAME,
CREDENTIAL_SERVICE.getName());
config.renameProperty("file", FILE.getName());
+ ProxyServiceMigration.renameProxyConfigurationServiceProperty(config);
}
private FileMetadata fetchFile(String fileId, ProcessSession session,
FlowFile outFlowFile) throws DbxException {
diff --git
a/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/ListDropbox.java
b/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/ListDropbox.java
index 699d4872ca..0d06684bb1 100644
---
a/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/ListDropbox.java
+++
b/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/ListDropbox.java
@@ -62,6 +62,7 @@ import org.apache.nifi.components.state.Scope;
import org.apache.nifi.context.PropertyContext;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.migration.PropertyConfiguration;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.processor.util.list.AbstractListProcessor;
@@ -171,6 +172,7 @@ public class ListDropbox extends
AbstractListProcessor<DropboxFileInfo> implemen
config.renameProperty(ListedEntityTracker.OLD_TRACKING_STATE_CACHE_PROPERTY_NAME,
TRACKING_STATE_CACHE.getName());
config.renameProperty(ListedEntityTracker.OLD_TRACKING_TIME_WINDOW_PROPERTY_NAME,
TRACKING_TIME_WINDOW.getName());
config.renameProperty(ListedEntityTracker.OLD_INITIAL_LISTING_TARGET_PROPERTY_NAME,
INITIAL_LISTING_TARGET.getName());
+ ProxyServiceMigration.renameProxyConfigurationServiceProperty(config);
}
@Override
diff --git
a/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/PutDropbox.java
b/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/PutDropbox.java
index 8741a08e58..9bb55dec2e 100644
---
a/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/PutDropbox.java
+++
b/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/PutDropbox.java
@@ -60,6 +60,7 @@ import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
import org.apache.nifi.migration.PropertyConfiguration;
+import org.apache.nifi.migration.ProxyServiceMigration;
import
org.apache.nifi.processors.conflict.resolution.ConflictResolutionStrategy;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
@@ -258,6 +259,7 @@ public class PutDropbox extends AbstractProcessor
implements DropboxTrait {
config.renameProperty("conflict-resolution-strategy",
CONFLICT_RESOLUTION.getName());
config.renameProperty("chunked-upload-size",
CHUNKED_UPLOAD_SIZE.getName());
config.renameProperty("chunked-upload-threshold",
CHUNKED_UPLOAD_THRESHOLD.getName());
+ ProxyServiceMigration.renameProxyConfigurationServiceProperty(config);
}
private void handleUploadError(final ConflictResolutionStrategy
conflictResolution, final String uploadPath, final UploadErrorException e) {
diff --git
a/nifi-extension-bundles/nifi-extension-utils/nifi-migration-utils/src/main/java/org/apache/nifi/migration/ProxyServiceMigration.java
b/nifi-extension-bundles/nifi-extension-utils/nifi-migration-utils/src/main/java/org/apache/nifi/migration/ProxyServiceMigration.java
index 019318f099..3474ddc807 100644
---
a/nifi-extension-bundles/nifi-extension-utils/nifi-migration-utils/src/main/java/org/apache/nifi/migration/ProxyServiceMigration.java
+++
b/nifi-extension-bundles/nifi-extension-utils/nifi-migration-utils/src/main/java/org/apache/nifi/migration/ProxyServiceMigration.java
@@ -32,8 +32,30 @@ public final class ProxyServiceMigration {
static final String PROXY_SERVICE_USERNAME = "proxy-user-name";
static final String PROXY_SERVICE_PASSWORD = "proxy-user-password";
+ /**
+ * Obsolete property name for the Proxy Configuration Service property
descriptor.
+ * Components using
ProxyConfiguration.createProxyConfigPropertyDescriptor() should migrate
+ * from this name to the current name "Proxy Configuration Service".
+ */
+ public static final String OBSOLETE_PROXY_CONFIGURATION_SERVICE =
"proxy-configuration-service";
+
+ /**
+ * Current property name for the Proxy Configuration Service property
descriptor.
+ */
+ public static final String PROXY_CONFIGURATION_SERVICE = "Proxy
Configuration Service";
+
private ProxyServiceMigration() { }
+ /**
+ * Renames the obsolete proxy configuration service property name to the
current name.
+ * This should be called by any component that uses
ProxyConfiguration.createProxyConfigPropertyDescriptor().
+ *
+ * @param config the component's property config to be migrated
+ */
+ public static void renameProxyConfigurationServiceProperty(final
PropertyConfiguration config) {
+ config.renameProperty(OBSOLETE_PROXY_CONFIGURATION_SERVICE,
PROXY_CONFIGURATION_SERVICE);
+ }
+
/**
* Migrates component level proxy properties to ProxyConfigurationService
with HTTP proxy type.
*
@@ -88,6 +110,9 @@ public final class ProxyServiceMigration {
final Proxy.Type proxyType,
final String proxyHostProperty,
final String proxyPortProperty,
final String
proxyUsernameProperty, final String proxyPasswordProperty) {
+ // Rename the obsolete proxy configuration service property name to
the current name
+ renameProxyConfigurationServiceProperty(config);
+
if (config.isPropertySet(proxyHostProperty)) {
final Map<String, String> proxyProperties = new HashMap<>();
proxyProperties.put(PROXY_SERVICE_TYPE, proxyType.name());
diff --git
a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/credentials/service/GCPCredentialsControllerService.java
b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/credentials/service/GCPCredentialsControllerService.java
index 1c15e26e5f..fce1bcf358 100644
---
a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/credentials/service/GCPCredentialsControllerService.java
+++
b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/credentials/service/GCPCredentialsControllerService.java
@@ -35,6 +35,7 @@ import org.apache.nifi.controller.VerifiableControllerService;
import org.apache.nifi.gcp.credentials.service.GCPCredentialsService;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.migration.PropertyConfiguration;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processors.gcp.ProxyAwareTransportFactory;
import
org.apache.nifi.processors.gcp.credentials.factory.AuthenticationStrategy;
@@ -153,6 +154,7 @@ public class GCPCredentialsControllerService extends
AbstractControllerService i
config.renameProperty("compute-engine-credentials",
LEGACY_USE_COMPUTE_ENGINE_CREDENTIALS.getName());
config.renameProperty("service-account-json-file",
SERVICE_ACCOUNT_JSON_FILE.getName());
config.renameProperty("service-account-json",
SERVICE_ACCOUNT_JSON.getName());
+ ProxyServiceMigration.renameProxyConfigurationServiceProperty(config);
final boolean legacyFlagsPresent =
config.hasProperty(LEGACY_USE_APPLICATION_DEFAULT_CREDENTIALS)
|| config.hasProperty(LEGACY_USE_COMPUTE_ENGINE_CREDENTIALS);
diff --git
a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/FetchGoogleDrive.java
b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/FetchGoogleDrive.java
index d5187bcec7..acd983b2fa 100644
---
a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/FetchGoogleDrive.java
+++
b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/FetchGoogleDrive.java
@@ -50,6 +50,7 @@ import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.migration.PropertyConfiguration;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -369,6 +370,7 @@ public class FetchGoogleDrive extends AbstractProcessor
implements GoogleDriveTr
config.renameProperty(OLD_CONNECT_TIMEOUT_PROPERTY_NAME,
CONNECT_TIMEOUT.getName());
config.renameProperty(OLD_READ_TIMEOUT_PROPERTY_NAME,
READ_TIMEOUT.getName());
config.renameProperty(GoogleUtils.OLD_GCP_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME,
GoogleUtils.GCP_CREDENTIALS_PROVIDER_SERVICE.getName());
+ ProxyServiceMigration.renameProxyConfigurationServiceProperty(config);
}
private String getExportType(final String mimeType, final ProcessContext
context) {
diff --git
a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/ListGoogleDrive.java
b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/ListGoogleDrive.java
index 140d77e861..ef1249b597 100644
---
a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/ListGoogleDrive.java
+++
b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/ListGoogleDrive.java
@@ -41,6 +41,7 @@ import org.apache.nifi.components.state.Scope;
import org.apache.nifi.context.PropertyContext;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.migration.PropertyConfiguration;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.processor.util.list.AbstractListProcessor;
@@ -243,6 +244,7 @@ public class ListGoogleDrive extends
AbstractListProcessor<GoogleDriveFileInfo>
config.renameProperty("recursive-search", RECURSIVE_SEARCH.getName());
config.renameProperty("min-age", MIN_AGE.getName());
config.renameProperty(GoogleUtils.OLD_GCP_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME,
GoogleUtils.GCP_CREDENTIALS_PROVIDER_SERVICE.getName());
+ ProxyServiceMigration.renameProxyConfigurationServiceProperty(config);
}
@Override
diff --git
a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/PutGoogleDrive.java
b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/PutGoogleDrive.java
index 92173d47be..c0b5c486b3 100644
---
a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/PutGoogleDrive.java
+++
b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/PutGoogleDrive.java
@@ -46,6 +46,7 @@ import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.migration.PropertyConfiguration;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.processor.ProcessContext;
@@ -329,7 +330,7 @@ public class PutGoogleDrive extends AbstractProcessor
implements GoogleDriveTrai
config.renameProperty("chunked-upload-size",
CHUNKED_UPLOAD_SIZE.getName());
config.renameProperty("chunked-upload-threshold",
CHUNKED_UPLOAD_THRESHOLD.getName());
config.renameProperty(GoogleUtils.OLD_GCP_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME,
GCP_CREDENTIALS_PROVIDER_SERVICE.getName());
-
+ ProxyServiceMigration.renameProxyConfigurationServiceProperty(config);
}
private FlowFile addAttributes(File file, FlowFile flowFile,
ProcessSession session) {
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
index debc21e88d..c068d3340a 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
@@ -64,6 +64,7 @@ import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.migration.PropertyConfiguration;
+import org.apache.nifi.migration.ProxyServiceMigration;
import org.apache.nifi.oauth2.OAuth2AccessTokenProvider;
import org.apache.nifi.oauth2.TokenRefreshStrategy;
import org.apache.nifi.processor.AbstractProcessor;
@@ -664,6 +665,7 @@ public class InvokeHTTP extends AbstractProcessor {
config.renameProperty("flow-file-naming-strategy",
RESPONSE_FLOW_FILE_NAMING_STRATEGY.getName());
config.renameProperty("Add Response Headers to Request",
RESPONSE_HEADER_REQUEST_ATTRIBUTES_ENABLED.getName());
config.renameProperty("Follow Redirects",
RESPONSE_REDIRECTS_ENABLED.getName());
+ ProxyServiceMigration.renameProxyConfigurationServiceProperty(config);
}
@Override
