This is an automated email from the ASF dual-hosted git repository. adebreceni pushed a commit to branch MINIFICPP-2669 in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 6164bf56aca4a5dbbd9d29de61328175215bb695 Author: Adam Debreceni <[email protected]> AuthorDate: Tue Jan 13 15:01:19 2026 +0100 MINIFICPP-2669 - Formatting fix --- core-framework/src/utils/ThreadPool.cpp | 2 +- libminifi/include/controllers/SSLContextService.h | 3 --- libminifi/include/core/controller/ControllerService.h | 12 ++++++------ .../minifi-cpp/core/controller/ControllerServiceApi.h | 12 ++++++------ .../minifi-cpp/core/controller/ControllerServiceContext.h | 8 ++++---- .../minifi-cpp/core/controller/ControllerServiceDescriptor.h | 6 +++--- .../minifi-cpp/core/controller/ControllerServiceFactory.h | 10 +++++----- 7 files changed, 25 insertions(+), 28 deletions(-) diff --git a/core-framework/src/utils/ThreadPool.cpp b/core-framework/src/utils/ThreadPool.cpp index 9b869bdf3..d25e9e486 100644 --- a/core-framework/src/utils/ThreadPool.cpp +++ b/core-framework/src/utils/ThreadPool.cpp @@ -152,7 +152,7 @@ void ThreadPool::manageWorkers() { continue; } if (thread_manager_->isAboveMax(current_workers_)) { - auto max = 1; // thread_manager_->getMaxConcurrentTasks(); + auto max = 1; // thread_manager_->getMaxConcurrentTasks(); auto differential = current_workers_ - max; thread_reduction_count_ += differential; } else if (thread_manager_->shouldReduce()) { diff --git a/libminifi/include/controllers/SSLContextService.h b/libminifi/include/controllers/SSLContextService.h index fbae98dde..c7d661876 100644 --- a/libminifi/include/controllers/SSLContextService.h +++ b/libminifi/include/controllers/SSLContextService.h @@ -18,7 +18,6 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN 1 -#include "core/controller/ControllerService.h" #endif #ifdef WIN32 @@ -39,8 +38,6 @@ #include "minifi-cpp/core/PropertyDefinition.h" #include "core/PropertyDefinitionBuilder.h" #include "core/controller/ControllerServiceBase.h" -#include "core/controller/ControllerService.h" -#include "core/logging/LoggerFactory.h" #include "io/validation.h" #include "minifi-cpp/controllers/SSLContextServiceInterface.h" #include "minifi-cpp/core/PropertyValidator.h" diff --git a/libminifi/include/core/controller/ControllerService.h b/libminifi/include/core/controller/ControllerService.h index a0f67afe2..930a51fb2 100644 --- a/libminifi/include/core/controller/ControllerService.h +++ b/libminifi/include/core/controller/ControllerService.h @@ -55,13 +55,13 @@ class ControllerService : public ConfigurableComponentImpl, public CoreComponent }; class ControllerServiceContextImpl : public ControllerServiceContext { - public: - explicit ControllerServiceContextImpl(ControllerService& impl): impl_(impl) {} - [[nodiscard]] nonstd::expected<std::string, std::error_code> getProperty(std::string_view name) const override; - [[nodiscard]] nonstd::expected<std::vector<std::string>, std::error_code> getAllPropertyValues(std::string_view name) const override; + public: + explicit ControllerServiceContextImpl(ControllerService& impl): impl_(impl) {} + [[nodiscard]] nonstd::expected<std::string, std::error_code> getProperty(std::string_view name) const override; + [[nodiscard]] nonstd::expected<std::vector<std::string>, std::error_code> getAllPropertyValues(std::string_view name) const override; - private: - ControllerService& impl_; + private: + ControllerService& impl_; }; public: diff --git a/minifi-api/include/minifi-cpp/core/controller/ControllerServiceApi.h b/minifi-api/include/minifi-cpp/core/controller/ControllerServiceApi.h index 27049c169..57fbfdeac 100644 --- a/minifi-api/include/minifi-cpp/core/controller/ControllerServiceApi.h +++ b/minifi-api/include/minifi-cpp/core/controller/ControllerServiceApi.h @@ -24,13 +24,13 @@ namespace org::apache::nifi::minifi::core::controller { class ControllerServiceApi { - public: - virtual ~ControllerServiceApi() = default; + public: + virtual ~ControllerServiceApi() = default; - virtual void initialize(ControllerServiceDescriptor& descriptor) = 0; - virtual void onEnable(ControllerServiceContext& context, const std::shared_ptr<Configure>& configuration, const std::vector<std::shared_ptr<ControllerServiceInterface>>& linked_services) = 0; - virtual void notifyStop() = 0; - virtual ControllerServiceInterface* getControllerServiceInterface() = 0; + virtual void initialize(ControllerServiceDescriptor& descriptor) = 0; + virtual void onEnable(ControllerServiceContext& context, const std::shared_ptr<Configure>& configuration, const std::vector<std::shared_ptr<ControllerServiceInterface>>& linked_services) = 0; + virtual void notifyStop() = 0; + virtual ControllerServiceInterface* getControllerServiceInterface() = 0; }; } // namespace org::apache::nifi::minifi::core::controller diff --git a/minifi-api/include/minifi-cpp/core/controller/ControllerServiceContext.h b/minifi-api/include/minifi-cpp/core/controller/ControllerServiceContext.h index 63f75616c..49b051ff5 100644 --- a/minifi-api/include/minifi-cpp/core/controller/ControllerServiceContext.h +++ b/minifi-api/include/minifi-cpp/core/controller/ControllerServiceContext.h @@ -22,11 +22,11 @@ namespace org::apache::nifi::minifi::core::controller { class ControllerServiceContext { - public: - virtual ~ControllerServiceContext() = default; + public: + virtual ~ControllerServiceContext() = default; - [[nodiscard]] virtual nonstd::expected<std::string, std::error_code> getProperty(std::string_view name) const = 0; - [[nodiscard]] virtual nonstd::expected<std::vector<std::string>, std::error_code> getAllPropertyValues(std::string_view name) const = 0; + [[nodiscard]] virtual nonstd::expected<std::string, std::error_code> getProperty(std::string_view name) const = 0; + [[nodiscard]] virtual nonstd::expected<std::vector<std::string>, std::error_code> getAllPropertyValues(std::string_view name) const = 0; }; } // namespace org::apache::nifi::minifi::core::controller diff --git a/minifi-api/include/minifi-cpp/core/controller/ControllerServiceDescriptor.h b/minifi-api/include/minifi-cpp/core/controller/ControllerServiceDescriptor.h index 572d2c572..525a6d6ce 100644 --- a/minifi-api/include/minifi-cpp/core/controller/ControllerServiceDescriptor.h +++ b/minifi-api/include/minifi-cpp/core/controller/ControllerServiceDescriptor.h @@ -22,10 +22,10 @@ namespace org::apache::nifi::minifi::core::controller { class ControllerServiceDescriptor { - public: - virtual ~ControllerServiceDescriptor() = default; + public: + virtual ~ControllerServiceDescriptor() = default; - virtual void setSupportedProperties(std::span<const PropertyReference> properties) = 0; + virtual void setSupportedProperties(std::span<const PropertyReference> properties) = 0; }; } // namespace org::apache::nifi::minifi::core::controller diff --git a/minifi-api/include/minifi-cpp/core/controller/ControllerServiceFactory.h b/minifi-api/include/minifi-cpp/core/controller/ControllerServiceFactory.h index af256bf5f..725944bfa 100644 --- a/minifi-api/include/minifi-cpp/core/controller/ControllerServiceFactory.h +++ b/minifi-api/include/minifi-cpp/core/controller/ControllerServiceFactory.h @@ -27,12 +27,12 @@ namespace org::apache::nifi::minifi::core::controller { class ControllerServiceApi; class ControllerServiceFactory { - public: - virtual std::unique_ptr<ControllerServiceApi> create(ControllerServiceMetadata metadata) = 0; - virtual std::string getGroupName() const = 0; - virtual std::string getClassName() const = 0; + public: + virtual std::unique_ptr<ControllerServiceApi> create(ControllerServiceMetadata metadata) = 0; + virtual std::string getGroupName() const = 0; + virtual std::string getClassName() const = 0; - virtual ~ControllerServiceFactory() = default; + virtual ~ControllerServiceFactory() = default; }; } // namespace org::apache::nifi::minifi::core::controller
