This is an automated email from the ASF dual-hosted git repository. martinzink pushed a commit to branch beke_2 in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 53b3bf74c3d866dde52350cbdcad4f953274c5a6 Author: Martin Zink <[email protected]> AuthorDate: Thu Jun 18 14:42:05 2026 +0200 fix4 --- Extensions.md | 4 ++-- .../cpp-extension-lib/src/core/logging/Logger.cpp | 14 -------------- extensions/ExtensionInitializer.cpp | 2 +- extensions/aws/AwsLoader.cpp | 2 +- extensions/kafka/ExtensionInitializer.cpp | 4 ++-- extensions/python/pythonlibloader/PythonLibLoader.cpp | 2 +- extensions/python/pythonloader/PyProcLoader.cpp | 2 +- extensions/sftp/SFTPLoader.cpp | 2 +- libminifi/src/core/extension/Extension.cpp | 4 ++-- .../extension-verification-test/CppApiExtension.cpp | 2 +- 10 files changed, 12 insertions(+), 26 deletions(-) diff --git a/Extensions.md b/Extensions.md index cebe83671..aa8575100 100644 --- a/Extensions.md +++ b/Extensions.md @@ -73,10 +73,10 @@ REGISTER_RESOURCE(RESTSender, DescriptionOnly); ``` Some extensions (e.g. `Python`) require initialization before use. -You need to define an `MinifiInitCppExtension` function of type `MinifiExtension*(MinifiExtensionContext*)` to be called. +You need to define an `minifi_init_cpp_extension` function of type `MinifiExtension*(MinifiExtensionContext*)` to be called. ```C++ -extern "C" void MinifiInitCppExtension(MinifiExtensionContext* extension_context) { +extern "C" void minifi_init_cpp_extension(MinifiExtensionContext* extension_context) { static PythonLibLoader python_lib_loader([&] (std::string_view key) -> std::optional<std::string> { std::optional<std::string> result; MinifiConfigGet(extension_context, minifi::utils::toStringView(key), [] (void* user_data, MinifiStringView value) { diff --git a/extension-framework/cpp-extension-lib/src/core/logging/Logger.cpp b/extension-framework/cpp-extension-lib/src/core/logging/Logger.cpp index 6b5e05423..7d4ada5ea 100644 --- a/extension-framework/cpp-extension-lib/src/core/logging/Logger.cpp +++ b/extension-framework/cpp-extension-lib/src/core/logging/Logger.cpp @@ -33,20 +33,6 @@ minifi_log_level toCLogLevel(minifi::core::logging::LOG_LEVEL lvl) { } gsl_FailFast(); } - -minifi::core::logging::LOG_LEVEL toLogLevel(minifi_log_level level) { - switch (level) { - case MINIFI_LOG_LEVEL_TRACE: return minifi::core::logging::trace; - case MINIFI_LOG_LEVEL_DEBUG: return minifi::core::logging::debug; - case MINIFI_LOG_LEVEL_INFO: return minifi::core::logging::info; - case MINIFI_LOG_LEVEL_WARNING: return minifi::core::logging::warn; - case MINIFI_LOG_LEVEL_ERROR: return minifi::core::logging::err; - case MINIFI_LOG_LEVEL_CRITICAL: return minifi::core::logging::critical; - case MINIFI_LOG_LEVEL_OFF: return minifi::core::logging::off; - } - gsl_FailFast(); -} - } // namespace void CffiLogger::set_max_log_size(const int) { diff --git a/extensions/ExtensionInitializer.cpp b/extensions/ExtensionInitializer.cpp index 1fe381f9a..b453268aa 100644 --- a/extensions/ExtensionInitializer.cpp +++ b/extensions/ExtensionInitializer.cpp @@ -22,7 +22,7 @@ namespace minifi = org::apache::nifi::minifi; -extern "C" void MinifiInitCppExtension(minifi_extension_context* extension_context) { +extern "C" void minifi_init_cpp_extension(minifi_extension_context* extension_context) { minifi_extension_definition extension_definition{ .name = minifi::utils::toStringView(MAKESTRING(MODULE_NAME)), .version = minifi::utils::toStringView(minifi::AgentBuild::VERSION), diff --git a/extensions/aws/AwsLoader.cpp b/extensions/aws/AwsLoader.cpp index b15ebbf8c..a14d0cb12 100644 --- a/extensions/aws/AwsLoader.cpp +++ b/extensions/aws/AwsLoader.cpp @@ -51,7 +51,7 @@ void deinit(gsl::owner<void*> sdk_opts_ptr) { } } // namespace org::apache::nifi::minifi::aws::init -extern "C" void MinifiInitCppExtension(minifi_extension_context* extension_context) { +extern "C" void minifi_init_cpp_extension(minifi_extension_context* extension_context) { using minifi::aws::init::toStringView; auto sdk_options = std::make_unique<Aws::SDKOptions>(); Aws::InitAPI(*sdk_options); diff --git a/extensions/kafka/ExtensionInitializer.cpp b/extensions/kafka/ExtensionInitializer.cpp index d9d424b80..b85521acb 100644 --- a/extensions/kafka/ExtensionInitializer.cpp +++ b/extensions/kafka/ExtensionInitializer.cpp @@ -25,9 +25,9 @@ namespace minifi = org::apache::nifi::minifi; -CEXTENSIONAPI const uint32_t MinifiApiVersion = MINIFI_API_VERSION; +CEXTENSIONAPI const uint32_t minifi_api_version = MINIFI_API_VERSION; -CEXTENSIONAPI void MinifiInitExtension(minifi_extension_context* extension_context) { +CEXTENSIONAPI void minifi_init_extension(minifi_extension_context* extension_context) { const minifi_extension_definition extension_definition{.name = minifi::api::utils::minifiStringView(MAKESTRING(EXTENSION_NAME)), .version = minifi::api::utils::minifiStringView(MAKESTRING(EXTENSION_VERSION)), .deinit = nullptr, diff --git a/extensions/python/pythonlibloader/PythonLibLoader.cpp b/extensions/python/pythonlibloader/PythonLibLoader.cpp index 6b05a84b3..935d77053 100644 --- a/extensions/python/pythonlibloader/PythonLibLoader.cpp +++ b/extensions/python/pythonlibloader/PythonLibLoader.cpp @@ -100,7 +100,7 @@ class PythonLibLoader { std::shared_ptr<minifi::core::logging::Logger> logger_ = minifi::core::logging::LoggerFactory<PythonLibLoader>::getLogger(); }; -extern "C" void MinifiInitCppExtension(minifi_extension_context* extension_context) { +extern "C" void minifi_init_cpp_extension(minifi_extension_context* extension_context) { static PythonLibLoader python_lib_loader([&] (std::string_view key) -> std::optional<std::string> { std::optional<std::string> result; minifi_config_get(extension_context, minifi::utils::toStringView(key), [] (void* user_data, minifi_string_view value) { diff --git a/extensions/python/pythonloader/PyProcLoader.cpp b/extensions/python/pythonloader/PyProcLoader.cpp index 1b8794122..9007d304c 100644 --- a/extensions/python/pythonloader/PyProcLoader.cpp +++ b/extensions/python/pythonloader/PyProcLoader.cpp @@ -33,7 +33,7 @@ static minifi::extensions::python::PythonCreator& getPythonCreator() { // the symbols of the python library extern "C" const int LOAD_MODULE_AS_GLOBAL = 1; -extern "C" void MinifiInitCppExtension(minifi_extension_context* extension_context) { +extern "C" void minifi_init_cpp_extension(minifi_extension_context* extension_context) { getPythonCreator().configure([&] (std::string_view key) -> std::optional<std::string> { std::optional<std::string> result; minifi_config_get(extension_context, minifi::utils::toStringView(key), [] (void* user_data, minifi_string_view value) { diff --git a/extensions/sftp/SFTPLoader.cpp b/extensions/sftp/SFTPLoader.cpp index ba323e513..9fc5d5d65 100644 --- a/extensions/sftp/SFTPLoader.cpp +++ b/extensions/sftp/SFTPLoader.cpp @@ -25,7 +25,7 @@ namespace minifi = org::apache::nifi::minifi; -extern "C" void MinifiInitCppExtension(minifi_extension_context* extension_context) { +extern "C" void minifi_init_cpp_extension(minifi_extension_context* extension_context) { if (libssh2_init(0) != 0) { return; } diff --git a/libminifi/src/core/extension/Extension.cpp b/libminifi/src/core/extension/Extension.cpp index d0245974c..c92ebbc22 100644 --- a/libminifi/src/core/extension/Extension.cpp +++ b/libminifi/src/core/extension/Extension.cpp @@ -61,7 +61,7 @@ bool Extension::load(bool global) { return false; } logger_->log_trace("Dlopen succeeded for extension '{}' at '{}'", library_name_, library_path_); - if (findSymbol("MinifiInitCppExtension")) { + if (findSymbol("minifi_init_cpp_extension")) { logger_->log_trace("Loaded cpp extension '{}' at '{}'", library_name_, library_path_); return true; } @@ -147,7 +147,7 @@ Extension::~Extension() { bool Extension::initialize(const std::shared_ptr<minifi::Configure>& configure) { logger_->log_trace("Initializing extension '{}'", library_name_); - void* init_symbol_ptr = findSymbol("MinifiInitCppExtension"); + void* init_symbol_ptr = findSymbol("minifi_init_cpp_extension"); if (!init_symbol_ptr) { init_symbol_ptr = findSymbol("minifi_init_extension"); } diff --git a/libminifi/test/integration/extension-verification-test/CppApiExtension.cpp b/libminifi/test/integration/extension-verification-test/CppApiExtension.cpp index 22e36ea09..1b34fbc1d 100644 --- a/libminifi/test/integration/extension-verification-test/CppApiExtension.cpp +++ b/libminifi/test/integration/extension-verification-test/CppApiExtension.cpp @@ -24,7 +24,7 @@ namespace minifi = org::apache::nifi::minifi; -extern "C" void MinifiInitCppExtension(minifi_extension_context* extension_context) { +extern "C" void minifi_init_cpp_extension(minifi_extension_context* extension_context) { minifi_extension_definition extension_definition{ .name = minifi::utils::toStringView(MAKESTRING(MODULE_NAME)), .version = minifi::utils::toStringView("1.0.0"),
