Skip to content

Commit f0fdb19

Browse files
dan-s1dan-s1
authored
NIFI-15165 Standardized property names in Standad Services (#10515)
Signed-off-by: David Handermann <[email protected]>
1 parent 1853647 commit f0fdb19

File tree

57 files changed

+493
-290
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+493
-290
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import org.apache.nifi.processor.util.StandardValidators;
3939
import org.apache.nifi.processors.aws.credentials.provider.AwsCredentialsProviderService;
4040
import org.apache.nifi.proxy.ProxyConfiguration;
41+
import org.apache.nifi.proxy.ProxyConfigurationService;
4142
import org.apache.nifi.proxy.ProxySpec;
4243
import org.apache.nifi.ssl.SSLContextProvider;
4344
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
@@ -188,6 +189,7 @@ public void migrateProperties(final PropertyConfiguration config) {
188189
config.renameProperty("aws-region", REGION.getName());
189190
migrateAuthenticationProperties(config);
190191
ProxyServiceMigration.migrateProxyProperties(config, PROXY_CONFIGURATION_SERVICE, OBSOLETE_PROXY_HOST, OBSOLETE_PROXY_PORT, OBSOLETE_PROXY_USERNAME, OBSOLETE_PROXY_PASSWORD);
192+
config.renameProperty(ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE, PROXY_CONFIGURATION_SERVICE.getName());
191193
}
192194

193195
private void migrateAuthenticationProperties(final PropertyConfiguration config) {

‎nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/kinesis/stream/record/TestKinesisRecordProcessorRecord.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void setUp() throws InitializationException {
109109

110110
runner.addControllerService("record-writer", writer);
111111
runner.setProperty(writer, SchemaAccessUtils.SCHEMA_ACCESS_STRATEGY, SchemaAccessUtils.INHERIT_RECORD_SCHEMA.getValue());
112-
runner.setProperty(writer, "output-grouping", "output-oneline");
112+
runner.setProperty(writer, JsonRecordSetWriter.OUTPUT_GROUPING, "output-oneline");
113113
runner.enableControllerService(writer);
114114
runner.setProperty(ConsumeKinesisStream.RECORD_WRITER, "record-writer");
115115
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
package org.apache.nifi.processors.aws.ml.polly;
1919

2020
import org.apache.nifi.processor.ProcessContext;
21+
import org.apache.nifi.processors.aws.AbstractAwsProcessor;
2122
import org.apache.nifi.processors.aws.testutil.AuthUtils;
23+
import org.apache.nifi.proxy.ProxyConfigurationService;
2224
import org.apache.nifi.reporting.InitializationException;
2325
import org.apache.nifi.util.MockFlowFile;
2426
import org.apache.nifi.util.PropertyMigrationResult;
@@ -139,7 +141,8 @@ public void testPollyTaskFailed() {
139141
void testMigration() {
140142
final PropertyMigrationResult propertyMigrationResult = runner.migrateProperties();
141143
final Map<String, String> expected = Map.of("aws-region", REGION.getName(),
142-
"awsTaskId", TASK_ID.getName());
144+
"awsTaskId", TASK_ID.getName(),
145+
ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE, AbstractAwsProcessor.PROXY_CONFIGURATION_SERVICE.getName());
143146

144147
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());
145148
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
import com.fasterxml.jackson.databind.ObjectMapper;
2323
import com.fasterxml.jackson.databind.json.JsonMapper;
2424
import org.apache.nifi.processor.ProcessContext;
25+
import org.apache.nifi.processors.aws.AbstractAwsProcessor;
2526
import org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStarter;
2627
import org.apache.nifi.processors.aws.testutil.AuthUtils;
28+
import org.apache.nifi.proxy.ProxyConfigurationService;
2729
import org.apache.nifi.reporting.InitializationException;
2830
import org.apache.nifi.util.PropertyMigrationResult;
2931
import org.apache.nifi.util.TestRunner;
@@ -163,7 +165,8 @@ public void testServiceFailure() throws JsonProcessingException {
163165
void testMigration() {
164166
final PropertyMigrationResult propertyMigrationResult = runner.migrateProperties();
165167
final Map<String, String> expected = Map.of("aws-region", REGION.getName(),
166-
"json-payload", AbstractAwsMachineLearningJobStarter.JSON_PAYLOAD.getName());
168+
"json-payload", AbstractAwsMachineLearningJobStarter.JSON_PAYLOAD.getName(),
169+
ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE, AbstractAwsProcessor.PROXY_CONFIGURATION_SERVICE.getName());
167170

168171
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());
169172
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919

2020
import org.apache.nifi.processor.ProcessContext;
2121
import org.apache.nifi.processor.Relationship;
22+
import org.apache.nifi.processors.aws.AbstractAwsProcessor;
2223
import org.apache.nifi.processors.aws.testutil.AuthUtils;
24+
import org.apache.nifi.proxy.ProxyConfigurationService;
2325
import org.apache.nifi.reporting.InitializationException;
2426
import org.apache.nifi.util.PropertyMigrationResult;
2527
import org.apache.nifi.util.TestRunner;
@@ -151,7 +153,8 @@ void testMigration() {
151153
final PropertyMigrationResult propertyMigrationResult = runner.migrateProperties();
152154
final Map<String, String> expected = Map.of("aws-region", REGION.getName(),
153155
"awsTaskId", TASK_ID.getName(),
154-
"textract-type", GetAwsTextractJobStatus.TEXTRACT_TYPE.getName());
156+
"textract-type", GetAwsTextractJobStatus.TEXTRACT_TYPE.getName(),
157+
ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE, AbstractAwsProcessor.PROXY_CONFIGURATION_SERVICE.getName());
155158

156159
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());
157160
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
import com.fasterxml.jackson.databind.ObjectMapper;
2323
import com.fasterxml.jackson.databind.json.JsonMapper;
2424
import org.apache.nifi.processor.ProcessContext;
25+
import org.apache.nifi.processors.aws.AbstractAwsProcessor;
2526
import org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStarter;
2627
import org.apache.nifi.processors.aws.testutil.AuthUtils;
28+
import org.apache.nifi.proxy.ProxyConfigurationService;
2729
import org.apache.nifi.reporting.InitializationException;
2830
import org.apache.nifi.util.PropertyMigrationResult;
2931
import org.apache.nifi.util.TestRunner;
@@ -324,7 +326,8 @@ void testMigration() {
324326
final PropertyMigrationResult propertyMigrationResult = runner.migrateProperties();
325327
final Map<String, String> expected = Map.of("aws-region", REGION.getName(),
326328
"json-payload", AbstractAwsMachineLearningJobStarter.JSON_PAYLOAD.getName(),
327-
"textract-type", StartAwsTextractJob.TEXTRACT_TYPE.getName());
329+
"textract-type", StartAwsTextractJob.TEXTRACT_TYPE.getName(),
330+
ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE, AbstractAwsProcessor.PROXY_CONFIGURATION_SERVICE.getName());
328331

329332
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());
330333
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919

2020
import org.apache.nifi.processor.ProcessContext;
2121
import org.apache.nifi.processor.Relationship;
22+
import org.apache.nifi.processors.aws.AbstractAwsProcessor;
2223
import org.apache.nifi.processors.aws.testutil.AuthUtils;
24+
import org.apache.nifi.proxy.ProxyConfigurationService;
2325
import org.apache.nifi.reporting.InitializationException;
2426
import org.apache.nifi.util.MockFlowFile;
2527
import org.apache.nifi.util.PropertyMigrationResult;
@@ -141,7 +143,8 @@ public void testTranscribeJobUnrecognized() {
141143
void testMigration() {
142144
final PropertyMigrationResult propertyMigrationResult = runner.migrateProperties();
143145
final Map<String, String> expected = Map.of("aws-region", REGION.getName(),
144-
"awsTaskId", TASK_ID.getName());
146+
"awsTaskId", TASK_ID.getName(),
147+
ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE, AbstractAwsProcessor.PROXY_CONFIGURATION_SERVICE.getName());
145148

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

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
import com.fasterxml.jackson.databind.ObjectMapper;
2323
import com.fasterxml.jackson.databind.json.JsonMapper;
2424
import org.apache.nifi.processor.ProcessContext;
25+
import org.apache.nifi.processors.aws.AbstractAwsProcessor;
2526
import org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStarter;
2627
import org.apache.nifi.processors.aws.testutil.AuthUtils;
28+
import org.apache.nifi.proxy.ProxyConfigurationService;
2729
import org.apache.nifi.reporting.InitializationException;
2830
import org.apache.nifi.util.PropertyMigrationResult;
2931
import org.apache.nifi.util.TestRunner;
@@ -159,7 +161,8 @@ public void testServiceFailure() throws JsonProcessingException {
159161
void testMigration() {
160162
final PropertyMigrationResult propertyMigrationResult = runner.migrateProperties();
161163
final Map<String, String> expected = Map.of("aws-region", REGION.getName(),
162-
"json-payload", AbstractAwsMachineLearningJobStarter.JSON_PAYLOAD.getName());
164+
"json-payload", AbstractAwsMachineLearningJobStarter.JSON_PAYLOAD.getName(),
165+
ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE, AbstractAwsProcessor.PROXY_CONFIGURATION_SERVICE.getName());
163166

164167
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());
165168
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919

2020
import org.apache.nifi.processor.ProcessContext;
2121
import org.apache.nifi.processor.Relationship;
22+
import org.apache.nifi.processors.aws.AbstractAwsProcessor;
2223
import org.apache.nifi.processors.aws.testutil.AuthUtils;
24+
import org.apache.nifi.proxy.ProxyConfigurationService;
2325
import org.apache.nifi.reporting.InitializationException;
2426
import org.apache.nifi.util.MockFlowFile;
2527
import org.apache.nifi.util.PropertyMigrationResult;
@@ -153,7 +155,8 @@ public void testTranslateJobUnrecognized() {
153155
void testMigration() {
154156
final PropertyMigrationResult propertyMigrationResult = runner.migrateProperties();
155157
final Map<String, String> expected = Map.of("aws-region", REGION.getName(),
156-
"awsTaskId", TASK_ID.getName());
158+
"awsTaskId", TASK_ID.getName(),
159+
ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE, AbstractAwsProcessor.PROXY_CONFIGURATION_SERVICE.getName());
157160

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

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@
2222
import com.fasterxml.jackson.databind.ObjectMapper;
2323
import com.fasterxml.jackson.databind.json.JsonMapper;
2424
import org.apache.nifi.processor.ProcessContext;
25+
import org.apache.nifi.processors.aws.AbstractAwsProcessor;
2526
import org.apache.nifi.processors.aws.ml.AbstractAwsMachineLearningJobStarter;
2627
import org.apache.nifi.processors.aws.region.RegionUtil;
2728
import org.apache.nifi.processors.aws.testutil.AuthUtils;
29+
import org.apache.nifi.proxy.ProxyConfigurationService;
2830
import org.apache.nifi.reporting.InitializationException;
2931
import org.apache.nifi.util.PropertyMigrationResult;
3032
import org.apache.nifi.util.TestRunner;
@@ -159,7 +161,8 @@ public void testServiceFailure() throws JsonProcessingException {
159161
void testMigration() {
160162
final PropertyMigrationResult propertyMigrationResult = runner.migrateProperties();
161163
final Map<String, String> expected = Map.of("aws-region", RegionUtil.REGION.getName(),
162-
"json-payload", AbstractAwsMachineLearningJobStarter.JSON_PAYLOAD.getName());
164+
"json-payload", AbstractAwsMachineLearningJobStarter.JSON_PAYLOAD.getName(),
165+
ProxyConfigurationService.OBSOLETE_PROXY_CONFIGURATION_SERVICE, AbstractAwsProcessor.PROXY_CONFIGURATION_SERVICE.getName());
163166

164167
assertEquals(expected, propertyMigrationResult.getPropertiesRenamed());
165168
}

0 commit comments

Comments
 (0)