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 567aa7606112e13bcc11e1f098b6b98a82861465 Author: Adam Debreceni <[email protected]> AuthorDate: Fri Aug 8 13:44:49 2025 +0200 Fix parameter name --- libminifi/include/core/FlowConfiguration.h | 2 +- libminifi/include/processors/ProcessorUtils.h | 12 +++--------- libminifi/src/core/FlowConfiguration.cpp | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/libminifi/include/core/FlowConfiguration.h b/libminifi/include/core/FlowConfiguration.h index 0c9cd327c..652674651 100644 --- a/libminifi/include/core/FlowConfiguration.h +++ b/libminifi/include/core/FlowConfiguration.h @@ -84,7 +84,7 @@ class FlowConfiguration : public CoreComponentImpl { ~FlowConfiguration() override; // Create Processor (Node/Input/Output Port) based on the name - std::unique_ptr<core::Processor> createProcessor(const std::string &class_short, const std::string &fullclass, const std::string &name, const utils::Identifier &uuid); + std::unique_ptr<core::Processor> createProcessor(const std::string &class_short, const std::string &fullclass, const std::string &object_name, const utils::Identifier &uuid); // Create Root Processor Group static std::unique_ptr<core::ProcessGroup> createRootProcessGroup(const std::string &name, const utils::Identifier &uuid, int version); diff --git a/libminifi/include/processors/ProcessorUtils.h b/libminifi/include/processors/ProcessorUtils.h index 7f5452e78..6b750ac8e 100644 --- a/libminifi/include/processors/ProcessorUtils.h +++ b/libminifi/include/processors/ProcessorUtils.h @@ -30,16 +30,10 @@ class ProcessorUtils { public: ProcessorUtils() = delete; - /** - * Instantiates and configures a processor - * @param class_short_name short name of the class - * @param canonicalName full class name ( canonical name ) - * @param uuid uuid object for the processor - */ - static inline std::unique_ptr<core::Processor> createProcessor(const std::string &class_short_name, const std::string &canonicalName, const std::string &name, const utils::Identifier &uuid) { - auto ptr = core::ClassLoader::getDefaultClassLoader().instantiate(class_short_name, name, uuid); + static inline std::unique_ptr<core::Processor> createProcessor(const std::string &class_short, const std::string &fullclass, const std::string &object_name, const utils::Identifier &uuid) { + auto ptr = core::ClassLoader::getDefaultClassLoader().instantiate(class_short, object_name, uuid); if (ptr == nullptr) { - ptr = core::ClassLoader::getDefaultClassLoader().instantiate(canonicalName, name, uuid); + ptr = core::ClassLoader::getDefaultClassLoader().instantiate(fullclass, object_name, uuid); } if (ptr == nullptr) { return nullptr; diff --git a/libminifi/src/core/FlowConfiguration.cpp b/libminifi/src/core/FlowConfiguration.cpp index 379c18fe3..ed4041e3f 100644 --- a/libminifi/src/core/FlowConfiguration.cpp +++ b/libminifi/src/core/FlowConfiguration.cpp @@ -71,8 +71,8 @@ FlowConfiguration::~FlowConfiguration() { } } -std::unique_ptr<core::Processor> FlowConfiguration::createProcessor(const std::string &class_short, const std::string &fullclass, const std::string &name, const utils::Identifier &uuid) { - auto processor = minifi::processors::ProcessorUtils::createProcessor(class_short, fullclass, name, uuid); +std::unique_ptr<core::Processor> FlowConfiguration::createProcessor(const std::string &class_short, const std::string &fullclass, const std::string &object_name, const utils::Identifier &uuid) { + auto processor = minifi::processors::ProcessorUtils::createProcessor(class_short, fullclass, object_name, uuid); if (nullptr == processor) { logger_->log_error("No Processor defined for {}", fullclass); return nullptr;
