review changes

Author: martinzink

Extensions.md

@@ -50,7 +50,6 @@ extern "C" MinifiExtension* InitExtension(MinifiConfig* /*config*/) {
     .processors_ptr = nullptr,
     .controller_services_count = 0,
     .controller_services_ptr = nullptr,
-    
   };
   return MinifiCreateExtension(minifi::utils::toStringView(MINIFI_API_VERSION), &ext_create_info);
 }

libminifi/include/utils/CControllerService.h

@@ -17,8 +17,6 @@
 
 #pragma once
 
-#pragma once
-
 #include <string>
 #include <vector>
 
@@ -48,9 +46,9 @@ class CControllerService final : public core::controller::ControllerServiceApi,
     : class_description_(std::move(class_description)),
       metadata_(std::move(metadata)) {
     MinifiControllerServiceMetadata c_metadata;
-    auto uuid_str = metadata.uuid.to_string();
+    auto uuid_str = metadata_.uuid.to_string();
     c_metadata.uuid = MinifiStringView{.data = uuid_str.data(), .length = uuid_str.length()};
-    c_metadata.name = MinifiStringView{.data = metadata.name.data(), .length = metadata.name.length()};
+    c_metadata.name = MinifiStringView{.data = metadata_.name.data(), .length = metadata_.name.length()};
     c_metadata.logger = reinterpret_cast<MinifiLogger*>(&metadata_.logger);
     impl_ = class_description_.callbacks.create(c_metadata);
   }

libminifi/include/utils/CProcessor.h

@@ -18,6 +18,7 @@
 #pragma once
 
 #include <string>
+#include <utility>
 
 #include "minifi-cpp/core/Annotation.h"
 #include "core/ProcessorMetrics.h"
@@ -63,18 +64,18 @@ class CProcessor : public minifi::core::ProcessorApi {
   CProcessor(CProcessorClassDescription class_description, minifi::core::ProcessorMetadata metadata)
       : class_description_(std::move(class_description)),
         metrics_extension_(std::make_shared<CProcessorMetricsWrapper>(*this)) {
-    metadata_ = metadata;
+    metadata_ = std::move(metadata);
     MinifiProcessorMetadata c_metadata;
-    auto uuid_str = metadata.uuid.to_string();
+    const auto uuid_str = metadata.uuid.to_string();
     c_metadata.uuid = MinifiStringView{.data = uuid_str.data(), .length = uuid_str.length()};
-    c_metadata.name = MinifiStringView{.data = metadata.name.data(), .length = metadata.name.length()};
+    c_metadata.name = MinifiStringView{.data = metadata_.name.data(), .length = metadata_.name.length()};
     c_metadata.logger = reinterpret_cast<MinifiLogger*>(&metadata_.logger);
     impl_ = class_description_.callbacks.create(c_metadata);
   }
   CProcessor(CProcessorClassDescription class_description, minifi::core::ProcessorMetadata metadata, gsl::owner<void*> impl)
       : class_description_(std::move(class_description)),
         impl_(impl),
-        metadata_(metadata),
+        metadata_(std::move(metadata)),
         metrics_extension_(std::make_shared<CProcessorMetricsWrapper>(*this)) {}
   ~CProcessor() override {
     class_description_.callbacks.destroy(impl_);

libminifi/src/minifi-c.cpp

@@ -540,15 +540,18 @@ MinifiStatus MinifiProcessContextGetControllerService(
     void(*cb)(
         void* user_ctx,
         void* service,
-        MinifiStringView group_name,
-        MinifiStringView class_name,
+        MinifiStringView type,
+        MinifiStringView group,
         MinifiStringView version),
     void* user_ctx) {
 
   gsl_Assert(process_context != MINIFI_NULL);
   const auto context = reinterpret_cast<minifi::core::ProcessContext*>(process_context);
   const auto name_str = std::string{toStringView(controller_service_name)};
   const auto service_shared_ptr = context->getControllerService(name_str, context->getProcessorInfo().getUUID());
+  if (!service_shared_ptr) {
+    return MINIFI_STATUS_UNKNOWN_ERROR;
+  }
   const minifi::utils::CControllerService* c_controller_service = dynamic_cast<minifi::utils::CControllerService*>(&*service_shared_ptr);
   if (c_controller_service) {
     const auto class_description = c_controller_service->getClassDescription();