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 ce6080e8e358692e12e678c68acb56231ba1af36 Author: Adam Debreceni <[email protected]> AuthorDate: Wed Jul 23 11:37:45 2025 +0200 Linter fix, rollback temp test changes --- extensions/python/PythonProcessor.cpp | 2 - extensions/sftp/processors/PutSFTP.cpp | 2 +- extensions/sftp/processors/SFTPProcessorBase.cpp | 2 +- .../standard-processors/modbus/FetchModbusTcp.cpp | 2 +- .../standard-processors/modbus/FetchModbusTcp.h | 2 +- .../tests/unit/DefragmentTextTests.cpp | 2 +- libminifi/src/core/ProcessContext.cpp | 10 ++--- libminifi/test/integration/C2MetricsTest.cpp | 47 ++++++++++------------ libminifi/test/libtest/unit/TestBase.h | 5 +++ minifi-api/include/minifi-cpp/core/ClassLoader.h | 3 +- .../include/minifi-cpp/core/ProcessContext.h | 10 ++--- 11 files changed, 44 insertions(+), 43 deletions(-) diff --git a/extensions/python/PythonProcessor.cpp b/extensions/python/PythonProcessor.cpp index 2416b3288..c7a231f21 100644 --- a/extensions/python/PythonProcessor.cpp +++ b/extensions/python/PythonProcessor.cpp @@ -22,8 +22,6 @@ namespace org::apache::nifi::minifi::extensions::python { -namespace core = org::apache::nifi::minifi::core; - PythonProcessor::PythonProcessor(python::processors::ExecutePythonProcessor* proc) : processor_(proc) { gsl_Expects(processor_); diff --git a/extensions/sftp/processors/PutSFTP.cpp b/extensions/sftp/processors/PutSFTP.cpp index 26a6d4bf7..41cd0b8bf 100644 --- a/extensions/sftp/processors/PutSFTP.cpp +++ b/extensions/sftp/processors/PutSFTP.cpp @@ -43,7 +43,7 @@ void PutSFTP::initialize() { } PutSFTP::PutSFTP(core::ProcessorMetadata metadata) - : SFTPProcessorBase(metadata), + : SFTPProcessorBase(std::move(metadata)), create_directory_(false), batch_size_(0), reject_zero_byte_(false), diff --git a/extensions/sftp/processors/SFTPProcessorBase.cpp b/extensions/sftp/processors/SFTPProcessorBase.cpp index a54fad7d2..4587d94ef 100644 --- a/extensions/sftp/processors/SFTPProcessorBase.cpp +++ b/extensions/sftp/processors/SFTPProcessorBase.cpp @@ -44,7 +44,7 @@ namespace org::apache::nifi::minifi::processors { SFTPProcessorBase::SFTPProcessorBase(core::ProcessorMetadata metadata) - : ProcessorImpl(metadata), + : ProcessorImpl(std::move(metadata)), connection_timeout_(0), data_timeout_(0), strict_host_checking_(false), diff --git a/extensions/standard-processors/modbus/FetchModbusTcp.cpp b/extensions/standard-processors/modbus/FetchModbusTcp.cpp index dccdad866..eacea365b 100644 --- a/extensions/standard-processors/modbus/FetchModbusTcp.cpp +++ b/extensions/standard-processors/modbus/FetchModbusTcp.cpp @@ -117,7 +117,7 @@ void FetchModbusTcp::initialize() { setSupportedRelationships(Relationships); } -std::shared_ptr<core::FlowFile> FetchModbusTcp::getOrCreateFlowFile(core::ProcessContext& context, core::ProcessSession& session) const { +std::shared_ptr<core::FlowFile> FetchModbusTcp::getOrCreateFlowFile(core::ProcessContext& context, core::ProcessSession& session) { if (context.hasIncomingConnections()) { return session.get(); } diff --git a/extensions/standard-processors/modbus/FetchModbusTcp.h b/extensions/standard-processors/modbus/FetchModbusTcp.h index 9fb0c4d4a..e7ce18ef6 100644 --- a/extensions/standard-processors/modbus/FetchModbusTcp.h +++ b/extensions/standard-processors/modbus/FetchModbusTcp.h @@ -124,7 +124,7 @@ class FetchModbusTcp final : public core::ProcessorImpl { asio::awaitable<nonstd::expected<core::RecordField, std::error_code>> sendRequestAndReadResponse(utils::net::ConnectionHandlerBase& connection_handler, const ReadModbusFunction& read_modbus_function); std::unordered_map<std::string, std::unique_ptr<ReadModbusFunction>> getAddressMap(core::ProcessContext& context, const core::FlowFile& flow_file); - std::shared_ptr<core::FlowFile> getOrCreateFlowFile(core::ProcessContext& context, core::ProcessSession& session) const; + static std::shared_ptr<core::FlowFile> getOrCreateFlowFile(core::ProcessContext& context, core::ProcessSession& session); void removeExpiredConnections(); asio::io_context io_context_; diff --git a/extensions/standard-processors/tests/unit/DefragmentTextTests.cpp b/extensions/standard-processors/tests/unit/DefragmentTextTests.cpp index 28f1579f0..017c2d1b9 100644 --- a/extensions/standard-processors/tests/unit/DefragmentTextTests.cpp +++ b/extensions/standard-processors/tests/unit/DefragmentTextTests.cpp @@ -324,7 +324,7 @@ class FragmentGenerator : public core::ProcessorImpl { ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS explicit FragmentGenerator(minifi::core::ProcessorMetadata metadata) - : ProcessorImpl(metadata) { + : ProcessorImpl(std::move(metadata)) { } void onTrigger(core::ProcessContext&, core::ProcessSession& session) override { diff --git a/libminifi/src/core/ProcessContext.cpp b/libminifi/src/core/ProcessContext.cpp index 985a23271..3c985c9bc 100644 --- a/libminifi/src/core/ProcessContext.cpp +++ b/libminifi/src/core/ProcessContext.cpp @@ -26,11 +26,11 @@ class StandardProcessorInfo : public ProcessorInfo { public: explicit StandardProcessorInfo(Processor& proc): proc_(proc) {} - std::string getName() const override {return proc_.getName();} - utils::Identifier getUUID() const override {return proc_.getUUID();} - std::shared_ptr<state::FlowIdentifier> getFlowIdentifier() const override {return proc_.getFlowIdentifier();} - std::map<std::string, core::Property, std::less<>> getSupportedProperties() const override {return proc_.getSupportedProperties();} - nonstd::expected<Property, std::error_code> getSupportedProperty(std::string_view name) const override {return proc_.getSupportedProperty(name);} + [[nodiscard]] std::string getName() const override {return proc_.getName();} + [[nodiscard]] utils::Identifier getUUID() const override {return proc_.getUUID();} + [[nodiscard]] std::shared_ptr<state::FlowIdentifier> getFlowIdentifier() const override {return proc_.getFlowIdentifier();} + [[nodiscard]] std::map<std::string, core::Property, std::less<>> getSupportedProperties() const override {return proc_.getSupportedProperties();} + [[nodiscard]] nonstd::expected<Property, std::error_code> getSupportedProperty(std::string_view name) const override {return proc_.getSupportedProperty(name);} private: Processor& proc_; diff --git a/libminifi/test/integration/C2MetricsTest.cpp b/libminifi/test/integration/C2MetricsTest.cpp index 75519215b..ac82324cf 100644 --- a/libminifi/test/integration/C2MetricsTest.cpp +++ b/libminifi/test/integration/C2MetricsTest.cpp @@ -58,8 +58,6 @@ class VerifyC2Metrics : public VerifyC2Base { const std::atomic_bool& metrics_updated_successfully_; }; -#define CHECK_EXPR(expr) (expr ? true : (std::cout << #expr << " failed" << std::endl, false)) - class MetricsHandler: public HeartbeatHandler { public: explicit MetricsHandler(std::atomic_bool& metrics_updated_successfully, std::shared_ptr<minifi::Configure> configuration, const std::filesystem::path& replacement_config_path) @@ -107,13 +105,13 @@ class MetricsHandler: public HeartbeatHandler { void verifyMetrics(const rapidjson::Document& root) { auto initial_metrics_verified = - CHECK_EXPR(root.HasMember("metrics")) && - CHECK_EXPR(root["metrics"].HasMember("RuntimeMetrics")) && - CHECK_EXPR(root["metrics"].HasMember("LoadMetrics")) && - CHECK_EXPR(root["metrics"].HasMember("ProcessorMetrics")) && - CHECK_EXPR(verifyRuntimeMetrics(root["metrics"]["RuntimeMetrics"])) && - CHECK_EXPR(verifyLoadMetrics(root["metrics"]["LoadMetrics"])) && - CHECK_EXPR(verifyProcessorMetrics(root["metrics"]["ProcessorMetrics"])); + root.HasMember("metrics") && + root["metrics"].HasMember("RuntimeMetrics") && + root["metrics"].HasMember("LoadMetrics") && + root["metrics"].HasMember("ProcessorMetrics") && + verifyRuntimeMetrics(root["metrics"]["RuntimeMetrics"]) && + verifyLoadMetrics(root["metrics"]["LoadMetrics"]) && + verifyProcessorMetrics(root["metrics"]["ProcessorMetrics"]); if (initial_metrics_verified) { test_state_ = TestState::SEND_NEW_CONFIG; } @@ -165,42 +163,41 @@ class MetricsHandler: public HeartbeatHandler { static bool verifyProcessorBulletins(const rapidjson::Value& runtime_metrics) { if (!runtime_metrics["flowInfo"].HasMember("processorBulletins")) { - std::cout << "!runtime_metrics[\"flowInfo\"].HasMember(\"processorBulletins\")" << std::endl; + std::cout << R"(!runtime_metrics["flowInfo"].HasMember("processorBulletins"))" << std::endl; return false; } auto bulletins = runtime_metrics["flowInfo"]["processorBulletins"].GetArray(); return std::any_of(bulletins.begin(), bulletins.end(), [](const auto& bulletin) { std::string message = bulletin["message"].GetString(); - return CHECK_EXPR(bulletin["id"].GetInt() > 0) && - CHECK_EXPR(bulletin["timestamp"].GetInt64() > 0) && - CHECK_EXPR(bulletin["level"].GetString() == std::string("ERROR")) && - CHECK_EXPR(bulletin["category"].GetString() == std::string("Log Message")) && - CHECK_EXPR(message.find("Error connecting to") != std::string::npos) && - CHECK_EXPR(message.find(GETTCP_UUID) != std::string::npos) && - CHECK_EXPR(bulletin["groupId"].GetString() == std::string(PROCESS_GROUP_UUID)) && - CHECK_EXPR(bulletin["groupName"].GetString() == std::string("MiNiFi Flow")) && - CHECK_EXPR(bulletin["groupPath"].GetString() == std::string("MiNiFi Flow")) && - CHECK_EXPR(bulletin["sourceId"].GetString() == std::string(GETTCP_UUID)) && - CHECK_EXPR(bulletin["sourceName"].GetString() == std::string("GetTCP")); + return bulletin["id"].GetInt() > 0 && + bulletin["timestamp"].GetInt64() > 0 && + bulletin["level"].GetString() == std::string("ERROR") && + bulletin["category"].GetString() == std::string("Log Message") && + message.find("Error connecting to") != std::string::npos && + message.find(GETTCP_UUID) != std::string::npos && + bulletin["groupId"].GetString() == std::string(PROCESS_GROUP_UUID) && + bulletin["groupName"].GetString() == std::string("MiNiFi Flow") && + bulletin["groupPath"].GetString() == std::string("MiNiFi Flow") && + bulletin["sourceId"].GetString() == std::string(GETTCP_UUID) && + bulletin["sourceName"].GetString() == std::string("GetTCP"); }); } static bool verifyRuntimeMetrics(const rapidjson::Value& runtime_metrics) { - return CHECK_EXPR(verifyCommonRuntimeMetricNodes(runtime_metrics, "2438e3c8-015a-1000-79ca-83af40ec1997")) && + return verifyCommonRuntimeMetricNodes(runtime_metrics, "2438e3c8-015a-1000-79ca-83af40ec1997") && [&]() { const auto processor_statuses = runtime_metrics["flowInfo"]["processorStatuses"].GetArray(); if (processor_statuses.Size() != 2) { - std::cout << "processor_statuses.Size() != 2" << std::endl; return false; } return std::all_of(processor_statuses.begin(), processor_statuses.end(), [&](const auto& processor) { if (processor["id"].GetString() != std::string(GETTCP_UUID) && processor["id"].GetString() != std::string(LOGATTRIBUTE1_UUID)) { throw std::runtime_error(std::string("Unexpected processor id in processorStatuses: ") + processor["id"].GetString()); } - return CHECK_EXPR(processorMetricsAreValid(processor)); + return processorMetricsAreValid(processor); }); }() && - CHECK_EXPR(verifyProcessorBulletins(runtime_metrics)); + verifyProcessorBulletins(runtime_metrics); } static bool verifyUpdatedRuntimeMetrics(const rapidjson::Value& runtime_metrics) { diff --git a/libminifi/test/libtest/unit/TestBase.h b/libminifi/test/libtest/unit/TestBase.h index 39b2856af..68759e462 100644 --- a/libminifi/test/libtest/unit/TestBase.h +++ b/libminifi/test/libtest/unit/TestBase.h @@ -231,6 +231,11 @@ class TypedProcessorWrapper { return proc_; } + core::Processor& operator*() const { + gsl_Assert(proc_); + return *proc_; + } + private: core::Processor* proc_{nullptr}; }; diff --git a/minifi-api/include/minifi-cpp/core/ClassLoader.h b/minifi-api/include/minifi-cpp/core/ClassLoader.h index 56e031f39..5413e74e5 100644 --- a/minifi-api/include/minifi-cpp/core/ClassLoader.h +++ b/minifi-api/include/minifi-cpp/core/ClassLoader.h @@ -75,7 +75,8 @@ class ClassLoader { [[nodiscard]] virtual std::unique_ptr<CoreComponent> instantiate(const std::string &class_name, const utils::Identifier &uuid, std::function<bool(CoreComponent*)> filter) = 0; - [[nodiscard]] virtual std::unique_ptr<CoreComponent> instantiate(const std::string &class_name, const std::string &name, const utils::Identifier &uuid, std::function<bool(CoreComponent*)> filter) = 0; + [[nodiscard]] virtual std::unique_ptr<CoreComponent> instantiate( + const std::string &class_name, const std::string &name, const utils::Identifier &uuid, std::function<bool(CoreComponent*)> filter) = 0; [[nodiscard]] virtual CoreComponent* instantiateRaw(const std::string &class_name, const std::string &name, std::function<bool(CoreComponent*)> filter) = 0; diff --git a/minifi-api/include/minifi-cpp/core/ProcessContext.h b/minifi-api/include/minifi-cpp/core/ProcessContext.h index 1e1e3e2b0..446d104a0 100644 --- a/minifi-api/include/minifi-cpp/core/ProcessContext.h +++ b/minifi-api/include/minifi-cpp/core/ProcessContext.h @@ -34,11 +34,11 @@ namespace org::apache::nifi::minifi::core { class ProcessorInfo { public: - virtual std::string getName() const = 0; - virtual utils::Identifier getUUID() const = 0; - virtual std::shared_ptr<state::FlowIdentifier> getFlowIdentifier() const = 0; - virtual std::map<std::string, core::Property, std::less<>> getSupportedProperties() const = 0; - virtual nonstd::expected<Property, std::error_code> getSupportedProperty(std::string_view name) const = 0; + [[nodiscard]] virtual std::string getName() const = 0; + [[nodiscard]] virtual utils::Identifier getUUID() const = 0; + [[nodiscard]] virtual std::shared_ptr<state::FlowIdentifier> getFlowIdentifier() const = 0; + [[nodiscard]] virtual std::map<std::string, core::Property, std::less<>> getSupportedProperties() const = 0; + [[nodiscard]] virtual nonstd::expected<Property, std::error_code> getSupportedProperty(std::string_view name) const = 0; virtual ~ProcessorInfo() = default; };
