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 75cdd49668013d5864cdbe1edffb3d8ca29e2577 Author: Adam Debreceni <[email protected]> AuthorDate: Mon Aug 11 16:23:26 2025 +0200 Fix rebase --- extension-utils/include/controllers/SSLContextService.h | 0 extensions/opc/tests/FetchOpcProcessorTests.cpp | 9 +++++---- extensions/standard-processors/processors/PutTCP.h | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extension-utils/include/controllers/SSLContextService.h b/extension-utils/include/controllers/SSLContextService.h deleted file mode 100644 index e69de29bb..000000000 diff --git a/extensions/opc/tests/FetchOpcProcessorTests.cpp b/extensions/opc/tests/FetchOpcProcessorTests.cpp index 52b7b7533..09da30ae0 100644 --- a/extensions/opc/tests/FetchOpcProcessorTests.cpp +++ b/extensions/opc/tests/FetchOpcProcessorTests.cpp @@ -20,6 +20,7 @@ #include "OpcUaTestServer.h" #include "unit/SingleProcessorTestController.h" #include "include/fetchopc.h" +#include "unit/TestUtils.h" namespace org::apache::nifi::minifi::test { @@ -182,7 +183,7 @@ TEST_CASE("Test trusted certs path must be valid", "[fetchopcprocessor]") { TEST_CASE("Test no fetch result using lazy mode when no timestamps are changed", "[fetchopcprocessor]") { OpcUaTestServer server(4841); server.start(); - SingleProcessorTestController controller{std::make_unique<processors::FetchOPCProcessor>("FetchOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::FetchOPCProcessor>("FetchOPCProcessor")}; LogTestController::getInstance().setDebug<processors::FetchOPCProcessor>(); auto fetch_opc_processor = controller.getProcessor(); REQUIRE(fetch_opc_processor->setProperty(processors::FetchOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4841/")); @@ -204,7 +205,7 @@ TEST_CASE("Test no fetch result using lazy mode when no timestamps are changed", TEST_CASE("Test fetch for nodes with changed timestamps with lazy mode", "[fetchopcprocessor]") { OpcUaTestServer server(4841); server.start(); - SingleProcessorTestController controller{std::make_unique<processors::FetchOPCProcessor>("FetchOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::FetchOPCProcessor>("FetchOPCProcessor")}; LogTestController::getInstance().setDebug<processors::FetchOPCProcessor>(); auto fetch_opc_processor = controller.getProcessor(); REQUIRE(fetch_opc_processor->setProperty(processors::FetchOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4841/")); @@ -228,7 +229,7 @@ TEST_CASE("Test fetch for nodes with changed timestamps with lazy mode", "[fetch TEST_CASE("Test no fetch result using lazy new value mode when no values are changed", "[fetchopcprocessor]") { OpcUaTestServer server(4841); server.start(); - SingleProcessorTestController controller{std::make_unique<processors::FetchOPCProcessor>("FetchOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::FetchOPCProcessor>("FetchOPCProcessor")}; LogTestController::getInstance().setDebug<processors::FetchOPCProcessor>(); auto fetch_opc_processor = controller.getProcessor(); REQUIRE(fetch_opc_processor->setProperty(processors::FetchOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4841/")); @@ -251,7 +252,7 @@ TEST_CASE("Test no fetch result using lazy new value mode when no values are cha TEST_CASE("Test fetching new values using lazy new value mode", "[fetchopcprocessor]") { OpcUaTestServer server(4841); server.start(); - SingleProcessorTestController controller{std::make_unique<processors::FetchOPCProcessor>("FetchOPCProcessor")}; + SingleProcessorTestController controller{minifi::test::utils::make_processor<processors::FetchOPCProcessor>("FetchOPCProcessor")}; LogTestController::getInstance().setDebug<processors::FetchOPCProcessor>(); auto fetch_opc_processor = controller.getProcessor(); REQUIRE(fetch_opc_processor->setProperty(processors::FetchOPCProcessor::OPCServerEndPoint.name, "opc.tcp://127.0.0.1:4841/")); diff --git a/extensions/standard-processors/processors/PutTCP.h b/extensions/standard-processors/processors/PutTCP.h index f95ec64c3..abad519d2 100644 --- a/extensions/standard-processors/processors/PutTCP.h +++ b/extensions/standard-processors/processors/PutTCP.h @@ -32,7 +32,6 @@ #include "asio/ssl/context.hpp" #include "controllers/SSLContextServiceInterface.h" #include "core/Core.h" -#include "core/Processor.h" #include "core/PropertyDefinition.h" #include "core/PropertyDefinitionBuilder.h" #include "core/RelationshipDefinition.h"
