From c05a2c04cb089dc101bf7803e1fe5930b0ac1e3a Mon Sep 17 00:00:00 2001 From: dan-s1 Date: Mon, 6 Jan 2025 15:09:37 +0000 Subject: [PATCH] NIFI-14109 Ensured the variables of property descriptors are called PROPERTY_DESCRIPTORS. For parent processor classes which defined common properties, made getCommonPropertyDescriptors() method for children to use to load them. Ensured lists of PropertyDescriptor objects has each PropertyDescriptor on its own line and sets of RelationShip objects has each Relationship on its own line to improve readability. --- .../airtable/QueryAirtableTable.java | 4 +- .../processors/AbstractAMQPProcessor.java | 9 ++-- .../nifi/amqp/processors/ConsumeAMQP.java | 6 +-- .../nifi/amqp/processors/PublishAMQP.java | 6 +-- .../ApicurioSchemaRegistry.java | 4 +- .../nifi/processors/asana/GetAsanaObject.java | 4 +- .../StandardAsanaClientProviderService.java | 4 +- .../processors/avro/ExtractAvroMetadata.java | 4 +- .../nifi/processors/avro/SplitAvro.java | 4 +- .../AbstractAwsMachineLearningJobStarter.java | 8 +++- ...tAwsMachineLearningJobStatusProcessor.java | 8 +++- .../AwsSecretsManagerParameterProvider.java | 4 +- .../aws/cloudwatch/PutCloudWatchMetric.java | 4 +- ...SCredentialsProviderControllerService.java | 4 +- .../aws/dynamodb/DeleteDynamoDB.java | 4 +- .../processors/aws/dynamodb/GetDynamoDB.java | 4 +- .../processors/aws/dynamodb/PutDynamoDB.java | 4 +- .../aws/dynamodb/PutDynamoDBRecord.java | 4 +- .../kinesis/firehose/PutKinesisFirehose.java | 4 +- .../kinesis/stream/ConsumeKinesisStream.java | 4 +- .../aws/kinesis/stream/PutKinesisStream.java | 4 +- .../nifi/processors/aws/lambda/PutLambda.java | 4 +- .../ml/textract/GetAwsTextractJobStatus.java | 6 +-- .../aws/ml/textract/StartAwsTextractJob.java | 6 +-- .../nifi/processors/aws/s3/CopyS3Object.java | 4 +- .../processors/aws/s3/DeleteS3Object.java | 7 +-- .../nifi/processors/aws/s3/FetchS3Object.java | 4 +- .../aws/s3/GetS3ObjectMetadata.java | 4 +- .../apache/nifi/processors/aws/s3/ListS3.java | 8 ++-- .../nifi/processors/aws/s3/PutS3Object.java | 7 +-- .../nifi/processors/aws/s3/TagS3Object.java | 7 +-- .../StandardS3EncryptionService.java | 4 +- .../aws/s3/service/S3FileResourceService.java | 4 +- .../nifi/processors/aws/sns/PutSNS.java | 7 +-- .../nifi/processors/aws/sqs/DeleteSQS.java | 7 +-- .../nifi/processors/aws/sqs/GetSQS.java | 7 +-- .../nifi/processors/aws/sqs/PutSQS.java | 7 +-- .../provider/service/MockAWSProcessor.java | 4 +- .../AmazonGlueSchemaRegistry.java | 4 +- ...AzureKeyVaultSecretsParameterProvider.java | 4 +- .../AbstractAzureCosmosDBProcessor.java | 6 ++- .../document/PutAzureCosmosDBRecord.java | 12 +++-- .../data/explorer/PutAzureDataExplorer.java | 4 +- .../data/explorer/QueryAzureDataExplorer.java | 4 +- .../azure/eventhub/ConsumeAzureEventHub.java | 4 +- .../azure/eventhub/GetAzureEventHub.java | 4 +- .../azure/eventhub/PutAzureEventHub.java | 4 +- .../storage/CopyAzureBlobStorage_v12.java | 4 +- .../storage/DeleteAzureBlobStorage_v12.java | 4 +- .../storage/DeleteAzureDataLakeStorage.java | 4 +- .../storage/FetchAzureBlobStorage_v12.java | 4 +- .../storage/FetchAzureDataLakeStorage.java | 4 +- .../storage/ListAzureBlobStorage_v12.java | 4 +- .../storage/ListAzureDataLakeStorage.java | 4 +- .../storage/MoveAzureDataLakeStorage.java | 4 +- .../storage/PutAzureBlobStorage_v12.java | 4 +- .../storage/PutAzureDataLakeStorage.java | 4 +- .../queue/GetAzureQueueStorage_v12.java | 4 +- .../queue/PutAzureQueueStorage_v12.java | 4 +- ...dardAzureCredentialsControllerService.java | 4 +- .../document/AzureCosmosDBClientService.java | 4 +- .../explorer/StandardKustoIngestService.java | 4 +- .../explorer/StandardKustoQueryService.java | 4 +- .../eventhub/AzureEventHubRecordSink.java | 4 +- .../ADLSCredentialsControllerService.java | 4 +- .../AzureBlobStorageFileResourceService.java | 4 +- ...ureDataLakeStorageFileResourceService.java | 4 +- ...orageCredentialsControllerService_v12.java | 4 +- ...bstractAzureLogAnalyticsReportingTask.java | 4 +- ...reLogAnalyticsProvenanceReportingTask.java | 4 +- .../AzureLogAnalyticsReportingTask.java | 4 +- .../nifi/processors/box/FetchBoxFile.java | 4 +- .../nifi/processors/box/ListBoxFile.java | 4 +- .../nifi/processors/box/PutBoxFile.java | 4 +- .../JsonConfigBasedBoxClientService.java | 4 +- .../mysql/processors/CaptureChangeMySQL.java | 4 +- .../processors/cipher/DecryptContentAge.java | 4 +- .../processors/cipher/EncryptContentAge.java | 4 +- .../processors/cipher/VerifyContentMAC.java | 4 +- .../compress/ModifyCompression.java | 9 ++-- .../ConfluentSchemaRegistry.java | 4 +- .../nifi/processors/dropbox/FetchDropbox.java | 4 +- .../nifi/processors/dropbox/ListDropbox.java | 4 +- .../nifi/processors/dropbox/PutDropbox.java | 21 +++------ .../StandardDropboxCredentialService.java | 4 +- .../ElasticSearchClientServiceImpl.java | 4 +- .../ElasticSearchStringLookupService.java | 4 +- .../email/AbstractEmailProcessor.java | 6 ++- .../nifi/processors/email/ConsumeIMAP.java | 6 +-- .../nifi/processors/email/ConsumePOP3.java | 2 +- .../email/ExtractEmailAttachments.java | 7 ++- .../processors/email/ExtractEmailHeaders.java | 8 ++-- .../nifi/processors/AbstractEnrichIP.java | 4 +- .../nifi/processors/GeoEnrichIPRecord.java | 10 ++-- .../AbstractListenEventBatchingProcessor.java | 4 +- .../listen/AbstractListenEventProcessor.java | 4 +- .../util/file/transfer/FetchFileTransfer.java | 33 +++++++------ .../util/file/transfer/GetFileTransfer.java | 13 ++---- .../hadoop/AbstractHadoopProcessor.java | 8 +++- .../util/list/AbstractListProcessor.java | 9 ++-- .../hadoop/AbstractFetchHDFSRecord.java | 2 +- .../hadoop/AbstractPutHDFSRecord.java | 2 +- .../GcpSecretManagerParameterProvider.java | 8 ++-- .../GCPCredentialsControllerService.java | 4 +- .../gcp/drive/FetchGoogleDrive.java | 6 +-- .../processors/gcp/drive/ListGoogleDrive.java | 4 +- .../processors/gcp/drive/PutGoogleDrive.java | 4 +- .../gcp/pubsub/ConsumeGCPubSub.java | 4 +- .../gcp/pubsub/PublishGCPubSub.java | 4 +- .../gcp/storage/GCSFileResourceService.java | 4 +- .../vision/AbstractGcpVisionProcessor.java | 10 ++-- ...ctGetGcpVisionAnnotateOperationStatus.java | 10 ++-- .../StartGcpVisionAnnotateFilesOperation.java | 4 +- ...StartGcpVisionAnnotateImagesOperation.java | 5 +- .../processors/geohash/GeohashRecord.java | 4 +- .../processors/graph/ExecuteGraphQuery.java | 33 +++++-------- .../graph/ExecuteGraphQueryRecord.java | 23 ++++++---- .../nifi/graph/Neo4JCypherClientService.java | 4 +- .../nifi/graph/TinkerpopClientService.java | 4 +- .../groovyx/ExecuteGroovyScript.java | 4 +- .../hadoop/CreateHadoopSequenceFile.java | 6 +-- .../nifi/processors/hadoop/DeleteHDFS.java | 6 +-- .../nifi/processors/hadoop/FetchHDFS.java | 6 +-- .../nifi/processors/hadoop/GetHDFS.java | 6 +-- .../processors/hadoop/GetHDFSFileInfo.java | 6 +-- .../nifi/processors/hadoop/ListHDFS.java | 6 +-- .../nifi/processors/hadoop/MoveHDFS.java | 6 +-- .../nifi/processors/hadoop/PutHDFS.java | 6 +-- .../hadoop/inotify/GetHDFSEvents.java | 6 +-- .../StandardHashiCorpVaultClientService.java | 4 +- .../HashiCorpVaultParameterProvider.java | 9 ++-- .../cacheclient/HazelcastMapCacheClient.java | 4 +- .../processors/hl7/ExtractHL7Attributes.java | 4 +- .../apache/nifi/processors/hl7/RouteHL7.java | 4 +- .../nifi/processors/hubspot/GetHubSpot.java | 4 +- .../apache/nifi/processors/AbstractIoTDB.java | 26 +++++------ .../JndiJmsConnectionFactoryProperties.java | 4 +- .../nifi/jms/processors/PublishJMS.java | 9 ++-- .../jolt/AbstractJoltTransform.java | 13 +++++- .../processors/jolt/JoltTransformJSON.java | 6 +-- .../processors/jolt/JoltTransformRecord.java | 6 +-- .../processors/jslt/JSLTTransformJSON.java | 4 +- .../service/Kafka3ConnectionService.java | 4 +- .../nifi/kafka/processors/ConsumeKafka.java | 4 +- .../nifi/kafka/processors/PublishKafka.java | 9 ++-- .../document/ExtractDocumentText.java | 9 ++-- .../image/ExtractImageMetadata.java | 4 +- .../nifi/processors/image/ResizeImage.java | 26 ++++++----- .../media/ExtractMediaMetadata.java | 4 +- .../mongodb/AbstractMongoProcessor.java | 6 ++- .../nifi/processors/mongodb/DeleteMongo.java | 6 +-- .../nifi/processors/mongodb/GetMongo.java | 6 +-- .../processors/mongodb/GetMongoRecord.java | 4 +- .../nifi/processors/mongodb/PutMongo.java | 6 +-- .../mongodb/PutMongoBulkOperations.java | 6 +-- .../processors/mongodb/PutMongoRecord.java | 6 +-- .../mongodb/RunMongoAggregation.java | 6 +-- .../gridfs/AbstractGridFSProcessor.java | 31 ++++++------- .../mongodb/gridfs/DeleteGridFS.java | 25 +++++----- .../mongodb/gridfs/FetchGridFS.java | 40 ++++++++-------- .../processors/mongodb/gridfs/PutGridFS.java | 42 ++++++++--------- .../mongodb/MongoDBControllerService.java | 4 +- .../nifi/processors/mqtt/ConsumeMQTT.java | 4 +- .../nifi/processors/mqtt/PublishMQTT.java | 4 +- .../processors/network/ParseNetflowv5.java | 4 +- .../processors/network/pcap/SplitPCAP.java | 4 +- .../apache/nifi/parquet/ParquetReader.java | 4 +- .../parquet/CalculateParquetOffsets.java | 10 ++-- .../CalculateParquetRowGroupOffsets.java | 11 +++-- .../parquet/ConvertAvroToParquet.java | 46 +++++++------------ .../nifi/processors/parquet/PutParquet.java | 28 +++++------ .../processors/pgp/DecryptContentPGP.java | 4 +- .../processors/pgp/EncryptContentPGP.java | 4 +- .../nifi/processors/pgp/SignContentPGP.java | 4 +- .../nifi/processors/pgp/VerifyContentPGP.java | 4 +- .../StandardPGPPrivateKeyService.java | 4 +- .../standard/StandardPGPPublicKeyService.java | 4 +- .../nifi/processors/excel/SplitExcel.java | 4 +- .../redis/processor/PutRedisHashRecord.java | 4 +- ...RedisDistributedMapCacheClientService.java | 4 +- .../services/AvroSchemaRegistry.java | 4 +- .../services/StandardJsonSchemaRegistry.java | 4 +- .../salesforce/PutSalesforceObject.java | 4 +- .../salesforce/QuerySalesforceObject.java | 4 +- .../script/ScriptedPartitionRecord.java | 2 +- .../script/ScriptedRecordProcessor.java | 2 +- .../script/ScriptedRouterProcessor.java | 2 +- .../script/ScriptedTransformRecord.java | 2 +- .../nifi/processors/shopify/GetShopify.java | 6 +-- .../sink/SiteToSiteReportingRecordSink.java | 4 +- .../nifi/processors/slack/ConsumeSlack.java | 5 +- .../nifi/processors/slack/ListenSlack.java | 4 +- .../nifi/processors/slack/PublishSlack.java | 15 +++--- .../nifi/services/slack/SlackRecordSink.java | 4 +- .../apache/nifi/processors/smb/FetchSmb.java | 4 +- .../nifi/processors/smb/GetSmbFile.java | 6 +-- .../apache/nifi/processors/smb/ListSmb.java | 4 +- .../nifi/processors/smb/PutSmbFile.java | 4 +- .../smb/SmbjClientProviderService.java | 4 +- .../snowflake/GetSnowflakeIngestStatus.java | 12 +++-- .../snowflake/PutSnowflakeInternalStage.java | 9 ++-- .../snowflake/StartSnowflakeIngest.java | 11 +++-- .../SnowflakeComputingConnectionPool.java | 4 +- ...SnowflakeIngestManagerProviderService.java | 4 +- .../nifi/processors/splunk/GetSplunk.java | 4 +- .../nifi/processors/splunk/PutSplunkHTTP.java | 31 +++++++------ .../splunk/QuerySplunkIndexingStatus.java | 10 ++-- .../nifi/processors/splunk/SplunkAPICall.java | 9 ++-- .../standard/AbstractRecordProcessor.java | 15 ++++-- .../processors/standard/AttributesToCSV.java | 4 +- .../processors/standard/AttributesToJSON.java | 4 +- .../standard/CalculateRecordStats.java | 5 +- .../processors/standard/CompressContent.java | 4 +- .../nifi/processors/standard/ControlRate.java | 4 +- .../standard/ConvertCharacterSet.java | 8 ++-- .../nifi/processors/standard/CountText.java | 4 +- .../standard/CryptographicHashContent.java | 4 +- .../standard/DeduplicateRecord.java | 4 +- .../nifi/processors/standard/DeleteFile.java | 4 +- .../processors/standard/DetectDuplicate.java | 4 +- .../standard/DuplicateFlowFile.java | 10 ++-- .../processors/standard/EncodeContent.java | 4 +- .../processors/standard/EnforceOrder.java | 4 +- .../processors/standard/EvaluateJsonPath.java | 4 +- .../processors/standard/EvaluateXPath.java | 4 +- .../processors/standard/EvaluateXQuery.java | 4 +- .../processors/standard/ExecuteProcess.java | 4 +- .../processors/standard/ExecuteSQLRecord.java | 4 +- .../standard/ExecuteStreamCommand.java | 4 +- .../nifi/processors/standard/ExtractGrok.java | 4 +- .../standard/ExtractRecordSchema.java | 4 +- .../nifi/processors/standard/ExtractText.java | 4 +- .../standard/FetchDistributedMapCache.java | 4 +- .../nifi/processors/standard/FetchFTP.java | 4 +- .../nifi/processors/standard/FetchFile.java | 4 +- .../nifi/processors/standard/FetchSFTP.java | 4 +- .../processors/standard/FilterAttribute.java | 4 +- .../nifi/processors/standard/FlattenJson.java | 4 +- .../nifi/processors/standard/ForkRecord.java | 4 +- .../processors/standard/GenerateFlowFile.java | 8 ++-- .../processors/standard/GenerateRecord.java | 8 ++-- .../standard/GenerateTableFetch.java | 4 +- .../nifi/processors/standard/GetFTP.java | 4 +- .../nifi/processors/standard/GetFile.java | 4 +- .../processors/standard/GetFileResource.java | 11 +++-- .../nifi/processors/standard/GetSFTP.java | 4 +- .../standard/HandleHttpRequest.java | 8 ++-- .../standard/HandleHttpResponse.java | 9 ++-- .../processors/standard/IdentifyMimeType.java | 16 ++++--- .../nifi/processors/standard/InvokeHTTP.java | 4 +- .../processors/standard/JoinEnrichment.java | 4 +- .../standard/ListDatabaseTables.java | 4 +- .../nifi/processors/standard/ListFTP.java | 4 +- .../nifi/processors/standard/ListFile.java | 8 ++-- .../nifi/processors/standard/ListSFTP.java | 4 +- .../nifi/processors/standard/ListenFTP.java | 8 ++-- .../nifi/processors/standard/ListenHTTP.java | 8 ++-- .../processors/standard/ListenSyslog.java | 4 +- .../nifi/processors/standard/ListenTCP.java | 10 ++-- .../processors/standard/LogAttribute.java | 4 +- .../nifi/processors/standard/LogMessage.java | 14 +++--- .../processors/standard/LookupAttribute.java | 4 +- .../processors/standard/LookupRecord.java | 4 +- .../processors/standard/MergeContent.java | 4 +- .../nifi/processors/standard/MergeRecord.java | 4 +- .../nifi/processors/standard/ModifyBytes.java | 10 ++-- .../processors/standard/MonitorActivity.java | 4 +- .../nifi/processors/standard/Notify.java | 4 +- .../processors/standard/PackageFlowFile.java | 6 ++- .../nifi/processors/standard/ParseSyslog.java | 6 ++- .../processors/standard/ParseSyslog5424.java | 4 +- .../processors/standard/PartitionRecord.java | 4 +- .../standard/PutDistributedMapCache.java | 4 +- .../nifi/processors/standard/PutEmail.java | 4 +- .../nifi/processors/standard/PutFTP.java | 4 +- .../nifi/processors/standard/PutFile.java | 4 +- .../nifi/processors/standard/PutRecord.java | 4 +- .../nifi/processors/standard/PutSFTP.java | 4 +- .../nifi/processors/standard/PutSQL.java | 4 +- .../nifi/processors/standard/PutSyslog.java | 4 +- .../standard/QueryDatabaseTable.java | 4 +- .../standard/QueryDatabaseTableRecord.java | 8 ++-- .../nifi/processors/standard/QueryRecord.java | 4 +- .../nifi/processors/standard/ReplaceText.java | 4 +- .../standard/ReplaceTextWithMapping.java | 4 +- .../processors/standard/RetryFlowFile.java | 4 +- .../processors/standard/RouteOnAttribute.java | 6 ++- .../processors/standard/RouteOnContent.java | 4 +- .../nifi/processors/standard/RouteText.java | 4 +- .../processors/standard/SampleRecord.java | 4 +- .../processors/standard/ScanAttribute.java | 4 +- .../nifi/processors/standard/ScanContent.java | 4 +- .../processors/standard/SegmentContent.java | 6 ++- .../processors/standard/SplitContent.java | 4 +- .../nifi/processors/standard/SplitJson.java | 4 +- .../nifi/processors/standard/SplitRecord.java | 4 +- .../nifi/processors/standard/SplitText.java | 4 +- .../nifi/processors/standard/SplitXml.java | 6 ++- .../nifi/processors/standard/TailFile.java | 8 ++-- .../processors/standard/TransformXml.java | 4 +- .../processors/standard/UnpackContent.java | 4 +- .../processors/standard/UpdateCounter.java | 8 ++-- .../nifi/processors/standard/ValidateCsv.java | 4 +- .../processors/standard/ValidateJson.java | 4 +- .../processors/standard/ValidateRecord.java | 4 +- .../nifi/processors/standard/ValidateXml.java | 4 +- .../apache/nifi/processors/standard/Wait.java | 4 +- .../DatabaseTableSchemaRegistry.java | 4 +- .../apache/nifi/dbcp/DBCPConnectionPool.java | 43 ++++++++--------- .../record/sink/db/DatabaseRecordSink.java | 4 +- .../nifi/dbcp/HikariCPConnectionPool.java | 4 +- .../cache/client/MapCacheClientService.java | 4 +- .../cache/client/SetCacheClientService.java | 4 +- .../service/StandardFileResourceService.java | 4 +- .../nifi/dbcp/HadoopDBCPConnectionPool.java | 4 +- .../nifi/http/StandardHttpContextMap.java | 4 +- .../service/StandardPrivateKeyService.java | 4 +- .../DistributedMapCacheLookupService.java | 4 +- .../apache/nifi/lookup/RestLookupService.java | 4 +- .../CommonsConfigurationLookupService.java | 4 +- .../db/DatabaseRecordLookupService.java | 4 +- .../db/SimpleDatabaseLookupService.java | 4 +- .../nifi/lookup/maxmind/IPLookupService.java | 4 +- .../StandardOauth2AccessTokenProvider.java | 4 +- .../StandardProxyConfigurationService.java | 4 +- .../org/apache/nifi/lookup/ReaderLookup.java | 4 +- .../nifi/lookup/RecordSetWriterLookup.java | 4 +- .../schema/inference/VolatileSchemaCache.java | 4 +- .../text/FreeFormTextRecordSetWriter.java | 4 +- .../nifi/record/sink/EmailRecordSink.java | 4 +- .../nifi/record/sink/HttpRecordSink.java | 4 +- .../nifi/record/sink/LoggingRecordSink.java | 4 +- .../record/sink/event/UDPEventRecordSink.java | 4 +- .../ssl/PEMEncodedSSLContextProvider.java | 4 +- .../nifi/ssl/StandardSSLContextService.java | 4 +- .../StandardWebClientServiceProvider.java | 4 +- .../analysis/AttributeRollingWindow.java | 4 +- .../attributes/UpdateAttribute.java | 4 +- .../websocket/ConnectWebSocket.java | 4 +- .../processors/websocket/ListenWebSocket.java | 4 +- .../processors/websocket/PutWebSocket.java | 4 +- .../jetty/AbstractJettyWebSocketService.java | 13 +++--- .../websocket/jetty/JettyWebSocketClient.java | 38 +++++++-------- .../websocket/jetty/JettyWebSocketServer.java | 31 ++++++------- .../processors/workday/GetWorkdayReport.java | 4 +- .../processors/zendesk/PutZendeskTicket.java | 4 +- .../services/zendesk/ZendeskRecordSink.java | 4 +- .../KubernetesConfigMapStateProvider.java | 6 ++- .../DynamicPropertiesTestProcessor.java | 9 ++-- ...lassloaderIsolationKeyProviderService.java | 4 +- 350 files changed, 1157 insertions(+), 1052 deletions(-) diff --git a/nifi-extension-bundles/nifi-airtable-bundle/nifi-airtable-processors/src/main/java/org/apache/nifi/processors/airtable/QueryAirtableTable.java b/nifi-extension-bundles/nifi-airtable-bundle/nifi-airtable-processors/src/main/java/org/apache/nifi/processors/airtable/QueryAirtableTable.java index b6d5d167c92c..728f9f7e0043 100644 --- a/nifi-extension-bundles/nifi-airtable-bundle/nifi-airtable-processors/src/main/java/org/apache/nifi/processors/airtable/QueryAirtableTable.java +++ b/nifi-extension-bundles/nifi-airtable-bundle/nifi-airtable-processors/src/main/java/org/apache/nifi/processors/airtable/QueryAirtableTable.java @@ -194,7 +194,7 @@ public class QueryAirtableTable extends AbstractProcessor { .description("For FlowFiles created as a result of a successful query.") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( API_URL, PAT, BASE_ID, @@ -217,7 +217,7 @@ public class QueryAirtableTable extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/AbstractAMQPProcessor.java b/nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/AbstractAMQPProcessor.java index 47c27a81457c..77f16a7f27b5 100644 --- a/nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/AbstractAMQPProcessor.java +++ b/nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/AbstractAMQPProcessor.java @@ -139,7 +139,7 @@ abstract class AbstractAMQPProcessor extends AbstractProce .addValidator(StandardValidators.BOOLEAN_VALIDATOR) .build(); - protected static final List PARENT_PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( BROKERS, HOST, PORT, V_HOST, @@ -147,8 +147,11 @@ abstract class AbstractAMQPProcessor extends AbstractProce PASSWORD, AMQP_VERSION, SSL_CONTEXT_SERVICE, - USE_CERT_AUTHENTICATION - ); + USE_CERT_AUTHENTICATION); + + protected static List getCommonPropertyDescriptors() { + return PROPERTY_DESCRIPTORS; + } private BlockingQueue> resourceQueue; diff --git a/nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/ConsumeAMQP.java b/nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/ConsumeAMQP.java index 144b20863285..84399ef66fd7 100644 --- a/nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/ConsumeAMQP.java +++ b/nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/ConsumeAMQP.java @@ -162,7 +162,7 @@ public class ConsumeAMQP extends AbstractAMQPProcessor { .description("All FlowFiles that are received from the AMQP queue are routed to this relationship") .build(); - private static final List PROPERTIES = Stream.concat( + private static final List PROPERTY_DESCRIPTORS = Stream.concat( Stream.of( QUEUE, AUTO_ACKNOWLEDGE, @@ -172,7 +172,7 @@ public class ConsumeAMQP extends AbstractAMQPProcessor { HEADER_KEY_PREFIX, HEADER_SEPARATOR, REMOVE_CURLY_BRACES - ), PARENT_PROPERTIES.stream() + ), getCommonPropertyDescriptors().stream() ).toList(); private static final Set RELATIONSHIPS = Set.of( @@ -315,7 +315,7 @@ protected synchronized AMQPConsumer createAMQPWorker(final ProcessContext contex @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/PublishAMQP.java b/nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/PublishAMQP.java index 57430fdbdd2d..cf113066bb76 100644 --- a/nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/PublishAMQP.java +++ b/nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/PublishAMQP.java @@ -132,7 +132,7 @@ public class PublishAMQP extends AbstractAMQPProcessor { .description("All FlowFiles that cannot be routed to the AMQP destination are routed to this relationship") .build(); - private final static List PROPERTIES = Stream.concat( + private final static List PROPERTY_DESCRIPTORS = Stream.concat( Stream.of( EXCHANGE, ROUTING_KEY, @@ -140,7 +140,7 @@ public class PublishAMQP extends AbstractAMQPProcessor { HEADERS_PATTERN, HEADER_SEPARATOR ), - PARENT_PROPERTIES.stream() + getCommonPropertyDescriptors().stream() ).toList(); private final static Set RELATIONSHIPS = Set.of( @@ -203,7 +203,7 @@ protected void processResource(final Connection connection, final AMQPPublisher @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-apicurio-bundle/nifi-apicurio-schema-registry-service/src/main/java/org/apache/nifi/apicurio/schemaregistry/ApicurioSchemaRegistry.java b/nifi-extension-bundles/nifi-apicurio-bundle/nifi-apicurio-schema-registry-service/src/main/java/org/apache/nifi/apicurio/schemaregistry/ApicurioSchemaRegistry.java index d36b34c21b48..12db5347decf 100644 --- a/nifi-extension-bundles/nifi-apicurio-bundle/nifi-apicurio-schema-registry-service/src/main/java/org/apache/nifi/apicurio/schemaregistry/ApicurioSchemaRegistry.java +++ b/nifi-extension-bundles/nifi-apicurio-bundle/nifi-apicurio-schema-registry-service/src/main/java/org/apache/nifi/apicurio/schemaregistry/ApicurioSchemaRegistry.java @@ -94,7 +94,7 @@ public class ApicurioSchemaRegistry extends AbstractControllerService implements .identifiesControllerService(WebClientServiceProvider.class) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SCHEMA_REGISTRY_URL, SCHEMA_GROUP_ID, CACHE_SIZE, @@ -105,7 +105,7 @@ public class ApicurioSchemaRegistry extends AbstractControllerService implements @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } private volatile SchemaRegistryClient client; diff --git a/nifi-extension-bundles/nifi-asana-bundle/nifi-asana-processors/src/main/java/org/apache/nifi/processors/asana/GetAsanaObject.java b/nifi-extension-bundles/nifi-asana-bundle/nifi-asana-processors/src/main/java/org/apache/nifi/processors/asana/GetAsanaObject.java index 597248e365ee..05c67efe5bca 100644 --- a/nifi-extension-bundles/nifi-asana-bundle/nifi-asana-processors/src/main/java/org/apache/nifi/processors/asana/GetAsanaObject.java +++ b/nifi-extension-bundles/nifi-asana-bundle/nifi-asana-processors/src/main/java/org/apache/nifi/processors/asana/GetAsanaObject.java @@ -190,7 +190,7 @@ public class GetAsanaObject extends AbstractProcessor { .addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR) .build(); - protected static final List DESCRIPTORS = List.of( + protected static final List PROPERTY_DESCRIPTORS = List.of( PROP_ASANA_CLIENT_SERVICE, PROP_DISTRIBUTED_CACHE_SERVICE, PROP_ASANA_OBJECT_TYPE, @@ -236,7 +236,7 @@ public Set getRelationships() { @Override public List getSupportedPropertyDescriptors() { - return DESCRIPTORS; + return PROPERTY_DESCRIPTORS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-asana-bundle/nifi-asana-services/src/main/java/org/apache/nifi/controller/asana/StandardAsanaClientProviderService.java b/nifi-extension-bundles/nifi-asana-bundle/nifi-asana-services/src/main/java/org/apache/nifi/controller/asana/StandardAsanaClientProviderService.java index 5d38dcf644eb..23563046a778 100644 --- a/nifi-extension-bundles/nifi-asana-bundle/nifi-asana-services/src/main/java/org/apache/nifi/controller/asana/StandardAsanaClientProviderService.java +++ b/nifi-extension-bundles/nifi-asana-bundle/nifi-asana-services/src/main/java/org/apache/nifi/controller/asana/StandardAsanaClientProviderService.java @@ -71,7 +71,7 @@ public class StandardAsanaClientProviderService extends AbstractControllerServic .addValidator(StandardValidators.NON_BLANK_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( PROP_ASANA_API_BASE_URL, PROP_ASANA_PERSONAL_ACCESS_TOKEN, PROP_ASANA_WORKSPACE_NAME @@ -83,7 +83,7 @@ public class StandardAsanaClientProviderService extends AbstractControllerServic @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-avro-bundle/nifi-avro-processors/src/main/java/org/apache/nifi/processors/avro/ExtractAvroMetadata.java b/nifi-extension-bundles/nifi-avro-bundle/nifi-avro-processors/src/main/java/org/apache/nifi/processors/avro/ExtractAvroMetadata.java index bcb2cbb57bd2..4318ac6975e4 100644 --- a/nifi-extension-bundles/nifi-avro-bundle/nifi-avro-processors/src/main/java/org/apache/nifi/processors/avro/ExtractAvroMetadata.java +++ b/nifi-extension-bundles/nifi-avro-bundle/nifi-avro-processors/src/main/java/org/apache/nifi/processors/avro/ExtractAvroMetadata.java @@ -113,7 +113,7 @@ public class ExtractAvroMetadata extends AbstractProcessor { static final String SCHEMA_FINGERPRINT_ATTR = "schema.fingerprint"; static final String ITEM_COUNT_ATTR = "item.count"; - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( FINGERPRINT_ALGORITHM, METADATA_KEYS, COUNT_ITEMS @@ -131,7 +131,7 @@ protected void init(ProcessorInitializationContext context) { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-avro-bundle/nifi-avro-processors/src/main/java/org/apache/nifi/processors/avro/SplitAvro.java b/nifi-extension-bundles/nifi-avro-bundle/nifi-avro-processors/src/main/java/org/apache/nifi/processors/avro/SplitAvro.java index 38f19662113b..23f107615acd 100644 --- a/nifi-extension-bundles/nifi-avro-bundle/nifi-avro-processors/src/main/java/org/apache/nifi/processors/avro/SplitAvro.java +++ b/nifi-extension-bundles/nifi-avro-bundle/nifi-avro-processors/src/main/java/org/apache/nifi/processors/avro/SplitAvro.java @@ -150,7 +150,7 @@ public class SplitAvro extends AbstractProcessor { "avro.codec" ); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SPLIT_STRATEGY, OUTPUT_SIZE, OUTPUT_STRATEGY, @@ -170,7 +170,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/ml/AbstractAwsMachineLearningJobStarter.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/ml/AbstractAwsMachineLearningJobStarter.java index 632f59e24ffe..cbcec17b4317 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/ml/AbstractAwsMachineLearningJobStarter.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/ml/AbstractAwsMachineLearningJobStarter.java @@ -76,7 +76,7 @@ public void migrateProperties(final PropertyConfiguration config) { config.renameProperty("aws-region", REGION.getName()); } - protected static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( MANDATORY_AWS_CREDENTIALS_PROVIDER_SERVICE, REGION, TIMEOUT, @@ -95,6 +95,10 @@ public void migrateProperties(final PropertyConfiguration config) { REL_FAILURE ); + protected static List getCommonPropertyDescriptors() { + return PROPERTY_DESCRIPTORS; + } + @Override public Set getRelationships() { return RELATIONSHIPS; @@ -102,7 +106,7 @@ public Set getRelationships() { @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/ml/AbstractAwsMachineLearningJobStatusProcessor.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/ml/AbstractAwsMachineLearningJobStatusProcessor.java index 7a653fbbf0d3..73c146ea84f4 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/ml/AbstractAwsMachineLearningJobStatusProcessor.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/ml/AbstractAwsMachineLearningJobStatusProcessor.java @@ -79,7 +79,7 @@ public abstract class AbstractAwsMachineLearningJobStatusProcessor< .autoTerminateDefault(true) .build(); public static final String FAILURE_REASON_ATTRIBUTE = "failure.reason"; - protected static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( TASK_ID, MANDATORY_AWS_CREDENTIALS_PROVIDER_SERVICE, REGION, @@ -92,6 +92,10 @@ public abstract class AbstractAwsMachineLearningJobStatusProcessor< .findAndAddModules() .build(); + protected static List getCommonPropertyDescriptors() { + return PROPERTY_DESCRIPTORS; + } + @Override public void migrateProperties(final PropertyConfiguration config) { config.renameProperty("aws-region", REGION.getName()); @@ -112,7 +116,7 @@ public Set getRelationships() { @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } protected FlowFile writeToFlowFile(final ProcessSession session, final FlowFile flowFile, final AwsResponse response) { diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-parameter-providers/src/main/java/org/apache/nifi/parameter/aws/AwsSecretsManagerParameterProvider.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-parameter-providers/src/main/java/org/apache/nifi/parameter/aws/AwsSecretsManagerParameterProvider.java index c4e090b37b57..59b90f59e448 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-parameter-providers/src/main/java/org/apache/nifi/parameter/aws/AwsSecretsManagerParameterProvider.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-parameter-providers/src/main/java/org/apache/nifi/parameter/aws/AwsSecretsManagerParameterProvider.java @@ -165,7 +165,7 @@ public String getDescription() { private static final String DEFAULT_USER_AGENT = "NiFi"; private static final Protocol DEFAULT_PROTOCOL = Protocol.HTTPS; - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SECRET_LISTING_STRATEGY, SECRET_NAME_PATTERN, SECRET_NAMES, @@ -179,7 +179,7 @@ public String getDescription() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/cloudwatch/PutCloudWatchMetric.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/cloudwatch/PutCloudWatchMetric.java index 3f99b7a51376..c714ae314dc4 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/cloudwatch/PutCloudWatchMetric.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/cloudwatch/PutCloudWatchMetric.java @@ -190,7 +190,7 @@ public ValidationResult validate(String subject, String input, ValidationContext .addValidator(DOUBLE_VALIDATOR) .build(); - public static final List PROPERTIES = List.of( + public static final List PROPERTY_DESCRIPTORS = List.of( NAMESPACE, METRIC_NAME, REGION, @@ -216,7 +216,7 @@ protected CloudWatchClientBuilder createClientBuilder(final ProcessContext conte @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/service/AWSCredentialsProviderControllerService.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/service/AWSCredentialsProviderControllerService.java index 0f18aadab68c..114c2ebf6c59 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/service/AWSCredentialsProviderControllerService.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/credentials/provider/service/AWSCredentialsProviderControllerService.java @@ -264,7 +264,7 @@ public class AWSCredentialsProviderControllerService extends AbstractControllerS .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( USE_DEFAULT_CREDENTIALS, ACCESS_KEY_ID, SECRET_KEY, @@ -304,7 +304,7 @@ public class AWSCredentialsProviderControllerService extends AbstractControllerS @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/DeleteDynamoDB.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/DeleteDynamoDB.java index d6a5139e83ef..27e821006f99 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/DeleteDynamoDB.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/DeleteDynamoDB.java @@ -70,7 +70,7 @@ }) public class DeleteDynamoDB extends AbstractDynamoDBProcessor { - public static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( TABLE, REGION, AWS_CREDENTIALS_PROVIDER_SERVICE, @@ -88,7 +88,7 @@ public class DeleteDynamoDB extends AbstractDynamoDBProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/GetDynamoDB.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/GetDynamoDB.java index 0300385f2d25..85485edb15e6 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/GetDynamoDB.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/GetDynamoDB.java @@ -83,7 +83,7 @@ public class GetDynamoDB extends AbstractDynamoDBProcessor { .required(false) .build(); - public static final List PROPERTIES = List.of( + public static final List PROPERTY_DESCRIPTORS = List.of( TABLE, REGION, AWS_CREDENTIALS_PROVIDER_SERVICE, @@ -117,7 +117,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/PutDynamoDB.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/PutDynamoDB.java index e9f43570530c..dab333776535 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/PutDynamoDB.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/PutDynamoDB.java @@ -77,7 +77,7 @@ @SystemResourceConsideration(resource = SystemResource.MEMORY) public class PutDynamoDB extends AbstractDynamoDBProcessor { - public static final List PROPERTIES = List.of( + public static final List PROPERTY_DESCRIPTORS = List.of( TABLE, REGION, AWS_CREDENTIALS_PROVIDER_SERVICE, @@ -99,7 +99,7 @@ public class PutDynamoDB extends AbstractDynamoDBProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/PutDynamoDBRecord.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/PutDynamoDBRecord.java index 15085a04b564..b103d591a5e4 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/PutDynamoDBRecord.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/PutDynamoDBRecord.java @@ -172,7 +172,7 @@ public class PutDynamoDBRecord extends AbstractDynamoDBProcessor { .description("Defines the name of the sort key field in the DynamoDB table. Sort key is also known as range key.") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( TABLE, REGION, AWS_CREDENTIALS_PROVIDER_SERVICE, @@ -190,7 +190,7 @@ public class PutDynamoDBRecord extends AbstractDynamoDBProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @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 e166d34c2491..b3f19fdf592d 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 @@ -87,7 +87,7 @@ public class PutKinesisFirehose extends AbstractAwsSyncProcessor PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( KINESIS_FIREHOSE_DELIVERY_STREAM_NAME, BATCH_SIZE, REGION, @@ -101,7 +101,7 @@ public class PutKinesisFirehose extends AbstractAwsSyncProcessor getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/stream/ConsumeKinesisStream.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/stream/ConsumeKinesisStream.java index a1f55fdb4379..59ece03cbdb2 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/stream/ConsumeKinesisStream.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/stream/ConsumeKinesisStream.java @@ -315,7 +315,7 @@ public class ConsumeKinesisStream extends AbstractAwsAsyncProcessor PROPERTIES = List.of( + public static final List PROPERTY_DESCRIPTORS = List.of( // Kinesis Stream specific properties KINESIS_STREAM_NAME, APPLICATION_NAME, @@ -388,7 +388,7 @@ public Object convert(final String value, final Class clazz) { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/stream/PutKinesisStream.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/stream/PutKinesisStream.java index a680e7c0bf27..bc6cb023d3ef 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/stream/PutKinesisStream.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/stream/PutKinesisStream.java @@ -113,7 +113,7 @@ public class PutKinesisStream extends AbstractAwsSyncProcessor PROPERTIES = List.of( + public static final List PROPERTY_DESCRIPTORS = List.of( KINESIS_STREAM_NAME, REGION, AWS_CREDENTIALS_PROVIDER_SERVICE, @@ -129,7 +129,7 @@ public class PutKinesisStream extends AbstractAwsSyncProcessor getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/lambda/PutLambda.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/lambda/PutLambda.java index f6215f4a75ed..01245dde40cc 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/lambda/PutLambda.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/lambda/PutLambda.java @@ -98,7 +98,7 @@ public class PutLambda extends AbstractAwsSyncProcessor PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( AWS_LAMBDA_FUNCTION_NAME, AWS_LAMBDA_FUNCTION_QUALIFIER, REGION, @@ -111,7 +111,7 @@ public class PutLambda extends AbstractAwsSyncProcessor getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/ml/textract/GetAwsTextractJobStatus.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/ml/textract/GetAwsTextractJobStatus.java index c7d8939f825e..5bc661baf0ca 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/ml/textract/GetAwsTextractJobStatus.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/ml/textract/GetAwsTextractJobStatus.java @@ -72,14 +72,14 @@ public ValidationResult validate(final String subject, final String value, final .defaultValue(String.format("${%s}", TEXTRACT_TYPE_ATTRIBUTE)) .addValidator(TEXTRACT_TYPE_VALIDATOR) .build(); - private static final List TEXTRACT_PROPERTIES = Stream.concat( - PROPERTIES.stream(), + private static final List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), Stream.of(TEXTRACT_TYPE) ).toList(); @Override public List getSupportedPropertyDescriptors() { - return TEXTRACT_PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/ml/textract/StartAwsTextractJob.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/ml/textract/StartAwsTextractJob.java index d63e4d2c1d4a..1ef4eea64f40 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/ml/textract/StartAwsTextractJob.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/ml/textract/StartAwsTextractJob.java @@ -63,14 +63,14 @@ public class StartAwsTextractJob extends AbstractAwsMachineLearningJobStarter< .allowableValues(TextractType.TEXTRACT_TYPES) .defaultValue(DOCUMENT_ANALYSIS.getType()) .build(); - private static final List TEXTRACT_PROPERTIES = Stream.concat( - PROPERTIES.stream(), + private static final List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), Stream.of(TEXTRACT_TYPE) ).toList(); @Override public List getSupportedPropertyDescriptors() { - return TEXTRACT_PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/CopyS3Object.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/CopyS3Object.java index d1fbefc73483..0b0ffde269dd 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/CopyS3Object.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/CopyS3Object.java @@ -86,7 +86,7 @@ public class CopyS3Object extends AbstractS3Processor { .defaultValue("${filename}-1") .build(); - static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SOURCE_BUCKET, SOURCE_KEY, DESTINATION_BUCKET, @@ -111,7 +111,7 @@ public class CopyS3Object extends AbstractS3Processor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java index 3aeeef456506..c565dba1a28a 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java @@ -62,7 +62,7 @@ public class DeleteS3Object extends AbstractS3Processor { .required(false) .build(); - public static final List PROPERTIES = List.of( + public static final List PROPERTY_DESCRIPTORS = List.of( BUCKET_WITH_DEFAULT_VALUE, KEY, AWS_CREDENTIALS_PROVIDER_SERVICE, @@ -80,11 +80,12 @@ public class DeleteS3Object extends AbstractS3Processor { SIGNER_OVERRIDE, S3_CUSTOM_SIGNER_CLASS_NAME, S3_CUSTOM_SIGNER_MODULE_LOCATION, - PROXY_CONFIGURATION_SERVICE); + PROXY_CONFIGURATION_SERVICE + ); @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java index b2b4d730069a..a7ca4cbe088e 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java @@ -271,7 +271,7 @@ public class FetchS3Object extends AbstractS3Processor { .required(false) .build(); - public static final List PROPERTIES = List.of( + public static final List PROPERTY_DESCRIPTORS = List.of( BUCKET_WITH_DEFAULT_VALUE, KEY, S3_REGION, @@ -291,7 +291,7 @@ public class FetchS3Object extends AbstractS3Processor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/GetS3ObjectMetadata.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/GetS3ObjectMetadata.java index 53ded72f8df6..1ecb46255d2a 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/GetS3ObjectMetadata.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/GetS3ObjectMetadata.java @@ -86,7 +86,7 @@ public class GetS3ObjectMetadata extends AbstractS3Processor { .dependsOn(METADATA_TARGET, TARGET_ATTRIBUTES) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( METADATA_TARGET, ATTRIBUTE_INCLUDE_PATTERN, BUCKET_WITH_DEFAULT_VALUE, @@ -133,7 +133,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/ListS3.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/ListS3.java index 0b6d392b4cfc..3b2c718705dc 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/ListS3.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/ListS3.java @@ -291,7 +291,7 @@ public class ListS3 extends AbstractS3Processor implements VerifiableProcessor { .build(); - public static final List PROPERTIES = List.of( + public static final List PROPERTY_DESCRIPTORS = List.of( BUCKET_WITHOUT_DEFAULT_VALUE, REGION, AWS_CREDENTIALS_PROVIDER_SERVICE, @@ -322,7 +322,7 @@ public class ListS3 extends AbstractS3Processor implements VerifiableProcessor { REL_SUCCESS ); - private static final Set TRACKING_RESET_PROPERTIES = Set.of( + private static final Set TRACKING_RESET_PROPERTY_DESCRIPTORS = Set.of( BUCKET_WITHOUT_DEFAULT_VALUE, REGION, PREFIX, @@ -351,7 +351,7 @@ public void onPrimaryNodeChange(final PrimaryNodeState newState) { @Override public void onPropertyModified(final PropertyDescriptor descriptor, final String oldValue, final String newValue) { - if (isConfigurationRestored() && TRACKING_RESET_PROPERTIES.contains(descriptor)) { + if (isConfigurationRestored() && TRACKING_RESET_PROPERTY_DESCRIPTORS.contains(descriptor)) { resetTracking = true; } } @@ -428,7 +428,7 @@ public ValidationResult validate(final String subject, final String input, final @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java index 721417042220..b08aa5438b78 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/PutS3Object.java @@ -264,7 +264,7 @@ public class PutS3Object extends AbstractS3Processor { .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT) .build(); - public static final List PROPERTIES = List.of( + public static final List PROPERTY_DESCRIPTORS = List.of( BUCKET_WITH_DEFAULT_VALUE, KEY, S3_REGION, @@ -300,7 +300,8 @@ public class PutS3Object extends AbstractS3Processor { MULTIPART_TEMP_DIR, USE_CHUNKED_ENCODING, USE_PATH_STYLE_ACCESS, - PROXY_CONFIGURATION_SERVICE); + PROXY_CONFIGURATION_SERVICE + ); final static String S3_BUCKET_KEY = "s3.bucket"; final static String S3_OBJECT_KEY = "s3.key"; @@ -331,7 +332,7 @@ public void setTempDir(final ProcessContext context) { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/TagS3Object.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/TagS3Object.java index 592676dc23a1..807aacb66c23 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/TagS3Object.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/TagS3Object.java @@ -105,7 +105,7 @@ public class TagS3Object extends AbstractS3Processor { .required(false) .build(); - public static final List PROPERTIES = List.of( + public static final List PROPERTY_DESCRIPTORS = List.of( BUCKET_WITH_DEFAULT_VALUE, KEY, S3_REGION, @@ -120,11 +120,12 @@ public class TagS3Object extends AbstractS3Processor { SIGNER_OVERRIDE, S3_CUSTOM_SIGNER_CLASS_NAME, S3_CUSTOM_SIGNER_MODULE_LOCATION, - PROXY_CONFIGURATION_SERVICE); + PROXY_CONFIGURATION_SERVICE + ); @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/encryption/StandardS3EncryptionService.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/encryption/StandardS3EncryptionService.java index bc6734d739f8..a38d9574a208 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/encryption/StandardS3EncryptionService.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/encryption/StandardS3EncryptionService.java @@ -109,7 +109,7 @@ STRATEGY_NAME_CSE_C, new ClientSideCEncryptionStrategy() .defaultValue(RegionUtilV1.createAllowableValue(Regions.DEFAULT_REGION).getValue()) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( ENCRYPTION_STRATEGY, ENCRYPTION_VALUE, KMS_REGION @@ -194,7 +194,7 @@ protected Collection customValidate(final ValidationContext va @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/service/S3FileResourceService.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/service/S3FileResourceService.java index c797d854d1e4..cff55f15b8ff 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/service/S3FileResourceService.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/service/S3FileResourceService.java @@ -78,7 +78,7 @@ public class S3FileResourceService extends AbstractControllerService implements .fromPropertyDescriptor(RegionUtilV1.S3_REGION) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( BUCKET_WITH_DEFAULT_VALUE, KEY, S3_REGION, @@ -90,7 +90,7 @@ public class S3FileResourceService extends AbstractControllerService implements @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sns/PutSNS.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sns/PutSNS.java index 62c93b633c67..5d1cc37deac9 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sns/PutSNS.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sns/PutSNS.java @@ -122,7 +122,7 @@ public class PutSNS extends AbstractAwsSyncProcessor PROPERTIES = List.of( + public static final List PROPERTY_DESCRIPTORS = List.of( ARN, ARN_TYPE, SUBJECT, @@ -135,13 +135,14 @@ public class PutSNS extends AbstractAwsSyncProcessor getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sqs/DeleteSQS.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sqs/DeleteSQS.java index 40dd6d65d282..4c83866bc0c5 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sqs/DeleteSQS.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sqs/DeleteSQS.java @@ -63,7 +63,7 @@ public class DeleteSQS extends AbstractAwsSyncProcessor PROPERTIES = List.of( + public static final List PROPERTY_DESCRIPTORS = List.of( QUEUE_URL, REGION, AWS_CREDENTIALS_PROVIDER_SERVICE, @@ -71,11 +71,12 @@ public class DeleteSQS extends AbstractAwsSyncProcessor getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sqs/GetSQS.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sqs/GetSQS.java index f2c5d6b5858c..b4ea13df63a0 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sqs/GetSQS.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sqs/GetSQS.java @@ -116,7 +116,7 @@ public class GetSQS extends AbstractAwsSyncProcessor PROPERTIES = List.of( + public static final List PROPERTY_DESCRIPTORS = List.of( QUEUE_URL, REGION, AWS_CREDENTIALS_PROVIDER_SERVICE, @@ -128,11 +128,12 @@ public class GetSQS extends AbstractAwsSyncProcessor getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sqs/PutSQS.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sqs/PutSQS.java index 7c4fec83019e..bd1e3ece7f3f 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sqs/PutSQS.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sqs/PutSQS.java @@ -102,7 +102,7 @@ public class PutSQS extends AbstractAwsSyncProcessor PROPERTIES = List.of( + public static final List PROPERTY_DESCRIPTORS = List.of( QUEUE_URL, REGION, AWS_CREDENTIALS_PROVIDER_SERVICE, @@ -112,13 +112,14 @@ public class PutSQS extends AbstractAwsSyncProcessor userDefinedProperties = Collections.emptyList(); @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/credentials/provider/service/MockAWSProcessor.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/credentials/provider/service/MockAWSProcessor.java index 0f86b60e4e50..fa3f320c5019 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/credentials/provider/service/MockAWSProcessor.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/credentials/provider/service/MockAWSProcessor.java @@ -48,7 +48,7 @@ */ public class MockAWSProcessor extends AbstractAWSCredentialsProviderProcessor { - public static final List PROPERTIES = List.of( + public static final List PROPERTY_DESCRIPTORS = List.of( USE_DEFAULT_CREDENTIALS, PROFILE_NAME, USE_ANONYMOUS_CREDENTIALS, @@ -66,7 +66,7 @@ public class MockAWSProcessor extends AbstractAWSCredentialsProviderProcessor getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/src/main/java/org/apache/nifi/aws/schemaregistry/AmazonGlueSchemaRegistry.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/src/main/java/org/apache/nifi/aws/schemaregistry/AmazonGlueSchemaRegistry.java index 296c47eaa748..12cb922eb25f 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/src/main/java/org/apache/nifi/aws/schemaregistry/AmazonGlueSchemaRegistry.java +++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-schema-registry-service/src/main/java/org/apache/nifi/aws/schemaregistry/AmazonGlueSchemaRegistry.java @@ -136,7 +136,7 @@ public class AmazonGlueSchemaRegistry extends AbstractControllerService implemen private static final PropertyDescriptor PROXY_CONFIGURATION_SERVICE = ProxyConfiguration.createProxyConfigPropertyDescriptor(PROXY_SPECS); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SCHEMA_REGISTRY_NAME, REGION, COMMUNICATIONS_TIMEOUT, @@ -150,7 +150,7 @@ public class AmazonGlueSchemaRegistry extends AbstractControllerService implemen @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } private volatile SchemaRegistryClient client; diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-parameter-providers/src/main/java/org/apache/nifi/parameter/azure/AzureKeyVaultSecretsParameterProvider.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-parameter-providers/src/main/java/org/apache/nifi/parameter/azure/AzureKeyVaultSecretsParameterProvider.java index 78107a76ffc0..c9305170caa9 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-parameter-providers/src/main/java/org/apache/nifi/parameter/azure/AzureKeyVaultSecretsParameterProvider.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-parameter-providers/src/main/java/org/apache/nifi/parameter/azure/AzureKeyVaultSecretsParameterProvider.java @@ -75,7 +75,7 @@ public class AzureKeyVaultSecretsParameterProvider extends AbstractParameterProv static final String GROUP_NAME_TAG = "group-name"; - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( AZURE_CREDENTIALS_SERVICE, KEY_VAULT_URI, GROUP_NAME_PATTERN @@ -83,7 +83,7 @@ public class AzureKeyVaultSecretsParameterProvider extends AbstractParameterProv @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/cosmos/document/AbstractAzureCosmosDBProcessor.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/cosmos/document/AbstractAzureCosmosDBProcessor.java index 6ee113a2c1cd..60b44a0d3c99 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/cosmos/document/AbstractAzureCosmosDBProcessor.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/cosmos/document/AbstractAzureCosmosDBProcessor.java @@ -87,7 +87,7 @@ public abstract class AbstractAzureCosmosDBProcessor extends AbstractProcessor { .addValidator(StandardValidators.NON_BLANK_VALIDATOR) .build(); - static final List descriptors = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CONNECTION_SERVICE, AzureCosmosDBUtils.URI, AzureCosmosDBUtils.DB_ACCESS_KEY, @@ -101,6 +101,10 @@ public abstract class AbstractAzureCosmosDBProcessor extends AbstractProcessor { private CosmosContainer container; private AzureCosmosDBConnectionService connectionService; + protected static List getCommonPropertyDescriptors() { + return PROPERTY_DESCRIPTORS; + } + @OnScheduled public void onScheduled(final ProcessContext context) throws CosmosException { final ComponentLog logger = getLogger(); diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/cosmos/document/PutAzureCosmosDBRecord.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/cosmos/document/PutAzureCosmosDBRecord.java index af4bb7f5f41a..ad06ae9620e9 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/cosmos/document/PutAzureCosmosDBRecord.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/cosmos/document/PutAzureCosmosDBRecord.java @@ -97,9 +97,13 @@ public class PutAzureCosmosDBRecord extends AbstractAzureCosmosDBProcessor { REL_FAILURE ); - private final static List PROPERTIES = Stream.concat( - descriptors.stream(), - Stream.of(RECORD_READER_FACTORY, INSERT_BATCH_SIZE, CONFLICT_HANDLE_STRATEGY) + private final static List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), + Stream.of( + RECORD_READER_FACTORY, + INSERT_BATCH_SIZE, + CONFLICT_HANDLE_STRATEGY + ) ).toList(); @Override @@ -109,7 +113,7 @@ public Set getRelationships() { @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } protected void bulkInsert(final List> records) throws CosmosException { diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/data/explorer/PutAzureDataExplorer.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/data/explorer/PutAzureDataExplorer.java index 56b052418a38..c4eb66c726d5 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/data/explorer/PutAzureDataExplorer.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/data/explorer/PutAzureDataExplorer.java @@ -161,7 +161,7 @@ public class PutAzureDataExplorer extends AbstractProcessor { .defaultValue("5 s") .build(); - private static final List descriptors = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( INGEST_SERVICE, DATABASE_NAME, TABLE_NAME, @@ -189,7 +189,7 @@ public Set getRelationships() { @Override public final List getSupportedPropertyDescriptors() { - return descriptors; + return PROPERTY_DESCRIPTORS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/data/explorer/QueryAzureDataExplorer.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/data/explorer/QueryAzureDataExplorer.java index 2ca56078fa2e..9aaee498dd9e 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/data/explorer/QueryAzureDataExplorer.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/data/explorer/QueryAzureDataExplorer.java @@ -95,7 +95,7 @@ public class QueryAzureDataExplorer extends AbstractProcessor { FAILURE ); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( KUSTO_QUERY_SERVICE, DATABASE_NAME, QUERY @@ -110,7 +110,7 @@ public Set getRelationships() { @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/ConsumeAzureEventHub.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/ConsumeAzureEventHub.java index d062ddc10857..bcc98d92d2de 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/ConsumeAzureEventHub.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/ConsumeAzureEventHub.java @@ -312,7 +312,7 @@ public class ConsumeAzureEventHub extends AbstractSessionFactoryProcessor implem REL_PARSE_FAILURE ); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( NAMESPACE, EVENT_HUB_NAME, SERVICE_BUS_ENDPOINT, @@ -347,7 +347,7 @@ public class ConsumeAzureEventHub extends AbstractSessionFactoryProcessor implem @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/GetAzureEventHub.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/GetAzureEventHub.java index ca9746254bfa..929f61182f16 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/GetAzureEventHub.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/GetAzureEventHub.java @@ -159,7 +159,7 @@ public class GetAzureEventHub extends AbstractProcessor implements AzureEventHub .description("Any FlowFile that is successfully received from the event hub will be transferred to this Relationship.") .build(); - private final static List PROPERTIES = List.of( + private final static List PROPERTY_DESCRIPTORS = List.of( NAMESPACE, EVENT_HUB_NAME, SERVICE_BUS_ENDPOINT, @@ -199,7 +199,7 @@ public Set getRelationships() { @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/PutAzureEventHub.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/PutAzureEventHub.java index fdcbf3bdcb6d..cb8ddc980b38 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/PutAzureEventHub.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/eventhub/PutAzureEventHub.java @@ -119,7 +119,7 @@ public class PutAzureEventHub extends AbstractProcessor implements AzureEventHub .description("Any FlowFile that could not be sent to the event hub will be transferred to this Relationship.") .build(); - private final static List PROPERTIES = List.of( + private final static List PROPERTY_DESCRIPTORS = List.of( NAMESPACE, EVENT_HUB_NAME, SERVICE_BUS_ENDPOINT, @@ -146,7 +146,7 @@ public Set getRelationships() { @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/CopyAzureBlobStorage_v12.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/CopyAzureBlobStorage_v12.java index 82c7689c36e8..9c3985629952 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/CopyAzureBlobStorage_v12.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/CopyAzureBlobStorage_v12.java @@ -167,7 +167,7 @@ public class CopyAzureBlobStorage_v12 extends AbstractAzureBlobProcessor_v12 { .required(false) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SOURCE_STORAGE_CREDENTIALS_SERVICE, SOURCE_CONTAINER_NAME, SOURCE_BLOB_NAME, @@ -181,7 +181,7 @@ public class CopyAzureBlobStorage_v12 extends AbstractAzureBlobProcessor_v12 { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureBlobStorage_v12.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureBlobStorage_v12.java index a8e889842be9..214ecf380f00 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureBlobStorage_v12.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureBlobStorage_v12.java @@ -73,7 +73,7 @@ public class DeleteAzureBlobStorage_v12 extends AbstractAzureBlobProcessor_v12 { .required(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( BLOB_STORAGE_CREDENTIALS_SERVICE, CONTAINER, BLOB_NAME, @@ -83,7 +83,7 @@ public class DeleteAzureBlobStorage_v12 extends AbstractAzureBlobProcessor_v12 { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureDataLakeStorage.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureDataLakeStorage.java index 080012600ed8..cd3dbc0ea25f 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureDataLakeStorage.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/DeleteAzureDataLakeStorage.java @@ -69,7 +69,7 @@ public class DeleteAzureDataLakeStorage extends AbstractAzureDataLakeStorageProc .dependsOn(FILESYSTEM_OBJECT_TYPE, FS_TYPE_FILE) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( ADLS_CREDENTIALS_SERVICE, FILESYSTEM, FILESYSTEM_OBJECT_TYPE, @@ -114,6 +114,6 @@ public void onTrigger(ProcessContext context, ProcessSession session) throws Pro @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } } \ No newline at end of file diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/FetchAzureBlobStorage_v12.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/FetchAzureBlobStorage_v12.java index effffe2c925b..61efa6a060a0 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/FetchAzureBlobStorage_v12.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/FetchAzureBlobStorage_v12.java @@ -140,7 +140,7 @@ public class FetchAzureBlobStorage_v12 extends AbstractAzureBlobProcessor_v12 im .required(false) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( BLOB_STORAGE_CREDENTIALS_SERVICE, CONTAINER, BLOB_NAME, @@ -161,7 +161,7 @@ protected Collection customValidate(ValidationContext validati @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/FetchAzureDataLakeStorage.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/FetchAzureDataLakeStorage.java index bd53b355612c..28a826a40dc3 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/FetchAzureDataLakeStorage.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/FetchAzureDataLakeStorage.java @@ -125,7 +125,7 @@ public class FetchAzureDataLakeStorage extends AbstractAzureDataLakeStorageProce .defaultValue("0") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( ADLS_CREDENTIALS_SERVICE, FILESYSTEM, DIRECTORY, @@ -138,7 +138,7 @@ public class FetchAzureDataLakeStorage extends AbstractAzureDataLakeStorageProce @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureBlobStorage_v12.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureBlobStorage_v12.java index 6074dcf549b2..1caafc94aa16 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureBlobStorage_v12.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureBlobStorage_v12.java @@ -134,7 +134,7 @@ public class ListAzureBlobStorage_v12 extends AbstractListAzureProcessor PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( BLOB_STORAGE_CREDENTIALS_SERVICE, CONTAINER, BLOB_NAME_PREFIX, @@ -154,7 +154,7 @@ public class ListAzureBlobStorage_v12 extends AbstractListAzureProcessor getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureDataLakeStorage.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureDataLakeStorage.java index f1a50ca4e9a7..3c75ae8c4abe 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureDataLakeStorage.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureDataLakeStorage.java @@ -141,7 +141,7 @@ public class ListAzureDataLakeStorage extends AbstractListAzureProcessor PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( ADLS_CREDENTIALS_SERVICE, FILESYSTEM, DIRECTORY, @@ -178,7 +178,7 @@ public class ListAzureDataLakeStorage extends AbstractListAzureProcessor getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/MoveAzureDataLakeStorage.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/MoveAzureDataLakeStorage.java index d388ab328964..708154265f44 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/MoveAzureDataLakeStorage.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/MoveAzureDataLakeStorage.java @@ -130,7 +130,7 @@ public class MoveAzureDataLakeStorage extends AbstractAzureDataLakeStorageProces .addValidator(new DirectoryValidator("Destination Directory")) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( ADLS_CREDENTIALS_SERVICE, SOURCE_FILESYSTEM, SOURCE_DIRECTORY, @@ -143,7 +143,7 @@ public class MoveAzureDataLakeStorage extends AbstractAzureDataLakeStorageProces @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/PutAzureBlobStorage_v12.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/PutAzureBlobStorage_v12.java index 8f13f7e3020d..3ce4ef7c96af 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/PutAzureBlobStorage_v12.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/PutAzureBlobStorage_v12.java @@ -104,7 +104,7 @@ @WritesAttribute(attribute = ATTR_NAME_IGNORED, description = ATTR_DESCRIPTION_IGNORED)}) public class PutAzureBlobStorage_v12 extends AbstractAzureBlobProcessor_v12 implements ClientSideEncryptionSupport { - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( BLOB_STORAGE_CREDENTIALS_SERVICE, AzureStorageUtils.CONTAINER, AzureStorageUtils.CREATE_CONTAINER, @@ -127,7 +127,7 @@ protected Collection customValidate(ValidationContext validati @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } public void onTrigger(final ProcessContext context, final ProcessSession session) throws ProcessException { diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/PutAzureDataLakeStorage.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/PutAzureDataLakeStorage.java index 8475e4bcec85..cafb82d55159 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/PutAzureDataLakeStorage.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/PutAzureDataLakeStorage.java @@ -124,7 +124,7 @@ public class PutAzureDataLakeStorage extends AbstractAzureDataLakeStorageProcess .dependsOn(WRITING_STRATEGY, WritingStrategy.WRITE_AND_RENAME) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( ADLS_CREDENTIALS_SERVICE, FILESYSTEM, DIRECTORY, @@ -139,7 +139,7 @@ public class PutAzureDataLakeStorage extends AbstractAzureDataLakeStorageProcess @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/queue/GetAzureQueueStorage_v12.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/queue/GetAzureQueueStorage_v12.java index a594f87e9906..491bd82fba00 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/queue/GetAzureQueueStorage_v12.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/queue/GetAzureQueueStorage_v12.java @@ -96,7 +96,7 @@ public class GetAzureQueueStorage_v12 extends AbstractAzureQueueStorage_v12 { .build(); private static final ProxySpec[] PROXY_SPECS = {ProxySpec.HTTP, ProxySpec.SOCKS}; - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( QUEUE_NAME, ENDPOINT_SUFFIX, STORAGE_CREDENTIALS_SERVICE, @@ -115,7 +115,7 @@ public class GetAzureQueueStorage_v12 extends AbstractAzureQueueStorage_v12 { @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/queue/PutAzureQueueStorage_v12.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/queue/PutAzureQueueStorage_v12.java index efea7bcb3f48..4865f942d381 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/queue/PutAzureQueueStorage_v12.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/queue/PutAzureQueueStorage_v12.java @@ -65,7 +65,7 @@ public class PutAzureQueueStorage_v12 extends AbstractAzureQueueStorage_v12 { .build(); private static final ProxySpec[] PROXY_SPECS = {ProxySpec.HTTP, ProxySpec.SOCKS}; - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( QUEUE_NAME, ENDPOINT_SUFFIX, STORAGE_CREDENTIALS_SERVICE, @@ -80,7 +80,7 @@ public class PutAzureQueueStorage_v12 extends AbstractAzureQueueStorage_v12 { @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/StandardAzureCredentialsControllerService.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/StandardAzureCredentialsControllerService.java index cc8ba362130f..c7c71f452d75 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/StandardAzureCredentialsControllerService.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/StandardAzureCredentialsControllerService.java @@ -68,7 +68,7 @@ public class StandardAzureCredentialsControllerService extends AbstractControlle .dependsOn(CREDENTIAL_CONFIGURATION_STRATEGY, MANAGED_IDENTITY) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CREDENTIAL_CONFIGURATION_STRATEGY, MANAGED_IDENTITY_CLIENT_ID ); @@ -77,7 +77,7 @@ public class StandardAzureCredentialsControllerService extends AbstractControlle @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/cosmos/document/AzureCosmosDBClientService.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/cosmos/document/AzureCosmosDBClientService.java index 31462a349131..3e18715e96d8 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/cosmos/document/AzureCosmosDBClientService.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/cosmos/document/AzureCosmosDBClientService.java @@ -83,7 +83,7 @@ protected void createCosmosClient(final String uri, final String accessKey, fina .buildClient(); } - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( AzureCosmosDBUtils.URI, AzureCosmosDBUtils.DB_ACCESS_KEY, AzureCosmosDBUtils.CONSISTENCY @@ -91,7 +91,7 @@ protected void createCosmosClient(final String uri, final String accessKey, fina @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/data/explorer/StandardKustoIngestService.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/data/explorer/StandardKustoIngestService.java index c8fb941b139a..6ee5bb21dd69 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/data/explorer/StandardKustoIngestService.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/data/explorer/StandardKustoIngestService.java @@ -105,7 +105,7 @@ public class StandardKustoIngestService extends AbstractControllerService implem .addValidator(StandardValidators.URL_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( AUTHENTICATION_STRATEGY, APPLICATION_CLIENT_ID, APPLICATION_KEY, @@ -127,7 +127,7 @@ public class StandardKustoIngestService extends AbstractControllerService implem @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/data/explorer/StandardKustoQueryService.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/data/explorer/StandardKustoQueryService.java index e5522c24c287..c904243fb832 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/data/explorer/StandardKustoQueryService.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/data/explorer/StandardKustoQueryService.java @@ -83,7 +83,7 @@ public class StandardKustoQueryService extends AbstractControllerService impleme .dependsOn(AUTHENTICATION_STRATEGY, KustoAuthenticationStrategy.APPLICATION_CREDENTIALS) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CLUSTER_URI, AUTHENTICATION_STRATEGY, APPLICATION_CLIENT_ID, @@ -95,7 +95,7 @@ public class StandardKustoQueryService extends AbstractControllerService impleme @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } public static final Pair NIFI_SOURCE = Pair.of("processor", "nifi-source"); diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/eventhub/AzureEventHubRecordSink.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/eventhub/AzureEventHubRecordSink.java index a249280ce801..739b207d9f17 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/eventhub/AzureEventHubRecordSink.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/eventhub/AzureEventHubRecordSink.java @@ -125,7 +125,7 @@ public class AzureEventHubRecordSink extends AbstractControllerService implement .required(false) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SERVICE_BUS_ENDPOINT, EVENT_HUB_NAMESPACE, EVENT_HUB_NAME, @@ -143,7 +143,7 @@ public class AzureEventHubRecordSink extends AbstractControllerService implement @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } protected EventHubProducerClient createEventHubClient(final String namespace, diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/ADLSCredentialsControllerService.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/ADLSCredentialsControllerService.java index c5b8b3fd1e33..ed907692ef7b 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/ADLSCredentialsControllerService.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/ADLSCredentialsControllerService.java @@ -77,7 +77,7 @@ public class ADLSCredentialsControllerService extends AbstractControllerService .dependsOn(CREDENTIALS_TYPE, AzureStorageCredentialsType.SERVICE_PRINCIPAL, AzureStorageCredentialsType.MANAGED_IDENTITY) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( ACCOUNT_NAME, ENDPOINT_SUFFIX, CREDENTIALS_TYPE, @@ -94,7 +94,7 @@ public class ADLSCredentialsControllerService extends AbstractControllerService @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/AzureBlobStorageFileResourceService.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/AzureBlobStorageFileResourceService.java index ef2b0fb1a404..0ff396601d24 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/AzureBlobStorageFileResourceService.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/AzureBlobStorageFileResourceService.java @@ -72,7 +72,7 @@ public class AzureBlobStorageFileResourceService extends AbstractControllerServi .defaultValue(String.format("${%s}", ATTR_NAME_BLOBNAME)) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( BLOB_STORAGE_CREDENTIALS_SERVICE, CONTAINER, BLOB_NAME @@ -83,7 +83,7 @@ public class AzureBlobStorageFileResourceService extends AbstractControllerServi @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/AzureDataLakeStorageFileResourceService.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/AzureDataLakeStorageFileResourceService.java index f9c9ae8188c6..f94a82d0363e 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/AzureDataLakeStorageFileResourceService.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/AzureDataLakeStorageFileResourceService.java @@ -76,7 +76,7 @@ public class AzureDataLakeStorageFileResourceService extends AbstractControllerS .defaultValue(String.format("${%s}", ATTR_NAME_DIRECTORY)) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( ADLS_CREDENTIALS_SERVICE, FILESYSTEM, DIRECTORY, @@ -88,7 +88,7 @@ public class AzureDataLakeStorageFileResourceService extends AbstractControllerS @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/AzureStorageCredentialsControllerService_v12.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/AzureStorageCredentialsControllerService_v12.java index f2503413aa4b..eb1dd0d1cafe 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/AzureStorageCredentialsControllerService_v12.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/services/azure/storage/AzureStorageCredentialsControllerService_v12.java @@ -57,7 +57,7 @@ public class AzureStorageCredentialsControllerService_v12 extends AbstractContro .dependsOn(CREDENTIALS_TYPE, AzureStorageCredentialsType.SERVICE_PRINCIPAL, AzureStorageCredentialsType.MANAGED_IDENTITY) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( ACCOUNT_NAME, ENDPOINT_SUFFIX, CREDENTIALS_TYPE, @@ -74,7 +74,7 @@ public class AzureStorageCredentialsControllerService_v12 extends AbstractContro @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AbstractAzureLogAnalyticsReportingTask.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AbstractAzureLogAnalyticsReportingTask.java index 6ed960aa339f..b7844610e684 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AbstractAzureLogAnalyticsReportingTask.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AbstractAzureLogAnalyticsReportingTask.java @@ -89,7 +89,7 @@ public abstract class AbstractAzureLogAnalyticsReportingTask extends AbstractRep .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT).build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( LOG_ANALYTICS_WORKSPACE_ID, LOG_ANALYTICS_WORKSPACE_KEY, APPLICATION_ID, @@ -114,7 +114,7 @@ protected String createAuthorization(String workspaceId, String key, int content @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } /** diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AzureLogAnalyticsProvenanceReportingTask.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AzureLogAnalyticsProvenanceReportingTask.java index afd1b776c69b..2311873d6922 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AzureLogAnalyticsProvenanceReportingTask.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AzureLogAnalyticsProvenanceReportingTask.java @@ -167,7 +167,7 @@ public class AzureLogAnalyticsProvenanceReportingTask extends AbstractAzureLogAn .description("Specifies how many records to send in a single batch, at most.").required(true) .defaultValue("1000").addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR).build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( LOG_ANALYTICS_WORKSPACE_ID, LOG_ANALYTICS_CUSTOM_LOG_NAME, LOG_ANALYTICS_WORKSPACE_KEY, @@ -194,7 +194,7 @@ public class AzureLogAnalyticsProvenanceReportingTask extends AbstractAzureLogAn @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } public void CreateConsumer(final ReportingContext context) { diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AzureLogAnalyticsReportingTask.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AzureLogAnalyticsReportingTask.java index 94ce957f2056..a5e1169aa4cd 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AzureLogAnalyticsReportingTask.java +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AzureLogAnalyticsReportingTask.java @@ -58,7 +58,7 @@ public class AzureLogAnalyticsReportingTask extends AbstractAzureLogAnalyticsRep .defaultValue("nifimetrics").addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT).build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SEND_JVM_METRICS, LOG_ANALYTICS_WORKSPACE_ID, LOG_ANALYTICS_CUSTOM_LOG_NAME, @@ -72,7 +72,7 @@ public class AzureLogAnalyticsReportingTask extends AbstractAzureLogAnalyticsRep @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-box-bundle/nifi-box-processors/src/main/java/org/apache/nifi/processors/box/FetchBoxFile.java b/nifi-extension-bundles/nifi-box-bundle/nifi-box-processors/src/main/java/org/apache/nifi/processors/box/FetchBoxFile.java index 53449632025e..189ee5c20424 100644 --- a/nifi-extension-bundles/nifi-box-bundle/nifi-box-processors/src/main/java/org/apache/nifi/processors/box/FetchBoxFile.java +++ b/nifi-extension-bundles/nifi-box-bundle/nifi-box-processors/src/main/java/org/apache/nifi/processors/box/FetchBoxFile.java @@ -99,7 +99,7 @@ public class FetchBoxFile extends AbstractProcessor { REL_FAILURE ); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( BoxClientService.BOX_CLIENT_SERVICE, FILE_ID ); @@ -108,7 +108,7 @@ public class FetchBoxFile extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-box-bundle/nifi-box-processors/src/main/java/org/apache/nifi/processors/box/ListBoxFile.java b/nifi-extension-bundles/nifi-box-bundle/nifi-box-processors/src/main/java/org/apache/nifi/processors/box/ListBoxFile.java index 523b69c24641..71ca40600c8c 100644 --- a/nifi-extension-bundles/nifi-box-bundle/nifi-box-processors/src/main/java/org/apache/nifi/processors/box/ListBoxFile.java +++ b/nifi-extension-bundles/nifi-box-bundle/nifi-box-processors/src/main/java/org/apache/nifi/processors/box/ListBoxFile.java @@ -128,7 +128,7 @@ public class ListBoxFile extends AbstractListProcessor { .dependsOn(LISTING_STRATEGY, BY_ENTITIES) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( BoxClientService.BOX_CLIENT_SERVICE, FOLDER_ID, RECURSIVE_SEARCH, @@ -144,7 +144,7 @@ public class ListBoxFile extends AbstractListProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-box-bundle/nifi-box-processors/src/main/java/org/apache/nifi/processors/box/PutBoxFile.java b/nifi-extension-bundles/nifi-box-bundle/nifi-box-processors/src/main/java/org/apache/nifi/processors/box/PutBoxFile.java index 4c7ac810bca7..4c3a4c263a9c 100644 --- a/nifi-extension-bundles/nifi-box-bundle/nifi-box-processors/src/main/java/org/apache/nifi/processors/box/PutBoxFile.java +++ b/nifi-extension-bundles/nifi-box-bundle/nifi-box-processors/src/main/java/org/apache/nifi/processors/box/PutBoxFile.java @@ -160,7 +160,7 @@ public class PutBoxFile extends AbstractProcessor { .required(false) .build(); - public static final List PROPERTIES = List.of( + public static final List PROPERTY_DESCRIPTORS = List.of( BoxClientService.BOX_CLIENT_SERVICE, FOLDER_ID, SUBFOLDER_NAME, @@ -199,7 +199,7 @@ public Set getRelationships() { @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-box-bundle/nifi-box-services/src/main/java/org/apache/nifi/box/controllerservices/JsonConfigBasedBoxClientService.java b/nifi-extension-bundles/nifi-box-bundle/nifi-box-services/src/main/java/org/apache/nifi/box/controllerservices/JsonConfigBasedBoxClientService.java index 1fa226d5aaee..a43fe7c22150 100644 --- a/nifi-extension-bundles/nifi-box-bundle/nifi-box-services/src/main/java/org/apache/nifi/box/controllerservices/JsonConfigBasedBoxClientService.java +++ b/nifi-extension-bundles/nifi-box-bundle/nifi-box-services/src/main/java/org/apache/nifi/box/controllerservices/JsonConfigBasedBoxClientService.java @@ -87,7 +87,7 @@ public class JsonConfigBasedBoxClientService extends AbstractControllerService i private static final ProxySpec[] PROXY_SPECS = {ProxySpec.HTTP, ProxySpec.HTTP_AUTH}; - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( ACCOUNT_ID, APP_CONFIG_FILE, APP_CONFIG_JSON, @@ -98,7 +98,7 @@ public class JsonConfigBasedBoxClientService extends AbstractControllerService i @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override 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 577c8b375b3c..e13a2c81f597 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 @@ -451,7 +451,7 @@ public class CaptureChangeMySQL extends AbstractSessionFactoryProcessor { SSL_MODE_VERIFY_IDENTITY) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( HOSTS, DRIVER_NAME, DRIVER_LOCATION, @@ -515,7 +515,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/DecryptContentAge.java b/nifi-extension-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/DecryptContentAge.java index 43d482d78a45..a92de1ee5b29 100644 --- a/nifi-extension-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/DecryptContentAge.java +++ b/nifi-extension-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/DecryptContentAge.java @@ -120,7 +120,7 @@ public class DecryptContentAge extends AbstractProcessor implements VerifiablePr FAILURE ); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( PRIVATE_KEY_SOURCE, PRIVATE_KEY_IDENTITIES, PRIVATE_KEY_IDENTITY_RESOURCES @@ -163,7 +163,7 @@ public Set getRelationships() { */ @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } /** diff --git a/nifi-extension-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/EncryptContentAge.java b/nifi-extension-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/EncryptContentAge.java index 9fc4d283f023..095c230d4418 100644 --- a/nifi-extension-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/EncryptContentAge.java +++ b/nifi-extension-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/EncryptContentAge.java @@ -127,7 +127,7 @@ public class EncryptContentAge extends AbstractProcessor implements VerifiablePr FAILURE ); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( FILE_ENCODING, PUBLIC_KEY_SOURCE, PUBLIC_KEY_RECIPIENTS, @@ -164,7 +164,7 @@ public Set getRelationships() { */ @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } /** diff --git a/nifi-extension-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/VerifyContentMAC.java b/nifi-extension-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/VerifyContentMAC.java index e5597b882b68..1e44b310b2bc 100644 --- a/nifi-extension-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/VerifyContentMAC.java +++ b/nifi-extension-bundles/nifi-cipher-bundle/nifi-cipher-processors/src/main/java/org/apache/nifi/processors/cipher/VerifyContentMAC.java @@ -133,7 +133,7 @@ public class VerifyContentMAC extends AbstractProcessor { protected static final String MAC_ALGORITHM_ATTRIBUTE = "mac.algorithm"; protected static final String MAC_ENCODING_ATTRIBUTE = "mac.encoding"; - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( MAC_ALGORITHM, MAC_ENCODING, MAC, @@ -198,7 +198,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-compress-bundle/nifi-compress-processors/src/main/java/org/apache/nifi/processors/compress/ModifyCompression.java b/nifi-extension-bundles/nifi-compress-bundle/nifi-compress-processors/src/main/java/org/apache/nifi/processors/compress/ModifyCompression.java index 1f0fffb0354b..d47b4d9aae57 100644 --- a/nifi-extension-bundles/nifi-compress-bundle/nifi-compress-processors/src/main/java/org/apache/nifi/processors/compress/ModifyCompression.java +++ b/nifi-extension-bundles/nifi-compress-bundle/nifi-compress-processors/src/main/java/org/apache/nifi/processors/compress/ModifyCompression.java @@ -149,14 +149,17 @@ public class ModifyCompression extends AbstractProcessor { .description("FlowFiles will be transferred to the failure relationship on compression modification errors") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( INPUT_COMPRESSION_STRATEGY, OUTPUT_COMPRESSION_STRATEGY, OUTPUT_COMPRESSION_LEVEL, OUTPUT_FILENAME_STRATEGY ); - private static final Set RELATIONSHIPS = Set.of(REL_SUCCESS, REL_FAILURE); + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS, + REL_FAILURE + ); private static final Map compressionFormatMimeTypeMap; @@ -184,7 +187,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/src/main/java/org/apache/nifi/confluent/schemaregistry/ConfluentSchemaRegistry.java b/nifi-extension-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/src/main/java/org/apache/nifi/confluent/schemaregistry/ConfluentSchemaRegistry.java index f45b223197e7..d57c22ace0f4 100644 --- a/nifi-extension-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/src/main/java/org/apache/nifi/confluent/schemaregistry/ConfluentSchemaRegistry.java +++ b/nifi-extension-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/src/main/java/org/apache/nifi/confluent/schemaregistry/ConfluentSchemaRegistry.java @@ -148,7 +148,7 @@ public class ConfluentSchemaRegistry extends AbstractControllerService implement .sensitive(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SCHEMA_REGISTRY_URLS, SSL_CONTEXT, TIMEOUT, @@ -164,7 +164,7 @@ public class ConfluentSchemaRegistry extends AbstractControllerService implement @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } private static final Validator REQUEST_HEADER_VALIDATOR = new Validator() { diff --git a/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/FetchDropbox.java b/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/FetchDropbox.java index 686f74ee42c2..1ceb7d50bcbc 100644 --- a/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/FetchDropbox.java +++ b/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/FetchDropbox.java @@ -105,7 +105,7 @@ public class FetchDropbox extends AbstractProcessor implements DropboxTrait { REL_FAILURE ); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CREDENTIAL_SERVICE, FILE, ProxyConfiguration.createProxyConfigPropertyDescriptor(ProxySpec.HTTP_AUTH) @@ -120,7 +120,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/ListDropbox.java b/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/ListDropbox.java index eea74ca4896c..ee40921f3ad9 100644 --- a/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/ListDropbox.java +++ b/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/ListDropbox.java @@ -143,7 +143,7 @@ public class ListDropbox extends AbstractListProcessor implemen .dependsOn(LISTING_STRATEGY, BY_ENTITIES) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CREDENTIAL_SERVICE, FOLDER, RECURSIVE_SEARCH, @@ -165,7 +165,7 @@ public void onScheduled(final ProcessContext context) { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/PutDropbox.java b/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/PutDropbox.java index f9fe78da35dc..fb47b9aa4dcd 100644 --- a/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/PutDropbox.java +++ b/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-processors/src/main/java/org/apache/nifi/processors/dropbox/PutDropbox.java @@ -52,10 +52,7 @@ import com.dropbox.core.v2.files.WriteMode; import java.io.IOException; import java.io.InputStream; -import java.util.Arrays; -import java.util.Collections; import java.util.Date; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -165,7 +162,7 @@ public class PutDropbox extends AbstractProcessor implements DropboxTrait { .required(false) .build(); - private static final List PROPERTIES = Collections.unmodifiableList(Arrays.asList( + private static final List PROPERTY_DESCRIPTORS = List.of( CREDENTIAL_SERVICE, FOLDER, FILE_NAME, @@ -173,16 +170,12 @@ public class PutDropbox extends AbstractProcessor implements DropboxTrait { CHUNKED_UPLOAD_THRESHOLD, CHUNKED_UPLOAD_SIZE, ProxyConfiguration.createProxyConfigPropertyDescriptor(ProxySpec.HTTP_AUTH) - )); + ); - private static final Set RELATIONSHIPS; - - static { - final Set rels = new HashSet<>(); - rels.add(REL_SUCCESS); - rels.add(REL_FAILURE); - RELATIONSHIPS = Collections.unmodifiableSet(rels); - } + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS, + REL_FAILURE + ); private volatile DbxClientV2 dropboxApiClient; @@ -193,7 +186,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-services/src/main/java/org/apache/nifi/services/dropbox/StandardDropboxCredentialService.java b/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-services/src/main/java/org/apache/nifi/services/dropbox/StandardDropboxCredentialService.java index 905baeada97d..c8d25e3bfa79 100644 --- a/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-services/src/main/java/org/apache/nifi/services/dropbox/StandardDropboxCredentialService.java +++ b/nifi-extension-bundles/nifi-dropbox-bundle/nifi-dropbox-services/src/main/java/org/apache/nifi/services/dropbox/StandardDropboxCredentialService.java @@ -75,7 +75,7 @@ public class StandardDropboxCredentialService extends AbstractControllerService .required(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( APP_KEY, APP_SECRET, ACCESS_TOKEN, @@ -86,7 +86,7 @@ public class StandardDropboxCredentialService extends AbstractControllerService @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientServiceImpl.java b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientServiceImpl.java index 4ee00c21a96b..b3e6f7a1f46d 100644 --- a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientServiceImpl.java +++ b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientServiceImpl.java @@ -102,7 +102,7 @@ public class ElasticSearchClientServiceImpl extends AbstractControllerService im private ObjectMapper mapper; - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( HTTP_HOSTS, PATH_PREFIX, AUTHORIZATION_SCHEME, @@ -137,7 +137,7 @@ public class ElasticSearchClientServiceImpl extends AbstractControllerService im @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchStringLookupService.java b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchStringLookupService.java index 2746386779e0..ec05144a5ae3 100644 --- a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchStringLookupService.java +++ b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchStringLookupService.java @@ -64,7 +64,7 @@ public class ElasticSearchStringLookupService extends AbstractControllerService .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CLIENT_SERVICE, INDEX, TYPE @@ -78,7 +78,7 @@ public class ElasticSearchStringLookupService extends AbstractControllerService @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java b/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java index 6af7c816f24d..785bbdeccec3 100644 --- a/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java +++ b/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/AbstractEmailProcessor.java @@ -165,7 +165,7 @@ abstract class AbstractEmailProcessor extends Ab * Will ensure that list of PropertyDescriptors is build only once, since * all other lifecycle methods are invoked multiple times. */ - final static List SHARED_DESCRIPTORS = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( HOST, PORT, AUTHORIZATION_MODE, @@ -195,6 +195,10 @@ abstract class AbstractEmailProcessor extends Ab protected volatile Optional oauth2AccessTokenProviderOptional; protected volatile AccessToken oauth2AccessDetails; + protected static List getCommonPropertyDescriptors() { + return PROPERTY_DESCRIPTORS; + } + @OnScheduled public void onScheduled(final ProcessContext context) { if (context.getProperty(OAUTH2_ACCESS_TOKEN_PROVIDER).isSet()) { diff --git a/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ConsumeIMAP.java b/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ConsumeIMAP.java index 422767d124bb..4ed00b95f314 100644 --- a/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ConsumeIMAP.java +++ b/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ConsumeIMAP.java @@ -51,8 +51,8 @@ public class ConsumeIMAP extends AbstractEmailProcessor { .addValidator(StandardValidators.BOOLEAN_VALIDATOR) .build(); - static final List DESCRIPTORS = Stream.concat( - SHARED_DESCRIPTORS.stream(), + static final List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), Stream.of( SHOULD_MARK_READ, USE_SSL @@ -75,6 +75,6 @@ protected String getProtocol(ProcessContext processContext) { @Override protected List getSupportedPropertyDescriptors() { - return DESCRIPTORS; + return PROPERTY_DESCRIPTORS; } } diff --git a/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ConsumePOP3.java b/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ConsumePOP3.java index 83a97ceda6f2..270c9480e94e 100644 --- a/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ConsumePOP3.java +++ b/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ConsumePOP3.java @@ -46,6 +46,6 @@ protected Pop3MailReceiver buildMessageReceiver(ProcessContext context) { @Override protected List getSupportedPropertyDescriptors() { - return SHARED_DESCRIPTORS; + return getCommonPropertyDescriptors(); } } diff --git a/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailAttachments.java b/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailAttachments.java index ad4920502100..9dc046576ac5 100644 --- a/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailAttachments.java +++ b/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailAttachments.java @@ -83,7 +83,10 @@ public class ExtractEmailAttachments extends AbstractProcessor { private static final String ATTACHMENT_DISPOSITION = "attachment"; - private static final Set relationships = Set.of(REL_ATTACHMENTS, REL_ORIGINAL, REL_FAILURE); + private static final Set RELATIONSHIPS = Set.of( + REL_ATTACHMENTS, + REL_ORIGINAL, + REL_FAILURE); @Override public void onTrigger(final ProcessContext context, final ProcessSession session) { @@ -171,7 +174,7 @@ public void onTrigger(final ProcessContext context, final ProcessSession session @Override public Set getRelationships() { - return relationships; + return RELATIONSHIPS; } private void parseAttachments(final List attachments, final MimePart parentPart, final int depth) throws MessagingException, IOException { diff --git a/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailHeaders.java b/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailHeaders.java index 2644c9b15021..fe76ad832e9e 100644 --- a/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailHeaders.java +++ b/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ExtractEmailHeaders.java @@ -127,12 +127,12 @@ public class ExtractEmailHeaders extends AbstractProcessor { private static final String ATTACHMENT_DISPOSITION = "attachment"; - private static final Set relationships = Set.of( + private static final Set RELATIONSHIPS = Set.of( REL_SUCCESS, REL_FAILURE ); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CAPTURED_HEADERS, STRICT_PARSING ); @@ -221,12 +221,12 @@ public void onTrigger(final ProcessContext context, final ProcessSession session @Override public Set getRelationships() { - return relationships; + return RELATIONSHIPS; } @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } private static void putAddressListInAttributes( diff --git a/nifi-extension-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/AbstractEnrichIP.java b/nifi-extension-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/AbstractEnrichIP.java index bcfc003f9863..1bccfb09c573 100644 --- a/nifi-extension-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/AbstractEnrichIP.java +++ b/nifi-extension-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/AbstractEnrichIP.java @@ -95,7 +95,7 @@ enum MessageLogLevel { REL_NOT_FOUND ); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( GEO_DATABASE_FILE, IP_ADDRESS_ATTRIBUTE, LOG_LEVEL @@ -117,7 +117,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/GeoEnrichIPRecord.java b/nifi-extension-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/GeoEnrichIPRecord.java index 4cdb56a47ab1..854407053f00 100644 --- a/nifi-extension-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/GeoEnrichIPRecord.java +++ b/nifi-extension-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/GeoEnrichIPRecord.java @@ -154,7 +154,7 @@ public class GeoEnrichIPRecord extends AbstractEnrichIP { REL_NOT_FOUND ); - public static final List GEO_PROPERTIES = List.of( + public static final List GEO_PROPERTY_DESCRIPTORS = List.of( GEO_CITY, GEO_LATITUDE, GEO_LONGITUDE, @@ -163,7 +163,7 @@ public class GeoEnrichIPRecord extends AbstractEnrichIP { GEO_POSTAL_CODE ); - private static final List DESCRIPTORS = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( GEO_DATABASE_FILE, READER, WRITER, @@ -185,7 +185,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return DESCRIPTORS; + return PROPERTY_DESCRIPTORS; } protected volatile RecordReaderFactory readerFactory; @@ -234,9 +234,9 @@ public void onTrigger(ProcessContext context, ProcessSession session) throws Pro try (InputStream is = session.read(input); OutputStream os = session.write(output); OutputStream osNotFound = splitOutput ? session.write(notFound) : null) { - RecordPathCache cache = new RecordPathCache(GEO_PROPERTIES.size() + 1); + RecordPathCache cache = new RecordPathCache(GEO_PROPERTY_DESCRIPTORS.size() + 1); Map paths = new HashMap<>(); - for (PropertyDescriptor descriptor : GEO_PROPERTIES) { + for (PropertyDescriptor descriptor : GEO_PROPERTY_DESCRIPTORS) { if (!context.getProperty(descriptor).isSet()) { continue; } diff --git a/nifi-extension-bundles/nifi-extension-utils/nifi-event-listen/src/main/java/org/apache/nifi/processor/util/listen/AbstractListenEventBatchingProcessor.java b/nifi-extension-bundles/nifi-extension-utils/nifi-event-listen/src/main/java/org/apache/nifi/processor/util/listen/AbstractListenEventBatchingProcessor.java index 273bf6a8617e..699daa85d7fa 100644 --- a/nifi-extension-bundles/nifi-extension-utils/nifi-event-listen/src/main/java/org/apache/nifi/processor/util/listen/AbstractListenEventBatchingProcessor.java +++ b/nifi-extension-bundles/nifi-extension-utils/nifi-event-listen/src/main/java/org/apache/nifi/processor/util/listen/AbstractListenEventBatchingProcessor.java @@ -43,7 +43,7 @@ */ public abstract class AbstractListenEventBatchingProcessor extends AbstractListenEventProcessor { - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( NETWORK_INTF_NAME, PORT, RECV_BUFFER_SIZE, @@ -60,7 +60,7 @@ public abstract class AbstractListenEventBatchingProcessor exte @Override protected void init(final ProcessorInitializationContext context) { this.descriptors = Stream.concat( - PROPERTIES.stream(), + PROPERTY_DESCRIPTORS.stream(), getAdditionalProperties().stream() ).toList(); diff --git a/nifi-extension-bundles/nifi-extension-utils/nifi-event-listen/src/main/java/org/apache/nifi/processor/util/listen/AbstractListenEventProcessor.java b/nifi-extension-bundles/nifi-extension-utils/nifi-event-listen/src/main/java/org/apache/nifi/processor/util/listen/AbstractListenEventProcessor.java index 1d57bf824e02..5084ddf79c09 100644 --- a/nifi-extension-bundles/nifi-extension-utils/nifi-event-listen/src/main/java/org/apache/nifi/processor/util/listen/AbstractListenEventProcessor.java +++ b/nifi-extension-bundles/nifi-extension-utils/nifi-event-listen/src/main/java/org/apache/nifi/processor/util/listen/AbstractListenEventProcessor.java @@ -109,7 +109,7 @@ public abstract class AbstractListenEventProcessor extends Abst public static final int POLL_TIMEOUT_MS = 20; - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( NETWORK_INTF_NAME, PORT, RECV_BUFFER_SIZE, @@ -134,7 +134,7 @@ public abstract class AbstractListenEventProcessor extends Abst @Override protected void init(final ProcessorInitializationContext context) { this.descriptors = Stream.concat( - PROPERTIES.stream(), + PROPERTY_DESCRIPTORS.stream(), getAdditionalProperties().stream() ).toList(); diff --git a/nifi-extension-bundles/nifi-extension-utils/nifi-file-transfer/src/main/java/org/apache/nifi/processor/util/file/transfer/FetchFileTransfer.java b/nifi-extension-bundles/nifi-extension-utils/nifi-file-transfer/src/main/java/org/apache/nifi/processor/util/file/transfer/FetchFileTransfer.java index a4f720924558..1bccd8ff0801 100644 --- a/nifi-extension-bundles/nifi-extension-utils/nifi-file-transfer/src/main/java/org/apache/nifi/processor/util/file/transfer/FetchFileTransfer.java +++ b/nifi-extension-bundles/nifi-extension-utils/nifi-file-transfer/src/main/java/org/apache/nifi/processor/util/file/transfer/FetchFileTransfer.java @@ -40,7 +40,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -142,6 +141,22 @@ public abstract class FetchFileTransfer extends AbstractProcessor { .description("Any FlowFile that could not be fetched from the remote server due to insufficient permissions will be transferred to this Relationship.") .build(); + private static final List PROPERTY_DESCRIPTORS = List.of( + HOSTNAME, + UNDEFAULTED_PORT, + REMOTE_FILENAME, + COMPLETION_STRATEGY, + MOVE_DESTINATION_DIR, + MOVE_CREATE_DIRECTORY + ); + + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS, + REL_NOT_FOUND, + REL_PERMISSION_DENIED, + REL_COMMS_FAILURE + ); + private final Map, BlockingQueue> fileTransferMap = new HashMap<>(); private final long IDLE_CONNECTION_MILLIS = TimeUnit.SECONDS.toMillis(10L); // amount of time to wait before closing an idle connection private volatile long lastClearTime = System.currentTimeMillis(); @@ -149,12 +164,7 @@ public abstract class FetchFileTransfer extends AbstractProcessor { @Override public Set getRelationships() { - final Set relationships = new HashSet<>(); - relationships.add(REL_SUCCESS); - relationships.add(REL_NOT_FOUND); - relationships.add(REL_PERMISSION_DENIED); - relationships.add(REL_COMMS_FAILURE); - return relationships; + return RELATIONSHIPS; } @OnScheduled @@ -203,14 +213,7 @@ public void cleanup() { @Override protected List getSupportedPropertyDescriptors() { - final List properties = new ArrayList<>(); - properties.add(HOSTNAME); - properties.add(UNDEFAULTED_PORT); - properties.add(REMOTE_FILENAME); - properties.add(COMPLETION_STRATEGY); - properties.add(MOVE_DESTINATION_DIR); - properties.add(MOVE_CREATE_DIRECTORY); - return properties; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-extension-utils/nifi-file-transfer/src/main/java/org/apache/nifi/processor/util/file/transfer/GetFileTransfer.java b/nifi-extension-bundles/nifi-extension-utils/nifi-file-transfer/src/main/java/org/apache/nifi/processor/util/file/transfer/GetFileTransfer.java index a6b65db7713a..330a4843d641 100644 --- a/nifi-extension-bundles/nifi-extension-utils/nifi-file-transfer/src/main/java/org/apache/nifi/processor/util/file/transfer/GetFileTransfer.java +++ b/nifi-extension-bundles/nifi-extension-utils/nifi-file-transfer/src/main/java/org/apache/nifi/processor/util/file/transfer/GetFileTransfer.java @@ -59,7 +59,10 @@ public abstract class GetFileTransfer extends AbstractProcessor { .name("success") .description("All FlowFiles that are received are routed to success") .build(); - private final Set relationships; + + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS + ); public static final String FILE_LAST_MODIFY_TIME_ATTRIBUTE = "file.lastModifiedTime"; public static final String FILE_OWNER_ATTRIBUTE = "file.owner"; @@ -81,15 +84,9 @@ public abstract class GetFileTransfer extends AbstractProcessor { private final Lock sharableTransferLock = transferLock.readLock(); private final Lock mutuallyExclusiveTransferLock = transferLock.writeLock(); - public GetFileTransfer() { - final Set relationships = new HashSet<>(); - relationships.add(REL_SUCCESS); - this.relationships = Collections.unmodifiableSet(relationships); - } - @Override public Set getRelationships() { - return relationships; + return RELATIONSHIPS; } protected abstract FileTransfer getFileTransfer(final ProcessContext context); 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 c81a234c99f7..53569495ae87 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 @@ -141,7 +141,7 @@ public abstract class AbstractHadoopProcessor extends AbstractProcessor implemen private static final Object RESOURCES_LOCK = new Object(); private static final HdfsResources EMPTY_HDFS_RESOURCES = new HdfsResources(null, null, null, null); - protected static final List PARENT_PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( HADOOP_CONFIGURATION_RESOURCES, KERBEROS_USER_SERVICE, ADDITIONAL_CLASSPATH_RESOURCES @@ -154,6 +154,10 @@ public abstract class AbstractHadoopProcessor extends AbstractProcessor implemen // Holder of cached Configuration information so validation does not reload the same config over and over private final AtomicReference validationResourceHolder = new AtomicReference<>(); + protected static List getCommonPropertyDescriptors() { + return PROPERTY_DESCRIPTORS; + } + @Override protected void init(ProcessorInitializationContext context) { hdfsResources.set(EMPTY_HDFS_RESOURCES); @@ -170,7 +174,7 @@ public void migrateProperties(final PropertyConfiguration config) { @Override protected List getSupportedPropertyDescriptors() { - return PARENT_PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/AbstractListProcessor.java b/nifi-extension-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/AbstractListProcessor.java index f845169a861e..41919562ea3f 100644 --- a/nifi-extension-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/AbstractListProcessor.java +++ b/nifi-extension-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/AbstractListProcessor.java @@ -56,7 +56,6 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Optional; @@ -233,6 +232,10 @@ protected enum ListingMode { .identifiesControllerService(RecordSetWriterFactory.class) .build(); + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS + ); + /** * Represents the timestamp of an entity which was the latest one within those listed at the previous cycle. * It does not necessary mean it has been processed as well. @@ -286,9 +289,7 @@ public void onPropertyModified(final PropertyDescriptor descriptor, final String @Override public Set getRelationships() { - final Set relationships = new HashSet<>(); - relationships.add(REL_SUCCESS); - return relationships; + return RELATIONSHIPS; } /** diff --git a/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractFetchHDFSRecord.java b/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractFetchHDFSRecord.java index 067e7f8f6cb2..d61176df74cb 100644 --- a/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractFetchHDFSRecord.java +++ b/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractFetchHDFSRecord.java @@ -114,7 +114,7 @@ protected final void init(final ProcessorInitializationContext context) { REL_FAILURE ); - final List props = new ArrayList<>(PARENT_PROPERTIES); + final List props = new ArrayList<>(getCommonPropertyDescriptors()); props.add(FILENAME); props.add(RECORD_WRITER); props.addAll(getAdditionalProperties()); diff --git a/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractPutHDFSRecord.java b/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractPutHDFSRecord.java index c02f08beb85b..15c8f13801c5 100644 --- a/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractPutHDFSRecord.java +++ b/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/src/main/java/org/apache/nifi/processors/hadoop/AbstractPutHDFSRecord.java @@ -152,7 +152,7 @@ protected final void init(final ProcessorInitializationContext context) { REL_FAILURE ); - final List props = new ArrayList<>(PARENT_PROPERTIES); + final List props = new ArrayList<>(getCommonPropertyDescriptors()); props.add(RECORD_READER); props.add(new PropertyDescriptor.Builder() diff --git a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-parameter-providers/src/main/java/org/apache/nifi/parameter/gcp/GcpSecretManagerParameterProvider.java b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-parameter-providers/src/main/java/org/apache/nifi/parameter/gcp/GcpSecretManagerParameterProvider.java index aae819f5e9f3..8276a196b9cd 100644 --- a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-parameter-providers/src/main/java/org/apache/nifi/parameter/gcp/GcpSecretManagerParameterProvider.java +++ b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-parameter-providers/src/main/java/org/apache/nifi/parameter/gcp/GcpSecretManagerParameterProvider.java @@ -41,8 +41,6 @@ import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -91,15 +89,15 @@ public class GcpSecretManagerParameterProvider extends AbstractParameterProvider private static final String GROUP_NAME_LABEL = "group-name"; private static final String SECRETS_PATH = "secrets/"; - private static final List PROPERTIES = Collections.unmodifiableList(Arrays.asList( + private static final List PROPERTY_DESCRIPTORS = List.of( GROUP_NAME_PATTERN, PROJECT_ID, GCP_CREDENTIALS_PROVIDER_SERVICE - )); + ); @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/credentials/service/GCPCredentialsControllerService.java b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/credentials/service/GCPCredentialsControllerService.java index 19af7d7f28b2..ad164758bf98 100644 --- a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/credentials/service/GCPCredentialsControllerService.java +++ b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/credentials/service/GCPCredentialsControllerService.java @@ -72,7 +72,7 @@ ) public class GCPCredentialsControllerService extends AbstractControllerService implements GCPCredentialsService, VerifiableControllerService { - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( USE_APPLICATION_DEFAULT_CREDENTIALS, USE_COMPUTE_ENGINE_CREDENTIALS, SERVICE_ACCOUNT_JSON_FILE, @@ -85,7 +85,7 @@ public class GCPCredentialsControllerService extends AbstractControllerService i @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } public GoogleCredentials getGoogleCredentials() throws ProcessException { diff --git a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/FetchGoogleDrive.java b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/FetchGoogleDrive.java index 840f639938f9..d9954e986c6e 100644 --- a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/FetchGoogleDrive.java +++ b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/FetchGoogleDrive.java @@ -230,7 +230,7 @@ public class FetchGoogleDrive extends AbstractProcessor implements GoogleDriveTr .description("A FlowFile will be routed here for each File for which fetch was attempted but failed.") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( GoogleUtils.GCP_CREDENTIALS_PROVIDER_SERVICE, FILE_ID, ProxyConfiguration.createProxyConfigPropertyDescriptor(ProxyAwareTransportFactory.PROXY_SPECS), @@ -240,7 +240,7 @@ public class FetchGoogleDrive extends AbstractProcessor implements GoogleDriveTr GOOGLE_DRAWING_EXPORT_TYPE ); - public static final Set RELATIONSHIPS = Set.of( + private static final Set RELATIONSHIPS = Set.of( REL_SUCCESS, REL_FAILURE ); @@ -249,7 +249,7 @@ public class FetchGoogleDrive extends AbstractProcessor implements GoogleDriveTr @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/ListGoogleDrive.java b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/ListGoogleDrive.java index 42e1cbc81868..aea9bd87edf5 100644 --- a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/ListGoogleDrive.java +++ b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/ListGoogleDrive.java @@ -148,7 +148,7 @@ public class ListGoogleDrive extends AbstractListProcessor .dependsOn(LISTING_STRATEGY, BY_ENTITIES) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( GoogleUtils.GCP_CREDENTIALS_PROVIDER_SERVICE, FOLDER_ID, RECURSIVE_SEARCH, @@ -165,7 +165,7 @@ public class ListGoogleDrive extends AbstractListProcessor @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/PutGoogleDrive.java b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/PutGoogleDrive.java index 461f2edef832..f8a8ba13efc3 100644 --- a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/PutGoogleDrive.java +++ b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/drive/PutGoogleDrive.java @@ -158,7 +158,7 @@ public class PutGoogleDrive extends AbstractProcessor implements GoogleDriveTrai .required(false) .build(); - public static final List PROPERTIES = List.of( + public static final List PROPERTY_DESCRIPTORS = List.of( GCP_CREDENTIALS_PROVIDER_SERVICE, FOLDER_ID, FILE_NAME, @@ -196,7 +196,7 @@ public Set getRelationships() { @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/pubsub/ConsumeGCPubSub.java b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/pubsub/ConsumeGCPubSub.java index e469b08bbd8c..4e1be6eb03b2 100644 --- a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/pubsub/ConsumeGCPubSub.java +++ b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/pubsub/ConsumeGCPubSub.java @@ -95,7 +95,7 @@ public class ConsumeGCPubSub extends AbstractGCPubSubWithProxyProcessor { .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( GCP_CREDENTIALS_PROVIDER_SERVICE, PROJECT_ID, SUBSCRIPTION, @@ -115,7 +115,7 @@ public class ConsumeGCPubSub extends AbstractGCPubSubWithProxyProcessor { @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/pubsub/PublishGCPubSub.java b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/pubsub/PublishGCPubSub.java index ea08dd5b3cff..62a80a7a99d1 100644 --- a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/pubsub/PublishGCPubSub.java +++ b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/pubsub/PublishGCPubSub.java @@ -173,7 +173,7 @@ public class PublishGCPubSub extends AbstractGCPubSubWithProxyProcessor { .description("FlowFiles are routed to this relationship if the Google Cloud Pub/Sub operation fails but attempting the operation again may succeed.") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( GCP_CREDENTIALS_PROVIDER_SERVICE, PROJECT_ID, TOPIC_NAME, @@ -199,7 +199,7 @@ public class PublishGCPubSub extends AbstractGCPubSubWithProxyProcessor { @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/storage/GCSFileResourceService.java b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/storage/GCSFileResourceService.java index cdfaa1ecdd4b..ca1efd98e7be 100644 --- a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/storage/GCSFileResourceService.java +++ b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/storage/GCSFileResourceService.java @@ -88,7 +88,7 @@ public class GCSFileResourceService extends AbstractControllerService implements .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( BUCKET, KEY, GoogleUtils.GCP_CREDENTIALS_PROVIDER_SERVICE @@ -98,7 +98,7 @@ public class GCSFileResourceService extends AbstractControllerService implements @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/vision/AbstractGcpVisionProcessor.java b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/vision/AbstractGcpVisionProcessor.java index 3c427e60d38f..851726b0a1f1 100644 --- a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/vision/AbstractGcpVisionProcessor.java +++ b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/vision/AbstractGcpVisionProcessor.java @@ -42,20 +42,24 @@ public abstract class AbstractGcpVisionProcessor extends AbstractProcessor { public static final Relationship REL_FAILURE = new Relationship.Builder().name("failure") .description("FlowFiles are routed to failure relationship").build(); - protected static final Set RELATIONSHIPS = Set.of( + private static final Set RELATIONSHIPS = Set.of( REL_SUCCESS, REL_FAILURE ); - protected static final List COMMON_PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( GCP_CREDENTIALS_PROVIDER_SERVICE ); private ImageAnnotatorClient vision; + protected static List getCommonPropertyDescriptors() { + return PROPERTY_DESCRIPTORS; + } + @Override public List getSupportedPropertyDescriptors() { - return COMMON_PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/vision/AbstractGetGcpVisionAnnotateOperationStatus.java b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/vision/AbstractGetGcpVisionAnnotateOperationStatus.java index e858153dd492..2a514bfaf06f 100644 --- a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/vision/AbstractGetGcpVisionAnnotateOperationStatus.java +++ b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/vision/AbstractGetGcpVisionAnnotateOperationStatus.java @@ -57,12 +57,12 @@ abstract public class AbstractGetGcpVisionAnnotateOperationStatus extends Abstra .description("Upon successful completion, the original FlowFile will be routed to this relationship.") .autoTerminateDefault(true) .build(); - private static final List PROPERTIES = Stream.concat( - COMMON_PROPERTIES.stream(), + private static final List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), Stream.of(OPERATION_KEY) ).toList(); - private static final Set COMMON_RELATIONSHIPS = Set.of( + private static final Set RELATIONSHIPS = Set.of( REL_ORIGINAL, REL_SUCCESS, REL_FAILURE, @@ -71,12 +71,12 @@ abstract public class AbstractGetGcpVisionAnnotateOperationStatus extends Abstra @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override public Set getRelationships() { - return COMMON_RELATIONSHIPS; + return RELATIONSHIPS; } @Override diff --git a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/vision/StartGcpVisionAnnotateFilesOperation.java b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/vision/StartGcpVisionAnnotateFilesOperation.java index e0d92cb5699a..41ba53a14b45 100644 --- a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/vision/StartGcpVisionAnnotateFilesOperation.java +++ b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/vision/StartGcpVisionAnnotateFilesOperation.java @@ -69,7 +69,7 @@ public class StartGcpVisionAnnotateFilesOperation extends AbstractStartGcpVision .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( JSON_PAYLOAD, GCP_CREDENTIALS_PROVIDER_SERVICE, OUTPUT_BUCKET, @@ -78,7 +78,7 @@ public class StartGcpVisionAnnotateFilesOperation extends AbstractStartGcpVision @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/vision/StartGcpVisionAnnotateImagesOperation.java b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/vision/StartGcpVisionAnnotateImagesOperation.java index 08477ea62d30..18192a87ff71 100644 --- a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/vision/StartGcpVisionAnnotateImagesOperation.java +++ b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/vision/StartGcpVisionAnnotateImagesOperation.java @@ -68,7 +68,8 @@ public class StartGcpVisionAnnotateImagesOperation extends AbstractStartGcpVisio }""") .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + + private static final List PROPERTY_DESCRIPTORS = List.of( JSON_PAYLOAD, GCP_CREDENTIALS_PROVIDER_SERVICE, OUTPUT_BUCKET, @@ -77,7 +78,7 @@ public class StartGcpVisionAnnotateImagesOperation extends AbstractStartGcpVisio @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-geohash-bundle/nifi-geohash-processors/src/main/java/org/apache/nifi/processors/geohash/GeohashRecord.java b/nifi-extension-bundles/nifi-geohash-bundle/nifi-geohash-processors/src/main/java/org/apache/nifi/processors/geohash/GeohashRecord.java index fe44e08444ca..d13b5b4dcb30 100644 --- a/nifi-extension-bundles/nifi-geohash-bundle/nifi-geohash-processors/src/main/java/org/apache/nifi/processors/geohash/GeohashRecord.java +++ b/nifi-extension-bundles/nifi-geohash-bundle/nifi-geohash-processors/src/main/java/org/apache/nifi/processors/geohash/GeohashRecord.java @@ -223,7 +223,7 @@ public enum RoutingStrategy { REL_FAILURE ); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( MODE, RECORD_READER, RECORD_WRITER, @@ -255,7 +255,7 @@ public Set getRelationships() { @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-processors/src/main/java/org/apache/nifi/processors/graph/ExecuteGraphQuery.java b/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-processors/src/main/java/org/apache/nifi/processors/graph/ExecuteGraphQuery.java index 386a18be0486..f3cf611c8ca8 100644 --- a/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-processors/src/main/java/org/apache/nifi/processors/graph/ExecuteGraphQuery.java +++ b/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-processors/src/main/java/org/apache/nifi/processors/graph/ExecuteGraphQuery.java @@ -36,9 +36,6 @@ import java.io.ByteArrayOutputStream; import java.io.OutputStream; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -64,35 +61,29 @@ }) public class ExecuteGraphQuery extends AbstractGraphExecutor { - private static final Set relationships; - private static final List propertyDescriptors; + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS, + REL_ORIGINAL, + REL_FAILURE + ); - public static final String EXECUTION_TIME = "query.took"; - - static { - final Set tempRelationships = new HashSet<>(); - tempRelationships.add(REL_SUCCESS); - tempRelationships.add(REL_ORIGINAL); - tempRelationships.add(REL_FAILURE); - relationships = Collections.unmodifiableSet(tempRelationships); - - final List tempDescriptors = new ArrayList<>(); - tempDescriptors.add(CLIENT_SERVICE); - tempDescriptors.add(QUERY); + private static final List PROPERTY_DESCRIPTORS = List.of( + CLIENT_SERVICE, + QUERY + ); - propertyDescriptors = Collections.unmodifiableList(tempDescriptors); - } + public static final String EXECUTION_TIME = "query.took"; protected ObjectMapper mapper = new ObjectMapper(); @Override public Set getRelationships() { - return relationships; + return RELATIONSHIPS; } @Override public final List getSupportedPropertyDescriptors() { - return propertyDescriptors; + return PROPERTY_DESCRIPTORS; } private volatile GraphClientService clientService; diff --git a/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-processors/src/main/java/org/apache/nifi/processors/graph/ExecuteGraphQueryRecord.java b/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-processors/src/main/java/org/apache/nifi/processors/graph/ExecuteGraphQueryRecord.java index 904926698194..278fd1b87603 100644 --- a/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-processors/src/main/java/org/apache/nifi/processors/graph/ExecuteGraphQueryRecord.java +++ b/nifi-extension-bundles/nifi-graph-bundle/nifi-graph-processors/src/main/java/org/apache/nifi/processors/graph/ExecuteGraphQueryRecord.java @@ -51,9 +51,7 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -120,10 +118,6 @@ protected PropertyDescriptor getSupportedDynamicPropertyDescriptor(final String .dynamic(true).addValidator(StandardValidators.NON_EMPTY_VALIDATOR).build(); } - public static final List DESCRIPTORS = Collections.unmodifiableList(Arrays.asList( - CLIENT_SERVICE, READER_SERVICE, WRITER_SERVICE, SUBMISSION_SCRIPT - )); - public static final Relationship SUCCESS = new Relationship.Builder().name("original") .description("Original flow files that successfully interacted with " + "graph server.") @@ -136,9 +130,18 @@ protected PropertyDescriptor getSupportedDynamicPropertyDescriptor(final String .autoTerminateDefault(true) .build(); - public static final Set RELATIONSHIPS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList( - SUCCESS, FAILURE, GRAPH - ))); + private static final List PROPERTY_DESCRIPTORS = List.of( + CLIENT_SERVICE, + READER_SERVICE, + WRITER_SERVICE, + SUBMISSION_SCRIPT + ); + + private static final Set RELATIONSHIPS = Set.of( + SUCCESS, + FAILURE, + GRAPH + ); public static final String RECORD_COUNT = "record.count"; public static final String GRAPH_OPERATION_TIME = "graph.operations.took"; @@ -151,7 +154,7 @@ public Set getRelationships() { @Override public List getSupportedPropertyDescriptors() { - return DESCRIPTORS; + return PROPERTY_DESCRIPTORS; } private GraphClientService clientService; diff --git a/nifi-extension-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service/src/main/java/org/apache/nifi/graph/Neo4JCypherClientService.java b/nifi-extension-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service/src/main/java/org/apache/nifi/graph/Neo4JCypherClientService.java index 9a34b4765bde..4a89d8dbae95 100644 --- a/nifi-extension-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service/src/main/java/org/apache/nifi/graph/Neo4JCypherClientService.java +++ b/nifi-extension-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service/src/main/java/org/apache/nifi/graph/Neo4JCypherClientService.java @@ -155,7 +155,7 @@ public class Neo4JCypherClientService extends AbstractControllerService implemen protected String password; protected String connectionUrl; - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CONNECTION_URL, USERNAME, PASSWORD, @@ -186,7 +186,7 @@ protected Collection customValidate(ValidationContext validati @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } protected Driver getDriver(ConfigurationContext context) { diff --git a/nifi-extension-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/TinkerpopClientService.java b/nifi-extension-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/TinkerpopClientService.java index 3c39c9e27c36..30c4927bbe09 100644 --- a/nifi-extension-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/TinkerpopClientService.java +++ b/nifi-extension-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/TinkerpopClientService.java @@ -217,7 +217,7 @@ public class TinkerpopClientService extends AbstractControllerService implements .identifiesControllerService(SSLContextProvider.class) .build(); - public static final List PROPERTIES = List.of( + public static final List PROPERTY_DESCRIPTORS = List.of( SUBMISSION_TYPE, CONNECTION_SETTINGS, REMOTE_OBJECTS_FILE, @@ -296,7 +296,7 @@ public String getTransitUrl() { @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/ExecuteGroovyScript.java b/nifi-extension-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/ExecuteGroovyScript.java index 08a8e96647a3..96275832333b 100644 --- a/nifi-extension-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/ExecuteGroovyScript.java +++ b/nifi-extension-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/src/main/java/org/apache/nifi/processors/groovyx/ExecuteGroovyScript.java @@ -136,7 +136,7 @@ public class ExecuteGroovyScript extends AbstractProcessor { public static final Relationship REL_FAILURE = new Relationship.Builder().name("failure").description("FlowFiles that failed to be processed").build(); - private static final List DESCRIPTORS = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SCRIPT_FILE, SCRIPT_BODY, FAIL_STRATEGY, @@ -165,7 +165,7 @@ public Set getRelationships() { @Override public final List getSupportedPropertyDescriptors() { - return DESCRIPTORS; + return PROPERTY_DESCRIPTORS; } private File asFile(String f) { diff --git a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java index b1ccf99ba86c..7bbb84ac1b6b 100644 --- a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java +++ b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/CreateHadoopSequenceFile.java @@ -98,8 +98,8 @@ public class CreateHadoopSequenceFile extends AbstractHadoopProcessor { RELATIONSHIP_FAILURE ); - private static final List PROPERTIES = Stream.concat( - PARENT_PROPERTIES.stream(), + private static final List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), Stream.of( COMPRESSION_TYPE, COMPRESSION_CODEC @@ -113,7 +113,7 @@ public Set getRelationships() { @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/DeleteHDFS.java b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/DeleteHDFS.java index 4f514768d56d..919a9cf96e74 100644 --- a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/DeleteHDFS.java +++ b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/DeleteHDFS.java @@ -112,8 +112,8 @@ public class DeleteHDFS extends AbstractHadoopProcessor { REL_FAILURE ); - private static final List PROPERTIES = Stream.concat( - PARENT_PROPERTIES.stream(), + private static final List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), Stream.of( FILE_OR_DIRECTORY, RECURSIVE @@ -122,7 +122,7 @@ public class DeleteHDFS extends AbstractHadoopProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/FetchHDFS.java b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/FetchHDFS.java index a7e2cdace5b1..f0f1d4e43d46 100644 --- a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/FetchHDFS.java +++ b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/FetchHDFS.java @@ -106,8 +106,8 @@ public class FetchHDFS extends AbstractHadoopProcessor { REL_COMMS_FAILURE ); - private static final List PROPERTIES = Stream.concat( - PARENT_PROPERTIES.stream(), + private static final List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), Stream.of( FILENAME, COMPRESSION_CODEC @@ -116,7 +116,7 @@ public class FetchHDFS extends AbstractHadoopProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFS.java b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFS.java index d9a9e9933d56..b0cc2ccfd1a6 100644 --- a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFS.java +++ b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFS.java @@ -182,8 +182,8 @@ public class GetHDFS extends AbstractHadoopProcessor { REL_SUCCESS ); - private static final List PROPERTIES = Stream.concat( - PARENT_PROPERTIES.stream(), + private static final List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), Stream.of( DIRECTORY, RECURSE_SUBDIRS, @@ -217,7 +217,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFSFileInfo.java b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFSFileInfo.java index c683946987b3..3ad591c97b57 100644 --- a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFSFileInfo.java +++ b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFSFileInfo.java @@ -230,8 +230,8 @@ public class GetHDFSFileInfo extends AbstractHadoopProcessor { .description("All failed attempts to access HDFS will be routed to this relationship") .build(); - private static final List PROPERTIES = Stream.concat( - PARENT_PROPERTIES.stream(), + private static final List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), Stream.of( FULL_PATH, RECURSE_SUBDIRS, @@ -260,7 +260,7 @@ protected void init(final ProcessorInitializationContext context) { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ListHDFS.java b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ListHDFS.java index 166cc2ef5477..ac500a6658c1 100644 --- a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ListHDFS.java +++ b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ListHDFS.java @@ -160,8 +160,8 @@ public class ListHDFS extends AbstractHadoopProcessor { public static final String LATEST_TIMESTAMP_KEY = "latest.timestamp"; public static final String LATEST_FILES_KEY = "latest.file.%d"; - private static final List PROPERTIES = Stream.concat( - PARENT_PROPERTIES.stream(), + private static final List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), Stream.of( DIRECTORY, RECURSE_SUBDIRS, @@ -189,7 +189,7 @@ protected void preProcessConfiguration(Configuration config, ProcessContext cont @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/MoveHDFS.java b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/MoveHDFS.java index 2fb0c4488015..4c07b5b0e560 100644 --- a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/MoveHDFS.java +++ b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/MoveHDFS.java @@ -188,8 +188,8 @@ public class MoveHDFS extends AbstractHadoopProcessor { REL_FAILURE ); - private static final List PROPERTIES = Stream.concat( - PARENT_PROPERTIES.stream(), + private static final List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), Stream.of( CONFLICT_RESOLUTION, INPUT_DIRECTORY_OR_FILE, @@ -220,7 +220,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnScheduled 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 4262166c6d26..c525e7ada2e2 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 @@ -239,8 +239,8 @@ public class PutHDFS extends AbstractHadoopProcessor { REL_FAILURE ); - private static final List PROPERTIES = Stream.concat( - PARENT_PROPERTIES.stream(), + private static final List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), Stream.of( new PropertyDescriptor.Builder() .fromPropertyDescriptor(DIRECTORY) @@ -269,7 +269,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/inotify/GetHDFSEvents.java b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/inotify/GetHDFSEvents.java index 26a2d83f90b8..d703d72b2925 100644 --- a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/inotify/GetHDFSEvents.java +++ b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/inotify/GetHDFSEvents.java @@ -136,8 +136,8 @@ public class GetHDFSEvents extends AbstractHadoopProcessor { .description("A flow file with updated information about a specific event will be sent to this relationship.") .build(); - private static final List PROPERTIES = Stream.concat( - PARENT_PROPERTIES.stream(), + private static final List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), Stream.of( POLL_DURATION, HDFS_PATH_TO_WATCH, @@ -158,7 +158,7 @@ public class GetHDFSEvents extends AbstractHadoopProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-client-service/src/main/java/org/apache/nifi/vault/hashicorp/StandardHashiCorpVaultClientService.java b/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-client-service/src/main/java/org/apache/nifi/vault/hashicorp/StandardHashiCorpVaultClientService.java index 627ae148f480..124451d45d64 100644 --- a/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-client-service/src/main/java/org/apache/nifi/vault/hashicorp/StandardHashiCorpVaultClientService.java +++ b/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-client-service/src/main/java/org/apache/nifi/vault/hashicorp/StandardHashiCorpVaultClientService.java @@ -56,7 +56,7 @@ ) public class StandardHashiCorpVaultClientService extends AbstractControllerService implements HashiCorpVaultClientService { - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CONFIGURATION_STRATEGY, VAULT_URI, VAULT_AUTHENTICATION, @@ -81,7 +81,7 @@ protected PropertyDescriptor getSupportedDynamicPropertyDescriptor(final String @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-provider/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultParameterProvider.java b/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-provider/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultParameterProvider.java index 26d71fbb55ba..90806a919037 100644 --- a/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-provider/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultParameterProvider.java +++ b/nifi-extension-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-provider/src/main/java/org/apache/nifi/vault/hashicorp/HashiCorpVaultParameterProvider.java @@ -32,8 +32,6 @@ import org.apache.nifi.processor.util.StandardValidators; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -81,17 +79,18 @@ public class HashiCorpVaultParameterProvider extends AbstractParameterProvider i .defaultValue(".*") .build(); - private static final List PROPERTIES = Collections.unmodifiableList(Arrays.asList( + private static final List PROPERTY_DESCRIPTORS = List.of( VAULT_CLIENT_SERVICE, KV_PATH, KV_VERSION, - SECRET_NAME_PATTERN)); + SECRET_NAME_PATTERN + ); private HashiCorpVaultCommunicationService vaultCommunicationService; @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-hazelcast-bundle/nifi-hazelcast-services/src/main/java/org/apache/nifi/hazelcast/services/cacheclient/HazelcastMapCacheClient.java b/nifi-extension-bundles/nifi-hazelcast-bundle/nifi-hazelcast-services/src/main/java/org/apache/nifi/hazelcast/services/cacheclient/HazelcastMapCacheClient.java index ec11673ba6b5..16223542cbb5 100644 --- a/nifi-extension-bundles/nifi-hazelcast-bundle/nifi-hazelcast-services/src/main/java/org/apache/nifi/hazelcast/services/cacheclient/HazelcastMapCacheClient.java +++ b/nifi-extension-bundles/nifi-hazelcast-bundle/nifi-hazelcast-services/src/main/java/org/apache/nifi/hazelcast/services/cacheclient/HazelcastMapCacheClient.java @@ -84,7 +84,7 @@ public class HazelcastMapCacheClient extends AbstractControllerService implement .build(); private static final long STARTING_REVISION = 1; - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( HAZELCAST_CACHE_MANAGER, HAZELCAST_CACHE_NAME, HAZELCAST_ENTRY_TTL @@ -192,7 +192,7 @@ public void close() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } private String serializeCacheEntryKey(final S key, final Serializer serializer) throws IOException { diff --git a/nifi-extension-bundles/nifi-hl7-bundle/nifi-hl7-processors/src/main/java/org/apache/nifi/processors/hl7/ExtractHL7Attributes.java b/nifi-extension-bundles/nifi-hl7-bundle/nifi-hl7-processors/src/main/java/org/apache/nifi/processors/hl7/ExtractHL7Attributes.java index 3a965ba6fc69..ac7228c1b58d 100644 --- a/nifi-extension-bundles/nifi-hl7-bundle/nifi-hl7-processors/src/main/java/org/apache/nifi/processors/hl7/ExtractHL7Attributes.java +++ b/nifi-extension-bundles/nifi-hl7-bundle/nifi-hl7-processors/src/main/java/org/apache/nifi/processors/hl7/ExtractHL7Attributes.java @@ -137,7 +137,7 @@ public class ExtractHL7Attributes extends AbstractProcessor { .description("A FlowFile is routed to this relationship if it cannot be mapped to FlowFile Attributes. This would happen if the FlowFile does not contain valid HL7 data") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CHARACTER_SET, USE_SEGMENT_NAMES, PARSE_SEGMENT_FIELDS, @@ -152,7 +152,7 @@ public class ExtractHL7Attributes extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-hl7-bundle/nifi-hl7-processors/src/main/java/org/apache/nifi/processors/hl7/RouteHL7.java b/nifi-extension-bundles/nifi-hl7-bundle/nifi-hl7-processors/src/main/java/org/apache/nifi/processors/hl7/RouteHL7.java index 0d08210fb5a5..5116916d94e0 100644 --- a/nifi-extension-bundles/nifi-hl7-bundle/nifi-hl7-processors/src/main/java/org/apache/nifi/processors/hl7/RouteHL7.java +++ b/nifi-extension-bundles/nifi-hl7-bundle/nifi-hl7-processors/src/main/java/org/apache/nifi/processors/hl7/RouteHL7.java @@ -90,7 +90,7 @@ public class RouteHL7 extends AbstractProcessor { .description("The original FlowFile that comes into this processor will be routed to this relationship, unless it is routed to 'failure'") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CHARACTER_SET ); @@ -114,7 +114,7 @@ protected PropertyDescriptor getSupportedDynamicPropertyDescriptor(final String @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-hubspot-bundle/nifi-hubspot-processors/src/main/java/org/apache/nifi/processors/hubspot/GetHubSpot.java b/nifi-extension-bundles/nifi-hubspot-bundle/nifi-hubspot-processors/src/main/java/org/apache/nifi/processors/hubspot/GetHubSpot.java index b3a44bf431e2..1c350c4f8373 100644 --- a/nifi-extension-bundles/nifi-hubspot-bundle/nifi-hubspot-processors/src/main/java/org/apache/nifi/processors/hubspot/GetHubSpot.java +++ b/nifi-extension-bundles/nifi-hubspot-bundle/nifi-hubspot-processors/src/main/java/org/apache/nifi/processors/hubspot/GetHubSpot.java @@ -182,7 +182,7 @@ private static Map createObjectTypeLookupMap() { private volatile WebClientServiceProvider webClientServiceProvider; private volatile boolean isObjectTypeModified; - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( OBJECT_TYPE, ACCESS_TOKEN, RESULT_LIMIT, @@ -198,7 +198,7 @@ private static Map createObjectTypeLookupMap() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-iotdb-bundle/nifi-iotdb-processors/src/main/java/org/apache/nifi/processors/AbstractIoTDB.java b/nifi-extension-bundles/nifi-iotdb-bundle/nifi-iotdb-processors/src/main/java/org/apache/nifi/processors/AbstractIoTDB.java index e003861f0b60..df034d963924 100755 --- a/nifi-extension-bundles/nifi-iotdb-bundle/nifi-iotdb-processors/src/main/java/org/apache/nifi/processors/AbstractIoTDB.java +++ b/nifi-extension-bundles/nifi-iotdb-bundle/nifi-iotdb-processors/src/main/java/org/apache/nifi/processors/AbstractIoTDB.java @@ -19,11 +19,9 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Optional; @@ -111,19 +109,19 @@ public abstract class AbstractIoTDB extends AbstractProcessor { .description("Processing failed") .build(); - private static final List descriptors = new ArrayList<>(); + private static final List PROPERTY_DESCRIPTORS = List.of( + IOTDB_HOST, + IOTDB_PORT, + USERNAME, + PASSWORD + ); - private static final Set relationships = new LinkedHashSet<>(); + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS, + REL_FAILURE + ); static { - descriptors.add(IOTDB_HOST); - descriptors.add(IOTDB_PORT); - descriptors.add(USERNAME); - descriptors.add(PASSWORD); - - relationships.add(REL_SUCCESS); - relationships.add(REL_FAILURE); - typeMap.put(RecordFieldType.STRING, TSDataType.TEXT); typeMap.put(RecordFieldType.BOOLEAN, TSDataType.BOOLEAN); typeMap.put(RecordFieldType.INT, TSDataType.INT32); @@ -149,7 +147,7 @@ public abstract class AbstractIoTDB extends AbstractProcessor { @Override public Set getRelationships() { - return relationships; + return RELATIONSHIPS; } @OnScheduled @@ -184,7 +182,7 @@ public void stop() { @Override protected List getSupportedPropertyDescriptors() { - return Collections.unmodifiableList(descriptors); + return PROPERTY_DESCRIPTORS; } protected TSDataType getType(RecordFieldType type) { diff --git a/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JndiJmsConnectionFactoryProperties.java b/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JndiJmsConnectionFactoryProperties.java index f8960a0a085c..1c57499b5153 100644 --- a/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JndiJmsConnectionFactoryProperties.java +++ b/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JndiJmsConnectionFactoryProperties.java @@ -99,7 +99,7 @@ public class JndiJmsConnectionFactoryProperties { .sensitive(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( JndiJmsConnectionFactoryProperties.JNDI_INITIAL_CONTEXT_FACTORY, JndiJmsConnectionFactoryProperties.JNDI_PROVIDER_URL, JndiJmsConnectionFactoryProperties.JNDI_CONNECTION_FACTORY_NAME, @@ -109,7 +109,7 @@ public class JndiJmsConnectionFactoryProperties { ); public static List getPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } public static PropertyDescriptor getDynamicPropertyDescriptor(final String propertyDescriptorName) { diff --git a/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/PublishJMS.java b/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/PublishJMS.java index 7f19ccb13a23..bf4b1fd6ed21 100644 --- a/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/PublishJMS.java +++ b/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/PublishJMS.java @@ -161,12 +161,12 @@ public class PublishJMS extends AbstractJMSProcessor { .description("All FlowFiles that cannot be sent to JMS destination are routed to this relationship") .build(); - private static final List COMMON_PROPERTIES = Stream.concat( + private static final List COMMON_PROPERTY_DESCRIPTORS = Stream.concat( JNDI_JMS_CF_PROPERTIES.stream(), JMS_CF_PROPERTIES.stream() ).toList(); - private static final List PROPERTIES = Stream.concat( + private static final List PROPERTY_DESCRIPTORS = Stream.concat( Stream.of( CF_SERVICE, DESTINATION, @@ -181,8 +181,9 @@ public class PublishJMS extends AbstractJMSProcessor { MAX_BATCH_SIZE, RECORD_READER, RECORD_WRITER), - COMMON_PROPERTIES.stream() + COMMON_PROPERTY_DESCRIPTORS.stream() ).toList(); + private final static Set RELATIONSHIPS = Set.of( REL_SUCCESS, REL_FAILURE @@ -294,7 +295,7 @@ private void handleException(ProcessContext context, ProcessSession processSessi @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } /** diff --git a/nifi-extension-bundles/nifi-jolt-bundle/nifi-jolt-processors/src/main/java/org/apache/nifi/processors/jolt/AbstractJoltTransform.java b/nifi-extension-bundles/nifi-jolt-bundle/nifi-jolt-processors/src/main/java/org/apache/nifi/processors/jolt/AbstractJoltTransform.java index 36b97dcb07cf..34d62a410564 100644 --- a/nifi-extension-bundles/nifi-jolt-bundle/nifi-jolt-processors/src/main/java/org/apache/nifi/processors/jolt/AbstractJoltTransform.java +++ b/nifi-extension-bundles/nifi-jolt-bundle/nifi-jolt-processors/src/main/java/org/apache/nifi/processors/jolt/AbstractJoltTransform.java @@ -99,8 +99,13 @@ public abstract class AbstractJoltTransform extends AbstractProcessor { .required(true) .build(); - static final List PROPERTIES = List.of(JOLT_TRANSFORM, JOLT_SPEC, CUSTOM_CLASS, - MODULES, TRANSFORM_CACHE_SIZE); + private static final List PROPERTY_DESCRIPTORS = List.of( + JOLT_TRANSFORM, + JOLT_SPEC, + CUSTOM_CLASS, + MODULES, + TRANSFORM_CACHE_SIZE + ); /** * It is a cache for transform objects. It keeps values indexed by jolt specification string. @@ -109,6 +114,10 @@ public abstract class AbstractJoltTransform extends AbstractProcessor { */ private Cache, JoltTransform> transformCache; + protected static List getCommonPropertyDescriptors() { + return PROPERTY_DESCRIPTORS; + } + @OnScheduled public void setup(final ProcessContext context) { int maxTransformsToCache = context.getProperty(TRANSFORM_CACHE_SIZE).asInteger(); diff --git a/nifi-extension-bundles/nifi-jolt-bundle/nifi-jolt-processors/src/main/java/org/apache/nifi/processors/jolt/JoltTransformJSON.java b/nifi-extension-bundles/nifi-jolt-bundle/nifi-jolt-processors/src/main/java/org/apache/nifi/processors/jolt/JoltTransformJSON.java index f5f032d0730f..afc72bca103e 100644 --- a/nifi-extension-bundles/nifi-jolt-bundle/nifi-jolt-processors/src/main/java/org/apache/nifi/processors/jolt/JoltTransformJSON.java +++ b/nifi-extension-bundles/nifi-jolt-bundle/nifi-jolt-processors/src/main/java/org/apache/nifi/processors/jolt/JoltTransformJSON.java @@ -87,8 +87,8 @@ public class JoltTransformJSON extends AbstractJoltTransform { .description("If a FlowFile fails processing for any reason (for example, the FlowFile is not valid JSON), it will be routed to this relationship") .build(); - private static final List PROPERTIES = Stream.concat( - AbstractJoltTransform.PROPERTIES.stream(), + private static final List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), Stream.of( PRETTY_PRINT, MAX_STRING_LENGTH @@ -110,7 +110,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-jolt-bundle/nifi-jolt-processors/src/main/java/org/apache/nifi/processors/jolt/JoltTransformRecord.java b/nifi-extension-bundles/nifi-jolt-bundle/nifi-jolt-processors/src/main/java/org/apache/nifi/processors/jolt/JoltTransformRecord.java index 782acef71c61..945faa7da4cd 100644 --- a/nifi-extension-bundles/nifi-jolt-bundle/nifi-jolt-processors/src/main/java/org/apache/nifi/processors/jolt/JoltTransformRecord.java +++ b/nifi-extension-bundles/nifi-jolt-bundle/nifi-jolt-processors/src/main/java/org/apache/nifi/processors/jolt/JoltTransformRecord.java @@ -106,8 +106,8 @@ public class JoltTransformRecord extends AbstractJoltTransform { .description("The original FlowFile that was transformed. If the FlowFile fails processing, nothing will be sent to this relationship") .build(); - private static final List PROPERTIES = Stream.concat( - AbstractJoltTransform.PROPERTIES.stream(), + private static final List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), Stream.of( RECORD_READER, RECORD_WRITER @@ -127,7 +127,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-jslt-bundle/nifi-jslt-processors/src/main/java/org/apache/nifi/processors/jslt/JSLTTransformJSON.java b/nifi-extension-bundles/nifi-jslt-bundle/nifi-jslt-processors/src/main/java/org/apache/nifi/processors/jslt/JSLTTransformJSON.java index ba875f9090cf..7f717281a1c8 100644 --- a/nifi-extension-bundles/nifi-jslt-bundle/nifi-jslt-processors/src/main/java/org/apache/nifi/processors/jslt/JSLTTransformJSON.java +++ b/nifi-extension-bundles/nifi-jslt-bundle/nifi-jslt-processors/src/main/java/org/apache/nifi/processors/jslt/JSLTTransformJSON.java @@ -148,7 +148,7 @@ public class JSLTTransformJSON extends AbstractProcessor { .description("If a FlowFile fails processing for any reason (for example, the FlowFile is not valid JSON), it will be routed to this relationship") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( JSLT_TRANSFORM, TRANSFORMATION_STRATEGY, PRETTY_PRINT, @@ -172,7 +172,7 @@ public Set getRelationships() { @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/Kafka3ConnectionService.java b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/Kafka3ConnectionService.java index 3b90b013eeac..8b808efc2146 100644 --- a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/Kafka3ConnectionService.java +++ b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-service/src/main/java/org/apache/nifi/kafka/service/Kafka3ConnectionService.java @@ -214,7 +214,7 @@ public class Kafka3ConnectionService extends AbstractControllerService implement .defaultValue("5 sec") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( BOOTSTRAP_SERVERS, SECURITY_PROTOCOL, SASL_MECHANISM, @@ -246,7 +246,7 @@ public void onEnabled(final ConfigurationContext configurationContext) { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/kafka/processors/ConsumeKafka.java b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/kafka/processors/ConsumeKafka.java index 35600aec0e02..44b8ad1bd8c6 100644 --- a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/kafka/processors/ConsumeKafka.java +++ b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/kafka/processors/ConsumeKafka.java @@ -276,7 +276,7 @@ public class ConsumeKafka extends AbstractProcessor implements VerifiableProcess .description("If configured to use a Record Reader, a Kafka message that cannot be parsed using the configured Record Reader will be routed to this relationship") .build(); - private static final List DESCRIPTORS = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CONNECTION_SERVICE, GROUP_ID, TOPIC_FORMAT, @@ -313,7 +313,7 @@ public class ConsumeKafka extends AbstractProcessor implements VerifiableProcess @Override public List getSupportedPropertyDescriptors() { - return DESCRIPTORS; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/kafka/processors/PublishKafka.java b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/kafka/processors/PublishKafka.java index ec61876aa130..5c158eeab514 100644 --- a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/kafka/processors/PublishKafka.java +++ b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/kafka/processors/PublishKafka.java @@ -298,7 +298,7 @@ public class PublishKafka extends AbstractProcessor implements KafkaPublishCompo .description("Any FlowFile that cannot be sent to Kafka will be routed to this Relationship") .build(); - private static final List DESCRIPTORS = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CONNECTION_SERVICE, TOPIC_NAME, FAILURE_STRATEGY, @@ -322,14 +322,17 @@ public class PublishKafka extends AbstractProcessor implements KafkaPublishCompo RECORD_METADATA_STRATEGY ); - private static final Set RELATIONSHIPS = Set.of(REL_SUCCESS, REL_FAILURE); + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS, + REL_FAILURE + ); private final Queue producerServices = new LinkedBlockingQueue<>(); @Override public List getSupportedPropertyDescriptors() { - return DESCRIPTORS; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/document/ExtractDocumentText.java b/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/document/ExtractDocumentText.java index 8312b6f05f4d..fc89d7adb745 100644 --- a/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/document/ExtractDocumentText.java +++ b/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/document/ExtractDocumentText.java @@ -32,10 +32,7 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Reader; -import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -53,7 +50,11 @@ public class ExtractDocumentText extends AbstractProcessor { public static final Relationship REL_FAILURE = new Relationship.Builder().name("failure") .description("Content extraction failed").build(); - private static final Set RELATIONSHIPS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(REL_ORIGINAL, REL_EXTRACTED, REL_FAILURE))); + private static final Set RELATIONSHIPS = Set.of( + REL_ORIGINAL, + REL_EXTRACTED, + REL_FAILURE + ); @Override public Set getRelationships() { diff --git a/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/image/ExtractImageMetadata.java b/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/image/ExtractImageMetadata.java index 71f2cdd8b8df..2e3810dfdcc7 100644 --- a/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/image/ExtractImageMetadata.java +++ b/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/image/ExtractImageMetadata.java @@ -75,7 +75,7 @@ public class ExtractImageMetadata extends AbstractProcessor { .description("Any FlowFile that fails to have image metadata extracted will be routed to failure") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( MAX_NUMBER_OF_ATTRIBUTES ); @@ -91,7 +91,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/image/ResizeImage.java b/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/image/ResizeImage.java index 3e2400539800..fd97008cc60a 100644 --- a/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/image/ResizeImage.java +++ b/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/image/ResizeImage.java @@ -25,8 +25,6 @@ import java.io.BufferedInputStream; import java.io.InputStream; import java.io.OutputStream; -import java.util.ArrayList; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; @@ -105,22 +103,26 @@ public class ResizeImage extends AbstractProcessor { .description("A FlowFile is routed to this relationship if it is not in the specified format") .build(); + private static final List PROPERTY_DESCRIPTORS = List.of( + IMAGE_WIDTH, + IMAGE_HEIGHT, + SCALING_ALGORITHM, + KEEP_RATIO + ); + + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS, + REL_FAILURE + ); + @Override protected List getSupportedPropertyDescriptors() { - final List properties = new ArrayList<>(); - properties.add(IMAGE_WIDTH); - properties.add(IMAGE_HEIGHT); - properties.add(SCALING_ALGORITHM); - properties.add(KEEP_RATIO); - return properties; + return PROPERTY_DESCRIPTORS; } @Override public Set getRelationships() { - final Set relationships = new HashSet<>(); - relationships.add(REL_SUCCESS); - relationships.add(REL_FAILURE); - return relationships; + return RELATIONSHIPS; } @Override diff --git a/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/media/ExtractMediaMetadata.java b/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/media/ExtractMediaMetadata.java index d67dbb44eb4d..7bed9edc0e48 100644 --- a/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/media/ExtractMediaMetadata.java +++ b/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/media/ExtractMediaMetadata.java @@ -115,7 +115,7 @@ public class ExtractMediaMetadata extends AbstractProcessor { .description("Any FlowFile that fails to have media metadata extracted will be routed to failure") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( MAX_NUMBER_OF_ATTRIBUTES, MAX_ATTRIBUTE_LENGTH, METADATA_KEY_FILTER, @@ -138,7 +138,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @SuppressWarnings("unused") diff --git a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java index 3f1d5b186b8f..765107a36ef1 100644 --- a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java +++ b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/AbstractMongoProcessor.java @@ -157,7 +157,7 @@ public abstract class AbstractMongoProcessor extends AbstractProcessor { .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES) .build(); - static final List DESCRIPTORS = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CLIENT_SERVICE, DATABASE_NAME, COLLECTION_NAME @@ -198,6 +198,10 @@ public String getDescription() { protected MongoClient mongoClient; protected MongoDBClientService clientService; + protected static List getCommonPropertyDescriptors() { + return PROPERTY_DESCRIPTORS; + } + @OnScheduled public final void createClient(ProcessContext context) { clientService = context.getProperty(CLIENT_SERVICE).asControllerService(MongoDBClientService.class); diff --git a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/DeleteMongo.java b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/DeleteMongo.java index df3d5bad16cc..d224c99c2d78 100644 --- a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/DeleteMongo.java +++ b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/DeleteMongo.java @@ -92,8 +92,8 @@ public class DeleteMongo extends AbstractMongoProcessor { REL_FAILURE ); - private final static List PROPERTIES = Stream.concat( - AbstractMongoProcessor.DESCRIPTORS.stream(), + private final static List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), Stream.of( DELETE_MODE, FAIL_ON_NO_DELETE @@ -107,7 +107,7 @@ public Set getRelationships() { @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } private static final List ALLOWED_DELETE_VALUES; diff --git a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/GetMongo.java b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/GetMongo.java index 33cd0a5d1321..7c2a863411e5 100644 --- a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/GetMongo.java +++ b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/GetMongo.java @@ -91,8 +91,8 @@ public class GetMongo extends AbstractMongoQueryProcessor { REL_ORIGINAL ); - private final static List PROPERTIES = Stream.concat( - AbstractMongoProcessor.DESCRIPTORS.stream(), + private final static List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), Stream.of( JSON_TYPE, USE_PRETTY_PRINTING, @@ -124,7 +124,7 @@ public Set getRelationships() { @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } //Turn a list of Mongo result documents into a String representation of a JSON array diff --git a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/GetMongoRecord.java b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/GetMongoRecord.java index 0e8b73e1dd7b..99629666668c 100644 --- a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/GetMongoRecord.java +++ b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/GetMongoRecord.java @@ -76,7 +76,7 @@ public class GetMongoRecord extends AbstractMongoQueryProcessor { .required(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CLIENT_SERVICE, WRITER_FACTORY, DATABASE_NAME, @@ -98,7 +98,7 @@ public class GetMongoRecord extends AbstractMongoQueryProcessor { @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongo.java b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongo.java index a92c27058ded..beac14b0d017 100644 --- a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongo.java +++ b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongo.java @@ -151,8 +151,8 @@ public class PutMongo extends AbstractMongoProcessor { REL_FAILURE ); - private final static List PROPERTIES = Stream.concat( - AbstractMongoProcessor.DESCRIPTORS.stream(), + private final static List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), Stream.of( MODE, UPSERT, @@ -171,7 +171,7 @@ public Set getRelationships() { @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongoBulkOperations.java b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongoBulkOperations.java index 79444e6c71ff..fafde5bd6efb 100644 --- a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongoBulkOperations.java +++ b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongoBulkOperations.java @@ -97,8 +97,8 @@ public class PutMongoBulkOperations extends AbstractMongoProcessor { REL_FAILURE ); - private final static List PROPERTIES = Stream.concat( - AbstractMongoProcessor.DESCRIPTORS.stream(), + private final static List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), Stream.of(ORDERED, CHARACTER_SET) ).toList(); @@ -109,7 +109,7 @@ public Set getRelationships() { @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongoRecord.java b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongoRecord.java index f83dfb4c54ea..7ef5d9c03d2d 100644 --- a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongoRecord.java +++ b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/PutMongoRecord.java @@ -142,8 +142,8 @@ public class PutMongoRecord extends AbstractMongoProcessor { REL_FAILURE ); - private final static List PROPERTIES = Stream.concat( - AbstractMongoProcessor.DESCRIPTORS.stream(), + private final static List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), Stream.of( RECORD_READER_FACTORY, INSERT_COUNT, @@ -161,7 +161,7 @@ public Set getRelationships() { @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/RunMongoAggregation.java b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/RunMongoAggregation.java index b46c29572458..515682049022 100644 --- a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/RunMongoAggregation.java +++ b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/RunMongoAggregation.java @@ -104,8 +104,8 @@ static final List buildAggregationQuery(String query) throws IOException { REL_FAILURE ); - private final static List PROPERTIES = Stream.concat( - AbstractMongoProcessor.DESCRIPTORS.stream(), + private final static List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), Stream.of( CHARSET, QUERY, @@ -125,7 +125,7 @@ public Set getRelationships() { @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } private String buildBatch(List batch) { diff --git a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/AbstractGridFSProcessor.java b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/AbstractGridFSProcessor.java index 48368b635c00..0deca0da85d0 100644 --- a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/AbstractGridFSProcessor.java +++ b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/AbstractGridFSProcessor.java @@ -33,9 +33,6 @@ import org.apache.nifi.util.StringUtils; import org.bson.types.ObjectId; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; import java.util.List; import java.util.Set; @@ -96,23 +93,25 @@ public abstract class AbstractGridFSProcessor extends AbstractProcessor { .description("When the operation succeeds, the flowfile is sent to this relationship.") .build(); - static final List PARENT_PROPERTIES; + private static final List PROPERTY_DESCRIPTORS = List.of( + CLIENT_SERVICE, + DATABASE_NAME, + BUCKET_NAME + ); - static final Set PARENT_RELATIONSHIPS; + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS, + REL_FAILURE + ); protected volatile MongoDBClientService clientService; - static { - List _temp = new ArrayList<>(); - _temp.add(CLIENT_SERVICE); - _temp.add(DATABASE_NAME); - _temp.add(BUCKET_NAME); - PARENT_PROPERTIES = Collections.unmodifiableList(_temp); - - Set _rels = new HashSet<>(); - _rels.add(REL_SUCCESS); - _rels.add(REL_FAILURE); - PARENT_RELATIONSHIPS = Collections.unmodifiableSet(_rels); + protected static List getCommonPropertyDescriptors() { + return PROPERTY_DESCRIPTORS; + } + + protected static Set getCommonRelationships() { + return RELATIONSHIPS; } protected MongoDatabase getDatabase(FlowFile input, ProcessContext context) { diff --git a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/DeleteGridFS.java b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/DeleteGridFS.java index 3d8946c80b31..209e2076e82c 100644 --- a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/DeleteGridFS.java +++ b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/DeleteGridFS.java @@ -43,10 +43,9 @@ import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.stream.Stream; @CapabilityDescription("Deletes a file from GridFS using a file name or a query.") @Tags({"gridfs", "delete", "mongodb"}) @@ -71,25 +70,23 @@ public class DeleteGridFS extends AbstractGridFSProcessor { .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .build(); - static final List DESCRIPTORS; - - static { - List _temp = new ArrayList<>(); - _temp.addAll(PARENT_PROPERTIES); - _temp.add(FILE_NAME); - _temp.add(QUERY); - _temp.add(QUERY_ATTRIBUTE); - DESCRIPTORS = Collections.unmodifiableList(_temp); - } + private static final List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), + Stream.of( + FILE_NAME, + QUERY, + QUERY_ATTRIBUTE + ) + ).toList(); @Override public Set getRelationships() { - return new HashSet<>(PARENT_RELATIONSHIPS); + return getCommonRelationships(); } @Override public final List getSupportedPropertyDescriptors() { - return DESCRIPTORS; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/FetchGridFS.java b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/FetchGridFS.java index 0cf001698370..0a5838ae947f 100644 --- a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/FetchGridFS.java +++ b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/FetchGridFS.java @@ -43,13 +43,12 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; @InputRequirement(InputRequirement.Requirement.INPUT_REQUIRED) @WritesAttributes( @@ -75,27 +74,26 @@ public class FetchGridFS extends AbstractGridFSProcessor implements QueryHelper .description("The original input flowfile goes to this relationship if the query does not cause an error") .build(); - static final List PROPERTY_DESCRIPTORS; - static final Set RELATIONSHIP_SET; - - static { - List _temp = new ArrayList<>(); - _temp.addAll(PARENT_PROPERTIES); - _temp.add(FILE_NAME); - _temp.add(QUERY); - _temp.add(QUERY_ATTRIBUTE); - _temp.add(OPERATION_MODE); - PROPERTY_DESCRIPTORS = Collections.unmodifiableList(_temp); - - Set _rels = new HashSet<>(); - _rels.addAll(PARENT_RELATIONSHIPS); - _rels.add(REL_ORIGINAL); - RELATIONSHIP_SET = Collections.unmodifiableSet(_rels); - } + private static final List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), + Stream.of( + FILE_NAME, + QUERY, + QUERY_ATTRIBUTE, + OPERATION_MODE + ) + ).toList(); + + private static final Set RELATIONSHIPS = Stream.concat( + getCommonRelationships().stream(), + Stream.of( + REL_ORIGINAL + ) + ).collect(Collectors.toUnmodifiableSet()); @Override public Set getRelationships() { - return RELATIONSHIP_SET; + return RELATIONSHIPS; } @Override diff --git a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/PutGridFS.java b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/PutGridFS.java index ee8041bd4df9..72e4b64f47cc 100644 --- a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/PutGridFS.java +++ b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/PutGridFS.java @@ -43,12 +43,11 @@ import org.bson.types.ObjectId; import java.io.InputStream; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; @InputRequirement(InputRequirement.Requirement.INPUT_REQUIRED) @Tags({"mongo", "gridfs", "put", "file", "store"}) @@ -118,22 +117,23 @@ public class PutGridFS extends AbstractGridFSProcessor { static final String ID_ATTRIBUTE = "gridfs.id"; - static final List DESCRIPTORS; - static final Set RELATIONSHIP_SET; - - static { - List propertyDescriptors = new ArrayList<>(PARENT_PROPERTIES); - propertyDescriptors.add(FILE_NAME); - propertyDescriptors.add(PROPERTIES_PREFIX); - propertyDescriptors.add(ENFORCE_UNIQUENESS); - propertyDescriptors.add(HASH_ATTRIBUTE); - propertyDescriptors.add(CHUNK_SIZE); - DESCRIPTORS = Collections.unmodifiableList(propertyDescriptors); - - Set relationships = new HashSet<>(PARENT_RELATIONSHIPS); - relationships.add(REL_DUPLICATE); - RELATIONSHIP_SET = Collections.unmodifiableSet(relationships); - } + private static final List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), + Stream.of( + FILE_NAME, + PROPERTIES_PREFIX, + ENFORCE_UNIQUENESS, + HASH_ATTRIBUTE, + CHUNK_SIZE + ) + ).toList(); + + private static final Set RELATIONSHIPS = Stream.concat( + getCommonRelationships().stream(), + Stream.of( + REL_DUPLICATE + ) + ).collect(Collectors.toUnmodifiableSet()); private String uniqueness; private String hashAttribute; @@ -147,12 +147,12 @@ public void onScheduled(ProcessContext context) { @Override public Set getRelationships() { - return RELATIONSHIP_SET; + return RELATIONSHIPS; } @Override public final List getSupportedPropertyDescriptors() { - return DESCRIPTORS; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/MongoDBControllerService.java b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/MongoDBControllerService.java index 7b4b0c26445c..e9e24aead28a 100644 --- a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/MongoDBControllerService.java +++ b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/main/java/org/apache/nifi/mongodb/MongoDBControllerService.java @@ -58,7 +58,7 @@ public void onEnabled(final ConfigurationContext context) { this.mongoClient = createClient(context, this.mongoClient); } - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( URI, DB_USER, DB_PASSWORD, @@ -180,7 +180,7 @@ public WriteConcern getWriteConcern() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnDisabled diff --git a/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/ConsumeMQTT.java b/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/ConsumeMQTT.java index 0840436c3dca..c0da9cff39cf 100644 --- a/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/ConsumeMQTT.java +++ b/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/ConsumeMQTT.java @@ -206,7 +206,7 @@ public class ConsumeMQTT extends AbstractMQTTProcessor { .autoTerminateDefault(true) // to make sure flow are still valid after upgrades .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( PROP_BROKER_URI, PROP_MQTT_VERSION, PROP_USERNAME, @@ -301,7 +301,7 @@ public Set getRelationships() { @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/PublishMQTT.java b/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/PublishMQTT.java index 5aa170c2e05e..f59e0c14344b 100644 --- a/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/PublishMQTT.java +++ b/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/PublishMQTT.java @@ -126,7 +126,7 @@ public class PublishMQTT extends AbstractMQTTProcessor { .description("FlowFiles that failed to send to the destination are transferred to this relationship.") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( PROP_BROKER_URI, PROP_MQTT_VERSION, PROP_USERNAME, @@ -170,7 +170,7 @@ public Set getRelationships() { @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/main/java/org/apache/nifi/processors/network/ParseNetflowv5.java b/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/main/java/org/apache/nifi/processors/network/ParseNetflowv5.java index dd1af40868a6..78c8bc6d02e5 100644 --- a/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/main/java/org/apache/nifi/processors/network/ParseNetflowv5.java +++ b/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/main/java/org/apache/nifi/processors/network/ParseNetflowv5.java @@ -84,7 +84,7 @@ public class ParseNetflowv5 extends AbstractProcessor { public static final Relationship REL_SUCCESS = new Relationship.Builder().name("success") .description("Any FlowFile that is successfully parsed as a netflowv5 data will be transferred to this Relationship.").build(); - public static final List PROPERTIES = List.of( + public static final List PROPERTY_DESCRIPTORS = List.of( FIELDS_DESTINATION ); @@ -101,7 +101,7 @@ public Set getRelationships() { @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/main/java/org/apache/nifi/processors/network/pcap/SplitPCAP.java b/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/main/java/org/apache/nifi/processors/network/pcap/SplitPCAP.java index c30781020204..3b820c53848b 100644 --- a/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/main/java/org/apache/nifi/processors/network/pcap/SplitPCAP.java +++ b/nifi-extension-bundles/nifi-network-bundle/nifi-network-processors/src/main/java/org/apache/nifi/processors/network/pcap/SplitPCAP.java @@ -111,7 +111,7 @@ public class SplitPCAP extends AbstractProcessor { .description("The individual PCAP 'segments' of the original PCAP FlowFile will be routed to this relationship.") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( PCAP_MAX_SIZE ); @@ -128,7 +128,7 @@ public Set getRelationships() { @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } /** diff --git a/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/parquet/ParquetReader.java b/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/parquet/ParquetReader.java index 78736a47fa92..24d8b6552545 100644 --- a/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/parquet/ParquetReader.java +++ b/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/parquet/ParquetReader.java @@ -40,7 +40,7 @@ "The schema will come from the Parquet data itself.") public class ParquetReader extends AbstractControllerService implements RecordReaderFactory { - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( ParquetUtils.AVRO_READ_COMPATIBILITY ); @@ -54,6 +54,6 @@ public RecordReader createRecordReader(final Map variables, fina @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } } diff --git a/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/processors/parquet/CalculateParquetOffsets.java b/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/processors/parquet/CalculateParquetOffsets.java index 276c3e6ea45b..b9c9edf66a0a 100644 --- a/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/processors/parquet/CalculateParquetOffsets.java +++ b/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/processors/parquet/CalculateParquetOffsets.java @@ -17,13 +17,9 @@ package org.apache.nifi.processors.parquet; -import static java.util.Collections.singletonList; - import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Optional; @@ -109,12 +105,14 @@ public class CalculateParquetOffsets extends AbstractProcessor { .description("FlowFiles, with special attributes that represent a chunk of the input file.") .build(); - static final List PROPERTY_DESCRIPTORS = Arrays.asList( + private static final List PROPERTY_DESCRIPTORS = List.of( PROP_RECORDS_PER_SPLIT, PROP_ZERO_CONTENT_OUTPUT ); - static final Set RELATIONSHIPS = new HashSet<>(singletonList(REL_SUCCESS)); + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS + ); @Override protected List getSupportedPropertyDescriptors() { diff --git a/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/processors/parquet/CalculateParquetRowGroupOffsets.java b/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/processors/parquet/CalculateParquetRowGroupOffsets.java index 526ed4f4201c..a89bcfe7488f 100644 --- a/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/processors/parquet/CalculateParquetRowGroupOffsets.java +++ b/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/processors/parquet/CalculateParquetRowGroupOffsets.java @@ -17,12 +17,9 @@ package org.apache.nifi.processors.parquet; -import static java.util.Collections.singletonList; - import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -83,9 +80,13 @@ public class CalculateParquetRowGroupOffsets extends AbstractProcessor { .description("FlowFiles, with special attributes that represent a chunk of the input file.") .build(); - static final List PROPERTY_DESCRIPTORS = singletonList(PROP_ZERO_CONTENT_OUTPUT); + private static final List PROPERTY_DESCRIPTORS = List.of( + PROP_ZERO_CONTENT_OUTPUT + ); - static final Set RELATIONSHIPS = new HashSet<>(singletonList(REL_SUCCESS)); + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS + ); @Override protected List getSupportedPropertyDescriptors() { diff --git a/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/processors/parquet/ConvertAvroToParquet.java b/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/processors/parquet/ConvertAvroToParquet.java index 3dfe28efb123..ef5cdf03e1be 100644 --- a/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/processors/parquet/ConvertAvroToParquet.java +++ b/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/processors/parquet/ConvertAvroToParquet.java @@ -19,7 +19,6 @@ package org.apache.nifi.processors.parquet; -import com.google.common.collect.ImmutableSet; import org.apache.avro.Schema; import org.apache.avro.file.DataFileStream; import org.apache.avro.generic.GenericDatumReader; @@ -39,7 +38,6 @@ import org.apache.nifi.processor.AbstractProcessor; import org.apache.nifi.processor.ProcessContext; import org.apache.nifi.processor.ProcessSession; -import org.apache.nifi.processor.ProcessorInitializationContext; import org.apache.nifi.processor.Relationship; import org.apache.nifi.processor.exception.ProcessException; import org.apache.parquet.avro.AvroParquetWriter; @@ -49,8 +47,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -74,8 +70,6 @@ public class ConvertAvroToParquet extends AbstractProcessor { // Attributes public static final String RECORD_COUNT_ATTRIBUTE = "record.count"; - private volatile List parquetProps; - // Relationships static final Relationship SUCCESS = new Relationship.Builder() .name("success") @@ -87,33 +81,25 @@ public class ConvertAvroToParquet extends AbstractProcessor { .description("Avro content that could not be processed") .build(); - static final Set RELATIONSHIPS - = ImmutableSet.builder() - .add(SUCCESS) - .add(FAILURE) - .build(); - - @Override - protected final void init(final ProcessorInitializationContext context) { - - - final List props = new ArrayList<>(); - - props.add(ParquetUtils.COMPRESSION_TYPE); - props.add(ParquetUtils.ROW_GROUP_SIZE); - props.add(ParquetUtils.PAGE_SIZE); - props.add(ParquetUtils.DICTIONARY_PAGE_SIZE); - props.add(ParquetUtils.MAX_PADDING_SIZE); - props.add(ParquetUtils.ENABLE_DICTIONARY_ENCODING); - props.add(ParquetUtils.ENABLE_VALIDATION); - props.add(ParquetUtils.WRITER_VERSION); - - this.parquetProps = Collections.unmodifiableList(props); - } + private static final Set RELATIONSHIPS = Set.of( + SUCCESS, + FAILURE + ); + + private static final List PROPERTY_DESCRIPTORS = List.of( + ParquetUtils.COMPRESSION_TYPE, + ParquetUtils.ROW_GROUP_SIZE, + ParquetUtils.PAGE_SIZE, + ParquetUtils.DICTIONARY_PAGE_SIZE, + ParquetUtils.MAX_PADDING_SIZE, + ParquetUtils.ENABLE_DICTIONARY_ENCODING, + ParquetUtils.ENABLE_VALIDATION, + ParquetUtils.WRITER_VERSION + ); @Override protected List getSupportedPropertyDescriptors() { - return parquetProps; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/processors/parquet/PutParquet.java b/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/processors/parquet/PutParquet.java index 31119291c1c4..25a5df328aa8 100644 --- a/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/processors/parquet/PutParquet.java +++ b/nifi-extension-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/main/java/org/apache/nifi/processors/parquet/PutParquet.java @@ -17,8 +17,6 @@ package org.apache.nifi.processors.parquet; import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; import org.apache.avro.Schema; import org.apache.avro.generic.GenericRecord; @@ -84,6 +82,19 @@ public class PutParquet extends AbstractPutHDFSRecord { .defaultValue("false") .build(); + private static final List PROPERTY_DESCRIPTORS = List.of( + ParquetUtils.ROW_GROUP_SIZE, + ParquetUtils.PAGE_SIZE, + ParquetUtils.DICTIONARY_PAGE_SIZE, + ParquetUtils.MAX_PADDING_SIZE, + ParquetUtils.ENABLE_DICTIONARY_ENCODING, + ParquetUtils.ENABLE_VALIDATION, + ParquetUtils.WRITER_VERSION, + ParquetUtils.AVRO_WRITE_OLD_LIST_STRUCTURE, + ParquetUtils.AVRO_ADD_LIST_ELEMENT_RECORDS, + REMOVE_CRC_FILES + ); + @Override public List getCompressionTypes(final ProcessorInitializationContext context) { return ParquetUtils.COMPRESSION_TYPES; @@ -96,18 +107,7 @@ public String getDefaultCompressionType(final ProcessorInitializationContext con @Override public List getAdditionalProperties() { - final List props = new ArrayList<>(); - props.add(ParquetUtils.ROW_GROUP_SIZE); - props.add(ParquetUtils.PAGE_SIZE); - props.add(ParquetUtils.DICTIONARY_PAGE_SIZE); - props.add(ParquetUtils.MAX_PADDING_SIZE); - props.add(ParquetUtils.ENABLE_DICTIONARY_ENCODING); - props.add(ParquetUtils.ENABLE_VALIDATION); - props.add(ParquetUtils.WRITER_VERSION); - props.add(ParquetUtils.AVRO_WRITE_OLD_LIST_STRUCTURE); - props.add(ParquetUtils.AVRO_ADD_LIST_ELEMENT_RECORDS); - props.add(REMOVE_CRC_FILES); - return Collections.unmodifiableList(props); + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-processors/src/main/java/org/apache/nifi/processors/pgp/DecryptContentPGP.java b/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-processors/src/main/java/org/apache/nifi/processors/pgp/DecryptContentPGP.java index 92c651ebd7b0..85edb6af1c4c 100644 --- a/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-processors/src/main/java/org/apache/nifi/processors/pgp/DecryptContentPGP.java +++ b/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-processors/src/main/java/org/apache/nifi/processors/pgp/DecryptContentPGP.java @@ -131,7 +131,7 @@ public class DecryptContentPGP extends AbstractProcessor { FAILURE ); - private static final List DESCRIPTORS = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( DECRYPTION_STRATEGY, PASSPHRASE, PRIVATE_KEY_SERVICE @@ -158,7 +158,7 @@ public Set getRelationships() { */ @Override public final List getSupportedPropertyDescriptors() { - return DESCRIPTORS; + return PROPERTY_DESCRIPTORS; } /** diff --git a/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-processors/src/main/java/org/apache/nifi/processors/pgp/EncryptContentPGP.java b/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-processors/src/main/java/org/apache/nifi/processors/pgp/EncryptContentPGP.java index 0b4f22401cfe..8748c75c37d7 100644 --- a/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-processors/src/main/java/org/apache/nifi/processors/pgp/EncryptContentPGP.java +++ b/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-processors/src/main/java/org/apache/nifi/processors/pgp/EncryptContentPGP.java @@ -153,7 +153,7 @@ public class EncryptContentPGP extends AbstractProcessor { FAILURE ); - private static final List DESCRIPTORS = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SYMMETRIC_KEY_ALGORITHM, FILE_ENCODING, PASSPHRASE, @@ -178,7 +178,7 @@ public Set getRelationships() { */ @Override public final List getSupportedPropertyDescriptors() { - return DESCRIPTORS; + return PROPERTY_DESCRIPTORS; } /** diff --git a/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-processors/src/main/java/org/apache/nifi/processors/pgp/SignContentPGP.java b/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-processors/src/main/java/org/apache/nifi/processors/pgp/SignContentPGP.java index 9eb4e2b39f29..4f3ef7c79762 100644 --- a/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-processors/src/main/java/org/apache/nifi/processors/pgp/SignContentPGP.java +++ b/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-processors/src/main/java/org/apache/nifi/processors/pgp/SignContentPGP.java @@ -143,7 +143,7 @@ public class SignContentPGP extends AbstractProcessor { FAILURE ); - private static final List DESCRIPTORS = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( FILE_ENCODING, HASH_ALGORITHM, SIGNING_STRATEGY, @@ -173,7 +173,7 @@ public Set getRelationships() { */ @Override public final List getSupportedPropertyDescriptors() { - return DESCRIPTORS; + return PROPERTY_DESCRIPTORS; } /** diff --git a/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-processors/src/main/java/org/apache/nifi/processors/pgp/VerifyContentPGP.java b/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-processors/src/main/java/org/apache/nifi/processors/pgp/VerifyContentPGP.java index 11c7b56bedf2..eab55e0aad61 100644 --- a/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-processors/src/main/java/org/apache/nifi/processors/pgp/VerifyContentPGP.java +++ b/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-processors/src/main/java/org/apache/nifi/processors/pgp/VerifyContentPGP.java @@ -99,7 +99,7 @@ public class VerifyContentPGP extends AbstractProcessor { FAILURE ); - private static final List DESCRIPTORS = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( PUBLIC_KEY_SERVICE ); @@ -124,7 +124,7 @@ public Set getRelationships() { */ @Override public final List getSupportedPropertyDescriptors() { - return DESCRIPTORS; + return PROPERTY_DESCRIPTORS; } /** diff --git a/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-service/src/main/java/org/apache/nifi/pgp/service/standard/StandardPGPPrivateKeyService.java b/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-service/src/main/java/org/apache/nifi/pgp/service/standard/StandardPGPPrivateKeyService.java index 198bbf202824..7ca32bcb8f93 100644 --- a/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-service/src/main/java/org/apache/nifi/pgp/service/standard/StandardPGPPrivateKeyService.java +++ b/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-service/src/main/java/org/apache/nifi/pgp/service/standard/StandardPGPPrivateKeyService.java @@ -94,7 +94,7 @@ public class StandardPGPPrivateKeyService extends AbstractControllerService impl private static final Charset KEY_CHARSET = StandardCharsets.US_ASCII; - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( KEYRING_FILE, KEYRING, KEY_PASSWORD @@ -153,7 +153,7 @@ public Optional findPrivateKey(final long keyIdentifier) { */ @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } /** diff --git a/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-service/src/main/java/org/apache/nifi/pgp/service/standard/StandardPGPPublicKeyService.java b/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-service/src/main/java/org/apache/nifi/pgp/service/standard/StandardPGPPublicKeyService.java index e722c9eff178..feb110b444f3 100644 --- a/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-service/src/main/java/org/apache/nifi/pgp/service/standard/StandardPGPPublicKeyService.java +++ b/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-service/src/main/java/org/apache/nifi/pgp/service/standard/StandardPGPPublicKeyService.java @@ -83,7 +83,7 @@ public class StandardPGPPublicKeyService extends AbstractControllerService imple private static final boolean PARALLEL_DISABLED = false; - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( KEYRING_FILE, KEYRING ); @@ -134,7 +134,7 @@ public Optional findPublicKey(final String search) { */ @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } /** diff --git a/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/processors/excel/SplitExcel.java b/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/processors/excel/SplitExcel.java index b8bcd712b379..a9e2ed0f5734 100644 --- a/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/processors/excel/SplitExcel.java +++ b/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/processors/excel/SplitExcel.java @@ -109,7 +109,7 @@ public class SplitExcel extends AbstractProcessor { .description("The individual Excel 'segments' of the original Excel FlowFile will be routed to this relationship.") .build(); - private static final List DESCRIPTORS = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( PROTECTION_TYPE, PASSWORD ); @@ -138,7 +138,7 @@ public Set getRelationships() { @Override public final List getSupportedPropertyDescriptors() { - return DESCRIPTORS; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/processor/PutRedisHashRecord.java b/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/processor/PutRedisHashRecord.java index f708d9f720af..b83a1cf519dc 100644 --- a/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/processor/PutRedisHashRecord.java +++ b/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/processor/PutRedisHashRecord.java @@ -123,7 +123,7 @@ public class PutRedisHashRecord extends AbstractProcessor { .description("FlowFiles containing Records with processing errors will be routed to this relationship") .build(); - static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( RECORD_READER_FACTORY, REDIS_CONNECTION_POOL, HASH_VALUE_RECORD_PATH, @@ -138,7 +138,7 @@ public class PutRedisHashRecord extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/service/SimpleRedisDistributedMapCacheClientService.java b/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/service/SimpleRedisDistributedMapCacheClientService.java index d33ea94939f8..cf99a0687541 100644 --- a/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/service/SimpleRedisDistributedMapCacheClientService.java +++ b/nifi-extension-bundles/nifi-redis-bundle/nifi-redis-extensions/src/main/java/org/apache/nifi/redis/service/SimpleRedisDistributedMapCacheClientService.java @@ -48,7 +48,7 @@ "This service is intended to be used when a non-atomic DistributedMapCacheClient is required.") public class SimpleRedisDistributedMapCacheClientService extends AbstractControllerService implements DistributedMapCacheClient { - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( REDIS_CONNECTION_POOL, TTL ); @@ -62,7 +62,7 @@ protected Long getTtl() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-registry-bundle/nifi-registry-service/src/main/java/org/apache/nifi/schemaregistry/services/AvroSchemaRegistry.java b/nifi-extension-bundles/nifi-registry-bundle/nifi-registry-service/src/main/java/org/apache/nifi/schemaregistry/services/AvroSchemaRegistry.java index ec61209371cd..c4d42a5eee93 100644 --- a/nifi-extension-bundles/nifi-registry-bundle/nifi-registry-service/src/main/java/org/apache/nifi/schemaregistry/services/AvroSchemaRegistry.java +++ b/nifi-extension-bundles/nifi-registry-bundle/nifi-registry-service/src/main/java/org/apache/nifi/schemaregistry/services/AvroSchemaRegistry.java @@ -63,7 +63,7 @@ public class AvroSchemaRegistry extends AbstractControllerService implements Sch .required(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( VALIDATE_FIELD_NAMES ); @@ -132,7 +132,7 @@ public RecordSchema retrieveSchema(final SchemaIdentifier schemaIdentifier) thro @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-registry-bundle/nifi-registry-service/src/main/java/org/apache/nifi/schemaregistry/services/StandardJsonSchemaRegistry.java b/nifi-extension-bundles/nifi-registry-bundle/nifi-registry-service/src/main/java/org/apache/nifi/schemaregistry/services/StandardJsonSchemaRegistry.java index 353ef1edca5b..9a0136fc0de3 100644 --- a/nifi-extension-bundles/nifi-registry-bundle/nifi-registry-service/src/main/java/org/apache/nifi/schemaregistry/services/StandardJsonSchemaRegistry.java +++ b/nifi-extension-bundles/nifi-registry-bundle/nifi-registry-service/src/main/java/org/apache/nifi/schemaregistry/services/StandardJsonSchemaRegistry.java @@ -58,7 +58,7 @@ expressionLanguageScope = ExpressionLanguageScope.NONE) public class StandardJsonSchemaRegistry extends AbstractControllerService implements JsonSchemaRegistry, JsonSchemaRegistryComponent { - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SCHEMA_VERSION ); @@ -143,7 +143,7 @@ public JsonSchema retrieveSchema(final String schemaName) throws SchemaNotFoundE @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/main/java/org/apache/nifi/processors/salesforce/PutSalesforceObject.java b/nifi-extension-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/main/java/org/apache/nifi/processors/salesforce/PutSalesforceObject.java index e058dc759303..0821d55d4e1b 100644 --- a/nifi-extension-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/main/java/org/apache/nifi/processors/salesforce/PutSalesforceObject.java +++ b/nifi-extension-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/main/java/org/apache/nifi/processors/salesforce/PutSalesforceObject.java @@ -91,7 +91,7 @@ public class PutSalesforceObject extends AbstractProcessor { .description("For FlowFiles created as a result of an execution error.") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SALESFORCE_INSTANCE_URL, API_VERSION, READ_TIMEOUT, @@ -109,7 +109,7 @@ public class PutSalesforceObject extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/main/java/org/apache/nifi/processors/salesforce/QuerySalesforceObject.java b/nifi-extension-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/main/java/org/apache/nifi/processors/salesforce/QuerySalesforceObject.java index 80f7437da400..dac87f8f9d04 100644 --- a/nifi-extension-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/main/java/org/apache/nifi/processors/salesforce/QuerySalesforceObject.java +++ b/nifi-extension-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/main/java/org/apache/nifi/processors/salesforce/QuerySalesforceObject.java @@ -306,7 +306,7 @@ public void onScheduled(ProcessContext context) { salesforceRestService = new SalesforceRestClient(salesforceConfiguration); } - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SALESFORCE_INSTANCE_URL, API_VERSION, QUERY_TYPE, @@ -332,7 +332,7 @@ public void onScheduled(ProcessContext context) { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedPartitionRecord.java b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedPartitionRecord.java index bbb0930e8a9b..773579cb9fb5 100644 --- a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedPartitionRecord.java +++ b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedPartitionRecord.java @@ -105,7 +105,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return DESCRIPTORS; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedRecordProcessor.java b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedRecordProcessor.java index 0b333ba0dd78..8a78dedd7ff6 100644 --- a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedRecordProcessor.java +++ b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedRecordProcessor.java @@ -80,7 +80,7 @@ abstract class ScriptedRecordProcessor extends AbstractProcessor implements Sear .required(true) .build(); - protected static final List DESCRIPTORS = List.of( + protected static final List PROPERTY_DESCRIPTORS = List.of( RECORD_READER, RECORD_WRITER, LANGUAGE, diff --git a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedRouterProcessor.java b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedRouterProcessor.java index 2323ea0afe08..542e2988766c 100644 --- a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedRouterProcessor.java +++ b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedRouterProcessor.java @@ -75,7 +75,7 @@ protected ScriptedRouterProcessor(final Class scriptResultType) { @Override protected List getSupportedPropertyDescriptors() { - return DESCRIPTORS; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedTransformRecord.java b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedTransformRecord.java index f093dd58ab21..c8650c328326 100644 --- a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedTransformRecord.java +++ b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ScriptedTransformRecord.java @@ -98,7 +98,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return DESCRIPTORS; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-shopify-bundle/nifi-shopify-processors/src/main/java/org/apache/nifi/processors/shopify/GetShopify.java b/nifi-extension-bundles/nifi-shopify-bundle/nifi-shopify-processors/src/main/java/org/apache/nifi/processors/shopify/GetShopify.java index ece7b9b9c7d2..2c950cf7a5ff 100644 --- a/nifi-extension-bundles/nifi-shopify-bundle/nifi-shopify-processors/src/main/java/org/apache/nifi/processors/shopify/GetShopify.java +++ b/nifi-extension-bundles/nifi-shopify-bundle/nifi-shopify-processors/src/main/java/org/apache/nifi/processors/shopify/GetShopify.java @@ -197,15 +197,15 @@ private static List createPropertyDescriptors() { propertyMap.put(resourceType, resourceDescriptor); return resourceDescriptor; }) - .collect(Collectors.toList()); - final List propertyDescriptors = new ArrayList<>(Arrays.asList( + .toList(); + final List propertyDescriptors = new ArrayList<>(List.of( STORE_DOMAIN, ACCESS_TOKEN, API_VERSION, OBJECT_CATEGORY )); propertyDescriptors.addAll(resourceDescriptors); - propertyDescriptors.addAll(Arrays.asList( + propertyDescriptors.addAll(List.of( RESULT_LIMIT, IS_INCREMENTAL, INCREMENTAL_DELAY, diff --git a/nifi-extension-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/sink/SiteToSiteReportingRecordSink.java b/nifi-extension-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/sink/SiteToSiteReportingRecordSink.java index e159095ee12c..cdd9ddad690f 100644 --- a/nifi-extension-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/sink/SiteToSiteReportingRecordSink.java +++ b/nifi-extension-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/sink/SiteToSiteReportingRecordSink.java @@ -50,7 +50,7 @@ @CapabilityDescription("Provides a service to write records using a configured RecordSetWriter over a Site-to-Site connection.") public class SiteToSiteReportingRecordSink extends AbstractControllerService implements RecordSinkService { - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( RECORD_WRITER_FACTORY, SiteToSiteUtils.DESTINATION_URL, SiteToSiteUtils.PORT_NAME, @@ -74,7 +74,7 @@ protected void init(final ControllerServiceInitializationContext context) { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/src/main/java/org/apache/nifi/processors/slack/ConsumeSlack.java b/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/src/main/java/org/apache/nifi/processors/slack/ConsumeSlack.java index 56f9611836e3..236d6674793e 100644 --- a/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/src/main/java/org/apache/nifi/processors/slack/ConsumeSlack.java +++ b/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/src/main/java/org/apache/nifi/processors/slack/ConsumeSlack.java @@ -184,7 +184,8 @@ public class ConsumeSlack extends AbstractProcessor implements VerifiableProcess .description("Slack messages that are successfully received will be routed to this relationship") .build(); - private static final List PROPERTIES = List.of(CHANNEL_IDS, + private static final List PROPERTY_DESCRIPTORS = List.of( + CHANNEL_IDS, ACCESS_TOKEN, REPLY_MONITOR_WINDOW, REPLY_MONITOR_FREQUENCY, @@ -204,7 +205,7 @@ public class ConsumeSlack extends AbstractProcessor implements VerifiableProcess @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/src/main/java/org/apache/nifi/processors/slack/ListenSlack.java b/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/src/main/java/org/apache/nifi/processors/slack/ListenSlack.java index 2a9446008bd3..6a456ec5c312 100644 --- a/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/src/main/java/org/apache/nifi/processors/slack/ListenSlack.java +++ b/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/src/main/java/org/apache/nifi/processors/slack/ListenSlack.java @@ -142,7 +142,7 @@ public class ListenSlack extends AbstractProcessor { .description("All FlowFiles that are created will be sent to this Relationship.") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( APP_TOKEN, BOT_TOKEN, EVENT_TYPE, @@ -160,7 +160,7 @@ public class ListenSlack extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/src/main/java/org/apache/nifi/processors/slack/PublishSlack.java b/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/src/main/java/org/apache/nifi/processors/slack/PublishSlack.java index 4390d2a4766b..c8c4a59d7263 100644 --- a/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/src/main/java/org/apache/nifi/processors/slack/PublishSlack.java +++ b/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/src/main/java/org/apache/nifi/processors/slack/PublishSlack.java @@ -211,14 +211,16 @@ public class PublishSlack extends AbstractProcessor { .required(false) .build(); - private static final List properties = List.of(ACCESS_TOKEN, + private static final List PROPERTY_DESCRIPTORS = List.of( + ACCESS_TOKEN, CHANNEL, PUBLISH_STRATEGY, MESSAGE_TEXT, CHARACTER_SET, SEND_CONTENT_AS_ATTACHMENT, MAX_FILE_SIZE, - THREAD_TS); + THREAD_TS + ); public static final Relationship REL_SUCCESS = new Relationship.Builder() @@ -236,10 +238,11 @@ public class PublishSlack extends AbstractProcessor { .description("FlowFiles are routed to 'failure' if unable to be sent to Slack for any other reason") .build(); - private static final Set relationships = Set.of( + private static final Set RELATIONSHIPS = Set.of( REL_SUCCESS, REL_RATE_LIMITED, - REL_FAILURE); + REL_FAILURE + ); private RateLimit rateLimit; @@ -249,12 +252,12 @@ public class PublishSlack extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return properties; + return PROPERTY_DESCRIPTORS; } @Override public Set getRelationships() { - return relationships; + return RELATIONSHIPS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/src/main/java/org/apache/nifi/services/slack/SlackRecordSink.java b/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/src/main/java/org/apache/nifi/services/slack/SlackRecordSink.java index 7ecab3c14b67..d214de452887 100644 --- a/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/src/main/java/org/apache/nifi/services/slack/SlackRecordSink.java +++ b/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/src/main/java/org/apache/nifi/services/slack/SlackRecordSink.java @@ -91,7 +91,7 @@ public class SlackRecordSink extends AbstractControllerService implements Record .identifiesControllerService(WebClientServiceProvider.class) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( API_URL, ACCESS_TOKEN, CHANNEL_ID, @@ -105,7 +105,7 @@ public class SlackRecordSink extends AbstractControllerService implements Record @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/FetchSmb.java b/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/FetchSmb.java index f09a9cd6d0e6..52feec30f159 100644 --- a/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/FetchSmb.java +++ b/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/FetchSmb.java @@ -118,7 +118,7 @@ public class FetchSmb extends AbstractProcessor { REL_FAILURE ); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SMB_CLIENT_PROVIDER_SERVICE, REMOTE_FILE, COMPLETION_STRATEGY, @@ -135,7 +135,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java b/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java index a0580d83aed5..76a64c1b5cc9 100644 --- a/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java +++ b/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/GetSmbFile.java @@ -218,7 +218,7 @@ public class GetSmbFile extends AbstractProcessor { public static final Relationship REL_SUCCESS = new Relationship.Builder().name("success").description("All files are routed to success").build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( HOSTNAME, SHARE, DIRECTORY, @@ -262,12 +262,12 @@ public class GetSmbFile extends AbstractProcessor { @Override public Set getRelationships() { - return this.RELATIONSHIPS; + return RELATIONSHIPS; } @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/ListSmb.java b/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/ListSmb.java index bf9b5cbe0849..a95c9da19810 100644 --- a/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/ListSmb.java +++ b/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/ListSmb.java @@ -189,7 +189,7 @@ public class ListSmb extends AbstractListProcessor { .addValidator(new MustNotContainDirectorySeparatorsValidator()) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SMB_CLIENT_PROVIDER_SERVICE, SMB_LISTING_STRATEGY, DIRECTORY, @@ -207,7 +207,7 @@ public class ListSmb extends AbstractListProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/PutSmbFile.java b/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/PutSmbFile.java index 7290d87e73a8..c2e2e2245fcd 100644 --- a/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/PutSmbFile.java +++ b/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-processors/src/main/java/org/apache/nifi/processors/smb/PutSmbFile.java @@ -170,7 +170,7 @@ public class PutSmbFile extends AbstractProcessor { .description("Files that could not be written to the output network path for some reason are transferred to this relationship") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( HOSTNAME, SHARE, DIRECTORY, @@ -202,7 +202,7 @@ public Set getRelationships() { @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-smbj-client/src/main/java/org/apache/nifi/services/smb/SmbjClientProviderService.java b/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-smbj-client/src/main/java/org/apache/nifi/services/smb/SmbjClientProviderService.java index 359b29d80f48..7d6258c1ee07 100644 --- a/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-smbj-client/src/main/java/org/apache/nifi/services/smb/SmbjClientProviderService.java +++ b/nifi-extension-bundles/nifi-smb-bundle/nifi-smb-smbj-client/src/main/java/org/apache/nifi/services/smb/SmbjClientProviderService.java @@ -101,7 +101,7 @@ public class SmbjClientProviderService extends AbstractControllerService impleme .addValidator(NON_BLANK_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( HOSTNAME, PORT, SHARE, @@ -122,7 +122,7 @@ public class SmbjClientProviderService extends AbstractControllerService impleme @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-processors/src/main/java/org/apache/nifi/processors/snowflake/GetSnowflakeIngestStatus.java b/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-processors/src/main/java/org/apache/nifi/processors/snowflake/GetSnowflakeIngestStatus.java index b4d4a2dacdce..20f37e98846f 100644 --- a/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-processors/src/main/java/org/apache/nifi/processors/snowflake/GetSnowflakeIngestStatus.java +++ b/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-processors/src/main/java/org/apache/nifi/processors/snowflake/GetSnowflakeIngestStatus.java @@ -79,13 +79,19 @@ public class GetSnowflakeIngestStatus extends AbstractProcessor { .description("For FlowFiles whose file is still not ingested. These FlowFiles should be routed back to this processor to try again later") .build(); - static final List PROPERTIES = List.of(INGEST_MANAGER_PROVIDER); + private static final List PROPERTY_DESCRIPTORS = List.of( + INGEST_MANAGER_PROVIDER + ); - private static final Set RELATIONSHIPS = Set.of(REL_SUCCESS, REL_RETRY, REL_FAILURE); + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS, + REL_RETRY, + REL_FAILURE + ); @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-processors/src/main/java/org/apache/nifi/processors/snowflake/PutSnowflakeInternalStage.java b/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-processors/src/main/java/org/apache/nifi/processors/snowflake/PutSnowflakeInternalStage.java index c0d3bf63cc61..1e8eab150145 100644 --- a/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-processors/src/main/java/org/apache/nifi/processors/snowflake/PutSnowflakeInternalStage.java +++ b/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-processors/src/main/java/org/apache/nifi/processors/snowflake/PutSnowflakeInternalStage.java @@ -113,7 +113,7 @@ public class PutSnowflakeInternalStage extends AbstractProcessor { .description("For FlowFiles of failed PUT operation") .build(); - static final List PROPERTIES = List.of( + static final List PROPERTY_DESCRIPTORS = List.of( SNOWFLAKE_CONNECTION_PROVIDER, INTERNAL_STAGE_TYPE, DATABASE, @@ -122,11 +122,14 @@ public class PutSnowflakeInternalStage extends AbstractProcessor { INTERNAL_STAGE ); - private static final Set RELATIONSHIPS = Set.of(REL_SUCCESS, REL_FAILURE); + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS, + REL_FAILURE + ); @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-processors/src/main/java/org/apache/nifi/processors/snowflake/StartSnowflakeIngest.java b/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-processors/src/main/java/org/apache/nifi/processors/snowflake/StartSnowflakeIngest.java index e3cbbbfe9256..2a7922409330 100644 --- a/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-processors/src/main/java/org/apache/nifi/processors/snowflake/StartSnowflakeIngest.java +++ b/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-processors/src/main/java/org/apache/nifi/processors/snowflake/StartSnowflakeIngest.java @@ -72,13 +72,18 @@ public class StartSnowflakeIngest extends AbstractProcessor { .description("For FlowFiles of failed ingest request") .build(); - static final List PROPERTIES = List.of(INGEST_MANAGER_PROVIDER); + static final List PROPERTY_DESCRIPTORS = List.of( + INGEST_MANAGER_PROVIDER + ); - private static final Set RELATIONSHIPS = Set.of(REL_SUCCESS, REL_FAILURE); + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS, + REL_FAILURE + ); @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-services/src/main/java/org/apache/nifi/snowflake/service/SnowflakeComputingConnectionPool.java b/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-services/src/main/java/org/apache/nifi/snowflake/service/SnowflakeComputingConnectionPool.java index a7951de01064..abf3465874ea 100644 --- a/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-services/src/main/java/org/apache/nifi/snowflake/service/SnowflakeComputingConnectionPool.java +++ b/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-services/src/main/java/org/apache/nifi/snowflake/service/SnowflakeComputingConnectionPool.java @@ -142,7 +142,7 @@ public class SnowflakeComputingConnectionPool extends AbstractDBCPConnectionPool .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CONNECTION_URL_FORMAT, SNOWFLAKE_URL, SNOWFLAKE_ACCOUNT_LOCATOR, @@ -169,7 +169,7 @@ public class SnowflakeComputingConnectionPool extends AbstractDBCPConnectionPool @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-services/src/main/java/org/apache/nifi/snowflake/service/StandardSnowflakeIngestManagerProviderService.java b/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-services/src/main/java/org/apache/nifi/snowflake/service/StandardSnowflakeIngestManagerProviderService.java index d2651f153613..a317facd6a88 100644 --- a/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-services/src/main/java/org/apache/nifi/snowflake/service/StandardSnowflakeIngestManagerProviderService.java +++ b/nifi-extension-bundles/nifi-snowflake-bundle/nifi-snowflake-services/src/main/java/org/apache/nifi/snowflake/service/StandardSnowflakeIngestManagerProviderService.java @@ -126,7 +126,7 @@ public class StandardSnowflakeIngestManagerProviderService extends AbstractContr .required(true) .build(); - static final List PROPERTIES = List.of( + static final List PROPERTY_DESCRIPTORS = List.of( ACCOUNT_IDENTIFIER_FORMAT, HOST_URL, ACCOUNT_LOCATOR, @@ -143,7 +143,7 @@ public class StandardSnowflakeIngestManagerProviderService extends AbstractContr @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } private volatile String fullyQualifiedPipeName; diff --git a/nifi-extension-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/main/java/org/apache/nifi/processors/splunk/GetSplunk.java b/nifi-extension-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/main/java/org/apache/nifi/processors/splunk/GetSplunk.java index e82dca417e22..b6e4ed13214c 100644 --- a/nifi-extension-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/main/java/org/apache/nifi/processors/splunk/GetSplunk.java +++ b/nifi-extension-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/main/java/org/apache/nifi/processors/splunk/GetSplunk.java @@ -270,7 +270,7 @@ public class GetSplunk extends AbstractProcessor implements ClassloaderIsolation REL_SUCCESS ); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SCHEME, HOSTNAME, PORT, @@ -304,7 +304,7 @@ public final Set getRelationships() { @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/main/java/org/apache/nifi/processors/splunk/PutSplunkHTTP.java b/nifi-extension-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/main/java/org/apache/nifi/processors/splunk/PutSplunkHTTP.java index c09875c40e66..e3a87a07ed24 100644 --- a/nifi-extension-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/main/java/org/apache/nifi/processors/splunk/PutSplunkHTTP.java +++ b/nifi-extension-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/main/java/org/apache/nifi/processors/splunk/PutSplunkHTTP.java @@ -43,15 +43,12 @@ import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Stream; @InputRequirement(InputRequirement.Requirement.INPUT_REQUIRED) @Tags({"splunk", "logs", "http"}) @@ -133,9 +130,22 @@ public class PutSplunkHTTP extends SplunkAPICall { .description("FlowFiles that failed to send to the destination are sent to this relationship.") .build(); - private static final Set RELATIONSHIPS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList( + private static final Set RELATIONSHIPS = Set.of( RELATIONSHIP_SUCCESS, - RELATIONSHIP_FAILURE))); + RELATIONSHIP_FAILURE + ); + + private static final List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), + Stream.of( + SOURCE, + SOURCE_TYPE, + HOST, + INDEX, + CONTENT_TYPE, + CHARSET + ) + ).toList(); @Override public Set getRelationships() { @@ -144,14 +154,7 @@ public Set getRelationships() { @Override public List getSupportedPropertyDescriptors() { - final List result = new ArrayList<>(super.getSupportedPropertyDescriptors()); - result.add(SOURCE); - result.add(SOURCE_TYPE); - result.add(HOST); - result.add(INDEX); - result.add(CONTENT_TYPE); - result.add(CHARSET); - return result; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/main/java/org/apache/nifi/processors/splunk/QuerySplunkIndexingStatus.java b/nifi-extension-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/main/java/org/apache/nifi/processors/splunk/QuerySplunkIndexingStatus.java index 314d51c2b480..12991f8d4fc5 100644 --- a/nifi-extension-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/main/java/org/apache/nifi/processors/splunk/QuerySplunkIndexingStatus.java +++ b/nifi-extension-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/main/java/org/apache/nifi/processors/splunk/QuerySplunkIndexingStatus.java @@ -117,11 +117,11 @@ public class QuerySplunkIndexingStatus extends SplunkAPICall { .addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR) .build(); - private static final List PROPERTIES = Stream.concat( - SplunkAPICall.PROPERTIES.stream(), + private static final List PROPERTY_DESCRIPTORS = Stream.concat( + getCommonPropertyDescriptors().stream(), Stream.of( - TTL, - MAX_QUERY_SIZE + TTL, + MAX_QUERY_SIZE ) ).toList(); @@ -130,7 +130,7 @@ public class QuerySplunkIndexingStatus extends SplunkAPICall { @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/main/java/org/apache/nifi/processors/splunk/SplunkAPICall.java b/nifi-extension-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/main/java/org/apache/nifi/processors/splunk/SplunkAPICall.java index 8b753d531c65..9d444cc9cbd6 100644 --- a/nifi-extension-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/main/java/org/apache/nifi/processors/splunk/SplunkAPICall.java +++ b/nifi-extension-bundles/nifi-splunk-bundle/nifi-splunk-processors/src/main/java/org/apache/nifi/processors/splunk/SplunkAPICall.java @@ -35,7 +35,6 @@ import java.io.IOException; import java.io.InputStream; -import java.util.Arrays; import java.util.List; abstract class SplunkAPICall extends AbstractProcessor { @@ -135,7 +134,7 @@ abstract class SplunkAPICall extends AbstractProcessor { .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT) .build(); - protected static final List PROPERTIES = Arrays.asList( + private static final List PROPERTY_DESCRIPTORS = List.of( SCHEME, HOSTNAME, PORT, @@ -154,9 +153,13 @@ abstract class SplunkAPICall extends AbstractProcessor { private volatile Service splunkService; private volatile String requestChannel; + protected static List getCommonPropertyDescriptors() { + return PROPERTY_DESCRIPTORS; + } + @Override public List getSupportedPropertyDescriptors() { - return SplunkAPICall.PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractRecordProcessor.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractRecordProcessor.java index 7351b8f96cd4..fef3eec0da47 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractRecordProcessor.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AbstractRecordProcessor.java @@ -78,17 +78,24 @@ public abstract class AbstractRecordProcessor extends AbstractProcessor { + "the unchanged FlowFile will be routed to this relationship") .build(); - private static final List properties = List.of(RECORD_READER, RECORD_WRITER); - private static final Set relationships = Set.of(REL_SUCCESS, REL_FAILURE); + private static final List PROPERTY_DESCRIPTORS = List.of( + RECORD_READER, + RECORD_WRITER + ); + + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS, + REL_FAILURE + ); @Override protected List getSupportedPropertyDescriptors() { - return properties; + return PROPERTY_DESCRIPTORS; } @Override public Set getRelationships() { - return relationships; + return RELATIONSHIPS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AttributesToCSV.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AttributesToCSV.java index d16c12bc208b..f7d82d0a4669 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AttributesToCSV.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AttributesToCSV.java @@ -146,7 +146,7 @@ public class AttributesToCSV extends AbstractProcessor { .defaultValue("false") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( ATTRIBUTES_LIST, ATTRIBUTES_REGEX, DESTINATION, @@ -174,7 +174,7 @@ public class AttributesToCSV extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AttributesToJSON.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AttributesToJSON.java index 29921080f766..0daa7eecfb63 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AttributesToJSON.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/AttributesToJSON.java @@ -167,7 +167,7 @@ public String getDescription() { .dependsOn(DESTINATION, DESTINATION_CONTENT) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( ATTRIBUTES_LIST, ATTRIBUTES_REGEX, DESTINATION, @@ -198,7 +198,7 @@ public String getDescription() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CalculateRecordStats.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CalculateRecordStats.java index 575648764aac..e53895b8ad34 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CalculateRecordStats.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CalculateRecordStats.java @@ -94,7 +94,7 @@ public class CalculateRecordStats extends AbstractProcessor { .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES) .build(); - static final List PROPERTIES = List.of( + static final List PROPERTY_DESCRIPTORS = List.of( RECORD_READER, LIMIT ); @@ -125,8 +125,9 @@ protected PropertyDescriptor getSupportedDynamicPropertyDescriptor(final String .build(); } + @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java index 0d12bb473f8a..c0f39a0dfafc 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java @@ -186,7 +186,7 @@ public class CompressContent extends AbstractProcessor { .defaultValue("false") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( MODE, COMPRESSION_FORMAT, COMPRESSION_LEVEL, @@ -230,7 +230,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java index 38382efb0616..469d32a8987f 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ControlRate.java @@ -208,7 +208,7 @@ public class ControlRate extends AbstractProcessor { .expressionLanguageSupported(ExpressionLanguageScope.NONE) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( RATE_CONTROL_CRITERIA, TIME_PERIOD, MAX_RATE, @@ -261,7 +261,7 @@ public class ControlRate extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java index b625ece1dbcc..7d61129d8718 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertCharacterSet.java @@ -90,14 +90,16 @@ public class ConvertCharacterSet extends AbstractProcessor { .required(true) .build(); - private final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( INPUT_CHARSET, OUTPUT_CHARSET ); public static final Relationship REL_SUCCESS = new Relationship.Builder().name("success").description("").build(); - private final Set RELATIONSHIPS = Set.of(REL_SUCCESS); + private final Set RELATIONSHIPS = Set.of( + REL_SUCCESS + ); public static final int MAX_BUFFER_SIZE = 512 * 1024; @@ -108,7 +110,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CountText.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CountText.java index 276078add0fe..908c0ebf77af 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CountText.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CountText.java @@ -151,7 +151,7 @@ public class CountText extends AbstractProcessor { .addValidator(StandardValidators.BOOLEAN_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( TEXT_LINE_COUNT_PD, TEXT_LINE_NONEMPTY_COUNT_PD, TEXT_WORD_COUNT_PD, @@ -331,6 +331,6 @@ int countWordsInLine(String line, boolean splitWordsOnSymbols) throws IOExceptio @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } } diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CryptographicHashContent.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CryptographicHashContent.java index 3f43f78c9a25..7a7d8ba6d8ce 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CryptographicHashContent.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CryptographicHashContent.java @@ -70,7 +70,7 @@ public class CryptographicHashContent extends AbstractProcessor { .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( FAIL_WHEN_EMPTY, HASH_ALGORITHM ); @@ -97,7 +97,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DeduplicateRecord.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DeduplicateRecord.java index 1c5b9f6bf90b..9e29a87ef824 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DeduplicateRecord.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DeduplicateRecord.java @@ -264,7 +264,7 @@ public class DeduplicateRecord extends AbstractProcessor { .required(false) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( DEDUPLICATION_STRATEGY, DISTRIBUTED_MAP_CACHE, CACHE_IDENTIFIER, @@ -312,7 +312,7 @@ public Set getRelationships() { @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DeleteFile.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DeleteFile.java index befcf8fc8e39..8d5b3b694f5f 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DeleteFile.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DeleteFile.java @@ -109,7 +109,7 @@ public class DeleteFile extends AbstractProcessor { .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES) .build(); - private final static List PROPERTIES = List.of( + private final static List PROPERTY_DESCRIPTORS = List.of( DIRECTORY_PATH, FILENAME ); @@ -121,7 +121,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DetectDuplicate.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DetectDuplicate.java index 50d20012e9b9..4ac63fda7ede 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DetectDuplicate.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DetectDuplicate.java @@ -108,7 +108,7 @@ public class DetectDuplicate extends AbstractProcessor { .defaultValue("true") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CACHE_ENTRY_IDENTIFIER, FLOWFILE_DESCRIPTION, AGE_OFF_DURATION, @@ -141,7 +141,7 @@ public class DetectDuplicate extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DuplicateFlowFile.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DuplicateFlowFile.java index 50061ab93986..1809b19f8973 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DuplicateFlowFile.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/DuplicateFlowFile.java @@ -59,14 +59,18 @@ public class DuplicateFlowFile extends AbstractProcessor { .addValidator(StandardValidators.NON_NEGATIVE_INTEGER_VALIDATOR) .build(); - private static final List PROPERTIES = List.of(NUM_COPIES); + private static final List PROPERTY_DESCRIPTORS = List.of( + NUM_COPIES + ); static final Relationship REL_SUCCESS = new Relationship.Builder() .name("success") .description("The original FlowFile and all copies will be sent to this relationship") .build(); - private static final Set RELATIONSHIPS = Set.of(REL_SUCCESS); + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS + ); @Override public Set getRelationships() { @@ -75,7 +79,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EncodeContent.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EncodeContent.java index d8ceef25771b..8b8b775b6f03 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EncodeContent.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EncodeContent.java @@ -101,7 +101,7 @@ public class EncodeContent extends AbstractProcessor { .dependsOn(LINE_OUTPUT_MODE, LineOutputMode.MULTIPLE_LINES) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( MODE, ENCODING, LINE_OUTPUT_MODE, @@ -134,7 +134,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EnforceOrder.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EnforceOrder.java index 15603c147723..4710cfdfcc2b 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EnforceOrder.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EnforceOrder.java @@ -178,7 +178,7 @@ public class EnforceOrder extends AbstractProcessor { .expressionLanguageSupported(ExpressionLanguageScope.NONE) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( GROUP_IDENTIFIER, ORDER_ATTRIBUTE, INITIAL_ORDER, @@ -223,7 +223,7 @@ public class EnforceOrder extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJsonPath.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJsonPath.java index ab5f9445b00f..05ffef2a72f7 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJsonPath.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJsonPath.java @@ -124,7 +124,7 @@ public class EvaluateJsonPath extends AbstractJsonPathProcessor { .dependsOn(DESTINATION, DESTINATION_ATTRIBUTE) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( DESTINATION, RETURN_TYPE, PATH_NOT_FOUND, @@ -191,7 +191,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java index aacfa9bb2f75..8cec22d2a7ea 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXPath.java @@ -131,7 +131,7 @@ public class EvaluateXPath extends AbstractProcessor { .defaultValue("false") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( DESTINATION, RETURN_TYPE, VALIDATE_DTD @@ -192,7 +192,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java index 89c0e7eb7d32..fc03ccdc0762 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java @@ -149,7 +149,7 @@ public class EvaluateXQuery extends AbstractProcessor { .defaultValue("false") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( DESTINATION, XML_OUTPUT_METHOD, XML_OUTPUT_OMIT_XML_DECLARATION, @@ -208,7 +208,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override 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 b88a90903bf4..b0f6679eba26 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 @@ -153,7 +153,7 @@ public class ExecuteProcess extends AbstractProcessor { .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( COMMAND, COMMAND_ARGUMENTS, BATCH_DURATION, @@ -184,7 +184,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteSQLRecord.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteSQLRecord.java index 7e802d2bfc5f..88f0b9f761d9 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteSQLRecord.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteSQLRecord.java @@ -150,7 +150,7 @@ public class ExecuteSQLRecord extends AbstractExecuteSQL { .required(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( DBCP_SERVICE, SQL_PRE_QUERY, SQL_SELECT_QUERY, @@ -174,7 +174,7 @@ public class ExecuteSQLRecord extends AbstractExecuteSQL { public ExecuteSQLRecord() { relationships = RELATIONSHIPS; - propDescriptors = PROPERTIES; + propDescriptors = PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java index 3d9fe9c7cdd3..e635df57faaf 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java @@ -287,7 +287,7 @@ public class ExecuteStreamCommand extends AbstractProcessor { .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( WORKING_DIR, EXECUTION_COMMAND, ARGUMENTS_STRATEGY, @@ -328,7 +328,7 @@ public void onPropertyModified(final PropertyDescriptor descriptor, final String @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override 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 0f989852b1e4..3c1998dab2ae 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 @@ -154,7 +154,7 @@ public class ExtractGrok extends AbstractProcessor { .defaultValue("false") .build(); - private final static List PROPERTIES = List.of( + private final static List PROPERTY_DESCRIPTORS = List.of( GROK_EXPRESSION, GROK_PATTERNS, DESTINATION, @@ -191,7 +191,7 @@ public Set getRelationships() { @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnStopped diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractRecordSchema.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractRecordSchema.java index 90e9b5edfdb1..2d3507209ee4 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractRecordSchema.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractRecordSchema.java @@ -77,7 +77,7 @@ public class ExtractRecordSchema extends AbstractProcessor { .required(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( RECORD_READER, SCHEMA_CACHE_SIZE ); @@ -101,7 +101,7 @@ public class ExtractRecordSchema extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override 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 218a9f3e8fe7..f0349298fa30 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 @@ -229,7 +229,7 @@ must be named, if the number of groups (not including capture group 0) does not .defaultValue("false") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CHARACTER_SET, MAX_BUFFER_SIZE, MAX_CAPTURE_GROUP_LENGTH, @@ -273,7 +273,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchDistributedMapCache.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchDistributedMapCache.java index c6038d520ba8..d027cb95f8f7 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchDistributedMapCache.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchDistributedMapCache.java @@ -119,7 +119,7 @@ public class FetchDistributedMapCache extends AbstractProcessor { .defaultValue("UTF-8") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CACHE_ENTRY_IDENTIFIER, DISTRIBUTED_CACHE_SERVICE, PUT_CACHE_VALUE_IN_ATTRIBUTE, @@ -151,7 +151,7 @@ public class FetchDistributedMapCache extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFTP.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFTP.java index b2e7b4019efa..0ba4e1f3a5be 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFTP.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFTP.java @@ -88,7 +88,7 @@ public class FetchFTP extends FetchFileTransfer { private static final PropertyDescriptor PORT = new PropertyDescriptor.Builder().fromPropertyDescriptor(UNDEFAULTED_PORT).defaultValue("21").build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( HOSTNAME, PORT, USERNAME, @@ -110,7 +110,7 @@ public class FetchFTP extends FetchFileTransfer { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @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 6b3e34f97b99..1ba8612397d9 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 @@ -176,7 +176,7 @@ public class FetchFile extends AbstractProcessor { .required(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( FILENAME, COMPLETION_STRATEGY, MOVE_DESTINATION_DIR, @@ -212,7 +212,7 @@ public class FetchFile extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchSFTP.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchSFTP.java index 5e45ed3e95de..1271934780ce 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchSFTP.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchSFTP.java @@ -97,7 +97,7 @@ public class FetchSFTP extends FetchFileTransfer { MOVE_CREATE_DIRECTORY.getDisplayName(), SFTPTransfer.DISABLE_DIRECTORY_LISTING.getDescription())).build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( HOSTNAME, PORT, USERNAME, @@ -125,7 +125,7 @@ public class FetchSFTP extends FetchFileTransfer { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FilterAttribute.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FilterAttribute.java index 31b68fafd060..366d48a47b90 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FilterAttribute.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FilterAttribute.java @@ -113,7 +113,7 @@ public class FilterAttribute extends AbstractProcessor { .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES) .build(); - private final static List PROPERTIES = List.of( + private final static List PROPERTY_DESCRIPTORS = List.of( FILTER_MODE, MATCHING_STRATEGY, ATTRIBUTE_ENUMERATION, @@ -131,7 +131,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FlattenJson.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FlattenJson.java index 2467ad95b86a..95fde41e0a64 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FlattenJson.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FlattenJson.java @@ -158,7 +158,7 @@ public class FlattenJson extends AbstractProcessor { .expressionLanguageSupported(ExpressionLanguageScope.NONE) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SEPARATOR, FLATTEN_MODE, IGNORE_RESERVED_CHARACTERS, @@ -184,7 +184,7 @@ public class FlattenJson extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ForkRecord.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ForkRecord.java index 7cc30f19d279..6f3d62c9df84 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ForkRecord.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ForkRecord.java @@ -141,7 +141,7 @@ public class ForkRecord extends AbstractProcessor { .required(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( RECORD_READER, RECORD_WRITER, MODE, @@ -169,7 +169,7 @@ public class ForkRecord extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateFlowFile.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateFlowFile.java index 257c1d244a6d..f195eac4019b 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateFlowFile.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateFlowFile.java @@ -126,7 +126,7 @@ public class GenerateFlowFile extends AbstractProcessor { .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( FILE_SIZE, BATCH_SIZE, DATA_FORMAT, @@ -140,13 +140,15 @@ public class GenerateFlowFile extends AbstractProcessor { .name("success") .build(); - private static final Set RELATIONSHIPS = Set.of(SUCCESS); + private static final Set RELATIONSHIPS = Set.of( + SUCCESS + ); private static final char[] TEXT_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890!@#$%^&*()-_=+/?.,';:\"?<>\n\t ".toCharArray(); @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateRecord.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateRecord.java index de6e76aab4be..6db4063e3acd 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateRecord.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateRecord.java @@ -151,7 +151,7 @@ public class GenerateRecord extends AbstractProcessor { .required(false) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( RECORD_WRITER, NUM_RECORDS, NULLABLE_FIELDS, @@ -164,13 +164,15 @@ public class GenerateRecord extends AbstractProcessor { .description("FlowFiles that are successfully created will be routed to this relationship") .build(); - static final Set RELATIONSHIPS = Set.of(REL_SUCCESS); + static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS + ); private volatile Faker faker = new Faker(); @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateTableFetch.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateTableFetch.java index 56cae799af02..6bdcad8ade38 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateTableFetch.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GenerateTableFetch.java @@ -164,7 +164,7 @@ public class GenerateTableFetch extends AbstractDatabaseFetchProcessor { .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( DBCP_SERVICE, DB_TYPE, TABLE_NAME, @@ -190,7 +190,7 @@ public class GenerateTableFetch extends AbstractDatabaseFetchProcessor { ); public GenerateTableFetch() { - propDescriptors = PROPERTIES; + propDescriptors = PROPERTY_DESCRIPTORS; relationships = RELATIONSHIPS; } diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFTP.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFTP.java index b5143e7ad985..06d8ecfbd049 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFTP.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFTP.java @@ -56,7 +56,7 @@ @SeeAlso(PutFTP.class) public class GetFTP extends GetFileTransfer { - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( FTPTransfer.HOSTNAME, FTPTransfer.PORT, FTPTransfer.USERNAME, @@ -83,7 +83,7 @@ public class GetFTP extends GetFileTransfer { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFile.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFile.java index 780e37c3ae98..6a6ec7911897 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFile.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFile.java @@ -188,7 +188,7 @@ public class GetFile extends AbstractProcessor { .defaultValue("10") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( DIRECTORY, FILE_FILTER, PATH_FILTER, @@ -226,7 +226,7 @@ public class GetFile extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFileResource.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFileResource.java index 7aa1471fff4d..1c329a1878fb 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFileResource.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetFileResource.java @@ -88,17 +88,22 @@ public class GetFileResource extends AbstractProcessor { .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .build(); - private static final List PROPERTIES = List.of(FILE_RESOURCE, MIME_TYPE); + private static final List PROPERTY_DESCRIPTORS = List.of( + FILE_RESOURCE, + MIME_TYPE + ); public static final Relationship SUCCESS = new Relationship.Builder() .name("success") .build(); - private static final Set RELATIONSHIPS = Set.of(SUCCESS); + private static final Set RELATIONSHIPS = Set.of( + SUCCESS + ); @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetSFTP.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetSFTP.java index faa9caee8847..db125e9b2950 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetSFTP.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/GetSFTP.java @@ -55,7 +55,7 @@ @SeeAlso(PutSFTP.class) public class GetSFTP extends GetFileTransfer { - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SFTPTransfer.HOSTNAME, SFTPTransfer.PORT, SFTPTransfer.USERNAME, @@ -88,7 +88,7 @@ public class GetSFTP extends GetFileTransfer { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java index 7ad6d77d8d65..e26260e8bab1 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java @@ -319,7 +319,7 @@ public class HandleHttpRequest extends AbstractProcessor { .defaultValue("512 KB") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( PORT, HOSTNAME, SSL_CONTEXT, @@ -348,7 +348,9 @@ public class HandleHttpRequest extends AbstractProcessor { .description("All content that is received is routed to the 'success' relationship") .build(); - private static final Set RELATIONSHIPS = Set.of(REL_SUCCESS); + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS + ); private volatile Server server; private volatile boolean ready; @@ -360,7 +362,7 @@ public class HandleHttpRequest extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpResponse.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpResponse.java index 18df55617e9c..771c1f51fb40 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpResponse.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpResponse.java @@ -82,7 +82,7 @@ public class HandleHttpResponse extends AbstractProcessor { .required(false) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( STATUS_CODE, HTTP_CONTEXT_MAP, ATTRIBUTES_AS_HEADERS_REGEX @@ -98,11 +98,14 @@ public class HandleHttpResponse extends AbstractProcessor { + "for instance, if the connection times out or if NiFi is restarted before responding to the HTTP Request.") .build(); - private static final Set RELATIONSHIPS = Set.of(REL_SUCCESS, REL_FAILURE); + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS, + REL_FAILURE + ); @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java index 8d064fb421d8..b6efd68a0774 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/IdentifyMimeType.java @@ -131,11 +131,11 @@ public class IdentifyMimeType extends AbstractProcessor { .dependsOn(CONFIG_STRATEGY, REPLACE, MERGE) .build(); - private static final List PROPERTIES = List.of( - USE_FILENAME_IN_DETECTION, - CONFIG_STRATEGY, - MIME_CONFIG_BODY, - MIME_CONFIG_FILE + private static final List PROPERTY_DESCRIPTORS = List.of( + USE_FILENAME_IN_DETECTION, + CONFIG_STRATEGY, + MIME_CONFIG_BODY, + MIME_CONFIG_FILE ); public static final Relationship REL_SUCCESS = new Relationship.Builder() @@ -143,7 +143,9 @@ public class IdentifyMimeType extends AbstractProcessor { .description("All FlowFiles are routed to success") .build(); - private static final Set RELATIONSHIPS = Set.of(REL_SUCCESS); + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS + ); private final TikaConfig config; private Detector detector; @@ -205,7 +207,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java index 7915557872c7..eee3fd1e7801 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java @@ -483,7 +483,7 @@ public class InvokeHTTP extends AbstractProcessor { private static final PropertyDescriptor PROXY_CONFIGURATION_SERVICE = ProxyConfiguration.createProxyConfigPropertyDescriptor(PROXY_SPECS); - public static final List PROPERTIES = List.of( + public static final List PROPERTY_DESCRIPTORS = List.of( HTTP_METHOD, HTTP_URL, HTTP2_DISABLED, @@ -571,7 +571,7 @@ public class InvokeHTTP extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override 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 8df227b40be0..a12f35099334 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 @@ -186,7 +186,7 @@ public class JoinEnrichment extends BinFiles { .defaultValue("10000") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( ORIGINAL_RECORD_READER, ENRICHMENT_RECORD_READER, RECORD_WRITER, @@ -231,7 +231,7 @@ public class JoinEnrichment extends BinFiles { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListDatabaseTables.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListDatabaseTables.java index ee2c20b87193..14cdfc51fc0d 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListDatabaseTables.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListDatabaseTables.java @@ -227,7 +227,7 @@ public class ListDatabaseTables extends AbstractProcessor { .identifiesControllerService(RecordSetWriterFactory.class) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( DBCP_SERVICE, CATALOG, SCHEMA_PATTERN, @@ -248,7 +248,7 @@ public class ListDatabaseTables extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFTP.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFTP.java index e102ae390bc0..d3cf742d18a7 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFTP.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFTP.java @@ -74,7 +74,7 @@ public class ListFTP extends ListFileTransfer { private static final PropertyDescriptor PORT = new PropertyDescriptor.Builder().fromPropertyDescriptor(UNDEFAULTED_PORT).defaultValue("21").build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( FILE_TRANSFER_LISTING_STRATEGY, HOSTNAME, PORT, @@ -103,7 +103,7 @@ public class ListFTP extends ListFileTransfer { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFile.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFile.java index 15af59b7e4c4..dba602e7830f 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFile.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFile.java @@ -267,7 +267,7 @@ public class ListFile extends AbstractListProcessor { .defaultValue("3 mins") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( DIRECTORY, LISTING_STRATEGY, RECURSE, @@ -292,7 +292,9 @@ public class ListFile extends AbstractListProcessor { MAX_LISTING_TIME ); - private static final Set RELATIONSHIPS = Set.of(REL_SUCCESS); + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS + ); private volatile ScheduledExecutorService monitoringThreadPool; private volatile Future monitoringFuture; @@ -324,7 +326,7 @@ protected void init(final ProcessorInitializationContext context) { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListSFTP.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListSFTP.java index b56192fd2406..09116bf837fc 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListSFTP.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListSFTP.java @@ -80,7 +80,7 @@ @DefaultSchedule(strategy = SchedulingStrategy.TIMER_DRIVEN, period = "1 min") public class ListSFTP extends ListFileTransfer { - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( FILE_TRANSFER_LISTING_STRATEGY, SFTPTransfer.HOSTNAME, SFTPTransfer.PORT, @@ -121,7 +121,7 @@ public class ListSFTP extends ListFileTransfer { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenFTP.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenFTP.java index 526005d763cb..99830b18ef59 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenFTP.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenFTP.java @@ -117,7 +117,7 @@ public class ListenFTP extends AbstractSessionFactoryProcessor { .sensitive(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( BIND_ADDRESS, PORT, USERNAME, @@ -130,7 +130,9 @@ public class ListenFTP extends AbstractSessionFactoryProcessor { .description("Relationship for successfully received files.") .build(); - private static final Set RELATIONSHIPS = Set.of(RELATIONSHIP_SUCCESS); + private static final Set RELATIONSHIPS = Set.of( + RELATIONSHIP_SUCCESS + ); private volatile FtpServer ftpServer; private volatile CountDownLatch sessionFactorySetSignal; @@ -138,7 +140,7 @@ public class ListenFTP extends AbstractSessionFactoryProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java index 7d8d9f7a0c70..4007a5e52f59 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java @@ -298,7 +298,7 @@ public AllowableValue getAllowableValue() { .dependsOn(RECORD_READER) .build(); - protected static final List PROPERTIES = List.of( + protected static final List PROPERTY_DESCRIPTORS = List.of( BASE_PATH, PORT, HEALTH_CHECK_PORT, @@ -324,7 +324,9 @@ public AllowableValue getAllowableValue() { .description("Relationship for successfully received FlowFiles") .build(); - private static final Set RELATIONSHIPS = Set.of(RELATIONSHIP_SUCCESS); + private static final Set RELATIONSHIPS = Set.of( + RELATIONSHIP_SUCCESS + ); public static final String CONTEXT_ATTRIBUTE_PROCESSOR = "processor"; public static final String CONTEXT_ATTRIBUTE_LOGGER = "logger"; @@ -377,7 +379,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnStopped diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenSyslog.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenSyslog.java index 374f7c9697ef..8dddd3c2ad2e 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenSyslog.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenSyslog.java @@ -192,7 +192,7 @@ public class ListenSyslog extends AbstractSyslogProcessor { .dependsOn(PROTOCOL, TCP_VALUE) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( PROTOCOL, PORT, NETWORK_INTF_NAME, @@ -239,7 +239,7 @@ public Set getRelationships() { @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenTCP.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenTCP.java index f899e713dcbc..af4e762c7c20 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenTCP.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenTCP.java @@ -127,7 +127,7 @@ public class ListenTCP extends AbstractProcessor { .addValidator(StandardValidators.TIME_PERIOD_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( ListenerProperties.NETWORK_INTF_NAME, ListenerProperties.PORT, ListenerProperties.RECV_BUFFER_SIZE, @@ -148,7 +148,9 @@ public class ListenTCP extends AbstractProcessor { .description("Messages received successfully will be sent out this relationship.") .build(); - private static final Set RELATIONSHIPS = Set.of(REL_SUCCESS); + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS + ); private static final long TRACKING_LOG_INTERVAL = 60000; private final AtomicLong nextTrackingLog = new AtomicLong(); @@ -269,12 +271,12 @@ protected String getTransitUri(final FlowFileEventBatch batch) @Override public final Set getRelationships() { - return this.RELATIONSHIPS; + return RELATIONSHIPS; } @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } private String getMessageDemarcator(final ProcessContext context) { 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 ed0bae85d6be..94f9b1bc399d 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 @@ -143,7 +143,7 @@ public class LogAttribute extends AbstractProcessor { .required(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( LOG_LEVEL, LOG_PAYLOAD, ATTRIBUTES_TO_LOG_CSV, @@ -178,7 +178,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } protected String processFlowFile(final ComponentLog logger, final DebugLevels logLevel, final FlowFile flowFile, final ProcessSession session, final ProcessContext context) { diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogMessage.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogMessage.java index 67d884cd1693..5cdd6703a6c8 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogMessage.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogMessage.java @@ -75,10 +75,10 @@ public class LogMessage extends AbstractProcessor { .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES) .build(); - private static final List PROPERTIES = List.of( - LOG_LEVEL, - LOG_PREFIX, - LOG_MESSAGE + private static final List PROPERTY_DESCRIPTORS = List.of( + LOG_LEVEL, + LOG_PREFIX, + LOG_MESSAGE ); public static final Relationship REL_SUCCESS = new Relationship.Builder() @@ -86,7 +86,9 @@ public class LogMessage extends AbstractProcessor { .description("All FlowFiles are routed to this relationship") .build(); - private static final Set RELATIONSHIPS = Set.of(REL_SUCCESS); + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS + ); enum MessageLogLevel { trace, debug, info, warn, error @@ -99,7 +101,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LookupAttribute.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LookupAttribute.java index 292d30e2dbe2..500b22c7259b 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LookupAttribute.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LookupAttribute.java @@ -85,7 +85,7 @@ public class LookupAttribute extends AbstractProcessor { .required(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( LOOKUP_SERVICE, INCLUDE_EMPTY_VALUES ); @@ -143,7 +143,7 @@ protected Collection customValidate(ValidationContext validati @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LookupRecord.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LookupRecord.java index 5509e0ff14da..1746a4dd6e07 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LookupRecord.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LookupRecord.java @@ -221,7 +221,7 @@ public class LookupRecord extends AbstractProcessor { .required(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( RECORD_READER, RECORD_WRITER, LOOKUP_SERVICE, @@ -272,7 +272,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override 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 c57576174fe3..f5afe0fd3fa4 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 @@ -395,7 +395,7 @@ public class MergeContent extends BinFiles { .dependsOn(MERGE_FORMAT, MERGE_FORMAT_TAR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( MERGE_STRATEGY, MERGE_FORMAT, AttributeStrategyUtil.ATTRIBUTE_STRATEGY, @@ -438,7 +438,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeRecord.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeRecord.java index 68519f235653..4f38ed86ebd6 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeRecord.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeRecord.java @@ -279,7 +279,7 @@ public class MergeRecord extends AbstractSessionFactoryProcessor { .addValidator(StandardValidators.TIME_PERIOD_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( RECORD_READER, RECORD_WRITER, MERGE_STRATEGY, @@ -316,7 +316,7 @@ public class MergeRecord extends AbstractSessionFactoryProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ModifyBytes.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ModifyBytes.java index cab590eb4abb..5b27c0022a2a 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ModifyBytes.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ModifyBytes.java @@ -52,7 +52,10 @@ public class ModifyBytes extends AbstractProcessor { .name("success") .description("Processed flowfiles.") .build(); - private static final Set RELATIONSHIPS = Set.of(REL_SUCCESS); + + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS + ); public static final PropertyDescriptor START_OFFSET = new PropertyDescriptor.Builder() .name("Start Offset") @@ -80,7 +83,8 @@ public class ModifyBytes extends AbstractProcessor { .allowableValues("true", "false") .defaultValue("false") .build(); - private static final List PROPERTIES = List.of( + + private static final List PROPERTY_DESCRIPTORS = List.of( START_OFFSET, END_OFFSET, REMOVE_ALL @@ -93,7 +97,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MonitorActivity.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MonitorActivity.java index 9adbb77cd0ec..88987debb1bf 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MonitorActivity.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MonitorActivity.java @@ -162,7 +162,7 @@ public class MonitorActivity extends AbstractProcessor { .defaultValue(REPORT_NODE_ALL.getValue()) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( THRESHOLD, CONTINUALLY_SEND_MESSAGES, INACTIVITY_MESSAGE, @@ -209,7 +209,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/Notify.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/Notify.java index a0e72fe72cae..40f4c79ca1f5 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/Notify.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/Notify.java @@ -132,7 +132,7 @@ public class Notify extends AbstractProcessor { .expressionLanguageSupported(ExpressionLanguageScope.NONE) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( RELEASE_SIGNAL_IDENTIFIER, SIGNAL_COUNTER_NAME, SIGNAL_COUNTER_DELTA, @@ -158,7 +158,7 @@ public class Notify extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PackageFlowFile.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PackageFlowFile.java index 40c4bbca171f..26c9d57592e0 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PackageFlowFile.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PackageFlowFile.java @@ -130,7 +130,9 @@ public class PackageFlowFile extends AbstractProcessor { .addValidator(StandardValidators.createLongValidator(1, 10_000, true)) .build(); - private static final List PROPERTIES = List.of(BATCH_SIZE); + private static final List PROPERTY_DESCRIPTORS = List.of( + BATCH_SIZE + ); static final Relationship REL_SUCCESS = new Relationship.Builder() .name("success") @@ -153,7 +155,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ParseSyslog.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ParseSyslog.java index 2850ae2580b2..092167b27e84 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ParseSyslog.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ParseSyslog.java @@ -74,7 +74,9 @@ public class ParseSyslog extends AbstractProcessor { .addValidator(StandardValidators.CHARACTER_SET_VALIDATOR) .build(); - private static final List PROPERTIES = List.of(CHARSET); + private static final List PROPERTY_DESCRIPTORS = List.of( + CHARSET + ); static final Relationship REL_FAILURE = new Relationship.Builder() .name("failure") @@ -94,7 +96,7 @@ public class ParseSyslog extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ParseSyslog5424.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ParseSyslog5424.java index e0b3fb4c2a4e..ed9eb0590017 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ParseSyslog5424.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ParseSyslog5424.java @@ -111,7 +111,7 @@ public class ParseSyslog5424 extends AbstractProcessor { .defaultValue("true") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CHARSET, NIL_POLICY, INCLUDE_BODY_IN_ATTRIBUTES @@ -137,7 +137,7 @@ public class ParseSyslog5424 extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PartitionRecord.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PartitionRecord.java index 63e0042c0136..1a4abf11860a 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PartitionRecord.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PartitionRecord.java @@ -141,7 +141,7 @@ public class PartitionRecord extends AbstractProcessor { .required(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( RECORD_READER, RECORD_WRITER ); @@ -168,7 +168,7 @@ public class PartitionRecord extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override 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 c3ef29e3a39c..0527182f17d8 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 @@ -105,7 +105,7 @@ public class PutDistributedMapCache extends AbstractProcessor { .expressionLanguageSupported(ExpressionLanguageScope.NONE) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CACHE_ENTRY_IDENTIFIER, DISTRIBUTED_CACHE_SERVICE, CACHE_UPDATE_STRATEGY, @@ -133,7 +133,7 @@ public class PutDistributedMapCache extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java index a48aa8c5a821..2f2dbb65b6ed 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutEmail.java @@ -296,7 +296,7 @@ public class PutEmail extends AbstractProcessor { .defaultValue(StandardCharsets.UTF_8.name()) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SMTP_HOSTNAME, SMTP_PORT, AUTHORIZATION_MODE, @@ -357,7 +357,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFTP.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFTP.java index 3c3c21cb4862..068b784a16f5 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFTP.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFTP.java @@ -75,7 +75,7 @@ public class PutFTP extends PutFileTransfer { .fromPropertyDescriptor(FTPTransfer.REMOTE_PATH) .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES).build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( FTPTransfer.HOSTNAME, FTPTransfer.PORT, FTPTransfer.USERNAME, @@ -101,7 +101,7 @@ public class PutFTP extends PutFileTransfer { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFile.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFile.java index 99d47e5f1f98..081fff7c7f30 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFile.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFile.java @@ -163,7 +163,7 @@ public ValidationResult validate(String subject, String input, ValidationContext .defaultValue("true") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( DIRECTORY, CONFLICT_RESOLUTION, CREATE_DIRS, @@ -196,7 +196,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutRecord.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutRecord.java index 911013810d08..a08dd1c26034 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutRecord.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutRecord.java @@ -77,7 +77,7 @@ public class PutRecord extends AbstractProcessor { .required(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( RECORD_READER, RECORD_SINK, INCLUDE_ZERO_RECORD_RESULTS @@ -113,7 +113,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSFTP.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSFTP.java index 66506c9fde9c..69f640558a3d 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSFTP.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSFTP.java @@ -43,7 +43,7 @@ @SeeAlso(GetSFTP.class) public class PutSFTP extends PutFileTransfer { - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( FileTransfer.HOSTNAME, SFTPTransfer.PORT, FileTransfer.USERNAME, @@ -77,7 +77,7 @@ public class PutSFTP extends PutFileTransfer { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSQL.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSQL.java index 938f8302d993..e5c74aa0cadd 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSQL.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSQL.java @@ -180,7 +180,7 @@ public class PutSQL extends AbstractSessionFactoryProcessor { .defaultValue("false") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CONNECTION_POOL, SQL_STATEMENT, SUPPORT_TRANSACTIONS, @@ -221,7 +221,7 @@ public class PutSQL extends AbstractSessionFactoryProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSyslog.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSyslog.java index 0bca6e502c62..543edc994a0d 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSyslog.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutSyslog.java @@ -149,7 +149,7 @@ public class PutSyslog extends AbstractSyslogProcessor { .dependsOn(PROTOCOL, TCP_VALUE) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( HOSTNAME, PROTOCOL, PORT, @@ -195,7 +195,7 @@ public Set getRelationships() { @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryDatabaseTable.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryDatabaseTable.java index fbed15c0ea0f..d3544779a0a8 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryDatabaseTable.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryDatabaseTable.java @@ -92,7 +92,7 @@ public class QueryDatabaseTable extends AbstractQueryDatabaseTable { .description("The name of the database table to be queried. When a custom query is used, this property is used to alias the query and appears as an attribute on the FlowFile.") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( DBCP_SERVICE, DB_TYPE, TABLE_NAME, @@ -118,7 +118,7 @@ public class QueryDatabaseTable extends AbstractQueryDatabaseTable { public QueryDatabaseTable() { relationships = RELATIONSHIPS; - propDescriptors = PROPERTIES; + propDescriptors = PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryDatabaseTableRecord.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryDatabaseTableRecord.java index 7e40f702e7f3..d776f9f54645 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryDatabaseTableRecord.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryDatabaseTableRecord.java @@ -191,7 +191,7 @@ public class QueryDatabaseTableRecord extends AbstractQueryDatabaseTable { .required(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( DBCP_SERVICE, DB_TYPE, TABLE_NAME, @@ -213,11 +213,13 @@ public class QueryDatabaseTableRecord extends AbstractQueryDatabaseTable { VARIABLE_REGISTRY_ONLY_DEFAULT_SCALE ); - private static final Set RELATIONSHIPS = Set.of(REL_SUCCESS); + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS + ); public QueryDatabaseTableRecord() { relationships = RELATIONSHIPS; - propDescriptors = PROPERTIES; + propDescriptors = PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryRecord.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryRecord.java index 96b6b33ec3a3..74978fa86875 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryRecord.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/QueryRecord.java @@ -218,7 +218,7 @@ public class QueryRecord extends AbstractProcessor { .required(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( RECORD_READER_FACTORY, RECORD_WRITER_FACTORY, INCLUDE_ZERO_RECORD_FLOWFILES, @@ -262,7 +262,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java index 00135aebf877..5061f6392cda 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceText.java @@ -274,7 +274,7 @@ public class ReplaceText extends AbstractProcessor { .required(false) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( REPLACEMENT_STRATEGY, SEARCH_VALUE, REPLACEMENT_VALUE, @@ -306,7 +306,7 @@ public class ReplaceText extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java index 36b1b2f30595..85dba965e281 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java @@ -117,7 +117,7 @@ public class ReplaceTextWithMapping extends AbstractProcessor { .defaultValue("1 MB") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( REGEX, MATCHING_GROUP_FOR_LOOKUP_KEY, MAPPING_FILE, @@ -168,7 +168,7 @@ protected Collection customValidate(final ValidationContext co @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @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 2a053a4f3c08..da03a365824d 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 @@ -140,7 +140,7 @@ public class RetryFlowFile extends AbstractProcessor { .defaultValue(FAIL_ON_REUSE.getValue()) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( RETRY_ATTRIBUTE, MAXIMUM_RETRIES, PENALIZE_RETRIED, @@ -199,7 +199,7 @@ protected PropertyDescriptor getSupportedDynamicPropertyDescriptor(String proper @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java index 7e57f669c0fb..93678ec5f9f3 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java @@ -192,7 +192,9 @@ public class RouteOnAttribute extends AbstractProcessor { .defaultValue(ROUTE_PROPERTY_NAME.getValue()) .build(); - private static final List PROPERTIES = List.of(ROUTE_STRATEGY); + private static final List PROPERTY_DESCRIPTORS = List.of( + ROUTE_STRATEGY + ); public static final Relationship REL_NO_MATCH = new Relationship.Builder() .name("unmatched") @@ -220,7 +222,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnContent.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnContent.java index 9c2cad339633..c55cf942c8e0 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnContent.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnContent.java @@ -91,7 +91,7 @@ public class RouteOnContent extends AbstractProcessor { .defaultValue("UTF-8") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( MATCH_REQUIREMENT, CHARACTER_SET, BUFFER_SIZE @@ -106,7 +106,7 @@ public class RouteOnContent extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteText.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteText.java index 7c5338cb3172..5a1b2eceeff5 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteText.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteText.java @@ -205,7 +205,7 @@ public class RouteText extends AbstractProcessor { .defaultValue("UTF-8") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( ROUTE_STRATEGY, MATCH_STRATEGY, CHARACTER_SET, @@ -264,7 +264,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SampleRecord.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SampleRecord.java index 1e229bf7636c..56d97f95c0de 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SampleRecord.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SampleRecord.java @@ -174,7 +174,7 @@ public class SampleRecord extends AbstractProcessor { .dependsOn(SAMPLING_STRATEGY, PROBABILISTIC_SAMPLING, RESERVOIR_SAMPLING) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( RECORD_READER_FACTORY, RECORD_WRITER_FACTORY, SAMPLING_STRATEGY, @@ -214,7 +214,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java index 41779af18bf3..93c67929c8bd 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanAttribute.java @@ -95,7 +95,7 @@ public class ScanAttribute extends AbstractProcessor { .addValidator(StandardValidators.createRegexValidator(0, 1, false)) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( DICTIONARY_FILE, ATTRIBUTE_PATTERN, MATCHING_CRITERIA, @@ -123,7 +123,7 @@ public class ScanAttribute extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanContent.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanContent.java index ac090bdba656..d600e38185e0 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanContent.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ScanContent.java @@ -85,7 +85,7 @@ public class ScanContent extends AbstractProcessor { .defaultValue(TEXT_ENCODING) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( DICTIONARY, DICTIONARY_ENCODING ); @@ -114,7 +114,7 @@ public class ScanContent extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SegmentContent.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SegmentContent.java index 10a2020b0a21..391d4ffcc106 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SegmentContent.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SegmentContent.java @@ -78,7 +78,9 @@ public class SegmentContent extends AbstractProcessor { .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES) .build(); - private static final List PROPERTIES = List.of(SIZE); + private static final List PROPERTY_DESCRIPTORS = List.of( + SIZE + ); public static final Relationship REL_SEGMENTS = new Relationship.Builder() .name("segments") @@ -102,7 +104,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitContent.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitContent.java index a7d2af90e3b2..bc627610577a 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitContent.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitContent.java @@ -115,7 +115,7 @@ public class SplitContent extends AbstractProcessor { .defaultValue(TRAILING_POSITION.getValue()) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( FORMAT, BYTE_SEQUENCE, KEEP_SEQUENCE, @@ -145,7 +145,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java index d49e705c164d..16f25c8d3274 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java @@ -89,7 +89,7 @@ public class SplitJson extends AbstractJsonPathProcessor { .required(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( ARRAY_JSON_PATH_EXPRESSION, NULL_VALUE_DEFAULT_REPRESENTATION, MAX_STRING_LENGTH @@ -127,7 +127,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitRecord.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitRecord.java index deb69bcef709..311292519d80 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitRecord.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitRecord.java @@ -96,7 +96,7 @@ public class SplitRecord extends AbstractProcessor { .required(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( RECORD_READER, RECORD_WRITER, RECORDS_PER_SPLIT @@ -124,7 +124,7 @@ public class SplitRecord extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java index 3b309c0590ab..4f872cd34178 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java @@ -135,7 +135,7 @@ public class SplitText extends AbstractProcessor { .defaultValue("true") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( LINE_SPLIT_COUNT, FRAGMENT_MAX_SIZE, HEADER_LINE_COUNT, @@ -268,7 +268,7 @@ protected Collection customValidate(ValidationContext validati @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } /** diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java index 073a713e3693..85aa760c2a01 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java @@ -94,7 +94,9 @@ public class SplitXml extends AbstractProcessor { .defaultValue("1") .build(); - private static final List PROPERTIES = List.of(SPLIT_DEPTH); + private static final List PROPERTY_DESCRIPTORS = List.of( + SPLIT_DEPTH + ); public static final Relationship REL_ORIGINAL = new Relationship.Builder() .name("original") @@ -122,7 +124,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TailFile.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TailFile.java index 3a13f4328eba..4dec2adbc27c 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TailFile.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/TailFile.java @@ -294,7 +294,7 @@ public class TailFile extends AbstractProcessor { .defaultValue("65536 B") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( MODE, FILENAME, ROLLING_FILENAME_PATTERN, @@ -316,7 +316,9 @@ public class TailFile extends AbstractProcessor { .description("All FlowFiles are routed to this Relationship.") .build(); - private static final Set RELATIONSHIPS = Set.of(REL_SUCCESS); + private static final Set RELATIONSHIPS = Set.of( + REL_SUCCESS + ); private volatile Map states = new HashMap<>(); private final AtomicLong lastLookup = new AtomicLong(0L); @@ -330,7 +332,7 @@ public class TailFile extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override 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 f3f33c8e4a48..63f5bfd56bf8 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 @@ -159,7 +159,7 @@ public class TransformXml extends AbstractProcessor { .addValidator(StandardValidators.TIME_PERIOD_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( XSLT_FILE_NAME, XSLT_CONTROLLER, XSLT_CONTROLLER_KEY, @@ -193,7 +193,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java index b831751b6e34..f7a012a05ca7 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UnpackContent.java @@ -206,7 +206,7 @@ public class UnpackContent extends AbstractProcessor { .addValidator(StandardValidators.BOOLEAN_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( PACKAGING_FORMAT, ZIP_FILENAME_CHARSET, FILE_FILTER, @@ -245,7 +245,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnStopped diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateCounter.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateCounter.java index d1e39714ad87..dd249a89dd7d 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateCounter.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/UpdateCounter.java @@ -60,7 +60,7 @@ public class UpdateCounter extends AbstractProcessor { .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( COUNTER_NAME, DELTA ); @@ -70,7 +70,9 @@ public class UpdateCounter extends AbstractProcessor { .description("Counter was updated/retrieved") .build(); - private static final Set RELATIONSHIPS = Set.of(SUCCESS); + private static final Set RELATIONSHIPS = Set.of( + SUCCESS + ); @Override public Set getRelationships() { @@ -79,7 +81,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateCsv.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateCsv.java index 8077905357d4..632c805c6c12 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateCsv.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateCsv.java @@ -195,7 +195,7 @@ public class ValidateCsv extends AbstractProcessor { .defaultValue("false") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SCHEMA, CSV_SOURCE_ATTRIBUTE, HEADER, @@ -228,7 +228,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java index 88208ec129a7..db87d91d74f1 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateJson.java @@ -170,7 +170,7 @@ public String getDescription() { .dependsOn(SCHEMA_ACCESS_STRATEGY, JsonSchemaStrategy.SCHEMA_CONTENT_PROPERTY) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SCHEMA_ACCESS_STRATEGY, SCHEMA_NAME, SCHEMA_REGISTRY, @@ -223,7 +223,7 @@ public Set getRelationships() { @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateRecord.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateRecord.java index 290c925fa1c6..1e1e6b99a294 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateRecord.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateRecord.java @@ -191,7 +191,7 @@ public class ValidateRecord extends AbstractProcessor { .addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( RECORD_READER, RECORD_WRITER, INVALID_RECORD_WRITER, @@ -229,7 +229,7 @@ public class ValidateRecord extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateXml.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateXml.java index ad5747af4202..60b8263b76b0 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateXml.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ValidateXml.java @@ -107,7 +107,7 @@ public class ValidateXml extends AbstractProcessor { .addValidator(StandardValidators.ATTRIBUTE_KEY_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SCHEMA_FILE, XML_SOURCE_ATTRIBUTE ); @@ -139,7 +139,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/Wait.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/Wait.java index b16b2ba3fcb1..bc391736e052 100644 --- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/Wait.java +++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/Wait.java @@ -237,7 +237,7 @@ public class Wait extends AbstractProcessor { .expressionLanguageSupported(ExpressionLanguageScope.NONE) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( RELEASE_SIGNAL_IDENTIFIER, TARGET_SIGNAL_COUNT, SIGNAL_COUNTER_NAME, @@ -281,7 +281,7 @@ public class Wait extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-db-schema-registry-bundle/nifi-db-schema-registry-service/src/main/java/org/apache/nifi/db/schemaregistry/DatabaseTableSchemaRegistry.java b/nifi-extension-bundles/nifi-standard-services/nifi-db-schema-registry-bundle/nifi-db-schema-registry-service/src/main/java/org/apache/nifi/db/schemaregistry/DatabaseTableSchemaRegistry.java index 3b95a3a27b0b..131120815c88 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-db-schema-registry-bundle/nifi-db-schema-registry-service/src/main/java/org/apache/nifi/db/schemaregistry/DatabaseTableSchemaRegistry.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-db-schema-registry-bundle/nifi-db-schema-registry-service/src/main/java/org/apache/nifi/db/schemaregistry/DatabaseTableSchemaRegistry.java @@ -82,7 +82,7 @@ public class DatabaseTableSchemaRegistry extends AbstractControllerService imple .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( DBCP_SERVICE, CATALOG_NAME, SCHEMA_NAME @@ -94,7 +94,7 @@ public class DatabaseTableSchemaRegistry extends AbstractControllerService imple @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/main/java/org/apache/nifi/dbcp/DBCPConnectionPool.java b/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/main/java/org/apache/nifi/dbcp/DBCPConnectionPool.java index c0f6175fc148..f5ccb22aaba1 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/main/java/org/apache/nifi/dbcp/DBCPConnectionPool.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/main/java/org/apache/nifi/dbcp/DBCPConnectionPool.java @@ -20,8 +20,6 @@ import java.sql.DriverManager; import java.sql.SQLException; import java.util.AbstractMap; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -95,32 +93,27 @@ public class DBCPConnectionPool extends AbstractDBCPConnectionPool implements DB */ protected static final String SENSITIVE_PROPERTY_PREFIX = "SENSITIVE."; - private static final List PROPERTIES; - - static { - final List props = new ArrayList<>(); - props.add(DATABASE_URL); - props.add(DB_DRIVERNAME); - props.add(DB_DRIVER_LOCATION); - props.add(KERBEROS_USER_SERVICE); - props.add(DB_USER); - props.add(DB_PASSWORD); - props.add(MAX_WAIT_TIME); - props.add(MAX_TOTAL_CONNECTIONS); - props.add(VALIDATION_QUERY); - props.add(MIN_IDLE); - props.add(MAX_IDLE); - props.add(MAX_CONN_LIFETIME); - props.add(EVICTION_RUN_PERIOD); - props.add(MIN_EVICTABLE_IDLE_TIME); - props.add(SOFT_MIN_EVICTABLE_IDLE_TIME); - - PROPERTIES = Collections.unmodifiableList(props); - } + private static final List PROPERTY_DESCRIPTORS = List.of( + DATABASE_URL, + DB_DRIVERNAME, + DB_DRIVER_LOCATION, + KERBEROS_USER_SERVICE, + DB_USER, + DB_PASSWORD, + MAX_WAIT_TIME, + MAX_TOTAL_CONNECTIONS, + VALIDATION_QUERY, + MIN_IDLE, + MAX_IDLE, + MAX_CONN_LIFETIME, + EVICTION_RUN_PERIOD, + MIN_EVICTABLE_IDLE_TIME, + SOFT_MIN_EVICTABLE_IDLE_TIME + ); @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/main/java/org/apache/nifi/record/sink/db/DatabaseRecordSink.java b/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/main/java/org/apache/nifi/record/sink/db/DatabaseRecordSink.java index 95fc3383eef4..ae18e5ce894c 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/main/java/org/apache/nifi/record/sink/db/DatabaseRecordSink.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/main/java/org/apache/nifi/record/sink/db/DatabaseRecordSink.java @@ -160,7 +160,7 @@ public class DatabaseRecordSink extends AbstractControllerService implements Rec .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( DBCP_SERVICE, CATALOG_NAME, SCHEMA_NAME, @@ -178,7 +178,7 @@ public class DatabaseRecordSink extends AbstractControllerService implements Rec @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/src/main/java/org/apache/nifi/dbcp/HikariCPConnectionPool.java b/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/src/main/java/org/apache/nifi/dbcp/HikariCPConnectionPool.java index ef0290d3a93c..2ac172ffa297 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/src/main/java/org/apache/nifi/dbcp/HikariCPConnectionPool.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/src/main/java/org/apache/nifi/dbcp/HikariCPConnectionPool.java @@ -205,7 +205,7 @@ public class HikariCPConnectionPool extends AbstractControllerService implements .required(false) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( DATABASE_URL, DB_DRIVERNAME, DB_DRIVER_LOCATION, @@ -224,7 +224,7 @@ public class HikariCPConnectionPool extends AbstractControllerService implements @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/MapCacheClientService.java b/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/MapCacheClientService.java index 55b2a75556bf..efbaffc35387 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/MapCacheClientService.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/MapCacheClientService.java @@ -81,7 +81,7 @@ public class MapCacheClientService extends AbstractControllerService implements .defaultValue("30 secs") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( HOSTNAME, PORT, SSL_CONTEXT_SERVICE, @@ -97,7 +97,7 @@ public class MapCacheClientService extends AbstractControllerService implements @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/SetCacheClientService.java b/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/SetCacheClientService.java index 6f38704d9ec8..a2a41c1fa3b3 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/SetCacheClientService.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/SetCacheClientService.java @@ -70,7 +70,7 @@ public class SetCacheClientService extends AbstractControllerService implements .defaultValue("30 secs") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( HOSTNAME, PORT, SSL_CONTEXT_SERVICE, @@ -86,7 +86,7 @@ public class SetCacheClientService extends AbstractControllerService implements @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-file-resource-service-bundle/nifi-file-resource-service/src/main/java/org/apache/nifi/fileresource/service/StandardFileResourceService.java b/nifi-extension-bundles/nifi-standard-services/nifi-file-resource-service-bundle/nifi-file-resource-service/src/main/java/org/apache/nifi/fileresource/service/StandardFileResourceService.java index 2747ca3a1c8d..2d5a5eca69f0 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-file-resource-service-bundle/nifi-file-resource-service/src/main/java/org/apache/nifi/fileresource/service/StandardFileResourceService.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-file-resource-service-bundle/nifi-file-resource-service/src/main/java/org/apache/nifi/fileresource/service/StandardFileResourceService.java @@ -65,7 +65,7 @@ public class StandardFileResourceService extends AbstractControllerService imple .addValidator(StandardValidators.NON_BLANK_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( FILE_PATH ); @@ -73,7 +73,7 @@ public class StandardFileResourceService extends AbstractControllerService imple @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/src/main/java/org/apache/nifi/dbcp/HadoopDBCPConnectionPool.java b/nifi-extension-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/src/main/java/org/apache/nifi/dbcp/HadoopDBCPConnectionPool.java index 1c362f01f870..65ddba07b3d8 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/src/main/java/org/apache/nifi/dbcp/HadoopDBCPConnectionPool.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/src/main/java/org/apache/nifi/dbcp/HadoopDBCPConnectionPool.java @@ -113,7 +113,7 @@ public class HadoopDBCPConnectionPool extends AbstractDBCPConnectionPool { .dynamicallyModifiesClasspath(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( DATABASE_URL, DB_DRIVERNAME, DB_DRIVER_LOCATION, @@ -147,7 +147,7 @@ public void migrateProperties(final PropertyConfiguration config) { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/src/main/java/org/apache/nifi/http/StandardHttpContextMap.java b/nifi-extension-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/src/main/java/org/apache/nifi/http/StandardHttpContextMap.java index 27e7dc108cae..12bc47918e41 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/src/main/java/org/apache/nifi/http/StandardHttpContextMap.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/src/main/java/org/apache/nifi/http/StandardHttpContextMap.java @@ -65,7 +65,7 @@ public class StandardHttpContextMap extends AbstractControllerService implements .addValidator(StandardValidators.TIME_PERIOD_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( MAX_OUTSTANDING_REQUESTS, REQUEST_EXPIRATION ); @@ -80,7 +80,7 @@ public class StandardHttpContextMap extends AbstractControllerService implements @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-key-service-bundle/nifi-key-service/src/main/java/org/apache/nifi/key/service/StandardPrivateKeyService.java b/nifi-extension-bundles/nifi-standard-services/nifi-key-service-bundle/nifi-key-service/src/main/java/org/apache/nifi/key/service/StandardPrivateKeyService.java index b74f1506f2d6..ba6d612da4f8 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-key-service-bundle/nifi-key-service/src/main/java/org/apache/nifi/key/service/StandardPrivateKeyService.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-key-service-bundle/nifi-key-service/src/main/java/org/apache/nifi/key/service/StandardPrivateKeyService.java @@ -79,7 +79,7 @@ public class StandardPrivateKeyService extends AbstractControllerService impleme .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( KEY_FILE, KEY, KEY_PASSWORD @@ -141,7 +141,7 @@ public void onDisabled() { */ @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } /** diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/DistributedMapCacheLookupService.java b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/DistributedMapCacheLookupService.java index 36eb0cb2f8b5..e13e9effb3df 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/DistributedMapCacheLookupService.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/DistributedMapCacheLookupService.java @@ -79,7 +79,7 @@ public class DistributedMapCacheLookupService extends AbstractControllerService .defaultValue(StandardCharsets.UTF_8.displayName()) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( PROP_DISTRIBUTED_CACHE_SERVICE, CHARACTER_ENCODING ); @@ -96,7 +96,7 @@ public void onEnabled(final ConfigurationContext context) { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/RestLookupService.java b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/RestLookupService.java index 7b3d499ec23b..d1d8c6390e4c 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/RestLookupService.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/RestLookupService.java @@ -212,7 +212,7 @@ public class RestLookupService extends AbstractControllerService implements Reco static final String BODY_KEY = "request.body"; static final String METHOD_KEY = "request.method"; - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( URL, RECORD_READER, RECORD_PATH, @@ -234,7 +234,7 @@ public class RestLookupService extends AbstractControllerService implements Reco @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } private volatile ProxyConfigurationService proxyConfigurationService; diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/configuration2/CommonsConfigurationLookupService.java b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/configuration2/CommonsConfigurationLookupService.java index 3473a694ad63..6f70fb3dacb5 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/configuration2/CommonsConfigurationLookupService.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/configuration2/CommonsConfigurationLookupService.java @@ -67,7 +67,7 @@ public abstract class CommonsConfigurationLookupService PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CONFIGURATION_FILE ); @@ -89,7 +89,7 @@ private Configuration getConfiguration() throws LookupFailureException { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/db/DatabaseRecordLookupService.java b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/db/DatabaseRecordLookupService.java index ed44d9ee6c25..2cd22a5a2687 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/db/DatabaseRecordLookupService.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/db/DatabaseRecordLookupService.java @@ -69,7 +69,7 @@ public class DatabaseRecordLookupService extends AbstractDatabaseLookupService i .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( DBCP_SERVICE, TABLE_NAME, LOOKUP_KEY_COLUMN, @@ -83,7 +83,7 @@ public class DatabaseRecordLookupService extends AbstractDatabaseLookupService i @Override protected void init(final ControllerServiceInitializationContext context) { - this.properties = PROPERTIES; + this.properties = PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/db/SimpleDatabaseLookupService.java b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/db/SimpleDatabaseLookupService.java index 93169e897a03..0c285a95f9ab 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/db/SimpleDatabaseLookupService.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/db/SimpleDatabaseLookupService.java @@ -60,7 +60,7 @@ public class SimpleDatabaseLookupService extends AbstractDatabaseLookupService i .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( DBCP_SERVICE, TABLE_NAME, LOOKUP_KEY_COLUMN, @@ -72,7 +72,7 @@ public class SimpleDatabaseLookupService extends AbstractDatabaseLookupService i @Override protected void init(final ControllerServiceInitializationContext context) { - this.properties = PROPERTIES; + this.properties = PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/maxmind/IPLookupService.java b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/maxmind/IPLookupService.java index dada28bb04b3..5f81ea60bbe5 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/maxmind/IPLookupService.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/maxmind/IPLookupService.java @@ -138,7 +138,7 @@ public class IPLookupService extends AbstractControllerService implements Record .required(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( GEO_DATABASE_FILE, LOOKUP_CITY, LOOKUP_ISP, @@ -149,7 +149,7 @@ public class IPLookupService extends AbstractControllerService implements Record @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled 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 da9865a14f5a..70fe54aec39e 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 @@ -209,7 +209,7 @@ public class StandardOauth2AccessTokenProvider extends AbstractControllerService private static final ProxySpec[] PROXY_SPECS = {ProxySpec.HTTP_AUTH}; - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( AUTHORIZATION_SERVER_URL, CLIENT_AUTHENTICATION_STRATEGY, GRANT_TYPE, @@ -251,7 +251,7 @@ public class StandardOauth2AccessTokenProvider extends AbstractControllerService @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-proxy-configuration-bundle/nifi-proxy-configuration/src/main/java/org/apache/nifi/proxy/StandardProxyConfigurationService.java b/nifi-extension-bundles/nifi-standard-services/nifi-proxy-configuration-bundle/nifi-proxy-configuration/src/main/java/org/apache/nifi/proxy/StandardProxyConfigurationService.java index c2f640ab14b5..4fdf6f40f621 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-proxy-configuration-bundle/nifi-proxy-configuration/src/main/java/org/apache/nifi/proxy/StandardProxyConfigurationService.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-proxy-configuration-bundle/nifi-proxy-configuration/src/main/java/org/apache/nifi/proxy/StandardProxyConfigurationService.java @@ -89,7 +89,7 @@ public class StandardProxyConfigurationService extends AbstractControllerService .sensitive(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( PROXY_TYPE, SOCKS_VERSION, PROXY_SERVER_HOST, @@ -102,7 +102,7 @@ public class StandardProxyConfigurationService extends AbstractControllerService @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/lookup/ReaderLookup.java b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/lookup/ReaderLookup.java index 30f0b6b10f44..0f2231cb6eec 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/lookup/ReaderLookup.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/lookup/ReaderLookup.java @@ -68,7 +68,7 @@ public class ReaderLookup extends AbstractControllerService implements RecordRea .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SERVICE_TO_USE ); @@ -77,7 +77,7 @@ public class ReaderLookup extends AbstractControllerService implements RecordRea @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/lookup/RecordSetWriterLookup.java b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/lookup/RecordSetWriterLookup.java index 48f18f44c43b..3d00fa8a24c7 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/lookup/RecordSetWriterLookup.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/lookup/RecordSetWriterLookup.java @@ -67,7 +67,7 @@ public class RecordSetWriterLookup extends AbstractControllerService implements .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( SERVICE_TO_USE ); @@ -85,7 +85,7 @@ protected PropertyDescriptor getSupportedDynamicPropertyDescriptor(final String @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/schema/inference/VolatileSchemaCache.java b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/schema/inference/VolatileSchemaCache.java index 7daf4146a8c4..cf6c0afd0772 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/schema/inference/VolatileSchemaCache.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/schema/inference/VolatileSchemaCache.java @@ -59,7 +59,7 @@ public class VolatileSchemaCache extends AbstractControllerService implements Re private static final Base64.Encoder ENCODER = Base64.getEncoder().withoutPadding(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( MAX_SIZE ); @@ -67,7 +67,7 @@ public class VolatileSchemaCache extends AbstractControllerService implements Re @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/text/FreeFormTextRecordSetWriter.java b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/text/FreeFormTextRecordSetWriter.java index 027ae5ee6355..b96f6c4debd6 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/text/FreeFormTextRecordSetWriter.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/text/FreeFormTextRecordSetWriter.java @@ -60,7 +60,7 @@ public class FreeFormTextRecordSetWriter extends AbstractControllerService imple .required(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( TEXT, CHARACTER_SET ); @@ -70,7 +70,7 @@ public class FreeFormTextRecordSetWriter extends AbstractControllerService imple @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/EmailRecordSink.java b/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/EmailRecordSink.java index cc3278a9caab..cd9a9db24f40 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/EmailRecordSink.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/EmailRecordSink.java @@ -174,7 +174,7 @@ public class EmailRecordSink extends AbstractControllerService implements Record .defaultValue("NiFi") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( FROM, TO, CC, @@ -212,7 +212,7 @@ public class EmailRecordSink extends AbstractControllerService implements Record @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/HttpRecordSink.java b/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/HttpRecordSink.java index 4c2c2ec85916..74ae0928961b 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/HttpRecordSink.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/HttpRecordSink.java @@ -92,7 +92,7 @@ public class HttpRecordSink extends AbstractControllerService implements RecordS .required(false) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( API_URL, MAX_BATCH_SIZE, RECORD_WRITER_FACTORY, @@ -109,7 +109,7 @@ public class HttpRecordSink extends AbstractControllerService implements RecordS @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } /** diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/LoggingRecordSink.java b/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/LoggingRecordSink.java index ab123fbb6eda..f6ed72e83fab 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/LoggingRecordSink.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/LoggingRecordSink.java @@ -50,7 +50,7 @@ public class LoggingRecordSink extends AbstractControllerService implements Reco .defaultValue(LogLevel.INFO.name()) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( RecordSinkService.RECORD_WRITER_FACTORY, LOG_LEVEL ); @@ -60,7 +60,7 @@ public class LoggingRecordSink extends AbstractControllerService implements Reco @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/event/UDPEventRecordSink.java b/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/event/UDPEventRecordSink.java index f5e8b916e717..383c94eb20af 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/event/UDPEventRecordSink.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/event/UDPEventRecordSink.java @@ -78,7 +78,7 @@ public class UDPEventRecordSink extends AbstractControllerService implements Rec .defaultValue("2") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( HOSTNAME, PORT, RECORD_WRITER_FACTORY, @@ -97,7 +97,7 @@ public class UDPEventRecordSink extends AbstractControllerService implements Rec @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/PEMEncodedSSLContextProvider.java b/nifi-extension-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/PEMEncodedSSLContextProvider.java index ac9b017285dd..16fe1cdd5992 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/PEMEncodedSSLContextProvider.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/PEMEncodedSSLContextProvider.java @@ -141,7 +141,7 @@ public class PEMEncodedSSLContextProvider extends AbstractControllerService impl .dependsOn(CERTIFICATE_AUTHORITIES_SOURCE, CertificateAuthoritiesSource.PROPERTIES) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( TLS_PROTOCOL, PRIVATE_KEY_SOURCE, PRIVATE_KEY, @@ -162,7 +162,7 @@ public class PEMEncodedSSLContextProvider extends AbstractControllerService impl @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java b/nifi-extension-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java index 41d3e0e4c180..527bd65d55b9 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java @@ -141,7 +141,7 @@ public class StandardSSLContextService extends AbstractControllerService impleme .sensitive(false) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( KEYSTORE, KEYSTORE_PASSWORD, KEY_PASSWORD, @@ -185,7 +185,7 @@ public void onPropertyModified(PropertyDescriptor descriptor, String oldValue, S @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-standard-services/nifi-web-client-provider-bundle/nifi-web-client-provider-service/src/main/java/org/apache/nifi/web/client/provider/service/StandardWebClientServiceProvider.java b/nifi-extension-bundles/nifi-standard-services/nifi-web-client-provider-bundle/nifi-web-client-provider-service/src/main/java/org/apache/nifi/web/client/provider/service/StandardWebClientServiceProvider.java index a2574f558150..5c309f08d262 100644 --- a/nifi-extension-bundles/nifi-standard-services/nifi-web-client-provider-bundle/nifi-web-client-provider-service/src/main/java/org/apache/nifi/web/client/provider/service/StandardWebClientServiceProvider.java +++ b/nifi-extension-bundles/nifi-standard-services/nifi-web-client-provider-bundle/nifi-web-client-provider-service/src/main/java/org/apache/nifi/web/client/provider/service/StandardWebClientServiceProvider.java @@ -98,7 +98,7 @@ public class StandardWebClientServiceProvider extends AbstractControllerService .identifiesControllerService(SSLContextProvider.class) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( CONNECT_TIMEOUT, READ_TIMEOUT, WRITE_TIMEOUT, @@ -161,7 +161,7 @@ public WebClientService getWebClientService() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } private Duration getDuration(final ConfigurationContext context, final PropertyDescriptor propertyDescriptor) { 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 aeda4e1a5d22..ab7a2f88809b 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 @@ -127,7 +127,7 @@ public class AttributeRollingWindow extends AbstractProcessor { REL_FAILED_SET_STATE, REL_FAILURE); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( VALUE_TO_TRACK, TIME_WINDOW, SUB_WINDOW_LENGTH @@ -143,7 +143,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnScheduled diff --git a/nifi-extension-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java b/nifi-extension-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java index bd98e2fa9b7c..a85eadd47cee 100644 --- a/nifi-extension-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java +++ b/nifi-extension-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java @@ -231,7 +231,7 @@ public ValidationResult validate(String subject, String input, ValidationContext .required(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( DELETE_ATTRIBUTES, STORE_STATE, STATEFUL_VARIABLES_INIT_VALUE, @@ -254,7 +254,7 @@ public Set getRelationships() { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-processors/src/main/java/org/apache/nifi/processors/websocket/ConnectWebSocket.java b/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-processors/src/main/java/org/apache/nifi/processors/websocket/ConnectWebSocket.java index 26177493d4b3..c424e467b52d 100644 --- a/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-processors/src/main/java/org/apache/nifi/processors/websocket/ConnectWebSocket.java +++ b/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-processors/src/main/java/org/apache/nifi/processors/websocket/ConnectWebSocket.java @@ -79,7 +79,7 @@ public class ConnectWebSocket extends AbstractWebSocketGatewayProcessor { .addValidator(StandardValidators.NON_BLANK_VALIDATOR) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( PROP_WEBSOCKET_CLIENT_SERVICE, PROP_WEBSOCKET_CLIENT_ID ); @@ -96,7 +96,7 @@ public Set getRelationships() { @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-processors/src/main/java/org/apache/nifi/processors/websocket/ListenWebSocket.java b/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-processors/src/main/java/org/apache/nifi/processors/websocket/ListenWebSocket.java index 2c572f7a6072..fd1a84026244 100644 --- a/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-processors/src/main/java/org/apache/nifi/processors/websocket/ListenWebSocket.java +++ b/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-processors/src/main/java/org/apache/nifi/processors/websocket/ListenWebSocket.java @@ -83,7 +83,7 @@ public class ListenWebSocket extends AbstractWebSocketGatewayProcessor { }) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( PROP_WEBSOCKET_SERVER_SERVICE, PROP_SERVER_URL_PATH ); @@ -97,7 +97,7 @@ public Set getRelationships() { @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-processors/src/main/java/org/apache/nifi/processors/websocket/PutWebSocket.java b/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-processors/src/main/java/org/apache/nifi/processors/websocket/PutWebSocket.java index de424934a4b4..b226740c5fdd 100644 --- a/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-processors/src/main/java/org/apache/nifi/processors/websocket/PutWebSocket.java +++ b/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-processors/src/main/java/org/apache/nifi/processors/websocket/PutWebSocket.java @@ -125,7 +125,7 @@ public class PutWebSocket extends AbstractProcessor { .description("FlowFiles that failed to send to the destination are transferred to this relationship.") .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( PROP_WS_SESSION_ID, PROP_WS_CONTROLLER_SERVICE_ID, PROP_WS_CONTROLLER_SERVICE_ENDPOINT, @@ -144,7 +144,7 @@ public Set getRelationships() { @Override public final List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/AbstractJettyWebSocketService.java b/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/AbstractJettyWebSocketService.java index 6d97673ba9fc..3081408bcd22 100644 --- a/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/AbstractJettyWebSocketService.java +++ b/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/AbstractJettyWebSocketService.java @@ -20,7 +20,6 @@ import org.apache.nifi.processor.util.StandardValidators; import org.apache.nifi.websocket.AbstractWebSocketService; -import java.util.ArrayList; import java.util.List; public abstract class AbstractJettyWebSocketService extends AbstractWebSocketService { @@ -52,11 +51,13 @@ public abstract class AbstractJettyWebSocketService extends AbstractWebSocketSer .addValidator(StandardValidators.DATA_SIZE_VALIDATOR) .build(); + private static final List PROPERTY_DESCRIPTORS = List.of( + INPUT_BUFFER_SIZE, + MAX_TEXT_MESSAGE_SIZE, + MAX_BINARY_MESSAGE_SIZE + ); + static List getAbstractPropertyDescriptors() { - final List descriptors = new ArrayList<>(); - descriptors.add(INPUT_BUFFER_SIZE); - descriptors.add(MAX_TEXT_MESSAGE_SIZE); - descriptors.add(MAX_BINARY_MESSAGE_SIZE); - return descriptors; + return PROPERTY_DESCRIPTORS; } } diff --git a/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketClient.java b/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketClient.java index 9a262610230c..e568cc147d63 100644 --- a/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketClient.java +++ b/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketClient.java @@ -66,6 +66,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.locks.ReentrantLock; +import java.util.stream.Stream; @Tags({"WebSocket", "Jetty", "client"}) @CapabilityDescription("Implementation of WebSocketClientService." + @@ -193,24 +194,23 @@ public class JettyWebSocketClient extends AbstractJettyWebSocketService implemen private static final int INITIAL_BACKOFF_MILLIS = 100; private static final int MAXIMUM_BACKOFF_MILLIS = 3200; - private static final List properties; - - static { - final List props = new ArrayList<>(getAbstractPropertyDescriptors()); - props.add(WS_URI); - props.add(SSL_CONTEXT); - props.add(CONNECTION_TIMEOUT); - props.add(CONNECTION_ATTEMPT_COUNT); - props.add(SESSION_MAINTENANCE_INTERVAL); - props.add(USER_NAME); - props.add(USER_PASSWORD); - props.add(AUTH_CHARSET); - props.add(CUSTOM_AUTH); - props.add(PROXY_HOST); - props.add(PROXY_PORT); - - properties = Collections.unmodifiableList(props); - } + + private static final List PROPERTY_DESCRIPTORS = Stream.concat( + getAbstractPropertyDescriptors().stream(), + Stream.of( + WS_URI, + SSL_CONTEXT, + CONNECTION_TIMEOUT, + CONNECTION_ATTEMPT_COUNT, + SESSION_MAINTENANCE_INTERVAL, + USER_NAME, + USER_PASSWORD, + AUTH_CHARSET, + CUSTOM_AUTH, + PROXY_HOST, + PROXY_PORT + ) + ).toList(); private final Map activeSessions = new ConcurrentHashMap<>(); private final ReentrantLock connectionLock = new ReentrantLock(); @@ -224,7 +224,7 @@ public class JettyWebSocketClient extends AbstractJettyWebSocketService implemen @Override protected List getSupportedPropertyDescriptors() { - return properties; + return PROPERTY_DESCRIPTORS; } @OnEnabled diff --git a/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketServer.java b/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketServer.java index 0dbe49c2bb35..e6e0e6d891ec 100644 --- a/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketServer.java +++ b/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketServer.java @@ -69,6 +69,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Stream; @Tags({"WebSocket", "Jetty", "server"}) @CapabilityDescription("Implementation of WebSocketServerService." + @@ -165,28 +166,26 @@ public class JettyWebSocketServer extends AbstractJettyWebSocketService implemen .identifiesExternalResource(ResourceCardinality.SINGLE, ResourceType.FILE) .build(); - private static final List properties; - - static { - final List props = new ArrayList<>(getAbstractPropertyDescriptors()); - props.add(LISTEN_PORT); - props.add(SSL_CONTEXT); - props.add(CLIENT_AUTH); - props.add(BASIC_AUTH); - props.add(AUTH_PATH_SPEC); - props.add(AUTH_ROLES); - props.add(LOGIN_SERVICE); - props.add(USERS_PROPERTIES_FILE); - - properties = Collections.unmodifiableList(props); - } + private static final List PROPERTY_DESCRIPTORS = Stream.concat( + getAbstractPropertyDescriptors().stream(), + Stream.of( + LISTEN_PORT, + SSL_CONTEXT, + CLIENT_AUTH, + BASIC_AUTH, + AUTH_PATH_SPEC, + AUTH_ROLES, + LOGIN_SERVICE, + USERS_PROPERTIES_FILE + ) + ).toList(); private Server server; private Integer listenPort; @Override protected List getSupportedPropertyDescriptors() { - return properties; + return PROPERTY_DESCRIPTORS; } diff --git a/nifi-extension-bundles/nifi-workday-bundle/nifi-workday-processors/src/main/java/org/apache/nifi/processors/workday/GetWorkdayReport.java b/nifi-extension-bundles/nifi-workday-bundle/nifi-workday-processors/src/main/java/org/apache/nifi/processors/workday/GetWorkdayReport.java index 1f8df56c6b65..ee8bf388cfe7 100644 --- a/nifi-extension-bundles/nifi-workday-bundle/nifi-workday-processors/src/main/java/org/apache/nifi/processors/workday/GetWorkdayReport.java +++ b/nifi-extension-bundles/nifi-workday-bundle/nifi-workday-processors/src/main/java/org/apache/nifi/processors/workday/GetWorkdayReport.java @@ -168,7 +168,7 @@ public class GetWorkdayReport extends AbstractProcessor { FAILURE ); - protected static final List PROPERTIES = List.of( + protected static final List PROPERTY_DESCRIPTORS = List.of( REPORT_URL, WORKDAY_USERNAME, WORKDAY_PASSWORD, @@ -183,7 +183,7 @@ public class GetWorkdayReport extends AbstractProcessor { @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-zendesk-bundle/nifi-zendesk-processors/src/main/java/org/apache/nifi/processors/zendesk/PutZendeskTicket.java b/nifi-extension-bundles/nifi-zendesk-bundle/nifi-zendesk-processors/src/main/java/org/apache/nifi/processors/zendesk/PutZendeskTicket.java index c7f8b6e589b0..40caee3efd27 100644 --- a/nifi-extension-bundles/nifi-zendesk-bundle/nifi-zendesk-processors/src/main/java/org/apache/nifi/processors/zendesk/PutZendeskTicket.java +++ b/nifi-extension-bundles/nifi-zendesk-bundle/nifi-zendesk-processors/src/main/java/org/apache/nifi/processors/zendesk/PutZendeskTicket.java @@ -117,7 +117,7 @@ public class PutZendeskTicket extends AbstractZendesk { .dependsOn(RECORD_READER) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( WEB_CLIENT_SERVICE_PROVIDER, ZENDESK_SUBDOMAIN, ZENDESK_USER, @@ -158,7 +158,7 @@ public Set getRelationships() { @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-extension-bundles/nifi-zendesk-bundle/nifi-zendesk-services/src/main/java/org/apache/nifi/services/zendesk/ZendeskRecordSink.java b/nifi-extension-bundles/nifi-zendesk-bundle/nifi-zendesk-services/src/main/java/org/apache/nifi/services/zendesk/ZendeskRecordSink.java index b9f7f8268aca..eab73b0b38d1 100644 --- a/nifi-extension-bundles/nifi-zendesk-bundle/nifi-zendesk-services/src/main/java/org/apache/nifi/services/zendesk/ZendeskRecordSink.java +++ b/nifi-extension-bundles/nifi-zendesk-bundle/nifi-zendesk-services/src/main/java/org/apache/nifi/services/zendesk/ZendeskRecordSink.java @@ -102,7 +102,7 @@ public class ZendeskRecordSink extends AbstractControllerService implements Reco .required(true) .build(); - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( WEB_CLIENT_SERVICE_PROVIDER, ZENDESK_SUBDOMAIN, ZENDESK_USER, @@ -129,7 +129,7 @@ protected PropertyDescriptor getSupportedDynamicPropertyDescriptor(final String @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-framework-bundle/nifi-framework-extensions/nifi-framework-kubernetes-bundle/nifi-framework-kubernetes-state-provider/src/main/java/org/apache/nifi/kubernetes/state/provider/KubernetesConfigMapStateProvider.java b/nifi-framework-bundle/nifi-framework-extensions/nifi-framework-kubernetes-bundle/nifi-framework-kubernetes-state-provider/src/main/java/org/apache/nifi/kubernetes/state/provider/KubernetesConfigMapStateProvider.java index 41eb9f407e98..a95ed3797ea8 100644 --- a/nifi-framework-bundle/nifi-framework-extensions/nifi-framework-kubernetes-bundle/nifi-framework-kubernetes-state-provider/src/main/java/org/apache/nifi/kubernetes/state/provider/KubernetesConfigMapStateProvider.java +++ b/nifi-framework-bundle/nifi-framework-extensions/nifi-framework-kubernetes-bundle/nifi-framework-kubernetes-state-provider/src/main/java/org/apache/nifi/kubernetes/state/provider/KubernetesConfigMapStateProvider.java @@ -61,7 +61,9 @@ public class KubernetesConfigMapStateProvider extends AbstractConfigurableCompon .required(false) .build(); - private static final List PROPERTIES = List.of(CONFIG_MAP_NAME_PREFIX); + private static final List PROPERTY_DESCRIPTORS = List.of( + CONFIG_MAP_NAME_PREFIX + ); private static final int MAX_UPDATE_ATTEMPTS = 5; @@ -100,7 +102,7 @@ public class KubernetesConfigMapStateProvider extends AbstractConfigurableCompon @Override public List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } /** diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/test/processors/DynamicPropertiesTestProcessor.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/test/processors/DynamicPropertiesTestProcessor.java index dd3d90b0a2c1..c55f2eb7b4f8 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/test/processors/DynamicPropertiesTestProcessor.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/test/processors/DynamicPropertiesTestProcessor.java @@ -30,7 +30,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -59,9 +58,9 @@ public Set getDynamicPropertyNames() { .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .build(); - public static final List PROPERTIES = Collections.unmodifiableList(Arrays.asList( - STATIC_PROPERTY - )); + public static final List PROPERTY_DESCRIPTORS = List.of( + STATIC_PROPERTY + ); private ProcessorNode processorNode; @@ -88,7 +87,7 @@ protected PropertyDescriptor getSupportedDynamicPropertyDescriptor(final String @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @Override diff --git a/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions-services/src/main/java/org/apache/nifi/cs/tests/system/ClassloaderIsolationKeyProviderService.java b/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions-services/src/main/java/org/apache/nifi/cs/tests/system/ClassloaderIsolationKeyProviderService.java index 89df1c5d8f83..c3c33e6b9b58 100644 --- a/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions-services/src/main/java/org/apache/nifi/cs/tests/system/ClassloaderIsolationKeyProviderService.java +++ b/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions-services/src/main/java/org/apache/nifi/cs/tests/system/ClassloaderIsolationKeyProviderService.java @@ -35,13 +35,13 @@ public class ClassloaderIsolationKeyProviderService extends AbstractControllerSe private volatile String keyField; - private static final List PROPERTIES = List.of( + private static final List PROPERTY_DESCRIPTORS = List.of( KEY_FIELD ); @Override protected List getSupportedPropertyDescriptors() { - return PROPERTIES; + return PROPERTY_DESCRIPTORS; } @OnEnabled