This is an automated email from the ASF dual-hosted git repository. adebreceni pushed a commit to branch minifi-api-reduced in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 025e7829dcc7d9407076ba04e5d14361473b6e5d Author: Adam Debreceni <[email protected]> AuthorDate: Mon May 12 15:00:40 2025 +0200 Linter fixes --- extensions/grafana-loki/PushGrafanaLoki.h | 2 +- .../tests/unit/ProcessorTests.cpp | 5 +++-- .../windows-event-log/ConsumeWindowsEventLog.cpp | 5 ++--- .../windows-event-log/ConsumeWindowsEventLog.h | 2 +- libminifi/include/core/Processor.h | 2 +- libminifi/src/core/ClassLoader.cpp | 20 +++++++------------- libminifi/src/core/Processor.cpp | 2 +- minifi-api/include/minifi-cpp/core/ClassLoader.h | 2 ++ 8 files changed, 18 insertions(+), 22 deletions(-) diff --git a/extensions/grafana-loki/PushGrafanaLoki.h b/extensions/grafana-loki/PushGrafanaLoki.h index c368bdf43..062fcd6a6 100644 --- a/extensions/grafana-loki/PushGrafanaLoki.h +++ b/extensions/grafana-loki/PushGrafanaLoki.h @@ -34,7 +34,7 @@ namespace org::apache::nifi::minifi::extensions::grafana::loki { class PushGrafanaLoki : public core::ProcessorImpl { public: - PushGrafanaLoki(core::ProcessorMetadata info) + explicit PushGrafanaLoki(core::ProcessorMetadata info) : ProcessorImpl(info), log_batch_(info.logger) { } diff --git a/extensions/standard-processors/tests/unit/ProcessorTests.cpp b/extensions/standard-processors/tests/unit/ProcessorTests.cpp index 9bd45174c..afec8d9f2 100644 --- a/extensions/standard-processors/tests/unit/ProcessorTests.cpp +++ b/extensions/standard-processors/tests/unit/ProcessorTests.cpp @@ -410,8 +410,9 @@ TEST_CASE("Test Find file", "[getfileCreate3]") { LogTestController::getInstance().setDebug<minifi::provenance::ProvenanceReporter>(); std::shared_ptr<TestPlan> plan = testController.createPlan(); auto processor = plan->addProcessor("GetFile", "getfileCreate2"); - TypedProcessorWrapper<minifi::core::reporting::SiteToSiteProvenanceReportingTask> processorReport = plan->addProcessor(minifi::test::utils::make_custom_processor<minifi::core::reporting::SiteToSiteProvenanceReportingTask>( - std::make_shared<minifi::ConfigureImpl>()), "reporter", core::Relationship("success", "description"), false); + TypedProcessorWrapper<minifi::core::reporting::SiteToSiteProvenanceReportingTask> processorReport = plan->addProcessor( + minifi::test::utils::make_custom_processor<minifi::core::reporting::SiteToSiteProvenanceReportingTask>(std::make_shared<minifi::ConfigureImpl>()), + "reporter", core::Relationship("success", "description"), false); auto dir = testController.createTempDirectory(); plan->setProperty(processor, minifi::processors::GetFile::Directory, dir.string()); diff --git a/extensions/windows-event-log/ConsumeWindowsEventLog.cpp b/extensions/windows-event-log/ConsumeWindowsEventLog.cpp index ec9ed90fa..391080840 100644 --- a/extensions/windows-event-log/ConsumeWindowsEventLog.cpp +++ b/extensions/windows-event-log/ConsumeWindowsEventLog.cpp @@ -61,9 +61,8 @@ namespace org::apache::nifi::minifi::processors { const int EVT_NEXT_TIMEOUT_MS = 500; -ConsumeWindowsEventLog::ConsumeWindowsEventLog(const std::string_view name, const utils::Identifier& uuid) - : core::ProcessorImpl(name, uuid) { - logger_ = core::logging::LoggerFactory<ConsumeWindowsEventLog>::getLogger(uuid_); +ConsumeWindowsEventLog::ConsumeWindowsEventLog(core::ProcessorMetadata info) + : core::ProcessorImpl(info) { char buff[MAX_COMPUTERNAME_LENGTH + 1]; DWORD size = sizeof(buff); if (GetComputerName(buff, &size)) { diff --git a/extensions/windows-event-log/ConsumeWindowsEventLog.h b/extensions/windows-event-log/ConsumeWindowsEventLog.h index 1fc66e64f..d47ab7ddf 100644 --- a/extensions/windows-event-log/ConsumeWindowsEventLog.h +++ b/extensions/windows-event-log/ConsumeWindowsEventLog.h @@ -80,7 +80,7 @@ class Bookmark; class ConsumeWindowsEventLog : public core::ProcessorImpl { public: - explicit ConsumeWindowsEventLog(const std::string_view name, const utils::Identifier& uuid = {}); + explicit ConsumeWindowsEventLog(core::ProcessorMetadata info); ~ConsumeWindowsEventLog() override; diff --git a/libminifi/include/core/Processor.h b/libminifi/include/core/Processor.h index 5558db8c5..c9503dc18 100644 --- a/libminifi/include/core/Processor.h +++ b/libminifi/include/core/Processor.h @@ -92,7 +92,7 @@ class Processor : public ConnectableImpl, public ConfigurableComponentImpl, publ void setProcessGroupUUIDStr(const std::string &uuid); void yield() override; void yield(std::chrono::steady_clock::duration delta_time); - bool isYield(); + bool isYield() const; void clearYield(); std::chrono::steady_clock::time_point getYieldExpirationTime() const; std::chrono::steady_clock::duration getYieldTime() const; diff --git a/libminifi/src/core/ClassLoader.cpp b/libminifi/src/core/ClassLoader.cpp index ebbce7f27..a316887e6 100644 --- a/libminifi/src/core/ClassLoader.cpp +++ b/libminifi/src/core/ClassLoader.cpp @@ -25,15 +25,11 @@ #include "range/v3/action/unique.hpp" #include "core/Processor.h" -namespace org { -namespace apache { -namespace nifi { -namespace minifi { -namespace core { +namespace org::apache::nifi::minifi::core { class ClassLoaderImpl : public ClassLoader { public: - explicit ClassLoaderImpl(const std::string& name = "/"); + explicit ClassLoaderImpl(std::string name = "/"); ClassLoader& getClassLoader(const std::string& child_name) override; @@ -51,6 +47,8 @@ class ClassLoaderImpl : public ClassLoader { CoreComponent* instantiateRaw(const std::string &class_name, const std::string &name, std::function<bool(CoreComponent*)> filter) override; + ~ClassLoaderImpl() override = default; + private: std::map<std::string, std::unique_ptr<ObjectFactory>> loaded_factories_; @@ -63,8 +61,8 @@ class ClassLoaderImpl : public ClassLoader { std::string name_; }; -ClassLoaderImpl::ClassLoaderImpl(const std::string& name) - : logger_(logging::LoggerFactory<ClassLoader>::getLogger()), name_(name) {} +ClassLoaderImpl::ClassLoaderImpl(std::string name) + : logger_(logging::LoggerFactory<ClassLoader>::getLogger()), name_(std::move(name)) {} ClassLoader &ClassLoader::getDefaultClassLoader() { static ClassLoaderImpl ret; @@ -219,8 +217,4 @@ CoreComponent* ClassLoaderImpl::instantiateRaw(const std::string &class_name, co return nullptr; } -} /* namespace core */ -} /* namespace minifi */ -} /* namespace nifi */ -} /* namespace apache */ -} /* namespace org */ +} // namespace org::apache::nifi::minifi::core diff --git a/libminifi/src/core/Processor.cpp b/libminifi/src/core/Processor.cpp index d1188c234..2ff4dc802 100644 --- a/libminifi/src/core/Processor.cpp +++ b/libminifi/src/core/Processor.cpp @@ -348,7 +348,7 @@ void Processor::yield(std::chrono::steady_clock::duration delta_time) { yield_expiration_ = std::chrono::steady_clock::now() + delta_time; } -bool Processor::isYield() { +bool Processor::isYield() const { return getYieldTime() > 0ms; } diff --git a/minifi-api/include/minifi-cpp/core/ClassLoader.h b/minifi-api/include/minifi-cpp/core/ClassLoader.h index cac9410d6..ec377de61 100644 --- a/minifi-api/include/minifi-cpp/core/ClassLoader.h +++ b/minifi-api/include/minifi-cpp/core/ClassLoader.h @@ -51,6 +51,8 @@ class ClassLoader { public: static ClassLoader &getDefaultClassLoader(); + virtual ~ClassLoader() = default; + /** * Retrieves a class loader * @param name name of class loader
