szaszm commented on code in PR #2096:
URL: https://github.com/apache/nifi-minifi-cpp/pull/2096#discussion_r3138954862
##########
libminifi/src/minifi-c.cpp:
##########
@@ -146,6 +151,37 @@ class CProcessorFactory : public
minifi::core::ProcessorFactory {
minifi::utils::CProcessorClassDescription class_description_;
};
+class CControllerServiceFactory : public
minifi::core::controller::ControllerServiceFactory {
+ public:
+ CControllerServiceFactory(std::string group_name, std::string class_name,
minifi::utils::CControllerServiceClassDescription class_description)
+ : group_name_(std::move(group_name)),
+ class_name_(std::move(class_name)),
+ class_description_(std::move(class_description)) {}
Review Comment:
```suggestion
class_description_(std::move(class_description))
{}
```
##########
minifi-api/include/minifi-c/minifi-c.h:
##########
@@ -164,6 +172,13 @@ typedef struct MinifiProcessorCallbacks {
MINIFI_OWNED MinifiPublishedMetrics*(*calculateMetrics)(void*);
} MinifiProcessorCallbacks;
+typedef struct MinifiControllerServiceCallbacks {
+ MINIFI_OWNED void*(*create)(MinifiControllerServiceMetadata);
+ void(*destroy)(MINIFI_OWNED void*);
+ MinifiStatus(*enable)(void*, MinifiControllerServiceContext*);
+ void(*notifyStop)(void*);
Review Comment:
I would phase out the "notifyStop" terminology and call this "disable"
```suggestion
void(*disable)(void*);
```
##########
libminifi/include/utils/CControllerService.h:
##########
@@ -0,0 +1,110 @@
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "minifi-c/minifi-c.h"
+#include "minifi-cpp/Exception.h"
+#include "minifi-cpp/core/ControllerServiceMetadata.h"
+#include "minifi-cpp/core/Property.h"
+#include "minifi-cpp/core/controller/ControllerServiceApi.h"
+
+namespace org::apache::nifi::minifi::utils {
+class CControllerService;
+
+
+struct CControllerServiceClassDescription {
+ std::string full_name;
+ std::vector<core::Property> class_properties;
+ MinifiControllerServiceCallbacks callbacks;
+};
+
+class CControllerService final : public
core::controller::ControllerServiceApi, public
core::controller::ControllerServiceHandle {
+ public:
+ CControllerService(CControllerServiceClassDescription class_description,
core::ControllerServiceMetadata metadata)
+ : class_description_(std::move(class_description)),
+ metadata_(std::move(metadata)) {
+ MinifiControllerServiceMetadata c_metadata;
+ 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.logger = reinterpret_cast<MinifiLogger*>(&metadata_.logger);
+ impl_ = class_description_.callbacks.create(c_metadata);
+ }
+ CControllerService(CControllerServiceClassDescription class_description,
core::ControllerServiceMetadata metadata, gsl::owner<void*> impl)
+ : class_description_(std::move(class_description)),
+ impl_(impl),
+ metadata_(std::move(metadata)) {}
+ ~CControllerService() override {
+ class_description_.callbacks.destroy(impl_);
+ }
Review Comment:
please follow rule of 5
##########
libminifi/include/utils/CControllerService.h:
##########
@@ -0,0 +1,110 @@
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "minifi-c/minifi-c.h"
+#include "minifi-cpp/Exception.h"
+#include "minifi-cpp/core/ControllerServiceMetadata.h"
+#include "minifi-cpp/core/Property.h"
+#include "minifi-cpp/core/controller/ControllerServiceApi.h"
+
+namespace org::apache::nifi::minifi::utils {
+class CControllerService;
+
+
+struct CControllerServiceClassDescription {
+ std::string full_name;
+ std::vector<core::Property> class_properties;
+ MinifiControllerServiceCallbacks callbacks;
+};
+
+class CControllerService final : public
core::controller::ControllerServiceApi, public
core::controller::ControllerServiceHandle {
+ public:
+ CControllerService(CControllerServiceClassDescription class_description,
core::ControllerServiceMetadata metadata)
+ : class_description_(std::move(class_description)),
+ metadata_(std::move(metadata)) {
+ MinifiControllerServiceMetadata c_metadata;
+ 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.logger = reinterpret_cast<MinifiLogger*>(&metadata_.logger);
+ impl_ = class_description_.callbacks.create(c_metadata);
+ }
+ CControllerService(CControllerServiceClassDescription class_description,
core::ControllerServiceMetadata metadata, gsl::owner<void*> impl)
+ : class_description_(std::move(class_description)),
+ impl_(impl),
+ metadata_(std::move(metadata)) {}
+ ~CControllerService() override {
+ class_description_.callbacks.destroy(impl_);
+ }
+
+ [[nodiscard]] bool supportsDynamicProperties() const override {
+ return false;
+ }
+
+ void initialize(core::controller::ControllerServiceDescriptor& descriptor)
override {
+
descriptor.setSupportedProperties(std::span(class_description_.class_properties));
+ }
+
+ void onEnable(core::controller::ControllerServiceContext&
controller_service_context,
+ const std::shared_ptr<Configure>&,
+ const
std::vector<std::shared_ptr<core::controller::ControllerServiceHandle>>&)
override {
+ const auto enable_status = class_description_.callbacks.enable(impl_,
reinterpret_cast<MinifiControllerServiceContext*>(&controller_service_context));
+ if (enable_status != MINIFI_STATUS_SUCCESS) {
+ throw Exception(PROCESS_SCHEDULE_EXCEPTION, "Could not enable controller
service");
+ }
+ }
+
+ void notifyStop() override {
+ class_description_.callbacks.notifyStop(impl_);
Review Comment:
```suggestion
class_description_.callbacks.disable(impl_);
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
