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 d92d9f72a5 NIFI-15219 Standardized the property names to have first
letter of a word uppercased (#10539)
d92d9f72a5 is described below
commit d92d9f72a596b5058c9208873a8b637ef80a0b6f
Author: dan-s1 <[email protected]>
AuthorDate: Tue Nov 18 16:38:30 2025 -0500
NIFI-15219 Standardized the property names to have first letter of a word
uppercased (#10539)
Signed-off-by: David Handermann <[email protected]>
---
.../nifi/processors/aws/AbstractAwsProcessor.java | 4 +++-
.../aws/dynamodb/AbstractDynamoDBProcessor.java | 6 ++++--
.../aws/kinesis/firehose/PutKinesisFirehose.java | 8 +++++++-
.../processors/aws/ml/polly/GetAwsPollyStatusTest.java | 3 +++
.../processors/aws/ml/polly/StartAwsPollyJobTest.java | 3 +++
.../aws/ml/textract/GetAwsTextractJobStatusTest.java | 3 +++
.../aws/ml/textract/StartAwsTextractJobStatusTest.java | 3 +++
.../ml/transcribe/GetAwsTranscribeJobStatusTest.java | 3 +++
.../aws/ml/transcribe/StartAwsTranscribeJobTest.java | 3 +++
.../aws/ml/translate/GetAwsTranslateJobStatusTest.java | 3 +++
.../aws/ml/translate/StartAwsTranslateJobTest.java | 3 +++
.../nifi/cdc/mysql/processors/CaptureChangeMySQL.java | 15 +++++----------
.../nifi/elasticsearch/ElasticSearchClientService.java | 6 ++++--
.../org/apache/nifi/processor/util/bin/BinFiles.java | 8 +++++++-
.../processors/hadoop/AbstractHadoopProcessor.java | 3 ++-
.../org/apache/nifi/processors/hadoop/PutHDFS.java | 3 ++-
.../processors/mqtt/common/AbstractMQTTProcessor.java | 3 ++-
.../apache/nifi/snmp/processors/ListenTrapSNMP.java | 9 +++++++--
.../org/apache/nifi/processors/standard/DebugFlow.java | 14 +++++++++++---
.../nifi/processors/standard/ExecuteProcess.java | 8 +++++++-
.../apache/nifi/processors/standard/ExtractGrok.java | 3 ++-
.../apache/nifi/processors/standard/ExtractText.java | 18 ++++++++++++++----
.../org/apache/nifi/processors/standard/FetchFile.java | 11 +++++++++--
.../nifi/processors/standard/JoinEnrichment.java | 1 +
.../apache/nifi/processors/standard/LogAttribute.java | 3 ++-
.../apache/nifi/processors/standard/MergeContent.java | 1 +
.../processors/standard/PutDistributedMapCache.java | 11 +++++++++--
.../apache/nifi/processors/standard/RetryFlowFile.java | 3 ++-
.../apache/nifi/processors/standard/TransformXml.java | 11 +++++++++--
.../nifi/oauth2/StandardOauth2AccessTokenProvider.java | 8 ++++++--
.../src/main/java/org/apache/nifi/csv/CSVReader.java | 3 ++-
.../stateful/analysis/AttributeRollingWindow.java | 14 +++++++++++---
32 files changed, 153 insertions(+), 45 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAwsProcessor.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAwsProcessor.java
index 4ff0097195..9715ead1eb 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAwsProcessor.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAwsProcessor.java
@@ -136,8 +136,9 @@ public abstract class AbstractAwsProcessor<C extends
AwsClient, B extends AwsCli
.addValidator(StandardValidators.URL_VALIDATOR)
.build();
+ public static final String
OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME = "AWS Credentials
Provider service";
public static final PropertyDescriptor AWS_CREDENTIALS_PROVIDER_SERVICE =
new PropertyDescriptor.Builder()
- .name("AWS Credentials Provider service")
+ .name("AWS Credentials Provider Service")
.description("The Controller Service that is used to obtain AWS
credentials provider")
.required(true)
.identifiesControllerService(AwsCredentialsProviderService.class)
@@ -187,6 +188,7 @@ public abstract class AbstractAwsProcessor<C extends
AwsClient, B extends AwsCli
@Override
public void migrateProperties(final PropertyConfiguration config) {
config.renameProperty("aws-region", REGION.getName());
+
config.renameProperty(OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME,
AWS_CREDENTIALS_PROVIDER_SERVICE.getName());
migrateAuthenticationProperties(config);
ProxyServiceMigration.migrateProxyProperties(config,
PROXY_CONFIGURATION_SERVICE, OBSOLETE_PROXY_HOST, OBSOLETE_PROXY_PORT,
OBSOLETE_PROXY_USERNAME, OBSOLETE_PROXY_PASSWORD);
config.renameProperty(ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE,
PROXY_CONFIGURATION_SERVICE.getName());
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/AbstractDynamoDBProcessor.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/AbstractDynamoDBProcessor.java
index cb76352fe3..d6111ea83f 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/AbstractDynamoDBProcessor.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/AbstractDynamoDBProcessor.java
@@ -129,7 +129,7 @@ public abstract class AbstractDynamoDBProcessor extends
AbstractAwsSyncProcessor
.build();
public static final PropertyDescriptor JSON_DOCUMENT = new
PropertyDescriptor.Builder()
- .name("Json Document attribute")
+ .name("Json Document")
.required(true)
.expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT)
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
@@ -146,7 +146,7 @@ public abstract class AbstractDynamoDBProcessor extends
AbstractAwsSyncProcessor
.build();
public static final PropertyDescriptor DOCUMENT_CHARSET = new
PropertyDescriptor.Builder()
- .name("Character set of document")
+ .name("Document Character Set")
.description("Character set of data in the document")
.addValidator(StandardValidators.CHARACTER_SET_VALIDATOR)
.required(true)
@@ -169,6 +169,8 @@ public abstract class AbstractDynamoDBProcessor extends
AbstractAwsSyncProcessor
public void migrateProperties(PropertyConfiguration config) {
super.migrateProperties(config);
config.renameProperty("Batch items for each request (between 1 and
50)", BATCH_SIZE.getName());
+ config.renameProperty("Json Document attribute",
JSON_DOCUMENT.getName());
+ config.renameProperty("Character set of document",
DOCUMENT_CHARSET.getName());
}
@Override
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/firehose/PutKinesisFirehose.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/firehose/PutKinesisFirehose.java
index 81baad1d8b..23bd5a9f6c 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/firehose/PutKinesisFirehose.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/firehose/PutKinesisFirehose.java
@@ -27,6 +27,7 @@ import org.apache.nifi.annotation.documentation.Tags;
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.processor.DataUnit;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -82,7 +83,7 @@ public class PutKinesisFirehose extends
AbstractAwsSyncProcessor<FirehoseClient,
.build();
public static final PropertyDescriptor MAX_MESSAGE_BUFFER_SIZE_MB = new
PropertyDescriptor.Builder()
- .name("Max message buffer size")
+ .name("Max Message Buffer Size")
.description("Max message buffer")
.defaultValue("1 MB")
.required(false)
@@ -193,4 +194,9 @@ public class PutKinesisFirehose extends
AbstractAwsSyncProcessor<FirehoseClient,
}
}
+ @Override
+ public void migrateProperties(PropertyConfiguration config) {
+ super.migrateProperties(config);
+ config.renameProperty("Max message buffer size",
MAX_MESSAGE_BUFFER_SIZE_MB.getName());
+ }
}
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/polly/GetAwsPollyStatusTest.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/polly/GetAwsPollyStatusTest.java
index e133ebc401..99d2bb1dea 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/polly/GetAwsPollyStatusTest.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/polly/GetAwsPollyStatusTest.java
@@ -41,6 +41,8 @@ import software.amazon.awssdk.services.polly.model.TaskStatus;
import java.util.Map;
+import static
org.apache.nifi.processors.aws.AbstractAwsProcessor.AWS_CREDENTIALS_PROVIDER_SERVICE;
+import static
org.apache.nifi.processors.aws.AbstractAwsProcessor.OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.AWS_TASK_OUTPUT_LOCATION;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_FAILURE;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_ORIGINAL;
@@ -142,6 +144,7 @@ public class GetAwsPollyStatusTest {
final PropertyMigrationResult propertyMigrationResult =
runner.migrateProperties();
final Map<String, String> expected = Map.of("aws-region",
REGION.getName(),
"awsTaskId", TASK_ID.getName(),
+ OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME,
AWS_CREDENTIALS_PROVIDER_SERVICE.getName(),
ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE,
AbstractAwsProcessor.PROXY_CONFIGURATION_SERVICE.getName());
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/polly/StartAwsPollyJobTest.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/polly/StartAwsPollyJobTest.java
index 805b949782..e62d0b963b 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/polly/StartAwsPollyJobTest.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/polly/StartAwsPollyJobTest.java
@@ -47,6 +47,8 @@ import
software.amazon.awssdk.services.polly.model.SynthesisTask;
import java.util.HashMap;
import java.util.Map;
+import static
org.apache.nifi.processors.aws.AbstractAwsProcessor.AWS_CREDENTIALS_PROVIDER_SERVICE;
+import static
org.apache.nifi.processors.aws.AbstractAwsProcessor.OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_FAILURE;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_ORIGINAL;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_SUCCESS;
@@ -166,6 +168,7 @@ public class StartAwsPollyJobTest {
final PropertyMigrationResult propertyMigrationResult =
runner.migrateProperties();
final Map<String, String> expected = Map.of("aws-region",
REGION.getName(),
"json-payload",
AbstractAwsMachineLearningJobStarter.JSON_PAYLOAD.getName(),
+ OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME,
AWS_CREDENTIALS_PROVIDER_SERVICE.getName(),
ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE,
AbstractAwsProcessor.PROXY_CONFIGURATION_SERVICE.getName());
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/textract/GetAwsTextractJobStatusTest.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/textract/GetAwsTextractJobStatusTest.java
index 7cb6bc4fa6..99a83e8b9b 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/textract/GetAwsTextractJobStatusTest.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/textract/GetAwsTextractJobStatusTest.java
@@ -44,6 +44,8 @@ import
software.amazon.awssdk.services.textract.model.JobStatus;
import java.util.Map;
+import static
org.apache.nifi.processors.aws.AbstractAwsProcessor.AWS_CREDENTIALS_PROVIDER_SERVICE;
+import static
org.apache.nifi.processors.aws.AbstractAwsProcessor.OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_FAILURE;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_RUNNING;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_SUCCESS;
@@ -154,6 +156,7 @@ public class GetAwsTextractJobStatusTest {
final Map<String, String> expected = Map.of("aws-region",
REGION.getName(),
"awsTaskId", TASK_ID.getName(),
"textract-type",
GetAwsTextractJobStatus.TEXTRACT_TYPE.getName(),
+ OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME,
AWS_CREDENTIALS_PROVIDER_SERVICE.getName(),
ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE,
AbstractAwsProcessor.PROXY_CONFIGURATION_SERVICE.getName());
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/textract/StartAwsTextractJobStatusTest.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/textract/StartAwsTextractJobStatusTest.java
index f6096808c2..baf92d15d1 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/textract/StartAwsTextractJobStatusTest.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/textract/StartAwsTextractJobStatusTest.java
@@ -49,6 +49,8 @@ import
software.amazon.awssdk.services.textract.model.StartExpenseAnalysisRespon
import java.util.HashMap;
import java.util.Map;
+import static
org.apache.nifi.processors.aws.AbstractAwsProcessor.AWS_CREDENTIALS_PROVIDER_SERVICE;
+import static
org.apache.nifi.processors.aws.AbstractAwsProcessor.OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_FAILURE;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_ORIGINAL;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_SUCCESS;
@@ -327,6 +329,7 @@ public class StartAwsTextractJobStatusTest {
final Map<String, String> expected = Map.of("aws-region",
REGION.getName(),
"json-payload",
AbstractAwsMachineLearningJobStarter.JSON_PAYLOAD.getName(),
"textract-type", StartAwsTextractJob.TEXTRACT_TYPE.getName(),
+ OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME,
AWS_CREDENTIALS_PROVIDER_SERVICE.getName(),
ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE,
AbstractAwsProcessor.PROXY_CONFIGURATION_SERVICE.getName());
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/transcribe/GetAwsTranscribeJobStatusTest.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/transcribe/GetAwsTranscribeJobStatusTest.java
index 4c36b41b1a..184d7224e8 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/transcribe/GetAwsTranscribeJobStatusTest.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/transcribe/GetAwsTranscribeJobStatusTest.java
@@ -43,6 +43,8 @@ import
software.amazon.awssdk.services.transcribe.model.TranscriptionJobStatus;
import java.util.Map;
+import static
org.apache.nifi.processors.aws.AbstractAwsProcessor.AWS_CREDENTIALS_PROVIDER_SERVICE;
+import static
org.apache.nifi.processors.aws.AbstractAwsProcessor.OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.AWS_TASK_OUTPUT_LOCATION;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.FAILURE_REASON_ATTRIBUTE;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_FAILURE;
@@ -144,6 +146,7 @@ public class GetAwsTranscribeJobStatusTest {
final PropertyMigrationResult propertyMigrationResult =
runner.migrateProperties();
final Map<String, String> expected = Map.of("aws-region",
REGION.getName(),
"awsTaskId", TASK_ID.getName(),
+ OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME,
AWS_CREDENTIALS_PROVIDER_SERVICE.getName(),
ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE,
AbstractAwsProcessor.PROXY_CONFIGURATION_SERVICE.getName());
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/transcribe/StartAwsTranscribeJobTest.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/transcribe/StartAwsTranscribeJobTest.java
index 18a5417d48..442d9f3d5a 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/transcribe/StartAwsTranscribeJobTest.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/transcribe/StartAwsTranscribeJobTest.java
@@ -46,6 +46,8 @@ import
software.amazon.awssdk.services.transcribe.model.TranscriptionJob;
import java.util.HashMap;
import java.util.Map;
+import static
org.apache.nifi.processors.aws.AbstractAwsProcessor.AWS_CREDENTIALS_PROVIDER_SERVICE;
+import static
org.apache.nifi.processors.aws.AbstractAwsProcessor.OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_FAILURE;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_ORIGINAL;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_SUCCESS;
@@ -162,6 +164,7 @@ public class StartAwsTranscribeJobTest {
final PropertyMigrationResult propertyMigrationResult =
runner.migrateProperties();
final Map<String, String> expected = Map.of("aws-region",
REGION.getName(),
"json-payload",
AbstractAwsMachineLearningJobStarter.JSON_PAYLOAD.getName(),
+ OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME,
AWS_CREDENTIALS_PROVIDER_SERVICE.getName(),
ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE,
AbstractAwsProcessor.PROXY_CONFIGURATION_SERVICE.getName());
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/translate/GetAwsTranslateJobStatusTest.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/translate/GetAwsTranslateJobStatusTest.java
index c427fc9fa8..667d7c5523 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/translate/GetAwsTranslateJobStatusTest.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/translate/GetAwsTranslateJobStatusTest.java
@@ -44,6 +44,8 @@ import
software.amazon.awssdk.services.translate.model.TextTranslationJobPropert
import java.time.Instant;
import java.util.Map;
+import static
org.apache.nifi.processors.aws.AbstractAwsProcessor.AWS_CREDENTIALS_PROVIDER_SERVICE;
+import static
org.apache.nifi.processors.aws.AbstractAwsProcessor.OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.AWS_TASK_OUTPUT_LOCATION;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_FAILURE;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_RUNNING;
@@ -156,6 +158,7 @@ public class GetAwsTranslateJobStatusTest {
final PropertyMigrationResult propertyMigrationResult =
runner.migrateProperties();
final Map<String, String> expected = Map.of("aws-region",
REGION.getName(),
"awsTaskId", TASK_ID.getName(),
+ OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME,
AWS_CREDENTIALS_PROVIDER_SERVICE.getName(),
ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE,
AbstractAwsProcessor.PROXY_CONFIGURATION_SERVICE.getName());
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/translate/StartAwsTranslateJobTest.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/translate/StartAwsTranslateJobTest.java
index 7ca204aec2..afa40a6581 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/translate/StartAwsTranslateJobTest.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/translate/StartAwsTranslateJobTest.java
@@ -47,6 +47,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import static
org.apache.nifi.processors.aws.AbstractAwsProcessor.AWS_CREDENTIALS_PROVIDER_SERVICE;
+import static
org.apache.nifi.processors.aws.AbstractAwsProcessor.OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_FAILURE;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_ORIGINAL;
import static
org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_SUCCESS;
@@ -162,6 +164,7 @@ public class StartAwsTranslateJobTest {
final PropertyMigrationResult propertyMigrationResult =
runner.migrateProperties();
final Map<String, String> expected = Map.of("aws-region",
RegionUtil.REGION.getName(),
"json-payload",
AbstractAwsMachineLearningJobStarter.JSON_PAYLOAD.getName(),
+ OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME,
AWS_CREDENTIALS_PROVIDER_SERVICE.getName(),
ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE,
AbstractAwsProcessor.PROXY_CONFIGURATION_SERVICE.getName());
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());
diff --git
a/nifi-extension-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/src/main/java/org/apache/nifi/cdc/mysql/processors/CaptureChangeMySQL.java
b/nifi-extension-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/src/main/java/org/apache/nifi/cdc/mysql/processors/CaptureChangeMySQL.java
index ce148965c5..3836556854 100644
---
a/nifi-extension-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/src/main/java/org/apache/nifi/cdc/mysql/processors/CaptureChangeMySQL.java
+++
b/nifi-extension-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/src/main/java/org/apache/nifi/cdc/mysql/processors/CaptureChangeMySQL.java
@@ -75,7 +75,6 @@ import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.components.state.Scope;
import org.apache.nifi.components.state.StateManager;
import org.apache.nifi.components.state.StateMap;
-import org.apache.nifi.distributed.cache.client.DistributedMapCacheClient;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.logging.ComponentLog;
@@ -197,6 +196,10 @@ public class CaptureChangeMySQL extends
AbstractSessionFactoryProcessor {
SSLMode.VERIFY_IDENTITY.toString(),
"Connect with TLS or fail when server support not enabled. Verify
server hostname matches presented X.509 certificate names or fail when not
matched");
+ private static final List<String>
OBSOLETE_DIST_CACHE_CLIENT_PROPERTY_NAMES = List.of(
+ "capture-change-mysql-dist-map-cache-client",
+ "Distributed Map Cache Client - unused"
+ );
// Properties
public static final PropertyDescriptor DATABASE_NAME_PATTERN = new
PropertyDescriptor.Builder()
@@ -308,13 +311,6 @@ public class CaptureChangeMySQL extends
AbstractSessionFactoryProcessor {
.expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT)
.build();
- public static final PropertyDescriptor DIST_CACHE_CLIENT = new
PropertyDescriptor.Builder()
- .name("Distributed Map Cache Client - unused")
- .description("This is a legacy property that is no longer used to
store table information, the processor will handle the table information
(column names, types, etc.)")
- .identifiesControllerService(DistributedMapCacheClient.class)
- .required(false)
- .build();
-
public static final PropertyDescriptor RETRIEVE_ALL_RECORDS = new
PropertyDescriptor.Builder()
.name("Retrieve All Records")
.description("Specifies whether to get all available CDC events,
regardless of the current binlog filename and/or position. If binlog filename
and position values are present "
@@ -441,7 +437,6 @@ public class CaptureChangeMySQL extends
AbstractSessionFactoryProcessor {
DATABASE_NAME_PATTERN,
TABLE_NAME_PATTERN,
CONNECT_TIMEOUT,
- DIST_CACHE_CLIENT,
RETRIEVE_ALL_RECORDS,
INCLUDE_BEGIN_COMMIT,
INCLUDE_DDL_EVENTS,
@@ -511,7 +506,6 @@ public class CaptureChangeMySQL extends
AbstractSessionFactoryProcessor {
config.renameProperty("events-per-flowfile-strategy",
EVENTS_PER_FLOWFILE_STRATEGY.getName());
config.renameProperty("number-of-events-per-flowfile",
NUMBER_OF_EVENTS_PER_FLOWFILE.getName());
config.renameProperty("capture-change-mysql-server-id",
SERVER_ID.getName());
- config.renameProperty("capture-change-mysql-dist-map-cache-client",
DIST_CACHE_CLIENT.getName());
config.renameProperty("capture-change-mysql-retrieve-all-records",
RETRIEVE_ALL_RECORDS.getName());
config.renameProperty("capture-change-mysql-include-begin-commit",
INCLUDE_BEGIN_COMMIT.getName());
config.renameProperty("capture-change-mysql-include-ddl-events",
INCLUDE_DDL_EVENTS.getName());
@@ -520,6 +514,7 @@ public class CaptureChangeMySQL extends
AbstractSessionFactoryProcessor {
config.renameProperty("capture-change-mysql-init-binlog-position",
INIT_BINLOG_POSITION.getName());
config.renameProperty("capture-change-mysql-use-gtid",
USE_BINLOG_GTID.getName());
config.renameProperty("capture-change-mysql-init-gtid",
INIT_BINLOG_GTID.getName());
+
OBSOLETE_DIST_CACHE_CLIENT_PROPERTY_NAMES.forEach(config::removeProperty);
}
@Override
diff --git
a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientService.java
b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientService.java
index b330c3965e..534efac4d7 100644
---
a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientService.java
+++
b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientService.java
@@ -26,6 +26,7 @@ import org.apache.nifi.migration.PropertyConfiguration;
import org.apache.nifi.oauth2.OAuth2AccessTokenProvider;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.proxy.ProxyConfiguration;
+import org.apache.nifi.proxy.ProxyConfigurationService;
import org.apache.nifi.proxy.ProxySpec;
import org.apache.nifi.ssl.SSLContextProvider;
@@ -130,7 +131,7 @@ public interface ElasticSearchClientService extends
ControllerService, Verifiabl
.build();
PropertyDescriptor CONNECT_TIMEOUT = new PropertyDescriptor.Builder()
- .name("Connect timeout")
+ .name("Connect Timeout")
.description("Controls the amount of time, in milliseconds, before
a timeout occurs when trying to connect.")
.required(true)
.defaultValue("5000")
@@ -281,7 +282,7 @@ public interface ElasticSearchClientService extends
ControllerService, Verifiabl
config.renameProperty("el-cs-password", PASSWORD.getName());
config.renameProperty("api-key-id", API_KEY_ID.getName());
config.renameProperty("api-key", API_KEY.getName());
- config.renameProperty("el-cs-connect-timeout",
CONNECT_TIMEOUT.getName());
+ List.of("el-cs-connect-timeout", "Connect
timeout").forEach(obsoletePropertyName ->
config.renameProperty(obsoletePropertyName, CONNECT_TIMEOUT.getName()));
config.renameProperty("el-cs-socket-timeout",
SOCKET_TIMEOUT.getName());
config.renameProperty("el-cs-charset", CHARSET.getName());
config.renameProperty("el-cs-suppress-nulls",
SUPPRESS_NULLS.getName());
@@ -295,6 +296,7 @@ public interface ElasticSearchClientService extends
ControllerService, Verifiabl
config.renameProperty("el-cs-sniffer-interval",
SNIFFER_INTERVAL.getName());
config.renameProperty("el-cs-sniffer-request-timeout",
SNIFFER_REQUEST_TIMEOUT.getName());
config.renameProperty("el-cs-sniffer-failure-delay",
SNIFFER_FAILURE_DELAY.getName());
+
config.renameProperty(ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE,
PROXY_CONFIGURATION_SERVICE.getName());
}
/**
diff --git
a/nifi-extension-bundles/nifi-extension-utils/nifi-bin-manager/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java
b/nifi-extension-bundles/nifi-extension-utils/nifi-bin-manager/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java
index 9ccb8eb0a4..7a97d01987 100644
---
a/nifi-extension-bundles/nifi-extension-utils/nifi-bin-manager/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java
+++
b/nifi-extension-bundles/nifi-extension-utils/nifi-bin-manager/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java
@@ -24,6 +24,7 @@ import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.context.PropertyContext;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.migration.PropertyConfiguration;
import org.apache.nifi.processor.AbstractSessionFactoryProcessor;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.processor.ProcessContext;
@@ -80,7 +81,7 @@ public abstract class BinFiles extends
AbstractSessionFactoryProcessor {
.build();
public static final PropertyDescriptor MAX_BIN_COUNT = new
PropertyDescriptor.Builder()
- .name("Maximum number of Bins")
+ .name("Maximum Number of Bins")
.description("Specifies the maximum number of bins that can be
held in memory at any one time")
.defaultValue("5")
.required(true)
@@ -196,6 +197,11 @@ public abstract class BinFiles extends
AbstractSessionFactoryProcessor {
}
}
+ @Override
+ public void migrateProperties(PropertyConfiguration config) {
+ config.renameProperty("Maximum number of Bins",
MAX_BIN_COUNT.getName());
+ }
+
private int migrateBins(final ProcessContext context, final boolean
relaxFullnessConstraint, final boolean newBinNeeded) {
int added = 0;
for (final Bin bin :
binManager.removeReadyBins(relaxFullnessConstraint)) {
diff --git
a/nifi-extension-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
b/nifi-extension-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
index 8cc168fde9..6f101f5444 100644
---
a/nifi-extension-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
+++
b/nifi-extension-bundles/nifi-extension-utils/nifi-hadoop-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractHadoopProcessor.java
@@ -109,7 +109,7 @@ public abstract class AbstractHadoopProcessor extends
AbstractProcessor implemen
.build();
public static final PropertyDescriptor COMPRESSION_CODEC = new
PropertyDescriptor.Builder()
- .name("Compression codec")
+ .name("Compression Codec")
.required(true)
.allowableValues(CompressionType.allowableValues())
.defaultValue(CompressionType.NONE.toString())
@@ -170,6 +170,7 @@ public abstract class AbstractHadoopProcessor extends
AbstractProcessor implemen
config.removeProperty("kerberos-credentials-service");
config.removeProperty("Kerberos Relogin Period");
config.renameProperty("kerberos-user-service",
KERBEROS_USER_SERVICE.getName());
+ config.renameProperty("Compression codec",
COMPRESSION_CODEC.getName());
}
@Override
diff --git
a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/PutHDFS.java
b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/PutHDFS.java
index 7b9ca0b54c..c4f0621897 100644
---
a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/PutHDFS.java
+++
b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/PutHDFS.java
@@ -198,7 +198,7 @@ public class PutHDFS extends AbstractHadoopProcessor {
.build();
public static final PropertyDescriptor UMASK = new
PropertyDescriptor.Builder()
- .name("Permissions umask")
+ .name("Permissions Umask")
.description(
"A umask represented as an octal number which determines
the permissions of files written to HDFS. " +
"This overrides the Hadoop property
\"fs.permissions.umask-mode\". " +
@@ -558,6 +558,7 @@ public class PutHDFS extends AbstractHadoopProcessor {
public void migrateProperties(PropertyConfiguration config) {
super.migrateProperties(config);
config.renameProperty("writing-strategy", WRITING_STRATEGY.getName());
+ config.renameProperty("Permissions umask", UMASK.getName());
}
protected Relationship getSuccessRelationship() {
diff --git
a/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/common/AbstractMQTTProcessor.java
b/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/common/AbstractMQTTProcessor.java
index f75a0e7545..c2f6ea9ad5 100644
---
a/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/common/AbstractMQTTProcessor.java
+++
b/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/common/AbstractMQTTProcessor.java
@@ -187,7 +187,7 @@ public abstract class AbstractMQTTProcessor extends
AbstractSessionFactoryProces
.build();
public static final PropertyDescriptor PROP_CLEAN_SESSION = new
PropertyDescriptor.Builder()
- .name("Session state")
+ .name("Session State")
.description("Whether to start a fresh or resume previous flows.
See the allowable value descriptions for more details.")
.required(true)
.allowableValues(
@@ -359,6 +359,7 @@ public abstract class AbstractMQTTProcessor extends
AbstractSessionFactoryProces
config.renameProperty("message-demarcator",
BASE_MESSAGE_DEMARCATOR.getName());
config.renameProperty("Connection Timeout (seconds)",
PROP_CONN_TIMEOUT.getName());
config.renameProperty("Keep Alive Interval (seconds)",
PROP_KEEP_ALIVE_INTERVAL.getName());
+ config.renameProperty("Session state", PROP_CLEAN_SESSION.getName());
}
protected boolean isConnected() {
diff --git
a/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/ListenTrapSNMP.java
b/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/ListenTrapSNMP.java
index 476e6d2400..9a4b1581a5 100644
---
a/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/ListenTrapSNMP.java
+++
b/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/ListenTrapSNMP.java
@@ -104,7 +104,7 @@ public class ListenTrapSNMP extends
AbstractSessionFactoryProcessor implements V
.build();
public static final PropertyDescriptor SNMP_USM_USERS_JSON = new
PropertyDescriptor.Builder()
- .name("USM Users JSON content")
+ .name("USM Users JSON Content")
.description("The JSON containing the user credentials for SNMPv3.
Check Usage for more details.")
.required(false)
.sensitive(true)
@@ -144,6 +144,11 @@ public class ListenTrapSNMP extends
AbstractSessionFactoryProcessor implements V
SNMP_USM_SECURITY_NAMES
);
+ private static final List<String>
OBSOLETE_SNMP_USM_USERS_JSON_PROPERTY_NAMES = List.of(
+ "snmp-usm-users-json-content",
+ "USM Users JSON content"
+ );
+
private static final Set<Relationship> RELATIONSHIPS = Set.of(
REL_SUCCESS,
REL_FAILURE
@@ -248,7 +253,7 @@ public class ListenTrapSNMP extends
AbstractSessionFactoryProcessor implements V
config.renameProperty("snmp-manager-port",
SNMP_MANAGER_PORT.getName());
config.renameProperty("snmp-usm-users-source",
SNMP_USM_USER_INPUT_METHOD.getName());
config.renameProperty("snmp-usm-users-file-path",
SNMP_USM_USERS_JSON_FILE_PATH.getName());
- config.renameProperty("snmp-usm-users-json-content",
SNMP_USM_USERS_JSON.getName());
+
OBSOLETE_SNMP_USM_USERS_JSON_PROPERTY_NAMES.forEach(obsoletePropertyName ->
config.renameProperty(obsoletePropertyName, SNMP_USM_USERS_JSON.getName()));
config.renameProperty("snmp-usm-security-names",
SNMP_USM_SECURITY_NAMES.getName());
config.renameProperty(BasicProperties.OLD_SNMP_VERSION_PROPERTY_NAME,
BasicProperties.SNMP_VERSION.getName());
config.renameProperty(BasicProperties.OLD_SNMP_COMMUNITY_PROPERTY_NAME,
BasicProperties.SNMP_COMMUNITY.getName());
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DebugFlow.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DebugFlow.java
index 5547d1ec3a..27c49f6464 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DebugFlow.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DebugFlow.java
@@ -31,6 +31,7 @@ import org.apache.nifi.expression.ExpressionLanguageScope;
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.processor.AbstractProcessor;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.processor.ProcessContext;
@@ -176,7 +177,7 @@ public class DebugFlow extends AbstractProcessor {
.addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
.build();
static final PropertyDescriptor ON_SCHEDULED_FAIL = new
PropertyDescriptor.Builder()
- .name("Fail When @OnScheduled called")
+ .name("Fail When @OnScheduled Called")
.description("Specifies whether or not the Processor should throw an
Exception when the methods annotated with @OnScheduled are called")
.required(true)
.allowableValues("true", "false")
@@ -190,7 +191,7 @@ public class DebugFlow extends AbstractProcessor {
.addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
.build();
static final PropertyDescriptor ON_UNSCHEDULED_FAIL = new
PropertyDescriptor.Builder()
- .name("Fail When @OnUnscheduled called")
+ .name("Fail When @OnUnscheduled Called")
.description("Specifies whether or not the Processor should throw an
Exception when the methods annotated with @OnUnscheduled are called")
.required(true)
.allowableValues("true", "false")
@@ -205,7 +206,7 @@ public class DebugFlow extends AbstractProcessor {
.expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT)
.build();
static final PropertyDescriptor ON_STOPPED_FAIL = new
PropertyDescriptor.Builder()
- .name("Fail When @OnStopped called")
+ .name("Fail When @OnStopped Called")
.description("Specifies whether or not the Processor should throw an
Exception when the methods annotated with @OnStopped are called")
.required(true)
.allowableValues("true", "false")
@@ -613,6 +614,13 @@ public class DebugFlow extends AbstractProcessor {
}
}
+ @Override
+ public void migrateProperties(PropertyConfiguration config) {
+ config.renameProperty("Fail When @OnScheduled called",
ON_SCHEDULED_FAIL.getName());
+ config.renameProperty("Fail When @OnUnscheduled called",
ON_UNSCHEDULED_FAIL.getName());
+ config.renameProperty("Fail When @OnStopped called",
ON_STOPPED_FAIL.getName());
+ }
+
private static class RuntimeExceptionValidator implements Validator {
@Override
public ValidationResult validate(final String subject, final String
input, final ValidationContext context) {
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteProcess.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteProcess.java
index d70f8b820e..0b6a7eb161 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteProcess.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteProcess.java
@@ -35,6 +35,7 @@ import org.apache.nifi.expression.ExpressionLanguageScope;
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.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -146,7 +147,7 @@ public class ExecuteProcess extends AbstractProcessor {
.build();
static final PropertyDescriptor MIME_TYPE = new
PropertyDescriptor.Builder()
- .name("Output MIME type")
+ .name("MIME Type")
.description("Specifies the value to set for the \"mime.type\"
attribute. This property is ignored if 'Batch Duration' is set.")
.required(false)
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
@@ -315,6 +316,11 @@ public class ExecuteProcess extends AbstractProcessor {
}
}
+ @Override
+ public void migrateProperties(PropertyConfiguration config) {
+ config.renameProperty("Output MIME type", MIME_TYPE.getName());
+ }
+
protected List<String> createCommandStrings(final ProcessContext context,
final String command, final String arguments) {
final List<String> args = ArgumentUtils.splitArgs(arguments,
context.getProperty(ARG_DELIMITER).getValue().charAt(0));
final List<String> commandStrings = new ArrayList<>(args.size() + 1);
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java
index de4e86e7ab..c3da5e82c8 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java
@@ -146,7 +146,7 @@ public class ExtractGrok extends AbstractProcessor {
.build();
public static final PropertyDescriptor NAMED_CAPTURES_ONLY = new
PropertyDescriptor.Builder()
- .name("Named captures only")
+ .name("Named Captures Only")
.description("Only store named captures from grok")
.required(true)
.allowableValues("true", "false")
@@ -331,5 +331,6 @@ public class ExtractGrok extends AbstractProcessor {
@Override
public void migrateProperties(PropertyConfiguration config) {
config.renameProperty("Grok Pattern file", GROK_PATTERNS.getName());
+ config.renameProperty("Named captures only",
NAMED_CAPTURES_ONLY.getName());
}
}
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java
index f0349298fa..2477c5da10 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractText.java
@@ -209,7 +209,7 @@ public class ExtractText extends AbstractProcessor {
.build();
public static final PropertyDescriptor ENABLE_REPEATING_CAPTURE_GROUP =
new PropertyDescriptor.Builder()
- .name("Enable repeating capture group")
+ .name("Enable Repeating Capture Group")
.description("If set to true, every string matching the capture groups
will be extracted. Otherwise, "
+ "if the Regular Expression matches more than once, only the
first match will be extracted.")
.required(true)
@@ -218,7 +218,7 @@ public class ExtractText extends AbstractProcessor {
.build();
public static final PropertyDescriptor ENABLE_NAMED_GROUPS = new
PropertyDescriptor.Builder()
- .name("Enable named group support")
+ .name("Enable Named Groups")
.description("""
If set to true, when named groups are present in the regular
expression, the name of the
group will be used in the attribute name as opposed to the group
index. All capturing groups
@@ -229,6 +229,16 @@ public class ExtractText extends AbstractProcessor {
.defaultValue("false")
.build();
+ private static final List<String>
OBSOLETE_ENABLE_REPEATING_CAPTURE_GROUP_PROPERTY_NAMES = List.of(
+ "extract-text-enable-repeating-capture-group",
+ "Enable repeating capture group"
+ );
+
+ private static final List<String>
OBSOLETE_ENABLE_NAMED_GROUPS_PROPERTY_NAMES = List.of(
+ "extract-text-enable-named-groups",
+ "Enable named group support"
+ );
+
private static final List<PropertyDescriptor> PROPERTY_DESCRIPTORS =
List.of(
CHARACTER_SET,
MAX_BUFFER_SIZE,
@@ -278,8 +288,8 @@ public class ExtractText extends AbstractProcessor {
@Override
public void migrateProperties(final PropertyConfiguration config) {
- config.renameProperty("extract-text-enable-named-groups", "Enable
named group support");
- config.renameProperty("extract-text-enable-repeating-capture-group",
"Enable repeating capture group");
+
OBSOLETE_ENABLE_REPEATING_CAPTURE_GROUP_PROPERTY_NAMES.forEach(obsoletePropertyName
-> config.renameProperty(obsoletePropertyName,
ENABLE_REPEATING_CAPTURE_GROUP.getName()));
+
OBSOLETE_ENABLE_NAMED_GROUPS_PROPERTY_NAMES.forEach(obsoletePropertyName ->
config.renameProperty(obsoletePropertyName, ENABLE_NAMED_GROUPS.getName()));
}
@Override
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFile.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFile.java
index 7963672d76..3a0c73d1b0 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFile.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFile.java
@@ -35,6 +35,7 @@ import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.logging.LogLevel;
+import org.apache.nifi.migration.PropertyConfiguration;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -163,14 +164,14 @@ public class FetchFile extends AbstractProcessor {
.required(true)
.build();
static final PropertyDescriptor FILE_NOT_FOUND_LOG_LEVEL = new
PropertyDescriptor.Builder()
- .name("Log level when file not found")
+ .name("File not Found Log Level")
.description("Log level to use in case the file does not exist when
the processor is triggered")
.allowableValues(LogLevel.values())
.defaultValue(LogLevel.ERROR.toString())
.required(true)
.build();
static final PropertyDescriptor PERM_DENIED_LOG_LEVEL = new
PropertyDescriptor.Builder()
- .name("Log level when permission denied")
+ .name("Permission Denied Log Level")
.description("Log level to use if the current application user does
not have sufficient permissions to read the file")
.allowableValues(LogLevel.values())
.defaultValue(LogLevel.ERROR.toString())
@@ -335,6 +336,12 @@ public class FetchFile extends AbstractProcessor {
});
}
+ @Override
+ public void migrateProperties(PropertyConfiguration config) {
+ config.renameProperty("Log level when file not found",
FILE_NOT_FOUND_LOG_LEVEL.getName());
+ config.renameProperty("Log level when permission denied",
PERM_DENIED_LOG_LEVEL.getName());
+ }
+
private void performCompletionAction(final String completionStrategy,
final File file, final String targetDirectoryName, final FlowFile flowFile,
final ProcessContext context) {
// Attempt to perform the Completion Strategy action
Exception completionFailureException = null;
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JoinEnrichment.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JoinEnrichment.java
index 7a1044be2b..348ad48058 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JoinEnrichment.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JoinEnrichment.java
@@ -225,6 +225,7 @@ public class JoinEnrichment extends BinFiles {
@Override
public void migrateProperties(PropertyConfiguration config) {
+ super.migrateProperties(config);
config.renameProperty(JdbcProperties.OLD_DEFAULT_PRECISION_PROPERTY_NAME,
DEFAULT_PRECISION.getName());
config.renameProperty(JdbcProperties.OLD_DEFAULT_SCALE_PROPERTY_NAME,
DEFAULT_SCALE.getName());
}
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java
index 27f0ab17a0..a3118bb682 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java
@@ -123,7 +123,7 @@ public class LogAttribute extends AbstractProcessor {
.defaultValue("true")
.build();
public static final PropertyDescriptor LOG_PREFIX = new
PropertyDescriptor.Builder()
- .name("Log prefix")
+ .name("Log Prefix")
.required(false)
.description("Log prefix appended to the log lines. It helps to
distinguish the output of multiple LogAttribute processors.")
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
@@ -340,6 +340,7 @@ public class LogAttribute extends AbstractProcessor {
config.renameProperty("attributes-to-log-regex",
ATTRIBUTES_TO_LOG_REGEX.getName());
config.renameProperty("attributes-to-ignore-regex",
ATTRIBUTES_TO_IGNORE_REGEX.getName());
config.renameProperty("character-set", CHARSET.getName());
+ config.renameProperty("Log prefix", LOG_PREFIX.getName());
}
protected static class FlowFilePayloadCallback implements
InputStreamCallback {
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
index 084f9fb940..a0284e75ba 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java
@@ -391,6 +391,7 @@ public class MergeContent extends BinFiles {
@Override
public void migrateProperties(PropertyConfiguration config) {
+ super.migrateProperties(config);
config.renameProperty("mergecontent-metadata-strategy",
METADATA_STRATEGY.getName());
config.renameProperty("Header File", HEADER.getName());
config.renameProperty("Footer File", FOOTER.getName());
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDistributedMapCache.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDistributedMapCache.java
index 43aa764b14..a645d6727f 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDistributedMapCache.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDistributedMapCache.java
@@ -35,6 +35,7 @@ import
org.apache.nifi.expression.AttributeExpression.ResultType;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.migration.PropertyConfiguration;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.processor.ProcessContext;
@@ -89,7 +90,7 @@ public class PutDistributedMapCache extends AbstractProcessor
{
"Adds the specified entry to the cache, if the key does not exist.");
public static final PropertyDescriptor CACHE_UPDATE_STRATEGY = new
PropertyDescriptor.Builder()
- .name("Cache update strategy")
+ .name("Cache Update Strategy")
.description("Determines how the cache is updated if the cache already
contains the entry")
.required(true)
.allowableValues(CACHE_UPDATE_REPLACE, CACHE_UPDATE_KEEP_ORIGINAL)
@@ -97,7 +98,7 @@ public class PutDistributedMapCache extends AbstractProcessor
{
.build();
public static final PropertyDescriptor CACHE_ENTRY_MAX_BYTES = new
PropertyDescriptor.Builder()
- .name("Max cache entry size")
+ .name("Max Cache Size")
.description("The maximum amount of data to put into cache")
.required(false)
.addValidator(StandardValidators.DATA_SIZE_VALIDATOR)
@@ -216,6 +217,12 @@ public class PutDistributedMapCache extends
AbstractProcessor {
}
}
+ @Override
+ public void migrateProperties(PropertyConfiguration config) {
+ config.renameProperty("Cache update strategy",
CACHE_UPDATE_STRATEGY.getName());
+ config.renameProperty("Max cache entry size",
CACHE_ENTRY_MAX_BYTES.getName());
+ }
+
public static class CacheValueSerializer implements Serializer<byte[]> {
@Override
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RetryFlowFile.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RetryFlowFile.java
index 6f727eba5b..6379742427 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RetryFlowFile.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RetryFlowFile.java
@@ -101,7 +101,7 @@ public class RetryFlowFile extends AbstractProcessor {
.defaultValue("true")
.build();
public static final PropertyDescriptor FAIL_ON_OVERWRITE = new
PropertyDescriptor.Builder()
- .name("Fail on Non-numerical Overwrite")
+ .name("Fail on Nonnumerical Overwrite")
.description("If the FlowFile already has the attribute defined in
'Retry Attribute' that is " +
"*not* a number, fail the FlowFile instead of resetting
that value to '1'")
.required(true)
@@ -304,5 +304,6 @@ public class RetryFlowFile extends AbstractProcessor {
config.renameProperty("maximum-retries", MAXIMUM_RETRIES.getName());
config.renameProperty("penalize-retries", PENALIZE_RETRIED.getName());
config.renameProperty("reuse-mode", REUSE_MODE.getName());
+ config.renameProperty("Fail on Non-numerical Overwrite",
FAIL_ON_OVERWRITE.getName());
}
}
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java
index c84712c64f..42a87920e0 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TransformXml.java
@@ -93,8 +93,13 @@ import java.util.concurrent.TimeUnit;
description = "These XSLT parameters are passed to the transformer")
public class TransformXml extends AbstractProcessor {
+ private static final List<String>
OBSOLETE_XSLT_CONTROLLER_KEY_PROPERTY_NAMES = List.of(
+ "xslt-controller-key",
+ "XSLT Lookup key"
+ );
+
public static final PropertyDescriptor XSLT_FILE_NAME = new
PropertyDescriptor.Builder()
- .name("XSLT file name")
+ .name("XSLT File Name")
.description("Provides the name (including full path) of the XSLT
file to apply to the FlowFile XML content."
+ "One of the 'XSLT file name' and 'XSLT Lookup'
properties must be defined.")
.required(false)
@@ -112,7 +117,7 @@ public class TransformXml extends AbstractProcessor {
.build();
public static final PropertyDescriptor XSLT_CONTROLLER_KEY = new
PropertyDescriptor.Builder()
- .name("XSLT Lookup key")
+ .name("XSLT Lookup Key")
.description("Key used to retrieve the XSLT definition from the
XSLT lookup controller. This property must be "
+ "set when using the XSLT controller property.")
.required(false)
@@ -316,11 +321,13 @@ public class TransformXml extends AbstractProcessor {
@Override
public void migrateProperties(PropertyConfiguration config) {
config.renameProperty("xslt-controller", XSLT_CONTROLLER.getName());
+
OBSOLETE_XSLT_CONTROLLER_KEY_PROPERTY_NAMES.forEach(obsoletePropertyName ->
config.renameProperty(obsoletePropertyName, XSLT_CONTROLLER_KEY.getName()));
config.renameProperty("xslt-controller-key",
XSLT_CONTROLLER_KEY.getName());
config.renameProperty("indent-output", INDENT_OUTPUT.getName());
config.renameProperty("secure-processing",
SECURE_PROCESSING.getName());
config.renameProperty("cache-size", CACHE_SIZE.getName());
config.renameProperty("cache-ttl-after-last-access",
CACHE_TTL_AFTER_LAST_ACCESS.getName());
+ config.renameProperty("XSLT file name", XSLT_FILE_NAME.getName());
}
private ErrorListenerLogger getErrorListenerLogger() {
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/src/main/java/org/apache/nifi/oauth2/StandardOauth2AccessTokenProvider.java
b/nifi-extension-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/src/main/java/org/apache/nifi/oauth2/StandardOauth2AccessTokenProvider.java
index 14b40d83b4..6b25b85eae 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/src/main/java/org/apache/nifi/oauth2/StandardOauth2AccessTokenProvider.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/src/main/java/org/apache/nifi/oauth2/StandardOauth2AccessTokenProvider.java
@@ -160,7 +160,7 @@ public class StandardOauth2AccessTokenProvider extends
AbstractControllerService
.build();
public static final PropertyDescriptor CLIENT_SECRET = new
PropertyDescriptor.Builder()
- .name("Client secret")
+ .name("Client Secret")
.dependsOn(CLIENT_ID)
.required(true)
.sensitive(true)
@@ -213,6 +213,10 @@ public class StandardOauth2AccessTokenProvider extends
AbstractControllerService
.build();
private static final ProxySpec[] PROXY_SPECS = {ProxySpec.HTTP_AUTH};
+ private static final List<String> OBSOLETE_CLIENT_SECRET_PROPERTY_NAMES =
List.of(
+ "client-secret",
+ "Client secret"
+ );
private static final List<PropertyDescriptor> PROPERTY_DESCRIPTORS =
List.of(
AUTHORIZATION_SERVER_URL,
@@ -266,7 +270,7 @@ public class StandardOauth2AccessTokenProvider extends
AbstractControllerService
propertyConfiguration.renameProperty("service-password",
PASSWORD.getName());
propertyConfiguration.renameProperty("refresh-token",
REFRESH_TOKEN.getName());
propertyConfiguration.renameProperty("client-id", CLIENT_ID.getName());
- propertyConfiguration.renameProperty("client-secret",
CLIENT_SECRET.getName());
+ OBSOLETE_CLIENT_SECRET_PROPERTY_NAMES.forEach(obsoletePropertyName ->
propertyConfiguration.renameProperty(obsoletePropertyName,
CLIENT_SECRET.getName()));
propertyConfiguration.renameProperty("scope", SCOPE.getName());
propertyConfiguration.renameProperty("resource", RESOURCE.getName());
propertyConfiguration.renameProperty("audience", AUDIENCE.getName());
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/csv/CSVReader.java
b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/csv/CSVReader.java
index 4b19021d78..04ccdbff58 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/csv/CSVReader.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/csv/CSVReader.java
@@ -87,7 +87,7 @@ public class CSVReader extends SchemaRegistryService
implements RecordReaderFact
.build();
public static final PropertyDescriptor TRIM_DOUBLE_QUOTE = new
PropertyDescriptor.Builder()
- .name("Trim double quote")
+ .name("Trim Double Quote")
.description("Whether or not to trim starting and ending double
quotes. For example: with trim string '\"test\"'"
+ " would be parsed to 'test', without trim would be
parsed to '\"test\"'."
+ "If set to 'false' it means full compliance with
RFC-4180. Default value is true, with trim.")
@@ -192,6 +192,7 @@ public class CSVReader extends SchemaRegistryService
implements RecordReaderFact
public void migrateProperties(PropertyConfiguration config) {
super.migrateProperties(config);
config.renameProperty("csv-reader-csv-parser", CSV_PARSER.getName());
+ config.renameProperty("Trim double quote",
TRIM_DOUBLE_QUOTE.getName());
config.renameProperty(CSVUtils.OLD_FIRST_LINE_IS_HEADER_PROPERTY_NAME,
CSVUtils.FIRST_LINE_IS_HEADER.getName());
config.renameProperty(CSVUtils.OLD_IGNORE_CSV_HEADER_PROPERTY_NAME,
CSVUtils.IGNORE_CSV_HEADER.getName());
config.renameProperty(CSVUtils.OLD_CHARSET_PROPERTY_NAME,
CSVUtils.CHARSET.getName());
diff --git
a/nifi-extension-bundles/nifi-stateful-analysis-bundle/nifi-stateful-analysis-processors/src/main/java/org/apache/nifi/processors/stateful/analysis/AttributeRollingWindow.java
b/nifi-extension-bundles/nifi-stateful-analysis-bundle/nifi-stateful-analysis-processors/src/main/java/org/apache/nifi/processors/stateful/analysis/AttributeRollingWindow.java
index 2c35fa370f..6155d750ab 100644
---
a/nifi-extension-bundles/nifi-stateful-analysis-bundle/nifi-stateful-analysis-processors/src/main/java/org/apache/nifi/processors/stateful/analysis/AttributeRollingWindow.java
+++
b/nifi-extension-bundles/nifi-stateful-analysis-bundle/nifi-stateful-analysis-processors/src/main/java/org/apache/nifi/processors/stateful/analysis/AttributeRollingWindow.java
@@ -31,6 +31,7 @@ import org.apache.nifi.components.state.StateManager;
import org.apache.nifi.components.state.StateMap;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.migration.PropertyConfiguration;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
@@ -95,20 +96,20 @@ public class AttributeRollingWindow extends
AbstractProcessor {
.build();
static final PropertyDescriptor VALUE_TO_TRACK = new
PropertyDescriptor.Builder()
- .name("Value to track")
+ .name("Value to Track")
.description("The expression on which to evaluate each FlowFile.
The result of the expression will be added to the rolling window value.")
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
.addValidator(StandardValidators.ATTRIBUTE_EXPRESSION_LANGUAGE_VALIDATOR)
.required(true)
.build();
static final PropertyDescriptor TIME_WINDOW = new
PropertyDescriptor.Builder()
- .name("Time window")
+ .name("Time Window")
.description("The time window on which to calculate the rolling
window.")
.addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
.required(true)
.build();
static final PropertyDescriptor SUB_WINDOW_LENGTH = new
PropertyDescriptor.Builder()
- .name("Sub-window length")
+ .name("Subwindow Length")
.description("When set, values will be batched into sub-windows of
the set length. This allows for much larger length total windows to be set but
sacrifices some precision. If this is " +
"not set (or is 0) then each value is stored in state with
the timestamp of when it was received. After the length of time stated in " +
TIME_WINDOW.getDisplayName() +
" elaspes the value will be removed. If this is set,
values will be batched together every X amount of time (where X is the time
period set for this property) and removed " +
@@ -180,6 +181,13 @@ public class AttributeRollingWindow extends
AbstractProcessor {
}
}
+ @Override
+ public void migrateProperties(PropertyConfiguration config) {
+ config.renameProperty("Value to track", VALUE_TO_TRACK.getName());
+ config.renameProperty("Time window", TIME_WINDOW.getName());
+ config.renameProperty("Sub-window length",
SUB_WINDOW_LENGTH.getName());
+ }
+
private void noMicroBatch(ProcessContext context, ProcessSession session,
FlowFile flowFile, Long currTime) {
Map<String, String> state = null;
try {
