From 18f1a45b7cb04b95ef4b479a505d72228c861a56 Mon Sep 17 00:00:00 2001 From: Adam Debreceni Date: Fri, 24 Jul 2026 14:36:43 +0200 Subject: [PATCH 1/2] MINIFICPP-2868 - Remove getProcessorType from ProcessorApi --- core-framework/include/core/ProcessorImpl.h | 12 +-------- .../libtest/CProcessorTestUtils.h | 7 ++++-- .../include/core/AbstractProcessor.h | 3 --- extensions/aws/tests/S3TestsFixture.h | 4 +-- .../tests/AzureBlobStorageTestsFixture.h | 2 +- .../tests/AzureDataLakeStorageTestsFixture.h | 2 +- .../azure/tests/ListAzureBlobStorageTests.cpp | 2 +- .../tests/ListAzureDataLakeStorageTests.cpp | 2 +- extensions/python/ExecutePythonProcessor.h | 1 - .../tests/ExecutePythonProcessorTests.cpp | 2 +- libminifi/include/Port.h | 4 +-- libminifi/include/core/Processor.h | 4 +-- libminifi/include/utils/CProcessor.h | 4 --- libminifi/src/core/ClassLoader.cpp | 2 +- libminifi/src/core/FlowConfiguration.cpp | 5 +++- libminifi/src/core/Processor.cpp | 25 +++---------------- .../src/core/flow/StructuredConfiguration.cpp | 4 +-- libminifi/test/libtest/unit/ProcessorUtils.h | 5 ++-- .../include/minifi-cpp/core/ProcessorApi.h | 1 - 19 files changed, 30 insertions(+), 61 deletions(-) diff --git a/core-framework/include/core/ProcessorImpl.h b/core-framework/include/core/ProcessorImpl.h index b022d79fc7..b238733a44 100644 --- a/core-framework/include/core/ProcessorImpl.h +++ b/core-framework/include/core/ProcessorImpl.h @@ -42,19 +42,11 @@ #include "minifi-cpp/core/ProcessorMetadata.h" #include "minifi-cpp/Exception.h" -#define ADD_GET_PROCESSOR_NAME \ - std::string getProcessorType() const override { \ - auto class_name = org::apache::nifi::minifi::core::className(); \ - auto splitted = org::apache::nifi::minifi::utils::string::split(class_name, "::"); \ - return splitted[splitted.size() - 1]; \ - } - #define ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS \ bool supportsDynamicProperties() const override { return SupportsDynamicProperties; } \ bool supportsDynamicRelationships() const override { return SupportsDynamicRelationships; } \ minifi::core::annotation::Input getInputRequirement() const override { return InputRequirement; } \ - bool isSingleThreaded() const override { return IsSingleThreaded; } \ - ADD_GET_PROCESSOR_NAME + bool isSingleThreaded() const override { return IsSingleThreaded; } namespace org::apache::nifi::minifi { @@ -85,8 +77,6 @@ class ProcessorImpl : public virtual ProcessorApi { [[nodiscard]] bool supportsDynamicRelationships() const override = 0; - std::string getProcessorType() const override = 0; - void initialize(ProcessorDescriptor& self) final; void setSupportedRelationships(std::span relationships); diff --git a/extension-framework/cpp-extension-lib/libtest/CProcessorTestUtils.h b/extension-framework/cpp-extension-lib/libtest/CProcessorTestUtils.h index 9f9df63cfa..4885a8b6a7 100644 --- a/extension-framework/cpp-extension-lib/libtest/CProcessorTestUtils.h +++ b/extension-framework/cpp-extension-lib/libtest/CProcessorTestUtils.h @@ -25,19 +25,22 @@ #include "utils/CControllerService.h" #include "utils/CProcessor.h" #include "minifi-cpp/agent/agent_docs.h" +#include "utils/StringUtils.h" namespace org::apache::nifi::minifi::test::utils { template std::unique_ptr make_custom_c_processor(minifi::core::ProcessorMetadata metadata, Args&&... args) { // NOLINT(cppcoreguidelines-missing-std-forward) + std::string type; std::unique_ptr processor_impl; minifi::api::core::useProcessorClassDefinition([&](const minifi_processor_definition& definition) { - minifi::utils::useCProcessorClassDescription(definition, [&](const auto&, auto c_description) { + minifi::utils::useCProcessorClassDescription(definition, [&](const auto& description, auto c_description) { + type = description.short_name_; processor_impl = std::make_unique(std::move(c_description), metadata, new T(metadata, std::forward(args)...)); }); }); - return std::make_unique(metadata.name, metadata.uuid, std::move(processor_impl)); + return std::make_unique(std::move(type), metadata.name, metadata.uuid, std::move(processor_impl)); } template diff --git a/extension-framework/include/core/AbstractProcessor.h b/extension-framework/include/core/AbstractProcessor.h index 86ce4050e4..3e25d4171f 100644 --- a/extension-framework/include/core/AbstractProcessor.h +++ b/extension-framework/include/core/AbstractProcessor.h @@ -48,8 +48,5 @@ class AbstractProcessor : public ProcessorImpl { bool supportsDynamicRelationships() const noexcept final { return ProcessorT::SupportsDynamicRelationships; } minifi::core::annotation::Input getInputRequirement() const noexcept final { return ProcessorT::InputRequirement; } bool isSingleThreaded() const noexcept final { return ProcessorT::IsSingleThreaded; } - std::string getProcessorType() const final { - return utils::string::partAfterLastOccurrenceOf(className(), ':'); - } }; } // namespace org::apache::nifi::minifi::core diff --git a/extensions/aws/tests/S3TestsFixture.h b/extensions/aws/tests/S3TestsFixture.h index da1ccd3d59..4fad58ad47 100644 --- a/extensions/aws/tests/S3TestsFixture.h +++ b/extensions/aws/tests/S3TestsFixture.h @@ -168,7 +168,7 @@ class FlowProcessorS3TestsFixture : public S3TestsFixture { this->mock_s3_request_sender->setUseVirtualAddressing(use_virtual_addressing); return std::make_unique(std::move(this->mock_s3_request_sender)); })); - auto s3_processor_unique_ptr = std::make_unique("S3Processor", uuid, std::move(impl)); + auto s3_processor_unique_ptr = std::make_unique(utils::string::partAfterLastOccurrenceOf(core::className(), ':'), "S3Processor", uuid, std::move(impl)); this->s3_processor = s3_processor_unique_ptr.get(); auto input_dir = this->test_controller.createTempDirectory(); @@ -226,7 +226,7 @@ class FlowProducerS3TestsFixture : public S3TestsFixture { this->mock_s3_request_sender->setUseVirtualAddressing(use_virtual_addressing); return std::make_unique(std::move(this->mock_s3_request_sender)); })); - auto s3_processor_unique_ptr = std::make_unique("S3Processor", uuid, std::move(impl)); + auto s3_processor_unique_ptr = std::make_unique(utils::string::partAfterLastOccurrenceOf(core::className(), ':'), "S3Processor", uuid, std::move(impl)); this->s3_processor = s3_processor_unique_ptr.get(); this->plan->addProcessor( diff --git a/extensions/azure/tests/AzureBlobStorageTestsFixture.h b/extensions/azure/tests/AzureBlobStorageTestsFixture.h index 181504303b..1b16af186c 100644 --- a/extensions/azure/tests/AzureBlobStorageTestsFixture.h +++ b/extensions/azure/tests/AzureBlobStorageTestsFixture.h @@ -64,7 +64,7 @@ class AzureBlobStorageTestsFixture { auto uuid = utils::IdGenerator::getIdGenerator()->generate(); auto impl = std::unique_ptr( new ProcessorType({.uuid = uuid, .name = "AzureBlobStorageProcessor", .logger = logging::LoggerFactory::getLogger(uuid)}, std::move(mock_blob_storage))); - auto azure_blob_storage_processor_unique_ptr = std::make_unique(impl->getName(), impl->getUUID(), std::move(impl)); + auto azure_blob_storage_processor_unique_ptr = std::make_unique(utils::string::partAfterLastOccurrenceOf(core::className(), ':'), impl->getName(), impl->getUUID(), std::move(impl)); azure_blob_storage_processor_ = azure_blob_storage_processor_unique_ptr.get(); auto input_dir = test_controller_.createTempDirectory(); std::ofstream input_file_stream(input_dir / GET_FILE_NAME); diff --git a/extensions/azure/tests/AzureDataLakeStorageTestsFixture.h b/extensions/azure/tests/AzureDataLakeStorageTestsFixture.h index 006ffa28ce..97d42d97b5 100644 --- a/extensions/azure/tests/AzureDataLakeStorageTestsFixture.h +++ b/extensions/azure/tests/AzureDataLakeStorageTestsFixture.h @@ -65,7 +65,7 @@ class AzureDataLakeStorageTestsFixture { new AzureDataLakeStorageProcessor({ .uuid = uuid, .name = "AzureDataLakeStorageProcessor", .logger = logging::LoggerFactory::getLogger(uuid)}, std::move(mock_data_lake_storage_client))); - auto azure_data_lake_storage_unique_ptr = std::make_unique(impl->getName(), impl->getUUID(), std::move(impl)); + auto azure_data_lake_storage_unique_ptr = std::make_unique(utils::string::partAfterLastOccurrenceOf(core::className(), ':'), impl->getName(), impl->getUUID(), std::move(impl)); azure_data_lake_storage_ = azure_data_lake_storage_unique_ptr.get(); auto input_dir = test_controller_.createTempDirectory(); minifi::test::utils::putFileToDir(input_dir, GETFILE_FILE_NAME, TEST_DATA); diff --git a/extensions/azure/tests/ListAzureBlobStorageTests.cpp b/extensions/azure/tests/ListAzureBlobStorageTests.cpp index 0c8ebfe9c4..3fde261fe8 100644 --- a/extensions/azure/tests/ListAzureBlobStorageTests.cpp +++ b/extensions/azure/tests/ListAzureBlobStorageTests.cpp @@ -50,7 +50,7 @@ class ListAzureBlobStorageTestsFixture { core::ProcessorMetadata{ .uuid = uuid, .name = "ListAzureBlobStorage", .logger = logging::LoggerFactory::getLogger(uuid)}, std::move(mock_blob_storage)); - auto list_azure_blob_storage_unique_ptr = std::make_unique(impl->getName(), impl->getUUID(), std::move(impl)); + auto list_azure_blob_storage_unique_ptr = std::make_unique("ListAzureBlobStorage", impl->getName(), impl->getUUID(), std::move(impl)); list_azure_blob_storage_ = list_azure_blob_storage_unique_ptr.get(); plan_->addProcessor(std::move(list_azure_blob_storage_unique_ptr), "ListAzureBlobStorage", { {"success", "d"} }); diff --git a/extensions/azure/tests/ListAzureDataLakeStorageTests.cpp b/extensions/azure/tests/ListAzureDataLakeStorageTests.cpp index c8fe778aed..2107493cb9 100644 --- a/extensions/azure/tests/ListAzureDataLakeStorageTests.cpp +++ b/extensions/azure/tests/ListAzureDataLakeStorageTests.cpp @@ -47,7 +47,7 @@ class ListAzureDataLakeStorageTestsFixture { new minifi::azure::processors::ListAzureDataLakeStorage({ .uuid = uuid, .name = "ListAzureDataLakeStorage", .logger = logging::LoggerFactory::getLogger(uuid)}, std::move(mock_data_lake_storage_client))); - auto list_azure_data_lake_storage_unique_ptr = std::make_unique(impl->getName(), impl->getUUID(), std::move(impl)); + auto list_azure_data_lake_storage_unique_ptr = std::make_unique("ListAzureDataLakeStorage", impl->getName(), impl->getUUID(), std::move(impl)); list_azure_data_lake_storage_ = list_azure_data_lake_storage_unique_ptr.get(); plan_->addProcessor(std::move(list_azure_data_lake_storage_unique_ptr), "ListAzureDataLakeStorage", { {"success", "d"} }); diff --git a/extensions/python/ExecutePythonProcessor.h b/extensions/python/ExecutePythonProcessor.h index 7c1575924a..e25307fb66 100644 --- a/extensions/python/ExecutePythonProcessor.h +++ b/extensions/python/ExecutePythonProcessor.h @@ -66,7 +66,6 @@ class ExecutePythonProcessor : public core::ProcessorImpl { bool supportsDynamicRelationships() const override { return SupportsDynamicRelationships; } minifi::core::annotation::Input getInputRequirement() const override { return InputRequirement; } bool isSingleThreaded() const override { return python_single_threaded_; } - ADD_GET_PROCESSOR_NAME void initialize() override; void onSchedule(core::ProcessContext& context, core::ProcessSessionFactory&) override; diff --git a/extensions/python/tests/ExecutePythonProcessorTests.cpp b/extensions/python/tests/ExecutePythonProcessorTests.cpp index f04c4e3a41..d95f1800d1 100644 --- a/extensions/python/tests/ExecutePythonProcessorTests.cpp +++ b/extensions/python/tests/ExecutePythonProcessorTests.cpp @@ -152,7 +152,7 @@ class SimplePythonFlowFileTransferTest : public ExecutePythonProcessorTestBase { .logger = logging::LoggerFactory::getLogger(uuid) }); execute_python_processor->setScriptFilePath(getScriptFullPath(used_as_script_file).string()); - auto execute_python_processor_unique_ptr = std::make_unique(execute_python_processor->getName(), execute_python_processor->getUUID(), std::move(execute_python_processor)); + auto execute_python_processor_unique_ptr = std::make_unique("ExecutePythonProcessor", execute_python_processor->getName(), execute_python_processor->getUUID(), std::move(execute_python_processor)); auto processor = plan_->addProcessor(std::move(execute_python_processor_unique_ptr), "executePythonProcessor", core::Relationship("success", "description"), link_to_previous); return processor; } diff --git a/libminifi/include/Port.h b/libminifi/include/Port.h index 8f1e20caf4..0f1e0e96a5 100644 --- a/libminifi/include/Port.h +++ b/libminifi/include/Port.h @@ -50,9 +50,9 @@ class PortImpl final : public ForwardingNode { PortType port_type_; }; -class Port : public core::Processor { +class Port final : public core::Processor { public: - Port(std::string_view name, const utils::Identifier& uuid, std::unique_ptr impl): Processor(name, uuid, std::move(impl)) {} + Port(std::string_view name, const utils::Identifier& uuid, std::unique_ptr impl): Processor("Port", name, uuid, std::move(impl)) {} PortType getPortType() const { auto* port_impl = dynamic_cast(impl_.get()); diff --git a/libminifi/include/core/Processor.h b/libminifi/include/core/Processor.h index 4eff8d8b23..4f48c09383 100644 --- a/libminifi/include/core/Processor.h +++ b/libminifi/include/core/Processor.h @@ -57,8 +57,7 @@ class ProcessSessionFactory; class Processor : public ConnectableImpl, public ConfigurableComponentImpl, public state::response::ResponseNodeSource { public: - Processor(std::string_view name, const utils::Identifier& uuid, std::unique_ptr impl); - explicit Processor(std::string_view name, std::unique_ptr impl); + Processor(std::string type, std::string_view name, const utils::Identifier& uuid, std::unique_ptr impl); Processor(const Processor& parent) = delete; Processor& operator=(const Processor& parent) = delete; @@ -141,6 +140,7 @@ class Processor : public ConnectableImpl, public ConfigurableComponentImpl, publ } protected: + std::string type_; std::atomic state_; std::atomic scheduling_period_; diff --git a/libminifi/include/utils/CProcessor.h b/libminifi/include/utils/CProcessor.h index 329b5ce9c1..ea6bcc6dad 100644 --- a/libminifi/include/utils/CProcessor.h +++ b/libminifi/include/utils/CProcessor.h @@ -110,10 +110,6 @@ class CProcessor : public minifi::core::ProcessorApi { return class_description_.is_single_threaded; } - std::string getProcessorType() const override { - return class_description_.name; - } - void onTrigger(minifi::core::ProcessContext& process_context, minifi::core::ProcessSession& process_session) override { std::optional error; auto status = class_description_.callbacks.trigger(impl_, reinterpret_cast(&process_context), reinterpret_cast(&process_session)); diff --git a/libminifi/src/core/ClassLoader.cpp b/libminifi/src/core/ClassLoader.cpp index ee97b3af9d..c5f3d39047 100644 --- a/libminifi/src/core/ClassLoader.cpp +++ b/libminifi/src/core/ClassLoader.cpp @@ -124,7 +124,7 @@ class ProcessorFactoryWrapper : public ObjectFactoryImpl { [[nodiscard]] gsl::owner createRaw(const std::string &name, const utils::Identifier &uuid) override { auto logger = logging::LoggerFactoryBase::getAliasedLogger(getClassName(), uuid); - return gsl::owner{new Processor(name, uuid, factory_->create({.uuid = uuid, .name = name, .logger = std::move(logger)}))}; + return gsl::owner{new Processor(utils::string::partAfterLastOccurrenceOf(factory_->getClassName(), ':'), name, uuid, factory_->create({.uuid = uuid, .name = name, .logger = std::move(logger)}))}; } [[nodiscard]] std::string getModuleName() const override { diff --git a/libminifi/src/core/FlowConfiguration.cpp b/libminifi/src/core/FlowConfiguration.cpp index aae42ca4ed..c63ce6bd92 100644 --- a/libminifi/src/core/FlowConfiguration.cpp +++ b/libminifi/src/core/FlowConfiguration.cpp @@ -100,7 +100,10 @@ std::unique_ptr FlowConfiguration::createProcessor(const std::s } std::unique_ptr FlowConfiguration::createProvenanceReportTask() { - auto processor = std::make_unique("", std::make_unique(this->configuration_)); + auto impl = std::make_unique(this->configuration_); + auto uuid = impl->getUUID(); + auto name = impl->getName(); + auto processor = std::make_unique("SiteToSiteProvenanceReportingTask", name, uuid, std::move(impl)); processor->initialize(); return processor; } diff --git a/libminifi/src/core/Processor.cpp b/libminifi/src/core/Processor.cpp index 108769c8b7..b20004a092 100644 --- a/libminifi/src/core/Processor.cpp +++ b/libminifi/src/core/Processor.cpp @@ -52,28 +52,9 @@ static std::mutex& getGraphMutex() { return mutex; } -Processor::Processor(std::string_view name, std::unique_ptr impl) - : ConnectableImpl(name), - state_(DISABLED), - scheduling_period_(MINIMUM_SCHEDULING_PERIOD), - run_duration_(DEFAULT_RUN_DURATION), - yield_period_(DEFAULT_YIELD_PERIOD_SECONDS), - active_tasks_(0), - trigger_when_empty_(false), - logger_(logging::LoggerFactory::getLogger(uuid_)), - metrics_(gsl::make_not_null(std::make_shared(*this))), - impl_(std::move(impl)) { - has_work_.store(false); - // Setup the default values - strategy_ = TIMER_DRIVEN; - penalization_period_ = DEFAULT_PENALIZATION_PERIOD; - max_concurrent_tasks_ = DEFAULT_MAX_CONCURRENT_TASKS; - incoming_connections_Iter = this->incoming_connections_.begin(); - logger_->log_debug("Processor {} created UUID {}", name_, getUUIDStr()); -} - -Processor::Processor(std::string_view name, const utils::Identifier& uuid, std::unique_ptr impl) +Processor::Processor(std::string type, std::string_view name, const utils::Identifier& uuid, std::unique_ptr impl) : ConnectableImpl(name, uuid), + type_(std::move(type)), state_(DISABLED), scheduling_period_(MINIMUM_SCHEDULING_PERIOD), run_duration_(DEFAULT_RUN_DURATION), @@ -447,7 +428,7 @@ bool Processor::isSingleThreaded() const { } std::string Processor::getProcessorType() const { - return impl_->getProcessorType(); + return type_; } void Processor::setTriggerWhenEmpty(bool trigger_when_empty) { diff --git a/libminifi/src/core/flow/StructuredConfiguration.cpp b/libminifi/src/core/flow/StructuredConfiguration.cpp index 04c1231418..e94eb69b90 100644 --- a/libminifi/src/core/flow/StructuredConfiguration.cpp +++ b/libminifi/src/core/flow/StructuredConfiguration.cpp @@ -741,7 +741,7 @@ void StructuredConfiguration::parseRPGPort(const Node& port_node, core::ProcessG auto port_impl = std::make_unique( nameStr, parent->getURL(), this->configuration_, uuid, direction); auto* port = port_impl.get(); - auto port_wrapper = std::make_unique(nameStr, uuid, std::move(port_impl)); + auto port_wrapper = std::make_unique("RemoteProcessGroupPort", nameStr, uuid, std::move(port_impl)); port->setTimeout(std::chrono::milliseconds(parent->getTimeout())); port->setTransmitting(true); port_wrapper->setYieldPeriodMsec(parent->getYieldPeriodMsec()); @@ -986,7 +986,7 @@ void StructuredConfiguration::parseFunnels(const Node& node, core::ProcessGroup* throw Exception(ExceptionType::GENERAL_EXCEPTION, "Incorrect funnel UUID format."); }); - auto funnel = std::make_unique(name, uuid.value(), std::make_unique(name, uuid.value())); + auto funnel = std::make_unique("Funnel", name, uuid.value(), std::make_unique(name, uuid.value())); logger_->log_debug("Created funnel with UUID {} and name {}", id, name); funnel->setScheduledState(core::RUNNING); funnel->setSchedulingStrategy(core::EVENT_DRIVEN); diff --git a/libminifi/test/libtest/unit/ProcessorUtils.h b/libminifi/test/libtest/unit/ProcessorUtils.h index dd637c7dd3..1bc10d067d 100644 --- a/libminifi/test/libtest/unit/ProcessorUtils.h +++ b/libminifi/test/libtest/unit/ProcessorUtils.h @@ -19,6 +19,7 @@ #include "core/Processor.h" #include "minifi-cpp/core/ProcessorMetadata.h" +#include "utils/StringUtils.h" namespace org::apache::nifi::minifi::test::utils { @@ -32,7 +33,7 @@ std::unique_ptr make_processor(std::string_view name, std::opti .name = std::string{name}, .logger = minifi::core::logging::LoggerFactory::getLogger(uuid.value()) }); - return std::make_unique(name, uuid.value(), std::move(processor_impl)); + return std::make_unique(minifi::utils::string::partAfterLastOccurrenceOf(core::className(), ':'), name, uuid.value(), std::move(processor_impl)); } template @@ -40,7 +41,7 @@ std::unique_ptr make_custom_processor(Args&&... args) { auto processor_impl = std::make_unique(std::forward(args)...); auto name = processor_impl->getName(); auto uuid = processor_impl->getUUID(); - return std::make_unique(name, uuid, std::move(processor_impl)); + return std::make_unique(minifi::utils::string::partAfterLastOccurrenceOf(core::className(), ':'), name, uuid, std::move(processor_impl)); } } // namespace org::apache::nifi::minifi::test::utils diff --git a/minifi-api/include/minifi-cpp/core/ProcessorApi.h b/minifi-api/include/minifi-cpp/core/ProcessorApi.h index f4ce642888..e328157a6d 100644 --- a/minifi-api/include/minifi-cpp/core/ProcessorApi.h +++ b/minifi-api/include/minifi-cpp/core/ProcessorApi.h @@ -50,7 +50,6 @@ class ProcessorApi { virtual void initialize(ProcessorDescriptor& descriptor) = 0; virtual bool isSingleThreaded() const = 0; - virtual std::string getProcessorType() const = 0; virtual void onTrigger(ProcessContext&, ProcessSession&) = 0; virtual void onSchedule(ProcessContext&, ProcessSessionFactory&) = 0; virtual void onUnSchedule() = 0; From e831bf81a54a4c098717bc87d8169fdd3a2087cc Mon Sep 17 00:00:00 2001 From: Adam Debreceni Date: Mon, 27 Jul 2026 09:33:24 +0200 Subject: [PATCH 2/2] MINIFICPP-2868 - Linter fix --- extensions/azure/tests/AzureBlobStorageTestsFixture.h | 3 ++- extensions/azure/tests/AzureDataLakeStorageTestsFixture.h | 3 ++- extensions/python/tests/ExecutePythonProcessorTests.cpp | 3 ++- libminifi/src/core/ClassLoader.cpp | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/extensions/azure/tests/AzureBlobStorageTestsFixture.h b/extensions/azure/tests/AzureBlobStorageTestsFixture.h index 1b16af186c..eae276f159 100644 --- a/extensions/azure/tests/AzureBlobStorageTestsFixture.h +++ b/extensions/azure/tests/AzureBlobStorageTestsFixture.h @@ -64,7 +64,8 @@ class AzureBlobStorageTestsFixture { auto uuid = utils::IdGenerator::getIdGenerator()->generate(); auto impl = std::unique_ptr( new ProcessorType({.uuid = uuid, .name = "AzureBlobStorageProcessor", .logger = logging::LoggerFactory::getLogger(uuid)}, std::move(mock_blob_storage))); - auto azure_blob_storage_processor_unique_ptr = std::make_unique(utils::string::partAfterLastOccurrenceOf(core::className(), ':'), impl->getName(), impl->getUUID(), std::move(impl)); + auto azure_blob_storage_processor_unique_ptr = std::make_unique( + utils::string::partAfterLastOccurrenceOf(core::className(), ':'), impl->getName(), impl->getUUID(), std::move(impl)); azure_blob_storage_processor_ = azure_blob_storage_processor_unique_ptr.get(); auto input_dir = test_controller_.createTempDirectory(); std::ofstream input_file_stream(input_dir / GET_FILE_NAME); diff --git a/extensions/azure/tests/AzureDataLakeStorageTestsFixture.h b/extensions/azure/tests/AzureDataLakeStorageTestsFixture.h index 97d42d97b5..5aba15ad6e 100644 --- a/extensions/azure/tests/AzureDataLakeStorageTestsFixture.h +++ b/extensions/azure/tests/AzureDataLakeStorageTestsFixture.h @@ -65,7 +65,8 @@ class AzureDataLakeStorageTestsFixture { new AzureDataLakeStorageProcessor({ .uuid = uuid, .name = "AzureDataLakeStorageProcessor", .logger = logging::LoggerFactory::getLogger(uuid)}, std::move(mock_data_lake_storage_client))); - auto azure_data_lake_storage_unique_ptr = std::make_unique(utils::string::partAfterLastOccurrenceOf(core::className(), ':'), impl->getName(), impl->getUUID(), std::move(impl)); + auto azure_data_lake_storage_unique_ptr = std::make_unique( + utils::string::partAfterLastOccurrenceOf(core::className(), ':'), impl->getName(), impl->getUUID(), std::move(impl)); azure_data_lake_storage_ = azure_data_lake_storage_unique_ptr.get(); auto input_dir = test_controller_.createTempDirectory(); minifi::test::utils::putFileToDir(input_dir, GETFILE_FILE_NAME, TEST_DATA); diff --git a/extensions/python/tests/ExecutePythonProcessorTests.cpp b/extensions/python/tests/ExecutePythonProcessorTests.cpp index d95f1800d1..b1c7b8809f 100644 --- a/extensions/python/tests/ExecutePythonProcessorTests.cpp +++ b/extensions/python/tests/ExecutePythonProcessorTests.cpp @@ -152,7 +152,8 @@ class SimplePythonFlowFileTransferTest : public ExecutePythonProcessorTestBase { .logger = logging::LoggerFactory::getLogger(uuid) }); execute_python_processor->setScriptFilePath(getScriptFullPath(used_as_script_file).string()); - auto execute_python_processor_unique_ptr = std::make_unique("ExecutePythonProcessor", execute_python_processor->getName(), execute_python_processor->getUUID(), std::move(execute_python_processor)); + auto execute_python_processor_unique_ptr = std::make_unique( + "ExecutePythonProcessor", execute_python_processor->getName(), execute_python_processor->getUUID(), std::move(execute_python_processor)); auto processor = plan_->addProcessor(std::move(execute_python_processor_unique_ptr), "executePythonProcessor", core::Relationship("success", "description"), link_to_previous); return processor; } diff --git a/libminifi/src/core/ClassLoader.cpp b/libminifi/src/core/ClassLoader.cpp index c5f3d39047..9559acaed4 100644 --- a/libminifi/src/core/ClassLoader.cpp +++ b/libminifi/src/core/ClassLoader.cpp @@ -124,7 +124,8 @@ class ProcessorFactoryWrapper : public ObjectFactoryImpl { [[nodiscard]] gsl::owner createRaw(const std::string &name, const utils::Identifier &uuid) override { auto logger = logging::LoggerFactoryBase::getAliasedLogger(getClassName(), uuid); - return gsl::owner{new Processor(utils::string::partAfterLastOccurrenceOf(factory_->getClassName(), ':'), name, uuid, factory_->create({.uuid = uuid, .name = name, .logger = std::move(logger)}))}; + return gsl::owner{new Processor( + utils::string::partAfterLastOccurrenceOf(factory_->getClassName(), ':'), name, uuid, factory_->create({.uuid = uuid, .name = name, .logger = std::move(logger)}))}; } [[nodiscard]] std::string getModuleName() const override {