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 52b092d6aed57d3ad48ea07667bad495149283d5 Author: Adam Debreceni <[email protected]> AuthorDate: Tue Apr 22 14:25:32 2025 +0200 Rebase fix --- extensions/opc/include/opcbase.h | 2 -- extensions/opc/src/opcbase.cpp | 1 - extensions/opc/src/putopc.cpp | 4 +-- extensions/opc/tests/FetchOpcProcessorTests.cpp | 18 +++++------ extensions/opc/tests/PutOpcProcessorTests.cpp | 36 +++++++++++----------- extensions/python/PythonCreator.h | 10 +++--- .../tests/integration/InvokeHTTPTests.cpp | 4 +-- libminifi/src/core/ProcessContext.cpp | 27 ++++++++-------- 8 files changed, 48 insertions(+), 54 deletions(-) diff --git a/extensions/opc/include/opcbase.h b/extensions/opc/include/opcbase.h index bdb79f558..982399125 100644 --- a/extensions/opc/include/opcbase.h +++ b/extensions/opc/include/opcbase.h @@ -82,8 +82,6 @@ class BaseOPCProcessor : public core::ProcessorImpl { void readPathReferenceTypes(core::ProcessContext& context, const std::string& node_id); void parseIdType(core::ProcessContext& context, const core::PropertyReference& prop); - std::shared_ptr<core::logging::Logger> logger_; - std::string node_id_; int32_t namespace_idx_ = 0; opc::OPCNodeIDType id_type_{}; diff --git a/extensions/opc/src/opcbase.cpp b/extensions/opc/src/opcbase.cpp index 27c6e10f9..7d7c7101c 100644 --- a/extensions/opc/src/opcbase.cpp +++ b/extensions/opc/src/opcbase.cpp @@ -21,7 +21,6 @@ #include "opc.h" #include "opcbase.h" #include "FlowFileRecord.h" -#include "core/Processor.h" #include "core/ProcessSession.h" #include "core/Core.h" #include "utils/ProcessorConfigUtils.h" diff --git a/extensions/opc/src/putopc.cpp b/extensions/opc/src/putopc.cpp index c99ae531f..72a309162 100644 --- a/extensions/opc/src/putopc.cpp +++ b/extensions/opc/src/putopc.cpp @@ -278,12 +278,12 @@ void PutOPCProcessor::onTrigger(core::ProcessContext& context, core::ProcessSess if (!reconnect()) { logger_->log_warn("Could not connect to OPC server, yielding"); - yield(); + context.yield(); return; } if (!readParentNodeId()) { - yield(); + context.yield(); return; } diff --git a/extensions/opc/tests/FetchOpcProcessorTests.cpp b/extensions/opc/tests/FetchOpcProcessorTests.cpp index a2b77d6c9..0a377f158 100644 --- a/extensions/opc/tests/FetchOpcProcessorTests.cpp +++ b/extensions/opc/tests/FetchOpcProcessorTests.cpp @@ -26,7 +26,7 @@ namespace org::apache::nifi::minifi::test { TEST_CASE("Test fetching using path node id", "[fetchopcprocessor]") { OpcUaTestServer server(4841); server.start(); - SingleProcessorTestController controller{std::make_unique<processors::FetchOPCProcessor>("FetchOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::FetchOPCProcessor>("FetchOPCProcessor")}; auto fetch_opc_processor = controller.getProcessor(); REQUIRE(fetch_opc_processor->setProperty(processors::FetchOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4841/")); REQUIRE(fetch_opc_processor->setProperty(processors::FetchOPCProcessor::NodeIDType.name, "Path")); @@ -62,7 +62,7 @@ TEST_CASE("Test fetching using path node id", "[fetchopcprocessor]") { TEST_CASE("Test fetching using custom reference type id path", "[fetchopcprocessor]") { OpcUaTestServer server(4841); server.start(); - SingleProcessorTestController controller{std::make_unique<processors::FetchOPCProcessor>("FetchOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::FetchOPCProcessor>("FetchOPCProcessor")}; auto fetch_opc_processor = controller.getProcessor(); REQUIRE(fetch_opc_processor->setProperty(processors::FetchOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4841/")); REQUIRE(fetch_opc_processor->setProperty(processors::FetchOPCProcessor::NodeIDType.name, "Path")); @@ -94,7 +94,7 @@ TEST_CASE("Test fetching using custom reference type id path", "[fetchopcprocess } TEST_CASE("Test missing path reference types", "[fetchopcprocessor]") { - SingleProcessorTestController controller{std::make_unique<processors::FetchOPCProcessor>("FetchOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::FetchOPCProcessor>("FetchOPCProcessor")}; auto fetch_opc_processor = controller.getProcessor(); REQUIRE(fetch_opc_processor->setProperty(processors::FetchOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4841/")); REQUIRE(fetch_opc_processor->setProperty(processors::FetchOPCProcessor::NodeIDType.name, "Path")); @@ -104,7 +104,7 @@ TEST_CASE("Test missing path reference types", "[fetchopcprocessor]") { } TEST_CASE("Test username and password should both be provided", "[fetchopcprocessor]") { - SingleProcessorTestController controller{std::make_unique<processors::FetchOPCProcessor>("FetchOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::FetchOPCProcessor>("FetchOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); REQUIRE(put_opc_processor->setProperty(processors::FetchOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4841/")); REQUIRE(put_opc_processor->setProperty(processors::FetchOPCProcessor::Username.name, "user")); @@ -114,7 +114,7 @@ TEST_CASE("Test username and password should both be provided", "[fetchopcproces } TEST_CASE("Test certificate path and key path should both be provided", "[fetchopcprocessor]") { - SingleProcessorTestController controller{std::make_unique<processors::FetchOPCProcessor>("FetchOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::FetchOPCProcessor>("FetchOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); REQUIRE(put_opc_processor->setProperty(processors::FetchOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4841/")); REQUIRE(put_opc_processor->setProperty(processors::FetchOPCProcessor::CertificatePath.name, "cert")); @@ -124,7 +124,7 @@ TEST_CASE("Test certificate path and key path should both be provided", "[fetcho } TEST_CASE("Test application uri should be provided if certificate is provided", "[fetchopcprocessor]") { - SingleProcessorTestController controller{std::make_unique<processors::FetchOPCProcessor>("FetchOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::FetchOPCProcessor>("FetchOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); REQUIRE(put_opc_processor->setProperty(processors::FetchOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4841/")); REQUIRE(put_opc_processor->setProperty(processors::FetchOPCProcessor::CertificatePath.name, "cert")); @@ -134,7 +134,7 @@ TEST_CASE("Test application uri should be provided if certificate is provided", } TEST_CASE("Test certificate path must be valid", "[fetchopcprocessor]") { - SingleProcessorTestController controller{std::make_unique<processors::FetchOPCProcessor>("FetchOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::FetchOPCProcessor>("FetchOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); REQUIRE(put_opc_processor->setProperty(processors::FetchOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4841/")); REQUIRE(put_opc_processor->setProperty(processors::FetchOPCProcessor::CertificatePath.name, "/invalid/cert/path")); @@ -145,7 +145,7 @@ TEST_CASE("Test certificate path must be valid", "[fetchopcprocessor]") { } TEST_CASE("Test key path must be valid", "[fetchopcprocessor]") { - SingleProcessorTestController controller{std::make_unique<processors::FetchOPCProcessor>("FetchOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::FetchOPCProcessor>("FetchOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); auto test_cert_path = controller.createTempDirectory() / "test_cert.pem"; { @@ -162,7 +162,7 @@ TEST_CASE("Test key path must be valid", "[fetchopcprocessor]") { } TEST_CASE("Test trusted certs path must be valid", "[fetchopcprocessor]") { - SingleProcessorTestController controller{std::make_unique<processors::FetchOPCProcessor>("FetchOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::FetchOPCProcessor>("FetchOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); auto test_cert_path = controller.createTempDirectory() / "test_cert.pem"; { diff --git a/extensions/opc/tests/PutOpcProcessorTests.cpp b/extensions/opc/tests/PutOpcProcessorTests.cpp index a03ef722e..dbba5c7a7 100644 --- a/extensions/opc/tests/PutOpcProcessorTests.cpp +++ b/extensions/opc/tests/PutOpcProcessorTests.cpp @@ -78,7 +78,7 @@ void verifyCreatedNode(const NodeData& expected_node, SingleProcessorTestControl TEST_CASE("Test creating a new node with path node id", "[putopcprocessor]") { OpcUaTestServer server; server.start(); - SingleProcessorTestController controller{std::make_unique<processors::PutOPCProcessor>("PutOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::PutOPCProcessor>("PutOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); NodeData expected_node{42, server.getNamespaceIndex(), 9999, "everything", "Simulator/Default/Device1", {}}; @@ -103,7 +103,7 @@ TEST_CASE("Test creating a new node with path node id", "[putopcprocessor]") { TEST_CASE("Test fetching using custom reference type id path", "[putopcprocessor]") { OpcUaTestServer server; server.start(); - SingleProcessorTestController controller{std::make_unique<processors::PutOPCProcessor>("PutOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::PutOPCProcessor>("PutOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); NodeData expected_node{42, server.getNamespaceIndex(), 9999, "everything", "Simulator/Default/Device1/INT3/INT4", "Organizes/Organizes/HasComponent/HasComponent"}; @@ -129,7 +129,7 @@ TEST_CASE("Test fetching using custom reference type id path", "[putopcprocessor TEST_CASE("Test fetching using custom target reference type id", "[putopcprocessor]") { OpcUaTestServer server; server.start(); - SingleProcessorTestController controller{std::make_unique<processors::PutOPCProcessor>("PutOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::PutOPCProcessor>("PutOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); NodeData expected_node{42, server.getNamespaceIndex(), 9999, "everything", "Simulator/Default/Device1/INT3", "Organizes/Organizes/HasComponent", "Organizes"}; @@ -154,7 +154,7 @@ TEST_CASE("Test fetching using custom target reference type id", "[putopcprocess } TEST_CASE("Test missing path reference types", "[putopcprocessor]") { - SingleProcessorTestController controller{std::make_unique<processors::PutOPCProcessor>("PutOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::PutOPCProcessor>("PutOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4840/")); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::ParentNodeIDType.name, "Path")); @@ -173,7 +173,7 @@ TEST_CASE("Test namespace cannot be empty", "[putopcprocessor]") { OpcUaTestServer server; server.start(); LogTestController::getInstance().setTrace<processors::PutOPCProcessor>(); - SingleProcessorTestController controller{std::make_unique<processors::PutOPCProcessor>("PutOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::PutOPCProcessor>("PutOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4840/")); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::ParentNodeIDType.name, "Path")); @@ -196,7 +196,7 @@ TEST_CASE("Test valid namespace being required", "[putopcprocessor]") { OpcUaTestServer server; server.start(); LogTestController::getInstance().setTrace<processors::PutOPCProcessor>(); - SingleProcessorTestController controller{std::make_unique<processors::PutOPCProcessor>("PutOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::PutOPCProcessor>("PutOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4840/")); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::ParentNodeIDType.name, "Path")); @@ -216,7 +216,7 @@ TEST_CASE("Test valid namespace being required", "[putopcprocessor]") { } TEST_CASE("Test username and password should both be provided", "[putopcprocessor]") { - SingleProcessorTestController controller{std::make_unique<processors::PutOPCProcessor>("PutOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::PutOPCProcessor>("PutOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4840/")); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::Username.name, "user")); @@ -226,7 +226,7 @@ TEST_CASE("Test username and password should both be provided", "[putopcprocesso } TEST_CASE("Test certificate path and key path should both be provided", "[putopcprocessor]") { - SingleProcessorTestController controller{std::make_unique<processors::PutOPCProcessor>("PutOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::PutOPCProcessor>("PutOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4840/")); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::CertificatePath.name, "cert")); @@ -236,7 +236,7 @@ TEST_CASE("Test certificate path and key path should both be provided", "[putopc } TEST_CASE("Test application uri should be provided if certificate is provided", "[putopcprocessor]") { - SingleProcessorTestController controller{std::make_unique<processors::PutOPCProcessor>("PutOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::PutOPCProcessor>("PutOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4840/")); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::CertificatePath.name, "cert")); @@ -246,7 +246,7 @@ TEST_CASE("Test application uri should be provided if certificate is provided", } TEST_CASE("Test certificate path must be valid", "[putopcprocessor]") { - SingleProcessorTestController controller{std::make_unique<processors::PutOPCProcessor>("PutOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::PutOPCProcessor>("PutOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4840/")); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::CertificatePath.name, "/invalid/cert/path")); @@ -257,7 +257,7 @@ TEST_CASE("Test certificate path must be valid", "[putopcprocessor]") { } TEST_CASE("Test key path must be valid", "[putopcprocessor]") { - SingleProcessorTestController controller{std::make_unique<processors::PutOPCProcessor>("PutOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::PutOPCProcessor>("PutOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); auto test_cert_path = controller.createTempDirectory() / "test_cert.pem"; { @@ -274,7 +274,7 @@ TEST_CASE("Test key path must be valid", "[putopcprocessor]") { } TEST_CASE("Test trusted certs path must be valid", "[putopcprocessor]") { - SingleProcessorTestController controller{std::make_unique<processors::PutOPCProcessor>("PutOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::PutOPCProcessor>("PutOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); auto test_cert_path = controller.createTempDirectory() / "test_cert.pem"; { @@ -292,7 +292,7 @@ TEST_CASE("Test trusted certs path must be valid", "[putopcprocessor]") { } TEST_CASE("Test invalid int node id", "[putopcprocessor]") { - SingleProcessorTestController controller{std::make_unique<processors::PutOPCProcessor>("PutOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::PutOPCProcessor>("PutOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4840/")); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::ParentNodeIDType.name, "Int")); @@ -305,7 +305,7 @@ TEST_CASE("Test invalid int node id", "[putopcprocessor]") { TEST_CASE("Test invalid parent node id path", "[putopcprocessor]") { OpcUaTestServer server; server.start(); - SingleProcessorTestController controller{std::make_unique<processors::PutOPCProcessor>("PutOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::PutOPCProcessor>("PutOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4840/")); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::ParentNodeIDType.name, "Path")); @@ -326,7 +326,7 @@ TEST_CASE("Test invalid parent node id path", "[putopcprocessor]") { TEST_CASE("Test missing target node id", "[putopcprocessor]") { OpcUaTestServer server; server.start(); - SingleProcessorTestController controller{std::make_unique<processors::PutOPCProcessor>("PutOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::PutOPCProcessor>("PutOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4840/")); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::ParentNodeIDType.name, "Path")); @@ -349,7 +349,7 @@ TEST_CASE("Test missing target node id", "[putopcprocessor]") { TEST_CASE("Test invalid target node id", "[putopcprocessor]") { OpcUaTestServer server; server.start(); - SingleProcessorTestController controller{std::make_unique<processors::PutOPCProcessor>("PutOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::PutOPCProcessor>("PutOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4840/")); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::ParentNodeIDType.name, "Path")); @@ -372,7 +372,7 @@ TEST_CASE("Test invalid target node id", "[putopcprocessor]") { TEST_CASE("Test missing target node type", "[putopcprocessor]") { OpcUaTestServer server; server.start(); - SingleProcessorTestController controller{std::make_unique<processors::PutOPCProcessor>("PutOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::PutOPCProcessor>("PutOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4840/")); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::ParentNodeIDType.name, "Path")); @@ -395,7 +395,7 @@ TEST_CASE("Test missing target node type", "[putopcprocessor]") { TEST_CASE("Test value type mismatch", "[putopcprocessor]") { OpcUaTestServer server; server.start(); - SingleProcessorTestController controller{std::make_unique<processors::PutOPCProcessor>("PutOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::PutOPCProcessor>("PutOPCProcessor")}; auto put_opc_processor = controller.getProcessor(); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4840/")); REQUIRE(put_opc_processor->setProperty(processors::PutOPCProcessor::ParentNodeIDType.name, "Path")); diff --git a/extensions/python/PythonCreator.h b/extensions/python/PythonCreator.h index 647f3255a..3cc2c1284 100644 --- a/extensions/python/PythonCreator.h +++ b/extensions/python/PythonCreator.h @@ -46,18 +46,18 @@ class DummyProcessorDescriptor : public core::ProcessorDescriptor { public: ~DummyProcessorDescriptor() override = default; - void setSupportedRelationships(std::span<const core::RelationshipDefinition> relationships) override {} - void setSupportedProperties(std::span<const core::PropertyReference> properties) override {} + void setSupportedRelationships(std::span<const core::RelationshipDefinition> /*relationships*/) override {} + void setSupportedProperties(std::span<const core::PropertyReference> /*properties*/) override {} }; class DummyLogger : public core::logging::Logger { public: - void set_max_log_size(int size) override {} + void set_max_log_size(int /*size*/) override {} std::optional<std::string> get_id() override { return std::nullopt; } - void log_string(core::logging::LOG_LEVEL level, std::string str) override {} - bool should_log(core::logging::LOG_LEVEL level) override { + void log_string(core::logging::LOG_LEVEL /*level*/, std::string /*str*/) override {} + bool should_log(core::logging::LOG_LEVEL /*level*/) override { return false; } [[nodiscard]] virtual core::logging::LOG_LEVEL level() const override { diff --git a/extensions/standard-processors/tests/integration/InvokeHTTPTests.cpp b/extensions/standard-processors/tests/integration/InvokeHTTPTests.cpp index de591b2ae..29e03ed83 100644 --- a/extensions/standard-processors/tests/integration/InvokeHTTPTests.cpp +++ b/extensions/standard-processors/tests/integration/InvokeHTTPTests.cpp @@ -410,8 +410,8 @@ TEST_CASE("InvokeHTTP: invalid characters are removed from outgoing HTTP headers test_attr_value_out = test_attr_value_in; }; - SingleProcessorTestController controller{std::make_unique<InvokeHTTP>("InvokeHTTP")}; - auto* const invoke_http = controller.getProcessor<InvokeHTTP>(); + SingleProcessorTestController controller{minifi::test::utils::make_processor<InvokeHTTP>("InvokeHTTP")}; + auto const invoke_http = controller.getProcessor<InvokeHTTP>(); const TestHTTPServer http_server; REQUIRE(invoke_http->setProperty(InvokeHTTP::Method.name, "POST")); REQUIRE(invoke_http->setProperty(InvokeHTTP::URL.name, TestHTTPServer::URL)); diff --git a/libminifi/src/core/ProcessContext.cpp b/libminifi/src/core/ProcessContext.cpp index dd9d55099..3e453d58c 100644 --- a/libminifi/src/core/ProcessContext.cpp +++ b/libminifi/src/core/ProcessContext.cpp @@ -41,36 +41,33 @@ class StandardProcessorInfo : public ProcessorInfo { ProcessContextImpl::ProcessContextImpl( Processor& processor, controller::ControllerServiceProvider* controller_service_provider, const std::shared_ptr<core::Repository>& repo, const std::shared_ptr<core::Repository>& flow_repo, const std::shared_ptr<core::ContentRepository>& content_repo) - : VariableRegistryImpl(Configure::create()), + : VariableRegistryImpl(static_cast<std::shared_ptr<Configure>>(minifi::Configure::create())), + logger_(logging::LoggerFactory<ProcessContext>::getLogger()), controller_service_provider_(controller_service_provider), + state_storage_(getStateStorage(logger_, controller_service_provider_, nullptr)), + repo_(repo), flow_repo_(flow_repo), content_repo_(content_repo), processor_(processor), - logger_(logging::LoggerFactory<ProcessContext>::getLogger()), configure_(minifi::Configure::create()), - initialized_(false) { - repo_ = repo; - state_storage_ = getStateStorage(logger_, controller_service_provider_, nullptr); - info_ = std::make_unique<StandardProcessorInfo>(processor); -} + info_(std::make_unique<StandardProcessorInfo>(processor)), + initialized_(false) {} ProcessContextImpl::ProcessContextImpl( Processor& processor, controller::ControllerServiceProvider* controller_service_provider, const std::shared_ptr<core::Repository>& repo, const std::shared_ptr<core::Repository>& flow_repo, const std::shared_ptr<minifi::Configure>& configuration, const std::shared_ptr<core::ContentRepository>& content_repo) : VariableRegistryImpl(configuration), + logger_(logging::LoggerFactory<ProcessContext>::getLogger()), controller_service_provider_(controller_service_provider), + state_storage_(getStateStorage(logger_, controller_service_provider_, configuration)), + repo_(repo), flow_repo_(flow_repo), content_repo_(content_repo), processor_(processor), - logger_(logging::LoggerFactory<ProcessContext>::getLogger()), - configure_(configuration), - initialized_(false) { - repo_ = repo; - state_storage_ = getStateStorage(logger_, controller_service_provider_, configuration); - if (!configure_) { configure_ = minifi::Configure::create(); } - info_ = std::make_unique<StandardProcessorInfo>(processor); -} + configure_(configuration ? gsl::make_not_null(configuration) : minifi::Configure::create()), + info_(std::make_unique<StandardProcessorInfo>(processor)), + initialized_(false) {} bool ProcessContextImpl::hasNonEmptyProperty(std::string_view name) const { auto val = getProcessor().getProperty(name);
