useProcessorClassDescription -> useProcessorClassDefinition

Author: martinzink

Extensions.md

@@ -48,8 +48,8 @@ extern "C" void MinifiInitExtension(MinifiExtensionContext* extension_context) {
     .user_data = nullptr
   };
   auto* extension = MinifiRegisterExtension(extension_context, &extension_definition);
-  minifi::api::core::useProcessorClassDescription<minifi::extensions::llamacpp::processors::RunLlamaCppInference>([&] (const MinifiProcessorClassDefinition& description) {
-    MinifiRegisterProcessor(extension, &description);
+  minifi::api::core::useProcessorClassDefinition<minifi::extensions::llamacpp::processors::RunLlamaCppInference>([&] (const MinifiProcessorClassDefinition& definition) {
+    MinifiRegisterProcessor(extension, &definition);
   });
 }
 ```

extension-framework/cpp-extension-lib/include/api/core/Resource.h

@@ -40,7 +40,7 @@
 namespace org::apache::nifi::minifi::api::core {
 
 template<typename Class, typename Fn>
-void useProcessorClassDescription(Fn&& fn) {
+void useProcessorClassDefinition(Fn&& fn) {
   std::vector<std::vector<MinifiStringView>> string_vector_cache;
 
   const auto full_name = minifi::core::className<Class>();
@@ -78,7 +78,7 @@ void useProcessorClassDescription(Fn&& fn) {
     attribute_relationships_cache.push_back(std::move(rel_cache));
   }
 
-  MinifiProcessorClassDefinition description{
+  MinifiProcessorClassDefinition definition{
     .full_name = utils::toStringView(full_name),
     .description = utils::toStringView(Class::Description),
     .class_properties_count = gsl::narrow<uint32_t>(class_properties.size()),
@@ -147,18 +147,18 @@ void useProcessorClassDescription(Fn&& fn) {
     }
   };
 
-  fn(description);
+  fn(definition);
 }
 
 template<typename Class, typename Fn>
-void useControllerServiceClassDescription(Fn&& fn) {
+void useControllerServiceClassDefinition(Fn&& fn) {
   std::vector<std::vector<MinifiStringView>> string_vector_cache;
 
   const auto full_name = minifi::core::className<Class>();
 
   std::vector<MinifiPropertyDefinition> class_properties = utils::toProperties(Class::Properties, string_vector_cache);
 
-  MinifiControllerServiceClassDefinition description{.full_name = utils::toStringView(full_name),
+  MinifiControllerServiceClassDefinition definition{.full_name = utils::toStringView(full_name),
       .description = utils::toStringView(Class::Description),
       .class_properties_count = gsl::narrow<uint32_t>(class_properties.size()),
       .class_properties_ptr = class_properties.data(),
@@ -179,14 +179,14 @@ void useControllerServiceClassDescription(Fn&& fn) {
               return static_cast<Class*>(self)->enable(context_wrapper);
             } catch (...) { return MINIFI_STATUS_UNKNOWN_ERROR; }
           },
-          .notifyStop = [](void* self) -> void {
+          .disable = [](void* self) -> void {
             try {
               static_cast<Class*>(self)->notifyStop();
             } catch (...) {}
           },
       }};
 
-  fn(description);
+  fn(definition);
 }
 
 }  // namespace org::apache::nifi::minifi::api::core

extension-framework/cpp-extension-lib/libtest/CProcessorTestUtils.h

@@ -32,8 +32,8 @@ template<typename T, typename... Args>
 std::unique_ptr<minifi::core::Processor> make_custom_c_processor(minifi::core::ProcessorMetadata metadata,
     Args&&... args) {  // NOLINT(cppcoreguidelines-missing-std-forward)
   std::unique_ptr<minifi::core::ProcessorApi> processor_impl;
-  minifi::api::core::useProcessorClassDescription<T>([&](const MinifiProcessorClassDefinition& description) {
-    minifi::utils::useCProcessorClassDescription(description, [&](const auto&, auto c_description) {
+  minifi::api::core::useProcessorClassDefinition<T>([&](const MinifiProcessorClassDefinition& definition) {
+    minifi::utils::useCProcessorClassDescription(definition, [&](const auto&, auto c_description) {
       processor_impl = std::make_unique<minifi::utils::CProcessor>(std::move(c_description), metadata, new T(metadata, std::forward<Args>(args)...));
     });
   });
@@ -44,8 +44,8 @@ template<typename T, typename... Args>
 std::shared_ptr<minifi::core::controller::ControllerService> make_custom_c_controller_service(minifi::core::ControllerServiceMetadata metadata,
     Args&&... args) {  // NOLINT(cppcoreguidelines-missing-std-forward)
   std::unique_ptr<minifi::core::controller::ControllerServiceApi> controller_service_impl;
-  minifi::api::core::useControllerServiceClassDescription<T>([&](const MinifiControllerServiceClassDefinition& description) {
-    minifi::utils::useCControllerServiceClassDescription(description, [&](const auto&, auto c_description) {
+  minifi::api::core::useControllerServiceClassDefinition<T>([&](const MinifiControllerServiceClassDefinition& definition) {
+    minifi::utils::useCControllerServiceClassDescription(definition, [&](const auto&, auto c_description) {
       controller_service_impl = std::make_unique<minifi::utils::CControllerService>(std::move(c_description),
           metadata,
           new T(metadata, std::forward<Args>(args)...));

extensions/llamacpp/processors/ExtensionInitializer.cpp

@@ -34,7 +34,7 @@ CEXTENSIONAPI void MinifiInitExtension(MinifiExtensionContext* extension_context
     .user_data = nullptr
   };
   auto* extension = MinifiRegisterExtension(extension_context, &extension_definition);
-  minifi::api::core::useProcessorClassDescription<minifi::extensions::llamacpp::processors::RunLlamaCppInference>([&] (const MinifiProcessorClassDefinition& description) {
-    MinifiRegisterProcessor(extension, &description);
+  minifi::api::core::useProcessorClassDefinition<minifi::extensions::llamacpp::processors::RunLlamaCppInference>([&] (const MinifiProcessorClassDefinition& definition) {
+    MinifiRegisterProcessor(extension, &definition);
   });
 }

libminifi/test/integration/extension-verification-test/CApiExtension.cpp

@@ -50,7 +50,7 @@ CEXTENSIONAPI void MinifiInitExtension(MinifiExtensionContext* extension_context
     .user_data = nullptr
   };
   auto extension = MinifiRegisterExtension(extension_context, &extension_definition);
-  minifi::api::core::useProcessorClassDescription<DummyCProcessor>([&] (const MinifiProcessorClassDefinition& description) {
-    MinifiRegisterProcessor(extension, &description);
+  minifi::api::core::useProcessorClassDefinition<DummyCProcessor>([&] (const MinifiProcessorClassDefinition& definition) {
+    MinifiRegisterProcessor(extension, &definition);
   });
 }