From 38b012a227a024517fb21438e431f073a003c3ca Mon Sep 17 00:00:00 2001 From: Gabor Gyimesi Date: Tue, 8 Aug 2023 13:48:29 +0200 Subject: [PATCH] Review update --- libminifi/include/core/Processor.h | 5 +++-- libminifi/src/core/Processor.cpp | 8 ++++---- libminifi/test/DummyProcessor.h | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/libminifi/include/core/Processor.h b/libminifi/include/core/Processor.h index d8eb5632d7b..477b6b29a48 100644 --- a/libminifi/include/core/Processor.h +++ b/libminifi/include/core/Processor.h @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -73,8 +74,8 @@ constexpr std::chrono::microseconds MINIMUM_SCHEDULING_PERIOD{30}; class Processor : public Connectable, public ConfigurableComponent, public state::response::ResponseNodeSource { public: - Processor(std::string name, const utils::Identifier& uuid, std::shared_ptr metrics = nullptr); - explicit Processor(std::string name, std::shared_ptr metrics = nullptr); + Processor(std::string_view name, const utils::Identifier& uuid, std::shared_ptr metrics = nullptr); + explicit Processor(std::string_view name, std::shared_ptr metrics = nullptr); Processor(const Processor& parent) = delete; Processor& operator=(const Processor& parent) = delete; diff --git a/libminifi/src/core/Processor.cpp b/libminifi/src/core/Processor.cpp index cf2449bc166..c865442cc51 100644 --- a/libminifi/src/core/Processor.cpp +++ b/libminifi/src/core/Processor.cpp @@ -40,8 +40,8 @@ using namespace std::literals::chrono_literals; namespace org::apache::nifi::minifi::core { -Processor::Processor(std::string name, std::shared_ptr metrics) - : Connectable(std::move(name)), +Processor::Processor(std::string_view name, std::shared_ptr metrics) + : Connectable(name), logger_(logging::LoggerFactory::getLogger(uuid_)), metrics_(metrics ? std::move(metrics) : std::make_shared(*this)) { has_work_.store(false); @@ -59,8 +59,8 @@ Processor::Processor(std::string name, std::shared_ptr metrics logger_->log_debug("Processor %s created UUID %s", name_, getUUIDStr()); } -Processor::Processor(std::string name, const utils::Identifier& uuid, std::shared_ptr metrics) - : Connectable(std::move(name), uuid), +Processor::Processor(std::string_view name, const utils::Identifier& uuid, std::shared_ptr metrics) + : Connectable(name, uuid), logger_(logging::LoggerFactory::getLogger(uuid_)), metrics_(metrics ? std::move(metrics) : std::make_shared(*this)) { has_work_.store(false); diff --git a/libminifi/test/DummyProcessor.h b/libminifi/test/DummyProcessor.h index 9a88d55d6fa..daa8092b23e 100644 --- a/libminifi/test/DummyProcessor.h +++ b/libminifi/test/DummyProcessor.h @@ -17,7 +17,7 @@ #pragma once #include -#include +#include #include #include "core/Processor.h" @@ -29,8 +29,8 @@ class DummyProcessor : public minifi::core::Processor { using minifi::core::Processor::Processor; public: - DummyProcessor(std::string name, const minifi::utils::Identifier& uuid) : Processor(std::move(name), uuid) {} - explicit DummyProcessor(std::string name) : Processor(std::move(name)) {} + DummyProcessor(std::string_view name, const minifi::utils::Identifier& uuid) : Processor(std::move(name), uuid) {} + explicit DummyProcessor(std::string_view name) : Processor(std::move(name)) {} static constexpr const char* Description = "A processor that does nothing."; static constexpr auto Properties = std::array{}; static constexpr auto Relationships = std::array{};