This is an automated email from the ASF dual-hosted git repository. martinzink pushed a commit to branch c_api_dev in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 120f2b9468a72c9e12b395d0048861da34eb20f2 Author: Martin Zink <[email protected]> AuthorDate: Tue Apr 28 11:14:14 2026 +0200 MINIFICPP-2796 Rename C api functions and remove workIsAvailable --- .../cpp-extension-lib/include/api/core/Resource.h | 9 +++------ libminifi/include/utils/CProcessor.h | 10 +++++----- minifi-api/include/minifi-c/minifi-c.h | 9 ++++----- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/extension-framework/cpp-extension-lib/include/api/core/Resource.h b/extension-framework/cpp-extension-lib/include/api/core/Resource.h index 292a99639..6cefe82f9 100644 --- a/extension-framework/cpp-extension-lib/include/api/core/Resource.h +++ b/extension-framework/cpp-extension-lib/include/api/core/Resource.h @@ -103,13 +103,10 @@ void useProcessorClassDescription(Fn&& fn) { .destroy = [] (MINIFI_OWNED void* self) -> void { delete static_cast<Class*>(self); }, - .isWorkAvailable = [] (void* self) -> MinifiBool { - return static_cast<Class*>(self)->isWorkAvailable(); - }, .getTriggerWhenEmpty = [] (void* self) -> MinifiBool { return static_cast<Class*>(self)->getTriggerWhenEmpty(); }, - .onTrigger = [] (void* self, MinifiProcessContext* context, MinifiProcessSession* session) -> MinifiStatus { + .trigger = [] (void* self, MinifiProcessContext* context, MinifiProcessSession* session) -> MinifiStatus { ProcessContext context_wrapper(context); ProcessSession session_wrapper(session); try { @@ -118,7 +115,7 @@ void useProcessorClassDescription(Fn&& fn) { return MINIFI_STATUS_UNKNOWN_ERROR; } }, - .onSchedule = [] (void* self, MinifiProcessContext* context) -> MinifiStatus { + .schedule = [] (void* self, MinifiProcessContext* context) -> MinifiStatus { ProcessContext context_wrapper(context); try { return static_cast<Class*>(self)->onSchedule(context_wrapper); @@ -126,7 +123,7 @@ void useProcessorClassDescription(Fn&& fn) { return MINIFI_STATUS_UNKNOWN_ERROR; } }, - .onUnSchedule = [] (void* self) -> void { + .unSchedule = [] (void* self) -> void { static_cast<Class*>(self)->onUnSchedule(); }, .calculateMetrics = [] (void* self) -> MINIFI_OWNED MinifiPublishedMetrics* { diff --git a/libminifi/include/utils/CProcessor.h b/libminifi/include/utils/CProcessor.h index 210f82b06..7dca958af 100644 --- a/libminifi/include/utils/CProcessor.h +++ b/libminifi/include/utils/CProcessor.h @@ -82,7 +82,7 @@ class CProcessor : public minifi::core::ProcessorApi { } bool isWorkAvailable() override { - return static_cast<bool>(class_description_.callbacks.isWorkAvailable(impl_)); + return false; } void restore(const std::shared_ptr<minifi::core::FlowFile>& /*file*/) override { @@ -119,7 +119,7 @@ class CProcessor : public minifi::core::ProcessorApi { void onTrigger(minifi::core::ProcessContext& process_context, minifi::core::ProcessSession& process_session) override { std::optional<std::string> error; - auto status = class_description_.callbacks.onTrigger(impl_, reinterpret_cast<MinifiProcessContext*>(&process_context), reinterpret_cast<MinifiProcessSession*>(&process_session)); + auto status = class_description_.callbacks.trigger(impl_, reinterpret_cast<MinifiProcessContext*>(&process_context), reinterpret_cast<MinifiProcessSession*>(&process_session)); if (status == MINIFI_STATUS_PROCESSOR_YIELD) { process_context.yield(); return; @@ -131,18 +131,18 @@ class CProcessor : public minifi::core::ProcessorApi { void onSchedule(minifi::core::ProcessContext& process_context, minifi::core::ProcessSessionFactory& /*process_session_factory*/) override { std::optional<std::string> error; - auto status = class_description_.callbacks.onSchedule(impl_, reinterpret_cast<MinifiProcessContext*>(&process_context)); + auto status = class_description_.callbacks.schedule(impl_, reinterpret_cast<MinifiProcessContext*>(&process_context)); if (status != MINIFI_STATUS_SUCCESS) { throw minifi::Exception(minifi::ExceptionType::PROCESS_SCHEDULE_EXCEPTION, "Error while scheduling processor"); } } void onUnSchedule() override { - class_description_.callbacks.onUnSchedule(impl_); + class_description_.callbacks.unSchedule(impl_); } void notifyStop() override { - class_description_.callbacks.onUnSchedule(impl_); + class_description_.callbacks.unSchedule(impl_); } minifi::core::annotation::Input getInputRequirement() const override { diff --git a/minifi-api/include/minifi-c/minifi-c.h b/minifi-api/include/minifi-c/minifi-c.h index ad9de505a..e5e98e5bc 100644 --- a/minifi-api/include/minifi-c/minifi-c.h +++ b/minifi-api/include/minifi-c/minifi-c.h @@ -42,7 +42,7 @@ extern "C" { #endif enum : uint32_t { - MINIFI_API_VERSION = 2 + MINIFI_API_VERSION = 3 }; typedef bool MinifiBool; @@ -165,11 +165,10 @@ typedef struct MinifiControllerServiceMetadata { typedef struct MinifiProcessorCallbacks { MINIFI_OWNED void*(*create)(MinifiProcessorMetadata); void(*destroy)(MINIFI_OWNED void*); - MinifiBool(*isWorkAvailable)(void*); MinifiBool(*getTriggerWhenEmpty)(void*); - MinifiStatus(*onTrigger)(void*, MinifiProcessContext*, MinifiProcessSession*); - MinifiStatus(*onSchedule)(void*, MinifiProcessContext*); - void(*onUnSchedule)(void*); + MinifiStatus(*trigger)(void*, MinifiProcessContext*, MinifiProcessSession*); + MinifiStatus(*schedule)(void*, MinifiProcessContext*); + void(*unSchedule)(void*); MINIFI_OWNED MinifiPublishedMetrics*(*calculateMetrics)(void*); } MinifiProcessorCallbacks;
