Skip to content

Commit 6b53a92

Browse files
committed
MINIFICPP-2669 - Formatting fix
1 parent e8b3778 commit 6b53a92

7 files changed

Lines changed: 25 additions & 28 deletions

File tree

core-framework/src/utils/ThreadPool.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ void ThreadPool::manageWorkers() {
152152
continue;
153153
}
154154
if (thread_manager_->isAboveMax(current_workers_)) {
155-
auto max = 1; // thread_manager_->getMaxConcurrentTasks();
155+
auto max = 1; // thread_manager_->getMaxConcurrentTasks();
156156
auto differential = current_workers_ - max;
157157
thread_reduction_count_ += differential;
158158
} else if (thread_manager_->shouldReduce()) {

libminifi/include/controllers/SSLContextService.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
#ifndef WIN32_LEAN_AND_MEAN
2020
#define WIN32_LEAN_AND_MEAN 1
21-
#include "core/controller/ControllerService.h"
2221
#endif
2322

2423
#ifdef WIN32
@@ -39,8 +38,6 @@
3938
#include "minifi-cpp/core/PropertyDefinition.h"
4039
#include "core/PropertyDefinitionBuilder.h"
4140
#include "core/controller/ControllerServiceBase.h"
42-
#include "core/controller/ControllerService.h"
43-
#include "core/logging/LoggerFactory.h"
4441
#include "io/validation.h"
4542
#include "minifi-cpp/controllers/SSLContextServiceInterface.h"
4643
#include "minifi-cpp/core/PropertyValidator.h"

libminifi/include/core/controller/ControllerService.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ class ControllerService : public ConfigurableComponentImpl, public CoreComponent
5555
};
5656

5757
class ControllerServiceContextImpl : public ControllerServiceContext {
58-
public:
59-
explicit ControllerServiceContextImpl(ControllerService& impl): impl_(impl) {}
60-
[[nodiscard]] nonstd::expected<std::string, std::error_code> getProperty(std::string_view name) const override;
61-
[[nodiscard]] nonstd::expected<std::vector<std::string>, std::error_code> getAllPropertyValues(std::string_view name) const override;
58+
public:
59+
explicit ControllerServiceContextImpl(ControllerService& impl): impl_(impl) {}
60+
[[nodiscard]] nonstd::expected<std::string, std::error_code> getProperty(std::string_view name) const override;
61+
[[nodiscard]] nonstd::expected<std::vector<std::string>, std::error_code> getAllPropertyValues(std::string_view name) const override;
6262

63-
private:
64-
ControllerService& impl_;
63+
private:
64+
ControllerService& impl_;
6565
};
6666

6767
public:

minifi-api/include/minifi-cpp/core/controller/ControllerServiceApi.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
namespace org::apache::nifi::minifi::core::controller {
2525

2626
class ControllerServiceApi {
27-
public:
28-
virtual ~ControllerServiceApi() = default;
27+
public:
28+
virtual ~ControllerServiceApi() = default;
2929

30-
virtual void initialize(ControllerServiceDescriptor& descriptor) = 0;
31-
virtual void onEnable(ControllerServiceContext& context, const std::shared_ptr<Configure>& configuration, const std::vector<std::shared_ptr<ControllerServiceInterface>>& linked_services) = 0;
32-
virtual void notifyStop() = 0;
33-
virtual ControllerServiceInterface* getControllerServiceInterface() = 0;
30+
virtual void initialize(ControllerServiceDescriptor& descriptor) = 0;
31+
virtual void onEnable(ControllerServiceContext& context, const std::shared_ptr<Configure>& configuration, const std::vector<std::shared_ptr<ControllerServiceInterface>>& linked_services) = 0;
32+
virtual void notifyStop() = 0;
33+
virtual ControllerServiceInterface* getControllerServiceInterface() = 0;
3434
};
3535

3636
} // namespace org::apache::nifi::minifi::core::controller

minifi-api/include/minifi-cpp/core/controller/ControllerServiceContext.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
namespace org::apache::nifi::minifi::core::controller {
2323

2424
class ControllerServiceContext {
25-
public:
26-
virtual ~ControllerServiceContext() = default;
25+
public:
26+
virtual ~ControllerServiceContext() = default;
2727

28-
[[nodiscard]] virtual nonstd::expected<std::string, std::error_code> getProperty(std::string_view name) const = 0;
29-
[[nodiscard]] virtual nonstd::expected<std::vector<std::string>, std::error_code> getAllPropertyValues(std::string_view name) const = 0;
28+
[[nodiscard]] virtual nonstd::expected<std::string, std::error_code> getProperty(std::string_view name) const = 0;
29+
[[nodiscard]] virtual nonstd::expected<std::vector<std::string>, std::error_code> getAllPropertyValues(std::string_view name) const = 0;
3030
};
3131

3232
} // namespace org::apache::nifi::minifi::core::controller

minifi-api/include/minifi-cpp/core/controller/ControllerServiceDescriptor.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
namespace org::apache::nifi::minifi::core::controller {
2323

2424
class ControllerServiceDescriptor {
25-
public:
26-
virtual ~ControllerServiceDescriptor() = default;
25+
public:
26+
virtual ~ControllerServiceDescriptor() = default;
2727

28-
virtual void setSupportedProperties(std::span<const PropertyReference> properties) = 0;
28+
virtual void setSupportedProperties(std::span<const PropertyReference> properties) = 0;
2929
};
3030

3131
} // namespace org::apache::nifi::minifi::core::controller

minifi-api/include/minifi-cpp/core/controller/ControllerServiceFactory.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ namespace org::apache::nifi::minifi::core::controller {
2727
class ControllerServiceApi;
2828

2929
class ControllerServiceFactory {
30-
public:
31-
virtual std::unique_ptr<ControllerServiceApi> create(ControllerServiceMetadata metadata) = 0;
32-
virtual std::string getGroupName() const = 0;
33-
virtual std::string getClassName() const = 0;
30+
public:
31+
virtual std::unique_ptr<ControllerServiceApi> create(ControllerServiceMetadata metadata) = 0;
32+
virtual std::string getGroupName() const = 0;
33+
virtual std::string getClassName() const = 0;
3434

35-
virtual ~ControllerServiceFactory() = default;
35+
virtual ~ControllerServiceFactory() = default;
3636
};
3737

3838
} // namespace org::apache::nifi::minifi::core::controller

0 commit comments

Comments
 (0)