This is an automated email from the ASF dual-hosted git repository. adebreceni pushed a commit to branch minifi-api-reduced in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit bf75a8ede3d47180297c9438f31d43d2434655f5 Author: Adam Debreceni <[email protected]> AuthorDate: Mon Jul 7 11:25:55 2025 +0200 Review changes --- core-framework/include/core/ProcessorFactory.h | 4 ++-- core-framework/include/core/ProcessorImpl.h | 4 ++-- core-framework/src/core/ProcessorImpl.cpp | 10 +++++----- extensions/aws/processors/DeleteS3Object.h | 4 ++-- extensions/aws/processors/FetchS3Object.h | 4 ++-- extensions/aws/processors/ListS3.h | 4 ++-- extensions/aws/processors/PutS3Object.h | 4 ++-- extensions/aws/processors/S3Processor.cpp | 4 ++-- extensions/aws/processors/S3Processor.h | 2 +- .../azure/processors/AzureBlobStorageProcessorBase.h | 4 ++-- .../processors/AzureBlobStorageSingleBlobProcessorBase.h | 4 ++-- .../processors/AzureDataLakeStorageFileProcessorBase.h | 4 ++-- .../azure/processors/AzureDataLakeStorageProcessorBase.h | 4 ++-- extensions/azure/processors/DeleteAzureBlobStorage.h | 8 ++++---- extensions/azure/processors/DeleteAzureDataLakeStorage.h | 4 ++-- extensions/azure/processors/FetchAzureBlobStorage.h | 8 ++++---- extensions/azure/processors/FetchAzureDataLakeStorage.h | 4 ++-- extensions/azure/processors/ListAzureBlobStorage.h | 8 ++++---- extensions/azure/processors/ListAzureDataLakeStorage.h | 4 ++-- extensions/azure/processors/PutAzureBlobStorage.h | 8 ++++---- extensions/azure/processors/PutAzureDataLakeStorage.h | 4 ++-- extensions/civetweb/processors/ListenHTTP.h | 4 ++-- extensions/grafana-loki/PushGrafanaLoki.h | 6 +++--- extensions/libarchive/MergeContent.h | 4 ++-- extensions/llamacpp/processors/RunLlamaCppInference.h | 4 ++-- extensions/mqtt/processors/PublishMQTT.h | 4 ++-- extensions/pdh/PerformanceDataMonitor.h | 4 ++-- extensions/python/ExecutePythonProcessor.cpp | 2 +- extensions/python/ExecutePythonProcessor.h | 6 +++--- extensions/python/PythonObjectFactory.h | 4 ++-- extensions/sftp/processors/PutSFTP.cpp | 4 ++-- extensions/sftp/processors/PutSFTP.h | 2 +- extensions/sftp/processors/SFTPProcessorBase.cpp | 4 ++-- extensions/sftp/processors/SFTPProcessorBase.h | 2 +- extensions/smb/tests/ListAndFetchSmbTests.cpp | 4 ++-- extensions/standard-processors/processors/GetFile.h | 4 ++-- extensions/standard-processors/processors/InvokeHTTP.h | 4 ++-- extensions/standard-processors/processors/LogAttribute.h | 4 ++-- extensions/standard-processors/processors/RouteText.cpp | 14 ++++---------- .../standard-processors/tests/unit/DefragmentTextTests.cpp | 4 ++-- extensions/systemd/ConsumeJournald.cpp | 2 +- extensions/systemd/ConsumeJournald.h | 2 +- extensions/windows-event-log/ConsumeWindowsEventLog.cpp | 4 ++-- extensions/windows-event-log/ConsumeWindowsEventLog.h | 2 +- libminifi/test/libtest/unit/MockClasses.h | 4 ++-- minifi-api/include/minifi-cpp/core/ProcessContext.h | 5 ----- minifi-api/include/minifi-cpp/core/ProcessorFactory.h | 2 +- 47 files changed, 99 insertions(+), 110 deletions(-) diff --git a/core-framework/include/core/ProcessorFactory.h b/core-framework/include/core/ProcessorFactory.h index 17a42b78d..bbba22664 100644 --- a/core-framework/include/core/ProcessorFactory.h +++ b/core-framework/include/core/ProcessorFactory.h @@ -41,8 +41,8 @@ class ProcessorFactoryImpl : public ProcessorFactory { return group_name_; } - std::unique_ptr<ProcessorApi> create(ProcessorMetadata info) override { - return std::make_unique<T>(info); + std::unique_ptr<ProcessorApi> create(ProcessorMetadata metadata) override { + return std::make_unique<T>(metadata); } std::string getClassName() const override { diff --git a/core-framework/include/core/ProcessorImpl.h b/core-framework/include/core/ProcessorImpl.h index 6b14e5e3d..987bb7586 100644 --- a/core-framework/include/core/ProcessorImpl.h +++ b/core-framework/include/core/ProcessorImpl.h @@ -75,7 +75,7 @@ class ProcessSessionFactory; class ProcessorImpl : public virtual ProcessorApi { public: - explicit ProcessorImpl(ProcessorMetadata info); + explicit ProcessorImpl(ProcessorMetadata metadata); ProcessorImpl(const ProcessorImpl&) = delete; ProcessorImpl(ProcessorImpl&&) = delete; @@ -142,7 +142,7 @@ class ProcessorImpl : public virtual ProcessorApi { void notifyStop() override { } - ProcessorMetadata info_; + ProcessorMetadata metadata_; std::atomic<bool> trigger_when_empty_; diff --git a/core-framework/src/core/ProcessorImpl.cpp b/core-framework/src/core/ProcessorImpl.cpp index 68f5885bd..bda6c6910 100644 --- a/core-framework/src/core/ProcessorImpl.cpp +++ b/core-framework/src/core/ProcessorImpl.cpp @@ -44,11 +44,11 @@ using namespace std::literals::chrono_literals; namespace org::apache::nifi::minifi::core { -ProcessorImpl::ProcessorImpl(ProcessorMetadata info) - : info_(std::move(info)), +ProcessorImpl::ProcessorImpl(ProcessorMetadata metadata) + : metadata_(std::move(metadata)), trigger_when_empty_(false), metrics_(std::make_shared<ProcessorMetricsImpl>(*this)), - logger_(info_.logger) { + logger_(metadata_.logger) { logger_->log_debug("Processor {} created with uuid {}", getName(), getUUIDStr()); } @@ -65,11 +65,11 @@ void ProcessorImpl::restore(const std::shared_ptr<FlowFile>& /*file*/) { } std::string ProcessorImpl::getName() const { - return info_.name; + return metadata_.name; } utils::Identifier ProcessorImpl::getUUID() const { - return info_.uuid; + return metadata_.uuid; } utils::SmallString<36> ProcessorImpl::getUUIDStr() const { diff --git a/extensions/aws/processors/DeleteS3Object.h b/extensions/aws/processors/DeleteS3Object.h index f723c58fd..1aa9c8075 100644 --- a/extensions/aws/processors/DeleteS3Object.h +++ b/extensions/aws/processors/DeleteS3Object.h @@ -74,8 +74,8 @@ class DeleteS3Object : public S3Processor { // NOLINT(cppcoreguidelines-special private: friend class ::FlowProcessorS3TestsFixture<DeleteS3Object>; - explicit DeleteS3Object(core::ProcessorMetadata info, std::unique_ptr<aws::s3::S3RequestSender> s3_request_sender) - : S3Processor(info, std::move(s3_request_sender)) { + explicit DeleteS3Object(core::ProcessorMetadata metadata, std::unique_ptr<aws::s3::S3RequestSender> s3_request_sender) + : S3Processor(metadata, std::move(s3_request_sender)) { } std::optional<aws::s3::DeleteObjectRequestParameters> buildDeleteS3RequestParams( diff --git a/extensions/aws/processors/FetchS3Object.h b/extensions/aws/processors/FetchS3Object.h index 19d9529bf..c703821fc 100644 --- a/extensions/aws/processors/FetchS3Object.h +++ b/extensions/aws/processors/FetchS3Object.h @@ -85,8 +85,8 @@ class FetchS3Object : public S3Processor { // NOLINT(cppcoreguidelines-special- private: friend class ::FlowProcessorS3TestsFixture<FetchS3Object>; - explicit FetchS3Object(core::ProcessorMetadata info, std::unique_ptr<aws::s3::S3RequestSender> s3_request_sender) - : S3Processor(info, std::move(s3_request_sender)) { + explicit FetchS3Object(core::ProcessorMetadata metadata, std::unique_ptr<aws::s3::S3RequestSender> s3_request_sender) + : S3Processor(metadata, std::move(s3_request_sender)) { } std::optional<aws::s3::GetObjectRequestParameters> buildFetchS3RequestParams( diff --git a/extensions/aws/processors/ListS3.h b/extensions/aws/processors/ListS3.h index 4c9d64fb1..f54810d40 100644 --- a/extensions/aws/processors/ListS3.h +++ b/extensions/aws/processors/ListS3.h @@ -95,8 +95,8 @@ class ListS3 : public S3Processor { // NOLINT(cppcoreguidelines-special-member- ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS using S3Processor::S3Processor; - explicit ListS3(core::ProcessorMetadata info, std::unique_ptr<aws::s3::S3RequestSender> s3_request_sender) - : S3Processor(info, std::move(s3_request_sender)) { + explicit ListS3(core::ProcessorMetadata metadata, std::unique_ptr<aws::s3::S3RequestSender> s3_request_sender) + : S3Processor(metadata, std::move(s3_request_sender)) { } ~ListS3() override = default; diff --git a/extensions/aws/processors/PutS3Object.h b/extensions/aws/processors/PutS3Object.h index 03647b5da..5fe86bf0d 100644 --- a/extensions/aws/processors/PutS3Object.h +++ b/extensions/aws/processors/PutS3Object.h @@ -194,8 +194,8 @@ class PutS3Object : public S3Processor { // NOLINT(cppcoreguidelines-special-me friend class ::FlowProcessorS3TestsFixture<PutS3Object>; - explicit PutS3Object(core::ProcessorMetadata info, std::unique_ptr<aws::s3::S3RequestSender> s3_request_sender) - : S3Processor(info, std::move(s3_request_sender)) { + explicit PutS3Object(core::ProcessorMetadata metadata, std::unique_ptr<aws::s3::S3RequestSender> s3_request_sender) + : S3Processor(metadata, std::move(s3_request_sender)) { } virtual uint64_t getMinPartSize() const { diff --git a/extensions/aws/processors/S3Processor.cpp b/extensions/aws/processors/S3Processor.cpp index 532bb6012..44e08e08e 100644 --- a/extensions/aws/processors/S3Processor.cpp +++ b/extensions/aws/processors/S3Processor.cpp @@ -32,8 +32,8 @@ namespace org::apache::nifi::minifi::aws::processors { -S3Processor::S3Processor(core::ProcessorMetadata info, std::unique_ptr<aws::s3::S3RequestSender> s3_request_sender) - : AwsProcessor(std::move(info)), +S3Processor::S3Processor(core::ProcessorMetadata metadata, std::unique_ptr<aws::s3::S3RequestSender> s3_request_sender) + : AwsProcessor(std::move(metadata)), s3_wrapper_(std::move(s3_request_sender)) { } diff --git a/extensions/aws/processors/S3Processor.h b/extensions/aws/processors/S3Processor.h index a5f966b5d..6d31d1eee 100644 --- a/extensions/aws/processors/S3Processor.h +++ b/extensions/aws/processors/S3Processor.h @@ -56,7 +56,7 @@ class S3Processor : public AwsProcessor { void onSchedule(core::ProcessContext& context, core::ProcessSessionFactory& session_factory) override; protected: - explicit S3Processor(core::ProcessorMetadata info, std::unique_ptr<aws::s3::S3RequestSender> s3_request_sender); + explicit S3Processor(core::ProcessorMetadata metadata, std::unique_ptr<aws::s3::S3RequestSender> s3_request_sender); aws::s3::S3Wrapper s3_wrapper_; }; diff --git a/extensions/azure/processors/AzureBlobStorageProcessorBase.h b/extensions/azure/processors/AzureBlobStorageProcessorBase.h index b40db3aad..32eb7f793 100644 --- a/extensions/azure/processors/AzureBlobStorageProcessorBase.h +++ b/extensions/azure/processors/AzureBlobStorageProcessorBase.h @@ -89,9 +89,9 @@ class AzureBlobStorageProcessorBase : public AzureStorageProcessorBase { protected: explicit AzureBlobStorageProcessorBase( - core::ProcessorMetadata info, + core::ProcessorMetadata metadata, std::unique_ptr<storage::BlobStorageClient> blob_storage_client) - : AzureStorageProcessorBase(info), + : AzureStorageProcessorBase(metadata), azure_blob_storage_(std::move(blob_storage_client)) { } diff --git a/extensions/azure/processors/AzureBlobStorageSingleBlobProcessorBase.h b/extensions/azure/processors/AzureBlobStorageSingleBlobProcessorBase.h index bb1466249..0e2b08466 100644 --- a/extensions/azure/processors/AzureBlobStorageSingleBlobProcessorBase.h +++ b/extensions/azure/processors/AzureBlobStorageSingleBlobProcessorBase.h @@ -41,9 +41,9 @@ class AzureBlobStorageSingleBlobProcessorBase : public AzureBlobStorageProcessor protected: explicit AzureBlobStorageSingleBlobProcessorBase( - core::ProcessorMetadata info, + core::ProcessorMetadata metadata, std::unique_ptr<storage::BlobStorageClient> blob_storage_client) - : AzureBlobStorageProcessorBase(info, std::move(blob_storage_client)) { + : AzureBlobStorageProcessorBase(metadata, std::move(blob_storage_client)) { } bool setBlobOperationParameters( diff --git a/extensions/azure/processors/AzureDataLakeStorageFileProcessorBase.h b/extensions/azure/processors/AzureDataLakeStorageFileProcessorBase.h index 55d522ff5..f45608319 100644 --- a/extensions/azure/processors/AzureDataLakeStorageFileProcessorBase.h +++ b/extensions/azure/processors/AzureDataLakeStorageFileProcessorBase.h @@ -41,8 +41,8 @@ class AzureDataLakeStorageFileProcessorBase : public AzureDataLakeStorageProcess ~AzureDataLakeStorageFileProcessorBase() override = default; protected: - explicit AzureDataLakeStorageFileProcessorBase(core::ProcessorMetadata info, std::unique_ptr<storage::DataLakeStorageClient> data_lake_storage_client) - : AzureDataLakeStorageProcessorBase(info, std::move(data_lake_storage_client)) { + explicit AzureDataLakeStorageFileProcessorBase(core::ProcessorMetadata metadata, std::unique_ptr<storage::DataLakeStorageClient> data_lake_storage_client) + : AzureDataLakeStorageProcessorBase(metadata, std::move(data_lake_storage_client)) { } bool setFileOperationCommonParameters( diff --git a/extensions/azure/processors/AzureDataLakeStorageProcessorBase.h b/extensions/azure/processors/AzureDataLakeStorageProcessorBase.h index 35b4383dd..3a3e2b07b 100644 --- a/extensions/azure/processors/AzureDataLakeStorageProcessorBase.h +++ b/extensions/azure/processors/AzureDataLakeStorageProcessorBase.h @@ -59,8 +59,8 @@ class AzureDataLakeStorageProcessorBase : public AzureStorageProcessorBase { void onSchedule(core::ProcessContext& context, core::ProcessSessionFactory& sessionFactory) override; protected: - explicit AzureDataLakeStorageProcessorBase(core::ProcessorMetadata info, std::unique_ptr<storage::DataLakeStorageClient> data_lake_storage_client) - : AzureStorageProcessorBase(info), + explicit AzureDataLakeStorageProcessorBase(core::ProcessorMetadata metadata, std::unique_ptr<storage::DataLakeStorageClient> data_lake_storage_client) + : AzureStorageProcessorBase(metadata), azure_data_lake_storage_(std::move(data_lake_storage_client)) { } diff --git a/extensions/azure/processors/DeleteAzureBlobStorage.h b/extensions/azure/processors/DeleteAzureBlobStorage.h index bb5709179..890d9f19d 100644 --- a/extensions/azure/processors/DeleteAzureBlobStorage.h +++ b/extensions/azure/processors/DeleteAzureBlobStorage.h @@ -62,8 +62,8 @@ class DeleteAzureBlobStorage final : public AzureBlobStorageSingleBlobProcessorB ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit DeleteAzureBlobStorage(core::ProcessorMetadata info) - : DeleteAzureBlobStorage(info, nullptr) { + explicit DeleteAzureBlobStorage(core::ProcessorMetadata metadata) + : DeleteAzureBlobStorage(metadata, nullptr) { } void initialize() override; @@ -73,8 +73,8 @@ class DeleteAzureBlobStorage final : public AzureBlobStorageSingleBlobProcessorB private: friend class ::AzureBlobStorageTestsFixture<DeleteAzureBlobStorage>; - explicit DeleteAzureBlobStorage(core::ProcessorMetadata info, std::unique_ptr<storage::BlobStorageClient> blob_storage_client) - : AzureBlobStorageSingleBlobProcessorBase(info, std::move(blob_storage_client)) { + explicit DeleteAzureBlobStorage(core::ProcessorMetadata metadata, std::unique_ptr<storage::BlobStorageClient> blob_storage_client) + : AzureBlobStorageSingleBlobProcessorBase(metadata, std::move(blob_storage_client)) { } std::optional<storage::DeleteAzureBlobStorageParameters> buildDeleteAzureBlobStorageParameters( diff --git a/extensions/azure/processors/DeleteAzureDataLakeStorage.h b/extensions/azure/processors/DeleteAzureDataLakeStorage.h index 88024909a..6f231c05f 100644 --- a/extensions/azure/processors/DeleteAzureDataLakeStorage.h +++ b/extensions/azure/processors/DeleteAzureDataLakeStorage.h @@ -58,8 +58,8 @@ class DeleteAzureDataLakeStorage final : public AzureDataLakeStorageFileProcesso private: friend class ::AzureDataLakeStorageTestsFixture<DeleteAzureDataLakeStorage>; - explicit DeleteAzureDataLakeStorage(core::ProcessorMetadata info, std::unique_ptr<storage::DataLakeStorageClient> data_lake_storage_client) - : AzureDataLakeStorageFileProcessorBase(info, std::move(data_lake_storage_client)) { + explicit DeleteAzureDataLakeStorage(core::ProcessorMetadata metadata, std::unique_ptr<storage::DataLakeStorageClient> data_lake_storage_client) + : AzureDataLakeStorageFileProcessorBase(metadata, std::move(data_lake_storage_client)) { } std::optional<storage::DeleteAzureDataLakeStorageParameters> buildDeleteParameters(core::ProcessContext& context, const core::FlowFile& flow_file); diff --git a/extensions/azure/processors/FetchAzureBlobStorage.h b/extensions/azure/processors/FetchAzureBlobStorage.h index d64ec37dd..3270becc4 100644 --- a/extensions/azure/processors/FetchAzureBlobStorage.h +++ b/extensions/azure/processors/FetchAzureBlobStorage.h @@ -68,8 +68,8 @@ class FetchAzureBlobStorage final : public AzureBlobStorageSingleBlobProcessorBa ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit FetchAzureBlobStorage(core::ProcessorMetadata info) - : FetchAzureBlobStorage(info, nullptr) { + explicit FetchAzureBlobStorage(core::ProcessorMetadata metadata) + : FetchAzureBlobStorage(metadata, nullptr) { } void initialize() override; @@ -78,8 +78,8 @@ class FetchAzureBlobStorage final : public AzureBlobStorageSingleBlobProcessorBa private: friend class ::AzureBlobStorageTestsFixture<FetchAzureBlobStorage>; - explicit FetchAzureBlobStorage(core::ProcessorMetadata info, std::unique_ptr<storage::BlobStorageClient> blob_storage_client) - : AzureBlobStorageSingleBlobProcessorBase(info, std::move(blob_storage_client)) { + explicit FetchAzureBlobStorage(core::ProcessorMetadata metadata, std::unique_ptr<storage::BlobStorageClient> blob_storage_client) + : AzureBlobStorageSingleBlobProcessorBase(metadata, std::move(blob_storage_client)) { } std::optional<storage::FetchAzureBlobStorageParameters> buildFetchAzureBlobStorageParameters( diff --git a/extensions/azure/processors/FetchAzureDataLakeStorage.h b/extensions/azure/processors/FetchAzureDataLakeStorage.h index 5626e8c28..d2a8e8565 100644 --- a/extensions/azure/processors/FetchAzureDataLakeStorage.h +++ b/extensions/azure/processors/FetchAzureDataLakeStorage.h @@ -79,8 +79,8 @@ class FetchAzureDataLakeStorage final : public AzureDataLakeStorageFileProcessor private: friend class ::AzureDataLakeStorageTestsFixture<FetchAzureDataLakeStorage>; - explicit FetchAzureDataLakeStorage(core::ProcessorMetadata info, std::unique_ptr<storage::DataLakeStorageClient> data_lake_storage_client) - : AzureDataLakeStorageFileProcessorBase(info, std::move(data_lake_storage_client)) { + explicit FetchAzureDataLakeStorage(core::ProcessorMetadata metadata, std::unique_ptr<storage::DataLakeStorageClient> data_lake_storage_client) + : AzureDataLakeStorageFileProcessorBase(metadata, std::move(data_lake_storage_client)) { } std::optional<storage::FetchAzureDataLakeStorageParameters> buildFetchParameters(core::ProcessContext& context, const core::FlowFile& flow_file); diff --git a/extensions/azure/processors/ListAzureBlobStorage.h b/extensions/azure/processors/ListAzureBlobStorage.h index 96ce71c7c..cfe630bf6 100644 --- a/extensions/azure/processors/ListAzureBlobStorage.h +++ b/extensions/azure/processors/ListAzureBlobStorage.h @@ -64,12 +64,12 @@ class ListAzureBlobStorage final : public AzureBlobStorageProcessorBase { ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit ListAzureBlobStorage(core::ProcessorMetadata info) - : ListAzureBlobStorage(info, nullptr) { + explicit ListAzureBlobStorage(core::ProcessorMetadata metadata) + : ListAzureBlobStorage(metadata, nullptr) { } - explicit ListAzureBlobStorage(core::ProcessorMetadata info, std::unique_ptr<storage::BlobStorageClient> blob_storage_client) - : AzureBlobStorageProcessorBase(info, std::move(blob_storage_client)) { + explicit ListAzureBlobStorage(core::ProcessorMetadata metadata, std::unique_ptr<storage::BlobStorageClient> blob_storage_client) + : AzureBlobStorageProcessorBase(metadata, std::move(blob_storage_client)) { } void initialize() override; diff --git a/extensions/azure/processors/ListAzureDataLakeStorage.h b/extensions/azure/processors/ListAzureDataLakeStorage.h index fa45cf168..c444c98c5 100644 --- a/extensions/azure/processors/ListAzureDataLakeStorage.h +++ b/extensions/azure/processors/ListAzureDataLakeStorage.h @@ -84,8 +84,8 @@ class ListAzureDataLakeStorage final : public AzureDataLakeStorageProcessorBase private: friend class ::ListAzureDataLakeStorageTestsFixture; - explicit ListAzureDataLakeStorage(core::ProcessorMetadata info, std::unique_ptr<storage::DataLakeStorageClient> data_lake_storage_client) - : AzureDataLakeStorageProcessorBase(info, std::move(data_lake_storage_client)) { + explicit ListAzureDataLakeStorage(core::ProcessorMetadata metadata, std::unique_ptr<storage::DataLakeStorageClient> data_lake_storage_client) + : AzureDataLakeStorageProcessorBase(metadata, std::move(data_lake_storage_client)) { } std::optional<storage::ListAzureDataLakeStorageParameters> buildListParameters(core::ProcessContext &context); diff --git a/extensions/azure/processors/PutAzureBlobStorage.h b/extensions/azure/processors/PutAzureBlobStorage.h index 695f4853a..4c1f9d6ab 100644 --- a/extensions/azure/processors/PutAzureBlobStorage.h +++ b/extensions/azure/processors/PutAzureBlobStorage.h @@ -65,8 +65,8 @@ class PutAzureBlobStorage final : public AzureBlobStorageSingleBlobProcessorBase ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit PutAzureBlobStorage(core::ProcessorMetadata info) - : PutAzureBlobStorage(info, nullptr) { + explicit PutAzureBlobStorage(core::ProcessorMetadata metadata) + : PutAzureBlobStorage(metadata, nullptr) { } void initialize() override; @@ -107,8 +107,8 @@ class PutAzureBlobStorage final : public AzureBlobStorageSingleBlobProcessorBase private: friend class ::AzureBlobStorageTestsFixture<PutAzureBlobStorage>; - explicit PutAzureBlobStorage(core::ProcessorMetadata info, std::unique_ptr<storage::BlobStorageClient> blob_storage_client) - : AzureBlobStorageSingleBlobProcessorBase(info, std::move(blob_storage_client)) { + explicit PutAzureBlobStorage(core::ProcessorMetadata metadata, std::unique_ptr<storage::BlobStorageClient> blob_storage_client) + : AzureBlobStorageSingleBlobProcessorBase(metadata, std::move(blob_storage_client)) { } std::optional<storage::PutAzureBlobStorageParameters> buildPutAzureBlobStorageParameters(core::ProcessContext &context, const core::FlowFile& flow_file); diff --git a/extensions/azure/processors/PutAzureDataLakeStorage.h b/extensions/azure/processors/PutAzureDataLakeStorage.h index f1684c003..e1bac70cc 100644 --- a/extensions/azure/processors/PutAzureDataLakeStorage.h +++ b/extensions/azure/processors/PutAzureDataLakeStorage.h @@ -95,8 +95,8 @@ class PutAzureDataLakeStorage final : public AzureDataLakeStorageFileProcessorBa std::shared_ptr<core::logging::Logger> logger_; }; - explicit PutAzureDataLakeStorage(core::ProcessorMetadata info, std::unique_ptr<storage::DataLakeStorageClient> data_lake_storage_client) - : AzureDataLakeStorageFileProcessorBase(info, std::move(data_lake_storage_client)) { + explicit PutAzureDataLakeStorage(core::ProcessorMetadata metadata, std::unique_ptr<storage::DataLakeStorageClient> data_lake_storage_client) + : AzureDataLakeStorageFileProcessorBase(metadata, std::move(data_lake_storage_client)) { } std::optional<storage::PutAzureDataLakeStorageParameters> buildUploadParameters(core::ProcessContext &context, const core::FlowFile& flow_file); diff --git a/extensions/civetweb/processors/ListenHTTP.h b/extensions/civetweb/processors/ListenHTTP.h index 199b2155b..06da14e1b 100644 --- a/extensions/civetweb/processors/ListenHTTP.h +++ b/extensions/civetweb/processors/ListenHTTP.h @@ -55,8 +55,8 @@ class ListenHTTP : public core::ProcessorImpl { public: friend struct ::org::apache::nifi::minifi::test::ListenHTTPTestAccessor; - explicit ListenHTTP(core::ProcessorMetadata info) - : ProcessorImpl(info) { + explicit ListenHTTP(core::ProcessorMetadata metadata) + : ProcessorImpl(metadata) { callbacks_.log_message = &logMessage; callbacks_.log_access = &logAccess; } diff --git a/extensions/grafana-loki/PushGrafanaLoki.h b/extensions/grafana-loki/PushGrafanaLoki.h index 5f8f914cb..bd64aa021 100644 --- a/extensions/grafana-loki/PushGrafanaLoki.h +++ b/extensions/grafana-loki/PushGrafanaLoki.h @@ -34,9 +34,9 @@ namespace org::apache::nifi::minifi::extensions::grafana::loki { class PushGrafanaLoki : public core::ProcessorImpl { public: - explicit PushGrafanaLoki(core::ProcessorMetadata info) - : ProcessorImpl(info), - log_batch_(info.logger) { + explicit PushGrafanaLoki(core::ProcessorMetadata metadata) + : ProcessorImpl(metadata), + log_batch_(metadata.logger) { } ~PushGrafanaLoki() override = default; diff --git a/extensions/libarchive/MergeContent.h b/extensions/libarchive/MergeContent.h index 0dbed6f40..2853f0c5d 100644 --- a/extensions/libarchive/MergeContent.h +++ b/extensions/libarchive/MergeContent.h @@ -294,8 +294,8 @@ class KeepAllUniqueAttributesMerger: public AttributeMerger { */ class MergeContent : public processors::BinFiles { public: - explicit MergeContent(core::ProcessorMetadata info) - : processors::BinFiles(info) { + explicit MergeContent(core::ProcessorMetadata metadata) + : processors::BinFiles(metadata) { mergeStrategy_ = merge_content_options::MERGE_STRATEGY_DEFRAGMENT; mergeFormat_ = merge_content_options::MERGE_FORMAT_CONCAT_VALUE; delimiterStrategy_ = merge_content_options::DELIMITER_STRATEGY_FILENAME; diff --git a/extensions/llamacpp/processors/RunLlamaCppInference.h b/extensions/llamacpp/processors/RunLlamaCppInference.h index 13eafa4e6..c2d11fe45 100644 --- a/extensions/llamacpp/processors/RunLlamaCppInference.h +++ b/extensions/llamacpp/processors/RunLlamaCppInference.h @@ -63,8 +63,8 @@ class RunLlamaCppInferenceMetrics : public core::ProcessorMetricsImpl { class RunLlamaCppInference : public core::ProcessorImpl { public: - explicit RunLlamaCppInference(core::ProcessorMetadata info, LlamaContextProvider llama_context_provider = {}) - : core::ProcessorImpl(info), + explicit RunLlamaCppInference(core::ProcessorMetadata metadata, LlamaContextProvider llama_context_provider = {}) + : core::ProcessorImpl(metadata), llama_context_provider_(std::move(llama_context_provider)) { metrics_ = gsl::make_not_null(std::make_shared<RunLlamaCppInferenceMetrics>(*this)); } diff --git a/extensions/mqtt/processors/PublishMQTT.h b/extensions/mqtt/processors/PublishMQTT.h index 3f252e6b9..a84fea851 100644 --- a/extensions/mqtt/processors/PublishMQTT.h +++ b/extensions/mqtt/processors/PublishMQTT.h @@ -39,8 +39,8 @@ namespace org::apache::nifi::minifi::processors { class PublishMQTT : public processors::AbstractMQTTProcessor { public: - explicit PublishMQTT(core::ProcessorMetadata info) - : processors::AbstractMQTTProcessor(info) { + explicit PublishMQTT(core::ProcessorMetadata metadata) + : processors::AbstractMQTTProcessor(metadata) { metrics_ = gsl::make_not_null(std::make_shared<PublishMQTTMetrics>(*this, in_flight_message_counter_)); } diff --git a/extensions/pdh/PerformanceDataMonitor.h b/extensions/pdh/PerformanceDataMonitor.h index 08d6ddbe9..196ca3db9 100644 --- a/extensions/pdh/PerformanceDataMonitor.h +++ b/extensions/pdh/PerformanceDataMonitor.h @@ -49,8 +49,8 @@ class PerformanceDataMonitor final : public core::ProcessorImpl { static constexpr const char* PRETTY_FORMAT_STR = "Pretty"; static constexpr const char* COMPACT_FORMAT_STR = "Compact"; - explicit PerformanceDataMonitor(core::ProcessorMetadata info) - : ProcessorImpl(info), output_format_(OutputFormat::JSON), pretty_output_(false), + explicit PerformanceDataMonitor(core::ProcessorMetadata metadata) + : ProcessorImpl(metadata), output_format_(OutputFormat::JSON), pretty_output_(false), decimal_places_(std::nullopt), pdh_query_(nullptr), resource_consumption_counters_() {} diff --git a/extensions/python/ExecutePythonProcessor.cpp b/extensions/python/ExecutePythonProcessor.cpp index 48a58ad6f..b9ed72bc1 100644 --- a/extensions/python/ExecutePythonProcessor.cpp +++ b/extensions/python/ExecutePythonProcessor.cpp @@ -60,7 +60,7 @@ void ExecutePythonProcessor::initialize() { ranges::transform(python_properties_, std::back_inserter(all_properties), &core::Property::getReference); setSupportedProperties(all_properties); setSupportedRelationships(Relationships); - logger_->log_debug("Processor has already been initialized, returning..."); + logger_->log_debug("Processor has been initialized."); } void ExecutePythonProcessor::initalizeThroughScriptEngine() { diff --git a/extensions/python/ExecutePythonProcessor.h b/extensions/python/ExecutePythonProcessor.h index 1e44b8cc3..e78623f68 100644 --- a/extensions/python/ExecutePythonProcessor.h +++ b/extensions/python/ExecutePythonProcessor.h @@ -40,12 +40,12 @@ namespace org::apache::nifi::minifi::extensions::python::processors { class ExecutePythonProcessor : public core::ProcessorImpl { public: - explicit ExecutePythonProcessor(core::ProcessorMetadata info) - : ProcessorImpl(info), + explicit ExecutePythonProcessor(core::ProcessorMetadata metadata) + : ProcessorImpl(metadata), processor_initialized_(false), python_dynamic_(false), reload_on_script_change_(true) { - python_logger_ = core::logging::LoggerFactory<ExecutePythonProcessor>::getAliasedLogger(getName(), info.uuid); + python_logger_ = core::logging::LoggerFactory<ExecutePythonProcessor>::getAliasedLogger(getName(), metadata.uuid); } EXTENSIONAPI static constexpr const char* Description = "Executes a script given the flow file and a process session. " diff --git a/extensions/python/PythonObjectFactory.h b/extensions/python/PythonObjectFactory.h index 4c75deb38..577f53f9a 100644 --- a/extensions/python/PythonObjectFactory.h +++ b/extensions/python/PythonObjectFactory.h @@ -45,8 +45,8 @@ class PythonObjectFactory : public org::apache::nifi::minifi::core::ProcessorFac qualified_module_name_(std::move(qualified_module_name)) { } - std::unique_ptr<org::apache::nifi::minifi::core::ProcessorApi> create(org::apache::nifi::minifi::core::ProcessorMetadata info) override { - auto obj = ProcessorFactoryImpl::create(info); + std::unique_ptr<org::apache::nifi::minifi::core::ProcessorApi> create(org::apache::nifi::minifi::core::ProcessorMetadata metadata) override { + auto obj = ProcessorFactoryImpl::create(metadata); auto ptr = org::apache::nifi::minifi::utils::dynamic_unique_cast<org::apache::nifi::minifi::extensions::python::processors::ExecutePythonProcessor>(std::move(obj)); if (ptr == nullptr) { return nullptr; diff --git a/extensions/sftp/processors/PutSFTP.cpp b/extensions/sftp/processors/PutSFTP.cpp index 5d0e836c0..26a6d4bf7 100644 --- a/extensions/sftp/processors/PutSFTP.cpp +++ b/extensions/sftp/processors/PutSFTP.cpp @@ -42,8 +42,8 @@ void PutSFTP::initialize() { setSupportedRelationships(Relationships); } -PutSFTP::PutSFTP(core::ProcessorMetadata info) - : SFTPProcessorBase(info), +PutSFTP::PutSFTP(core::ProcessorMetadata metadata) + : SFTPProcessorBase(metadata), create_directory_(false), batch_size_(0), reject_zero_byte_(false), diff --git a/extensions/sftp/processors/PutSFTP.h b/extensions/sftp/processors/PutSFTP.h index 2343bc4d7..92bc62411 100644 --- a/extensions/sftp/processors/PutSFTP.h +++ b/extensions/sftp/processors/PutSFTP.h @@ -51,7 +51,7 @@ class PutSFTP : public SFTPProcessorBase { static constexpr std::string_view CONFLICT_RESOLUTION_FAIL = "FAIL"; static constexpr std::string_view CONFLICT_RESOLUTION_NONE = "NONE"; - explicit PutSFTP(core::ProcessorMetadata info); + explicit PutSFTP(core::ProcessorMetadata metadata); ~PutSFTP() override; EXTENSIONAPI static constexpr const char* Description = "Sends FlowFiles to an SFTP Server"; diff --git a/extensions/sftp/processors/SFTPProcessorBase.cpp b/extensions/sftp/processors/SFTPProcessorBase.cpp index c9d620233..a54fad7d2 100644 --- a/extensions/sftp/processors/SFTPProcessorBase.cpp +++ b/extensions/sftp/processors/SFTPProcessorBase.cpp @@ -43,8 +43,8 @@ namespace org::apache::nifi::minifi::processors { -SFTPProcessorBase::SFTPProcessorBase(core::ProcessorMetadata info) - : ProcessorImpl(info), +SFTPProcessorBase::SFTPProcessorBase(core::ProcessorMetadata metadata) + : ProcessorImpl(metadata), connection_timeout_(0), data_timeout_(0), strict_host_checking_(false), diff --git a/extensions/sftp/processors/SFTPProcessorBase.h b/extensions/sftp/processors/SFTPProcessorBase.h index a63c57d71..d68ce7aa9 100644 --- a/extensions/sftp/processors/SFTPProcessorBase.h +++ b/extensions/sftp/processors/SFTPProcessorBase.h @@ -40,7 +40,7 @@ namespace org::apache::nifi::minifi::processors { class SFTPProcessorBase : public core::ProcessorImpl { public: - explicit SFTPProcessorBase(core::ProcessorMetadata info); + explicit SFTPProcessorBase(core::ProcessorMetadata metadata); ~SFTPProcessorBase() override; static constexpr std::string_view PROXY_TYPE_DIRECT = "DIRECT"; diff --git a/extensions/smb/tests/ListAndFetchSmbTests.cpp b/extensions/smb/tests/ListAndFetchSmbTests.cpp index d413ece1b..e75462ebe 100644 --- a/extensions/smb/tests/ListAndFetchSmbTests.cpp +++ b/extensions/smb/tests/ListAndFetchSmbTests.cpp @@ -65,8 +65,8 @@ TEST_CASE("ListSmb and FetchSmb work together") { } controller.runSession(plan); - CHECK(read_from_success_relationship->numberOfFlowFilesRead() == 1); - CHECK(read_from_failure_relationship->numberOfFlowFilesRead() == 0); + CHECK(read_from_success_relationship.get().numberOfFlowFilesRead() == 1); + CHECK(read_from_failure_relationship.get().numberOfFlowFilesRead() == 0); } } // namespace org::apache::nifi::minifi::extensions::smb::test diff --git a/extensions/standard-processors/processors/GetFile.h b/extensions/standard-processors/processors/GetFile.h index 09fc01133..d255ba39f 100644 --- a/extensions/standard-processors/processors/GetFile.h +++ b/extensions/standard-processors/processors/GetFile.h @@ -84,8 +84,8 @@ class GetFileMetrics : public core::ProcessorMetricsImpl { class GetFile : public core::ProcessorImpl { public: - explicit GetFile(core::ProcessorMetadata info) - : ProcessorImpl(info) { + explicit GetFile(core::ProcessorMetadata metadata) + : ProcessorImpl(metadata) { metrics_ = gsl::make_not_null(std::make_shared<GetFileMetrics>(*this)); } ~GetFile() override = default; diff --git a/extensions/standard-processors/processors/InvokeHTTP.h b/extensions/standard-processors/processors/InvokeHTTP.h index da4652a89..a8950057f 100644 --- a/extensions/standard-processors/processors/InvokeHTTP.h +++ b/extensions/standard-processors/processors/InvokeHTTP.h @@ -127,8 +127,8 @@ class InvokeHTTP : public core::ProcessorImpl { EXTENSIONAPI static constexpr std::string_view REQUEST_URL = "invokehttp.request.url"; EXTENSIONAPI static constexpr std::string_view TRANSACTION_ID = "invokehttp.tx.id"; - explicit InvokeHTTP(core::ProcessorMetadata info) - : ProcessorImpl(info) { + explicit InvokeHTTP(core::ProcessorMetadata metadata) + : ProcessorImpl(metadata) { setTriggerWhenEmpty(true); } diff --git a/extensions/standard-processors/processors/LogAttribute.h b/extensions/standard-processors/processors/LogAttribute.h index c47f414ff..55bc6c938 100644 --- a/extensions/standard-processors/processors/LogAttribute.h +++ b/extensions/standard-processors/processors/LogAttribute.h @@ -39,8 +39,8 @@ namespace org::apache::nifi::minifi::processors { class LogAttribute : public core::ProcessorImpl { public: - explicit LogAttribute(core::ProcessorMetadata info) - : ProcessorImpl(info) { + explicit LogAttribute(core::ProcessorMetadata metadata) + : ProcessorImpl(metadata) { logger_->set_max_log_size(-1); } diff --git a/extensions/standard-processors/processors/RouteText.cpp b/extensions/standard-processors/processors/RouteText.cpp index a8b5c5aad..5d005f6fb 100644 --- a/extensions/standard-processors/processors/RouteText.cpp +++ b/extensions/standard-processors/processors/RouteText.cpp @@ -54,16 +54,10 @@ void RouteText::onSchedule(core::ProcessContext& context, core::ProcessSessionFa group_fallback_ = context.getProperty(GroupingFallbackValue).value_or(""); - { - const auto static_relationships = RouteText::Relationships; - std::vector<core::RelationshipDefinition> relationships(static_relationships.begin(), static_relationships.end()); - - for (const auto& property_name : context.getDynamicPropertyKeys()) { - core::RelationshipDefinition rel{property_name, "Dynamic Route"}; - dynamic_relationships_[property_name] = rel; - relationships.push_back(rel); - logger_->log_info("RouteText registered dynamic route '{}'", property_name); - } + for (const auto& property_name : context.getDynamicPropertyKeys()) { + core::RelationshipDefinition rel{property_name, "Dynamic Route"}; + dynamic_relationships_[property_name] = rel; + logger_->log_info("RouteText registered dynamic route '{}'", property_name); } } diff --git a/extensions/standard-processors/tests/unit/DefragmentTextTests.cpp b/extensions/standard-processors/tests/unit/DefragmentTextTests.cpp index 1fb68b0c4..28f1579f0 100644 --- a/extensions/standard-processors/tests/unit/DefragmentTextTests.cpp +++ b/extensions/standard-processors/tests/unit/DefragmentTextTests.cpp @@ -323,8 +323,8 @@ class FragmentGenerator : public core::ProcessorImpl { static constexpr bool IsSingleThreaded = false; ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit FragmentGenerator(minifi::core::ProcessorMetadata info) - : ProcessorImpl(info) { + explicit FragmentGenerator(minifi::core::ProcessorMetadata metadata) + : ProcessorImpl(metadata) { } void onTrigger(core::ProcessContext&, core::ProcessSession& session) override { diff --git a/extensions/systemd/ConsumeJournald.cpp b/extensions/systemd/ConsumeJournald.cpp index ca0cfa276..0a7043ed9 100644 --- a/extensions/systemd/ConsumeJournald.cpp +++ b/extensions/systemd/ConsumeJournald.cpp @@ -33,7 +33,7 @@ namespace org::apache::nifi::minifi::extensions::systemd { namespace chr = std::chrono; -ConsumeJournald::ConsumeJournald(core::ProcessorMetadata info, std::unique_ptr<libwrapper::LibWrapper>&& libwrapper) +ConsumeJournald::ConsumeJournald(core::ProcessorMetadata metadata, std::unique_ptr<libwrapper::LibWrapper>&& libwrapper) : core::ProcessorImpl{info}, libwrapper_{std::move(libwrapper)} {} void ConsumeJournald::initialize() { diff --git a/extensions/systemd/ConsumeJournald.h b/extensions/systemd/ConsumeJournald.h index 07cd49dc4..32de33253 100644 --- a/extensions/systemd/ConsumeJournald.h +++ b/extensions/systemd/ConsumeJournald.h @@ -113,7 +113,7 @@ class ConsumeJournald final : public core::ProcessorImpl { ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit ConsumeJournald(core::ProcessorMetadata info, std::unique_ptr<libwrapper::LibWrapper>&& = libwrapper::createLibWrapper()); + explicit ConsumeJournald(core::ProcessorMetadata metadata, std::unique_ptr<libwrapper::LibWrapper>&& = libwrapper::createLibWrapper()); ConsumeJournald(const ConsumeJournald&) = delete; ConsumeJournald(ConsumeJournald&&) = delete; ConsumeJournald& operator=(const ConsumeJournald&) = delete; diff --git a/extensions/windows-event-log/ConsumeWindowsEventLog.cpp b/extensions/windows-event-log/ConsumeWindowsEventLog.cpp index 391080840..d2bbbf6ea 100644 --- a/extensions/windows-event-log/ConsumeWindowsEventLog.cpp +++ b/extensions/windows-event-log/ConsumeWindowsEventLog.cpp @@ -61,8 +61,8 @@ namespace org::apache::nifi::minifi::processors { const int EVT_NEXT_TIMEOUT_MS = 500; -ConsumeWindowsEventLog::ConsumeWindowsEventLog(core::ProcessorMetadata info) - : core::ProcessorImpl(info) { +ConsumeWindowsEventLog::ConsumeWindowsEventLog(core::ProcessorMetadata metadata) + : core::ProcessorImpl(metadata) { char buff[MAX_COMPUTERNAME_LENGTH + 1]; DWORD size = sizeof(buff); if (GetComputerName(buff, &size)) { diff --git a/extensions/windows-event-log/ConsumeWindowsEventLog.h b/extensions/windows-event-log/ConsumeWindowsEventLog.h index d47ab7ddf..263e9902c 100644 --- a/extensions/windows-event-log/ConsumeWindowsEventLog.h +++ b/extensions/windows-event-log/ConsumeWindowsEventLog.h @@ -80,7 +80,7 @@ class Bookmark; class ConsumeWindowsEventLog : public core::ProcessorImpl { public: - explicit ConsumeWindowsEventLog(core::ProcessorMetadata info); + explicit ConsumeWindowsEventLog(core::ProcessorMetadata metadata); ~ConsumeWindowsEventLog() override; diff --git a/libminifi/test/libtest/unit/MockClasses.h b/libminifi/test/libtest/unit/MockClasses.h index bb55e7a30..0fde351b7 100644 --- a/libminifi/test/libtest/unit/MockClasses.h +++ b/libminifi/test/libtest/unit/MockClasses.h @@ -83,8 +83,8 @@ class MockControllerService : public minifi::core::controller::ControllerService class MockProcessor : public minifi::core::ProcessorImpl { public: - explicit MockProcessor(minifi::core::ProcessorMetadata info) - : ProcessorImpl(info) { + explicit MockProcessor(minifi::core::ProcessorMetadata metadata) + : ProcessorImpl(metadata) { setTriggerWhenEmpty(true); } diff --git a/minifi-api/include/minifi-cpp/core/ProcessContext.h b/minifi-api/include/minifi-cpp/core/ProcessContext.h index fdc04a874..1e1e3e2b0 100644 --- a/minifi-api/include/minifi-cpp/core/ProcessContext.h +++ b/minifi-api/include/minifi-cpp/core/ProcessContext.h @@ -32,11 +32,6 @@ namespace org::apache::nifi::minifi::core { -namespace detail { -template<typename T> -concept NotAFlowFile = !std::convertible_to<T &, const FlowFile &> && !std::convertible_to<T &, const std::shared_ptr<FlowFile> &>; -} // namespace detail - class ProcessorInfo { public: virtual std::string getName() const = 0; diff --git a/minifi-api/include/minifi-cpp/core/ProcessorFactory.h b/minifi-api/include/minifi-cpp/core/ProcessorFactory.h index ed27ebf2e..258b857ed 100644 --- a/minifi-api/include/minifi-cpp/core/ProcessorFactory.h +++ b/minifi-api/include/minifi-cpp/core/ProcessorFactory.h @@ -28,7 +28,7 @@ class ProcessorApi; class ProcessorFactory { public: - virtual std::unique_ptr<ProcessorApi> create(ProcessorMetadata info) = 0; + virtual std::unique_ptr<ProcessorApi> create(ProcessorMetadata metadata) = 0; virtual std::string getGroupName() const = 0; virtual std::string getClassName() const = 0;
