Skip to content

Commit d92d9f7

Browse files
dan-s1dan-s1
authored
NIFI-15219 Standardized the property names to have first letter of a word uppercased (#10539)
Signed-off-by: David Handermann <[email protected]>
1 parent fd7c412 commit d92d9f7

File tree

32 files changed

+153
-45
lines changed

32 files changed

+153
-45
lines changed

‎nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAwsProcessor.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,9 @@ public abstract class AbstractAwsProcessor<C extends AwsClient, B extends AwsCli
136136
.addValidator(StandardValidators.URL_VALIDATOR)
137137
.build();
138138

139+
public static final String OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME = "AWS Credentials Provider service";
139140
public static final PropertyDescriptor AWS_CREDENTIALS_PROVIDER_SERVICE = new PropertyDescriptor.Builder()
140-
.name("AWS Credentials Provider service")
141+
.name("AWS Credentials Provider Service")
141142
.description("The Controller Service that is used to obtain AWS credentials provider")
142143
.required(true)
143144
.identifiesControllerService(AwsCredentialsProviderService.class)
@@ -187,6 +188,7 @@ public Set<Relationship> getRelationships() {
187188
@Override
188189
public void migrateProperties(final PropertyConfiguration config) {
189190
config.renameProperty("aws-region", REGION.getName());
191+
config.renameProperty(OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME, AWS_CREDENTIALS_PROVIDER_SERVICE.getName());
190192
migrateAuthenticationProperties(config);
191193
ProxyServiceMigration.migrateProxyProperties(config, PROXY_CONFIGURATION_SERVICE, OBSOLETE_PROXY_HOST, OBSOLETE_PROXY_PORT, OBSOLETE_PROXY_USERNAME, OBSOLETE_PROXY_PASSWORD);
192194
config.renameProperty(ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE, PROXY_CONFIGURATION_SERVICE.getName());

‎nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/AbstractDynamoDBProcessor.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public abstract class AbstractDynamoDBProcessor extends AbstractAwsSyncProcessor
129129
.build();
130130

131131
public static final PropertyDescriptor JSON_DOCUMENT = new PropertyDescriptor.Builder()
132-
.name("Json Document attribute")
132+
.name("Json Document")
133133
.required(true)
134134
.expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT)
135135
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
@@ -146,7 +146,7 @@ public abstract class AbstractDynamoDBProcessor extends AbstractAwsSyncProcessor
146146
.build();
147147

148148
public static final PropertyDescriptor DOCUMENT_CHARSET = new PropertyDescriptor.Builder()
149-
.name("Character set of document")
149+
.name("Document Character Set")
150150
.description("Character set of data in the document")
151151
.addValidator(StandardValidators.CHARACTER_SET_VALIDATOR)
152152
.required(true)
@@ -169,6 +169,8 @@ public Set<Relationship> getRelationships() {
169169
public void migrateProperties(PropertyConfiguration config) {
170170
super.migrateProperties(config);
171171
config.renameProperty("Batch items for each request (between 1 and 50)", BATCH_SIZE.getName());
172+
config.renameProperty("Json Document attribute", JSON_DOCUMENT.getName());
173+
config.renameProperty("Character set of document", DOCUMENT_CHARSET.getName());
172174
}
173175

174176
@Override

‎nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/firehose/PutKinesisFirehose.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.apache.nifi.components.PropertyDescriptor;
2828
import org.apache.nifi.expression.ExpressionLanguageScope;
2929
import org.apache.nifi.flowfile.FlowFile;
30+
import org.apache.nifi.migration.PropertyConfiguration;
3031
import org.apache.nifi.processor.DataUnit;
3132
import org.apache.nifi.processor.ProcessContext;
3233
import org.apache.nifi.processor.ProcessSession;
@@ -82,7 +83,7 @@ public class PutKinesisFirehose extends AbstractAwsSyncProcessor<FirehoseClient,
8283
.build();
8384

8485
public static final PropertyDescriptor MAX_MESSAGE_BUFFER_SIZE_MB = new PropertyDescriptor.Builder()
85-
.name("Max message buffer size")
86+
.name("Max Message Buffer Size")
8687
.description("Max message buffer")
8788
.defaultValue("1 MB")
8889
.required(false)
@@ -193,4 +194,9 @@ public void onTrigger(final ProcessContext context, final ProcessSession session
193194
}
194195
}
195196

197+
@Override
198+
public void migrateProperties(PropertyConfiguration config) {
199+
super.migrateProperties(config);
200+
config.renameProperty("Max message buffer size", MAX_MESSAGE_BUFFER_SIZE_MB.getName());
201+
}
196202
}

‎nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/polly/GetAwsPollyStatusTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141

4242
import java.util.Map;
4343

44+
import static org.apache.nifi.processors.aws.AbstractAwsProcessor.AWS_CREDENTIALS_PROVIDER_SERVICE;
45+
import static org.apache.nifi.processors.aws.AbstractAwsProcessor.OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME;
4446
import static org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.AWS_TASK_OUTPUT_LOCATION;
4547
import static org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_FAILURE;
4648
import static org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_ORIGINAL;
@@ -142,6 +144,7 @@ void testMigration() {
142144
final PropertyMigrationResult propertyMigrationResult = runner.migrateProperties();
143145
final Map<String, String> expected = Map.of("aws-region", REGION.getName(),
144146
"awsTaskId", TASK_ID.getName(),
147+
OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME, AWS_CREDENTIALS_PROVIDER_SERVICE.getName(),
145148
ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE, AbstractAwsProcessor.PROXY_CONFIGURATION_SERVICE.getName());
146149

147150
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());

‎nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/polly/StartAwsPollyJobTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747
import java.util.HashMap;
4848
import java.util.Map;
4949

50+
import static org.apache.nifi.processors.aws.AbstractAwsProcessor.AWS_CREDENTIALS_PROVIDER_SERVICE;
51+
import static org.apache.nifi.processors.aws.AbstractAwsProcessor.OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME;
5052
import static org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_FAILURE;
5153
import static org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_ORIGINAL;
5254
import static org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_SUCCESS;
@@ -166,6 +168,7 @@ void testMigration() {
166168
final PropertyMigrationResult propertyMigrationResult = runner.migrateProperties();
167169
final Map<String, String> expected = Map.of("aws-region", REGION.getName(),
168170
"json-payload", AbstractAwsMachineLearningJobStarter.JSON_PAYLOAD.getName(),
171+
OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME, AWS_CREDENTIALS_PROVIDER_SERVICE.getName(),
169172
ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE, AbstractAwsProcessor.PROXY_CONFIGURATION_SERVICE.getName());
170173

171174
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());

‎nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/textract/GetAwsTextractJobStatusTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444

4545
import java.util.Map;
4646

47+
import static org.apache.nifi.processors.aws.AbstractAwsProcessor.AWS_CREDENTIALS_PROVIDER_SERVICE;
48+
import static org.apache.nifi.processors.aws.AbstractAwsProcessor.OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME;
4749
import static org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_FAILURE;
4850
import static org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_RUNNING;
4951
import static org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_SUCCESS;
@@ -154,6 +156,7 @@ void testMigration() {
154156
final Map<String, String> expected = Map.of("aws-region", REGION.getName(),
155157
"awsTaskId", TASK_ID.getName(),
156158
"textract-type", GetAwsTextractJobStatus.TEXTRACT_TYPE.getName(),
159+
OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME, AWS_CREDENTIALS_PROVIDER_SERVICE.getName(),
157160
ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE, AbstractAwsProcessor.PROXY_CONFIGURATION_SERVICE.getName());
158161

159162
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());

‎nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/textract/StartAwsTextractJobStatusTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@
4949
import java.util.HashMap;
5050
import java.util.Map;
5151

52+
import static org.apache.nifi.processors.aws.AbstractAwsProcessor.AWS_CREDENTIALS_PROVIDER_SERVICE;
53+
import static org.apache.nifi.processors.aws.AbstractAwsProcessor.OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME;
5254
import static org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_FAILURE;
5355
import static org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_ORIGINAL;
5456
import static org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_SUCCESS;
@@ -327,6 +329,7 @@ void testMigration() {
327329
final Map<String, String> expected = Map.of("aws-region", REGION.getName(),
328330
"json-payload", AbstractAwsMachineLearningJobStarter.JSON_PAYLOAD.getName(),
329331
"textract-type", StartAwsTextractJob.TEXTRACT_TYPE.getName(),
332+
OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME, AWS_CREDENTIALS_PROVIDER_SERVICE.getName(),
330333
ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE, AbstractAwsProcessor.PROXY_CONFIGURATION_SERVICE.getName());
331334

332335
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());

‎nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/transcribe/GetAwsTranscribeJobStatusTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343

4444
import java.util.Map;
4545

46+
import static org.apache.nifi.processors.aws.AbstractAwsProcessor.AWS_CREDENTIALS_PROVIDER_SERVICE;
47+
import static org.apache.nifi.processors.aws.AbstractAwsProcessor.OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME;
4648
import static org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.AWS_TASK_OUTPUT_LOCATION;
4749
import static org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.FAILURE_REASON_ATTRIBUTE;
4850
import static org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_FAILURE;
@@ -144,6 +146,7 @@ void testMigration() {
144146
final PropertyMigrationResult propertyMigrationResult = runner.migrateProperties();
145147
final Map<String, String> expected = Map.of("aws-region", REGION.getName(),
146148
"awsTaskId", TASK_ID.getName(),
149+
OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME, AWS_CREDENTIALS_PROVIDER_SERVICE.getName(),
147150
ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE, AbstractAwsProcessor.PROXY_CONFIGURATION_SERVICE.getName());
148151

149152
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());

‎nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/transcribe/StartAwsTranscribeJobTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
import java.util.HashMap;
4747
import java.util.Map;
4848

49+
import static org.apache.nifi.processors.aws.AbstractAwsProcessor.AWS_CREDENTIALS_PROVIDER_SERVICE;
50+
import static org.apache.nifi.processors.aws.AbstractAwsProcessor.OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME;
4951
import static org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_FAILURE;
5052
import static org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_ORIGINAL;
5153
import static org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_SUCCESS;
@@ -162,6 +164,7 @@ void testMigration() {
162164
final PropertyMigrationResult propertyMigrationResult = runner.migrateProperties();
163165
final Map<String, String> expected = Map.of("aws-region", REGION.getName(),
164166
"json-payload", AbstractAwsMachineLearningJobStarter.JSON_PAYLOAD.getName(),
167+
OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME, AWS_CREDENTIALS_PROVIDER_SERVICE.getName(),
165168
ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE, AbstractAwsProcessor.PROXY_CONFIGURATION_SERVICE.getName());
166169

167170
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());

‎nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/ml/translate/GetAwsTranslateJobStatusTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444
import java.time.Instant;
4545
import java.util.Map;
4646

47+
import static org.apache.nifi.processors.aws.AbstractAwsProcessor.AWS_CREDENTIALS_PROVIDER_SERVICE;
48+
import static org.apache.nifi.processors.aws.AbstractAwsProcessor.OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME;
4749
import static org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.AWS_TASK_OUTPUT_LOCATION;
4850
import static org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_FAILURE;
4951
import static org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStatusProcessor.REL_RUNNING;
@@ -156,6 +158,7 @@ void testMigration() {
156158
final PropertyMigrationResult propertyMigrationResult = runner.migrateProperties();
157159
final Map<String, String> expected = Map.of("aws-region", REGION.getName(),
158160
"awsTaskId", TASK_ID.getName(),
161+
OBSOLETE_AWS_CREDENTIALS_PROVIDER_SERVICE_PROPERTY_NAME, AWS_CREDENTIALS_PROVIDER_SERVICE.getName(),
159162
ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE, AbstractAwsProcessor.PROXY_CONFIGURATION_SERVICE.getName());
160163

161164
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());

0 commit comments

Comments
 (0)