This is an automated email from the ASF dual-hosted git repository. fgerlits pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 8d18ef1ffbb48752909fe5c513c05a1500fbae64 Author: Gabor Gyimesi <[email protected]> AuthorDate: Fri Jan 6 11:53:50 2023 +0100 MINIFICPP-2026 Make isRunning member functions const Signed-off-by: Ferenc Gerlits <[email protected]> This closes #1486 --- extensions/aws/controllerservices/AWSCredentialsService.h | 2 +- .../azure/controllerservices/AzureStorageCredentialsService.h | 2 +- extensions/coap/controllerservice/CoapConnector.h | 2 +- extensions/coap/server/CoapServer.h | 6 +++--- .../elasticsearch/ElasticsearchCredentialsControllerService.h | 2 +- .../gcp/controllerservices/GCPCredentialsControllerService.h | 2 +- extensions/http-curl/client/HTTPClient.h | 2 +- extensions/jni/ExecuteJavaControllerService.h | 2 +- extensions/jni/jvm/JavaControllerService.h | 2 +- extensions/libarchive/FocusArchiveEntry.h | 1 - extensions/rocksdb-repos/DatabaseContentRepository.h | 2 +- extensions/sql/services/DatabaseService.h | 2 +- libminifi/include/Connection.h | 2 +- libminifi/include/FlowController.h | 2 +- libminifi/include/c2/C2Protocol.h | 6 +++--- libminifi/include/c2/HeartbeatReporter.h | 2 +- libminifi/include/c2/triggers/FileUpdateTrigger.h | 2 +- libminifi/include/controllers/AttributeProviderService.h | 2 +- libminifi/include/controllers/LinuxPowerManagementService.h | 2 +- libminifi/include/controllers/NetworkPrioritizerService.h | 2 +- libminifi/include/controllers/SSLContextService.h | 2 +- libminifi/include/controllers/ThreadManagementService.h | 10 +++++----- libminifi/include/controllers/UpdatePolicyControllerService.h | 2 +- libminifi/include/controllers/keyvalue/KeyValueStateStorage.h | 2 +- libminifi/include/core/Connectable.h | 2 +- libminifi/include/core/Processor.h | 2 +- libminifi/include/core/ProcessorNode.h | 2 +- libminifi/include/core/SerializableComponent.h | 2 +- libminifi/include/core/ThreadedRepository.h | 2 +- libminifi/include/core/controller/ControllerService.h | 4 ++-- libminifi/include/core/state/ProcessorController.h | 2 +- libminifi/include/core/state/UpdateController.h | 2 +- libminifi/include/core/state/nodes/MetricsBase.h | 2 +- libminifi/include/sitetosite/SiteToSiteClient.h | 2 +- libminifi/src/controllers/LinuxPowerManagementService.cpp | 2 +- libminifi/src/controllers/NetworkPrioritizerService.cpp | 2 +- libminifi/src/controllers/UpdatePolicyControllerService.cpp | 2 +- libminifi/src/core/Processor.cpp | 2 +- libminifi/src/core/ProcessorNode.cpp | 2 +- libminifi/src/core/state/ProcessorController.cpp | 2 +- libminifi/test/unit/ComponentManifestTests.cpp | 2 +- libminifi/test/unit/ControllerTests.cpp | 4 ++-- libminifi/test/unit/MockClasses.h | 2 +- libminifi/test/unit/ProvenanceTestHelper.h | 2 +- 44 files changed, 53 insertions(+), 54 deletions(-) diff --git a/extensions/aws/controllerservices/AWSCredentialsService.h b/extensions/aws/controllerservices/AWSCredentialsService.h index dd9846e31..63f747ac9 100644 --- a/extensions/aws/controllerservices/AWSCredentialsService.h +++ b/extensions/aws/controllerservices/AWSCredentialsService.h @@ -71,7 +71,7 @@ class AWSCredentialsService : public core::controller::ControllerService { return false; }; - bool isRunning() override { + bool isRunning() const override { return getState() == core::controller::ControllerServiceState::ENABLED; } diff --git a/extensions/azure/controllerservices/AzureStorageCredentialsService.h b/extensions/azure/controllerservices/AzureStorageCredentialsService.h index 2bc95526b..6de49dc1a 100644 --- a/extensions/azure/controllerservices/AzureStorageCredentialsService.h +++ b/extensions/azure/controllerservices/AzureStorageCredentialsService.h @@ -70,7 +70,7 @@ class AzureStorageCredentialsService : public core::controller::ControllerServic return false; } - bool isRunning() override { + bool isRunning() const override { return getState() == core::controller::ControllerServiceState::ENABLED; } diff --git a/extensions/coap/controllerservice/CoapConnector.h b/extensions/coap/controllerservice/CoapConnector.h index 84d5bf1a8..1b6e56685 100644 --- a/extensions/coap/controllerservice/CoapConnector.h +++ b/extensions/coap/controllerservice/CoapConnector.h @@ -68,7 +68,7 @@ class CoapConnectorService : public core::controller::ControllerService { void yield() override { } - bool isRunning() override { + bool isRunning() const override { return getState() == core::controller::ControllerServiceState::ENABLED; } diff --git a/extensions/coap/server/CoapServer.h b/extensions/coap/server/CoapServer.h index dc0fe6a99..fc3c067a2 100644 --- a/extensions/coap/server/CoapServer.h +++ b/extensions/coap/server/CoapServer.h @@ -183,7 +183,7 @@ class CoapServer : public core::Connectable { /** * Determines if we are connected and operating */ - virtual bool isRunning() { + bool isRunning() const override { return running_.load(); } @@ -193,14 +193,14 @@ class CoapServer : public core::Connectable { */ void waitForWork(uint64_t timeoutMs); - virtual void yield() { + void yield() override { } /** * Determines if work is available by this connectable * @return boolean if work is available. */ - virtual bool isWorkAvailable() { + bool isWorkAvailable() override { return true; } diff --git a/extensions/elasticsearch/ElasticsearchCredentialsControllerService.h b/extensions/elasticsearch/ElasticsearchCredentialsControllerService.h index ebd80e6d9..e0b9413fe 100644 --- a/extensions/elasticsearch/ElasticsearchCredentialsControllerService.h +++ b/extensions/elasticsearch/ElasticsearchCredentialsControllerService.h @@ -57,7 +57,7 @@ class ElasticsearchCredentialsControllerService : public core::controller::Contr return false; } - bool isRunning() override { + bool isRunning() const override { return getState() == core::controller::ControllerServiceState::ENABLED; } diff --git a/extensions/gcp/controllerservices/GCPCredentialsControllerService.h b/extensions/gcp/controllerservices/GCPCredentialsControllerService.h index ae51fa472..b70f04a90 100644 --- a/extensions/gcp/controllerservices/GCPCredentialsControllerService.h +++ b/extensions/gcp/controllerservices/GCPCredentialsControllerService.h @@ -65,7 +65,7 @@ class GCPCredentialsControllerService : public core::controller::ControllerServi return false; } - bool isRunning() override { + bool isRunning() const override { return getState() == core::controller::ControllerServiceState::ENABLED; } diff --git a/extensions/http-curl/client/HTTPClient.h b/extensions/http-curl/client/HTTPClient.h index a6c894073..acc650380 100644 --- a/extensions/http-curl/client/HTTPClient.h +++ b/extensions/http-curl/client/HTTPClient.h @@ -171,7 +171,7 @@ class HTTPClient : public utils::BaseHTTPClient, public core::Connectable { /** * Determines if we are connected and operating */ - bool isRunning() override { + bool isRunning() const override { return true; } diff --git a/extensions/jni/ExecuteJavaControllerService.h b/extensions/jni/ExecuteJavaControllerService.h index 43e5102b2..9e968ea5f 100644 --- a/extensions/jni/ExecuteJavaControllerService.h +++ b/extensions/jni/ExecuteJavaControllerService.h @@ -66,7 +66,7 @@ class ExecuteJavaControllerService : public ConfigurationContext, public std::en void yield() override { } - bool isRunning() override { + bool isRunning() const override { return getState() == core::controller::ControllerServiceState::ENABLED; } diff --git a/extensions/jni/jvm/JavaControllerService.h b/extensions/jni/jvm/JavaControllerService.h index 854240094..497eebada 100644 --- a/extensions/jni/jvm/JavaControllerService.h +++ b/extensions/jni/jvm/JavaControllerService.h @@ -71,7 +71,7 @@ class JavaControllerService : public core::controller::ControllerService, public void yield() override { } - bool isRunning() override { + bool isRunning() const override { return getState() == core::controller::ControllerServiceState::ENABLED; } diff --git a/extensions/libarchive/FocusArchiveEntry.h b/extensions/libarchive/FocusArchiveEntry.h index 874b3bdc0..f4e2c033b 100644 --- a/extensions/libarchive/FocusArchiveEntry.h +++ b/extensions/libarchive/FocusArchiveEntry.h @@ -64,7 +64,6 @@ class FocusArchiveEntry : public core::Processor { public: explicit ReadCallback(core::Processor*, utils::file::FileManager *file_man, ArchiveMetadata *archiveMetadata); int64_t operator()(const std::shared_ptr<io::InputStream>& stream) const; - bool isRunning() {return proc_->isRunning();} private: utils::file::FileManager *file_man_; diff --git a/extensions/rocksdb-repos/DatabaseContentRepository.h b/extensions/rocksdb-repos/DatabaseContentRepository.h index fcf943b11..f00bc7905 100644 --- a/extensions/rocksdb-repos/DatabaseContentRepository.h +++ b/extensions/rocksdb-repos/DatabaseContentRepository.h @@ -83,7 +83,7 @@ class DatabaseContentRepository : public core::ContentRepository, public core::C /** * Determines if we are connected and operating */ - bool isRunning() override { + bool isRunning() const override { return true; } diff --git a/extensions/sql/services/DatabaseService.h b/extensions/sql/services/DatabaseService.h index f82acb092..45e2edd91 100644 --- a/extensions/sql/services/DatabaseService.h +++ b/extensions/sql/services/DatabaseService.h @@ -58,7 +58,7 @@ class DatabaseService : public core::controller::ControllerService { void yield() override { } - bool isRunning() override { + bool isRunning() const override { return getState() == core::controller::ControllerServiceState::ENABLED; } diff --git a/libminifi/include/Connection.h b/libminifi/include/Connection.h index 40c5611a2..81e1a7a25 100644 --- a/libminifi/include/Connection.h +++ b/libminifi/include/Connection.h @@ -174,7 +174,7 @@ class Connection : public core::Connectable { return queue_.isWorkAvailable(); } - bool isRunning() override { + bool isRunning() const override { return true; } diff --git a/libminifi/include/FlowController.h b/libminifi/include/FlowController.h index b398191d1..84ac20af8 100644 --- a/libminifi/include/FlowController.h +++ b/libminifi/include/FlowController.h @@ -92,7 +92,7 @@ class FlowController : public core::controller::ForwardingControllerServiceProvi virtual void load(std::unique_ptr<core::ProcessGroup> root = nullptr, bool reload = false); - bool isRunning() override { + bool isRunning() const override { return running_.load() || updating_.load(); } diff --git a/libminifi/include/c2/C2Protocol.h b/libminifi/include/c2/C2Protocol.h index 5db0dcdbd..ce248a4d7 100644 --- a/libminifi/include/c2/C2Protocol.h +++ b/libminifi/include/c2/C2Protocol.h @@ -75,7 +75,7 @@ class C2Protocol : public core::Connectable { /** * Determines if we are connected and operating */ - virtual bool isRunning() { + bool isRunning() const override { return running_.load(); } @@ -85,14 +85,14 @@ class C2Protocol : public core::Connectable { */ void waitForWork(uint64_t timeoutMs); - virtual void yield() { + void yield() override { } /** * Determines if work is available by this connectable * @return boolean if work is available. */ - virtual bool isWorkAvailable() { + bool isWorkAvailable() override { return true; } diff --git a/libminifi/include/c2/HeartbeatReporter.h b/libminifi/include/c2/HeartbeatReporter.h index 9ae00859c..5b4435ddd 100644 --- a/libminifi/include/c2/HeartbeatReporter.h +++ b/libminifi/include/c2/HeartbeatReporter.h @@ -67,7 +67,7 @@ class HeartbeatReporter : public core::Connectable { /** * Determines if we are connected and operating */ - bool isRunning() override { + bool isRunning() const override { return true; } diff --git a/libminifi/include/c2/triggers/FileUpdateTrigger.h b/libminifi/include/c2/triggers/FileUpdateTrigger.h index a4b8a4581..745841055 100644 --- a/libminifi/include/c2/triggers/FileUpdateTrigger.h +++ b/libminifi/include/c2/triggers/FileUpdateTrigger.h @@ -83,7 +83,7 @@ class FileUpdateTrigger : public C2Trigger { /** * Determines if we are connected and operating */ - bool isRunning() override { + bool isRunning() const override { return true; } diff --git a/libminifi/include/controllers/AttributeProviderService.h b/libminifi/include/controllers/AttributeProviderService.h index 3aee6a525..b3a59be87 100644 --- a/libminifi/include/controllers/AttributeProviderService.h +++ b/libminifi/include/controllers/AttributeProviderService.h @@ -30,7 +30,7 @@ class AttributeProviderService : public core::controller::ControllerService { using ControllerService::ControllerService; void yield() override {} - bool isRunning() override { return getState() == core::controller::ControllerServiceState::ENABLED; } + bool isRunning() const override { return getState() == core::controller::ControllerServiceState::ENABLED; } bool isWorkAvailable() override { return false; } using AttributeMap = std::unordered_map<std::string, std::string>; diff --git a/libminifi/include/controllers/LinuxPowerManagementService.h b/libminifi/include/controllers/LinuxPowerManagementService.h index 01bff6f47..4117e19d7 100644 --- a/libminifi/include/controllers/LinuxPowerManagementService.h +++ b/libminifi/include/controllers/LinuxPowerManagementService.h @@ -109,7 +109,7 @@ class LinuxPowerManagerService : public ThreadManagementService { void yield() override; - bool isRunning() override; + bool isRunning() const override; bool isWorkAvailable() override; diff --git a/libminifi/include/controllers/NetworkPrioritizerService.h b/libminifi/include/controllers/NetworkPrioritizerService.h index 68519b836..87924a716 100644 --- a/libminifi/include/controllers/NetworkPrioritizerService.h +++ b/libminifi/include/controllers/NetworkPrioritizerService.h @@ -84,7 +84,7 @@ class NetworkPrioritizerService : public core::controller::ControllerService, pu void yield() override; - bool isRunning() override; + bool isRunning() const override; bool isWorkAvailable() override; diff --git a/libminifi/include/controllers/SSLContextService.h b/libminifi/include/controllers/SSLContextService.h index f61ecef2b..a9c7a8c55 100644 --- a/libminifi/include/controllers/SSLContextService.h +++ b/libminifi/include/controllers/SSLContextService.h @@ -152,7 +152,7 @@ class SSLContextService : public core::controller::ControllerService { void yield() override { } - bool isRunning() override { + bool isRunning() const override { return getState() == core::controller::ControllerServiceState::ENABLED; } diff --git a/libminifi/include/controllers/ThreadManagementService.h b/libminifi/include/controllers/ThreadManagementService.h index c60bdf3ce..d41c3e830 100644 --- a/libminifi/include/controllers/ThreadManagementService.h +++ b/libminifi/include/controllers/ThreadManagementService.h @@ -84,22 +84,22 @@ class ThreadManagementService : public core::controller::ControllerService { */ virtual bool canIncrease() = 0; - virtual void initialize() { + void initialize() override { ControllerService::initialize(); } - void yield() { + void yield() override { } - bool isRunning() { + bool isRunning() const override { return getState() == core::controller::ControllerServiceState::ENABLED; } - bool isWorkAvailable() { + bool isWorkAvailable() override { return false; } - virtual void onEnable() { + void onEnable() override { } protected: diff --git a/libminifi/include/controllers/UpdatePolicyControllerService.h b/libminifi/include/controllers/UpdatePolicyControllerService.h index 9c75e4d7e..e1b67f39a 100644 --- a/libminifi/include/controllers/UpdatePolicyControllerService.h +++ b/libminifi/include/controllers/UpdatePolicyControllerService.h @@ -70,7 +70,7 @@ class UpdatePolicyControllerService : public core::controller::ControllerService void yield() override; - bool isRunning() override; + bool isRunning() const override; bool isWorkAvailable() override; diff --git a/libminifi/include/controllers/keyvalue/KeyValueStateStorage.h b/libminifi/include/controllers/keyvalue/KeyValueStateStorage.h index c0f2e5109..9fa3fca20 100644 --- a/libminifi/include/controllers/keyvalue/KeyValueStateStorage.h +++ b/libminifi/include/controllers/keyvalue/KeyValueStateStorage.h @@ -45,7 +45,7 @@ class KeyValueStateStorage : public core::StateStorage, public core::controller: void yield() override { } - bool isRunning() override { + bool isRunning() const override { return getState() == core::controller::ControllerServiceState::ENABLED; } diff --git a/libminifi/include/core/Connectable.h b/libminifi/include/core/Connectable.h index 4b1ac2cd7..f4a3e305a 100644 --- a/libminifi/include/core/Connectable.h +++ b/libminifi/include/core/Connectable.h @@ -113,7 +113,7 @@ class Connectable : public CoreComponent { /** * Determines if we are connected and operating */ - virtual bool isRunning() = 0; + virtual bool isRunning() const = 0; /** * Block until work is available on any input connection, or the given duration elapses diff --git a/libminifi/include/core/Processor.h b/libminifi/include/core/Processor.h index 52a5f12da..b4a72596b 100644 --- a/libminifi/include/core/Processor.h +++ b/libminifi/include/core/Processor.h @@ -82,7 +82,7 @@ class Processor : public Connectable, public ConfigurableComponent, public state Processor(const Processor& parent) = delete; Processor& operator=(const Processor& parent) = delete; - bool isRunning() override; + bool isRunning() const override; ~Processor() override; diff --git a/libminifi/include/core/ProcessorNode.h b/libminifi/include/core/ProcessorNode.h index 96014ed9d..b39bef83d 100644 --- a/libminifi/include/core/ProcessorNode.h +++ b/libminifi/include/core/ProcessorNode.h @@ -261,7 +261,7 @@ class ProcessorNode : public ConfigurableComponent, public Connectable { return false; } - bool isRunning() override; + bool isRunning() const override; bool isWorkAvailable() override; diff --git a/libminifi/include/core/SerializableComponent.h b/libminifi/include/core/SerializableComponent.h index d5b0b037b..4d3ee9bcc 100644 --- a/libminifi/include/core/SerializableComponent.h +++ b/libminifi/include/core/SerializableComponent.h @@ -81,7 +81,7 @@ class SerializableComponent : public core::Connectable { /** * Determines if we are connected and operating */ - bool isRunning() override { + bool isRunning() const override { return true; } diff --git a/libminifi/include/core/ThreadedRepository.h b/libminifi/include/core/ThreadedRepository.h index c991e2d57..21a4515c5 100644 --- a/libminifi/include/core/ThreadedRepository.h +++ b/libminifi/include/core/ThreadedRepository.h @@ -75,7 +75,7 @@ class ThreadedRepository : public core::Repository, public core::TraceableResour return true; } - bool isRunning() override { + bool isRunning() const override { return running_state_.load() == RunningState::Running; } diff --git a/libminifi/include/core/controller/ControllerService.h b/libminifi/include/core/controller/ControllerService.h index 5aae23f8c..60823608b 100644 --- a/libminifi/include/core/controller/ControllerService.h +++ b/libminifi/include/core/controller/ControllerService.h @@ -97,7 +97,7 @@ class ControllerService : public ConfigurableComponent, public Connectable { configuration_ = configuration; } - ControllerServiceState getState() { + ControllerServiceState getState() const { return current_state_.load(); } @@ -127,7 +127,7 @@ class ControllerService : public ConfigurableComponent, public Connectable { protected: std::vector<std::shared_ptr<controller::ControllerService> > linked_services_; std::shared_ptr<Configure> configuration_; - std::atomic<ControllerServiceState> current_state_; + mutable std::atomic<ControllerServiceState> current_state_; bool canEdit() override { return true; } diff --git a/libminifi/include/core/state/ProcessorController.h b/libminifi/include/core/state/ProcessorController.h index e3546da2a..d1f910331 100644 --- a/libminifi/include/core/state/ProcessorController.h +++ b/libminifi/include/core/state/ProcessorController.h @@ -56,7 +56,7 @@ class ProcessorController : public StateController { */ int16_t stop() override; - bool isRunning() override; + bool isRunning() const override; int16_t pause() override; diff --git a/libminifi/include/core/state/UpdateController.h b/libminifi/include/core/state/UpdateController.h index f87cc7a56..4ee42bc3e 100644 --- a/libminifi/include/core/state/UpdateController.h +++ b/libminifi/include/core/state/UpdateController.h @@ -129,7 +129,7 @@ class StateController : public Pausable { */ virtual int16_t stop() = 0; - virtual bool isRunning() = 0; + virtual bool isRunning() const = 0; }; /** diff --git a/libminifi/include/core/state/nodes/MetricsBase.h b/libminifi/include/core/state/nodes/MetricsBase.h index ff2e20d10..062aa57b7 100644 --- a/libminifi/include/core/state/nodes/MetricsBase.h +++ b/libminifi/include/core/state/nodes/MetricsBase.h @@ -71,7 +71,7 @@ class ResponseNode : public core::Connectable, public PublishedMetricProvider { void yield() override { } - bool isRunning() override { + bool isRunning() const override { return true; } diff --git a/libminifi/include/sitetosite/SiteToSiteClient.h b/libminifi/include/sitetosite/SiteToSiteClient.h index 8d57558f1..ace583c18 100644 --- a/libminifi/include/sitetosite/SiteToSiteClient.h +++ b/libminifi/include/sitetosite/SiteToSiteClient.h @@ -178,7 +178,7 @@ class SiteToSiteClient : public core::Connectable { /** * Determines if we are connected and operating */ - bool isRunning() override { + bool isRunning() const override { return running_; } diff --git a/libminifi/src/controllers/LinuxPowerManagementService.cpp b/libminifi/src/controllers/LinuxPowerManagementService.cpp index 64197b14a..881aa82a1 100644 --- a/libminifi/src/controllers/LinuxPowerManagementService.cpp +++ b/libminifi/src/controllers/LinuxPowerManagementService.cpp @@ -167,7 +167,7 @@ void LinuxPowerManagerService::initialize() { void LinuxPowerManagerService::yield() { } -bool LinuxPowerManagerService::isRunning() { +bool LinuxPowerManagerService::isRunning() const { return getState() == core::controller::ControllerServiceState::ENABLED; } diff --git a/libminifi/src/controllers/NetworkPrioritizerService.cpp b/libminifi/src/controllers/NetworkPrioritizerService.cpp index 8770b4fa8..564193032 100644 --- a/libminifi/src/controllers/NetworkPrioritizerService.cpp +++ b/libminifi/src/controllers/NetworkPrioritizerService.cpp @@ -166,7 +166,7 @@ void NetworkPrioritizerService::reduce_tokens(uint32_t size) { } } -bool NetworkPrioritizerService::isRunning() { +bool NetworkPrioritizerService::isRunning() const { return getState() == core::controller::ControllerServiceState::ENABLED; } diff --git a/libminifi/src/controllers/UpdatePolicyControllerService.cpp b/libminifi/src/controllers/UpdatePolicyControllerService.cpp index 7a36adde6..3a6a4b686 100644 --- a/libminifi/src/controllers/UpdatePolicyControllerService.cpp +++ b/libminifi/src/controllers/UpdatePolicyControllerService.cpp @@ -58,7 +58,7 @@ void UpdatePolicyControllerService::initialize() { void UpdatePolicyControllerService::yield() { } -bool UpdatePolicyControllerService::isRunning() { +bool UpdatePolicyControllerService::isRunning() const { return getState() == core::controller::ControllerServiceState::ENABLED; } diff --git a/libminifi/src/core/Processor.cpp b/libminifi/src/core/Processor.cpp index ed40dc3b8..bd4705675 100644 --- a/libminifi/src/core/Processor.cpp +++ b/libminifi/src/core/Processor.cpp @@ -83,7 +83,7 @@ Processor::~Processor() { logger_->log_debug("Destroying processor %s with uuid %s", name_, getUUIDStr()); } -bool Processor::isRunning() { +bool Processor::isRunning() const { return (state_ == RUNNING && active_tasks_ > 0); } diff --git a/libminifi/src/core/ProcessorNode.cpp b/libminifi/src/core/ProcessorNode.cpp index ee4162bf8..026ad86cb 100644 --- a/libminifi/src/core/ProcessorNode.cpp +++ b/libminifi/src/core/ProcessorNode.cpp @@ -32,7 +32,7 @@ bool ProcessorNode::isWorkAvailable() { return processor_->isWorkAvailable(); } -bool ProcessorNode::isRunning() { +bool ProcessorNode::isRunning() const { return processor_->isRunning(); } diff --git a/libminifi/src/core/state/ProcessorController.cpp b/libminifi/src/core/state/ProcessorController.cpp index b496387d9..6b4d135b1 100644 --- a/libminifi/src/core/state/ProcessorController.cpp +++ b/libminifi/src/core/state/ProcessorController.cpp @@ -44,7 +44,7 @@ int16_t ProcessorController::stop() { return 0; } -bool ProcessorController::isRunning() { +bool ProcessorController::isRunning() const { return processor_->isRunning(); } diff --git a/libminifi/test/unit/ComponentManifestTests.cpp b/libminifi/test/unit/ComponentManifestTests.cpp index 093aad2a9..9dacb8851 100644 --- a/libminifi/test/unit/ComponentManifestTests.cpp +++ b/libminifi/test/unit/ComponentManifestTests.cpp @@ -48,7 +48,7 @@ class ExampleService : public core::controller::ControllerService { bool canEdit() override { return false; } void yield() override {} - bool isRunning() override { return false; } + bool isRunning() const override { return false; } bool isWorkAvailable() override { return false; } }; diff --git a/libminifi/test/unit/ControllerTests.cpp b/libminifi/test/unit/ControllerTests.cpp index 8b7a2bec1..796d1eae2 100644 --- a/libminifi/test/unit/ControllerTests.cpp +++ b/libminifi/test/unit/ControllerTests.cpp @@ -58,7 +58,7 @@ class TestStateController : public minifi::state::StateController { return 0; } - bool isRunning() override { + bool isRunning() const override { return is_running; } @@ -113,7 +113,7 @@ class TestUpdateSink : public minifi::state::StateMonitor { return 0; } - bool isRunning() override { + bool isRunning() const override { return is_running; } diff --git a/libminifi/test/unit/MockClasses.h b/libminifi/test/unit/MockClasses.h index 042833314..dabd5da41 100644 --- a/libminifi/test/unit/MockClasses.h +++ b/libminifi/test/unit/MockClasses.h @@ -64,7 +64,7 @@ class MockControllerService : public minifi::core::controller::ControllerService void yield() override { } - bool isRunning() override { + bool isRunning() const override { return true; } diff --git a/libminifi/test/unit/ProvenanceTestHelper.h b/libminifi/test/unit/ProvenanceTestHelper.h index 194db5c96..d51ad27e7 100644 --- a/libminifi/test/unit/ProvenanceTestHelper.h +++ b/libminifi/test/unit/ProvenanceTestHelper.h @@ -266,7 +266,7 @@ class TestFlowController : public org::apache::nifi::minifi::FlowController { stop(); } - bool isRunning() override { + bool isRunning() const override { return true; }
