review changes

martinzink · martinzink · commit af940b4217fa · 2026-06-29T13:50:19.000+02:00
diff --git a/.github/workflows/create-release-artifacts.yml b/.github/workflows/create-release-artifacts.yml
@@ -96,7 +96,7 @@ jobs:
           
           cp behave_framework/dist/*.whl minifi-native-sdk/
           cp minifi-api/minifi-api.def minifi-native-sdk/
-          cp minifi-api/include/minifi-c/minifi-api.h minifi-native-sdk/
+          cp minifi-api/include/minifi-api.h minifi-native-sdk/
           
           zip -r minifi-native-sdk.zip minifi-native-sdk/
 
diff --git a/extension-framework/include/utils/ExtensionInitUtils.h b/extension-framework/include/utils/ExtensionInitUtils.h
@@ -21,7 +21,7 @@
 #include <string>
 #include <string_view>
 
-#include "minifi-c/minifi-api.h"
+#include "minifi-api.h"
 
 namespace org::apache::nifi::minifi::utils {
 
diff --git a/extensions/ExtensionInitializer.cpp b/extensions/ExtensionInitializer.cpp
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 #include "core/Resource.h"
-#include "minifi-c/minifi-api.h"
+#include "minifi-api.h"
 #include "minifi-cpp/agent/agent_version.h"
 #include "utils/ExtensionInitUtils.h"
 
diff --git a/extensions/aws/AwsLoader.cpp b/extensions/aws/AwsLoader.cpp
@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "aws/core/Aws.h"
-#include "minifi-c/minifi-api.h"
+#include "minifi-api.h"
 #include "minifi-cpp/agent/agent_version.h"
 #include "utils/AWSSdkLogger.h"
 #include "utils/ExtensionInitUtils.h"
diff --git a/extensions/python/pythonlibloader/PythonLibLoader.cpp b/extensions/python/pythonlibloader/PythonLibLoader.cpp
@@ -24,7 +24,7 @@
 
 #include "core/Resource.h"
 #include "core/logging/LoggerFactory.h"
-#include "minifi-c/minifi-api.h"
+#include "minifi-api.h"
 #include "minifi-cpp/agent/agent_version.h"
 #include "utils/ExtensionInitUtils.h"
 #include "utils/StringUtils.h"
diff --git a/extensions/python/pythonloader/PyProcLoader.cpp b/extensions/python/pythonloader/PyProcLoader.cpp
@@ -18,7 +18,7 @@
 #include "PythonBindings.h"
 #include "PythonCreator.h"
 #include "core/Resource.h"
-#include "minifi-c/minifi-api.h"
+#include "minifi-api.h"
 #include "minifi-cpp/agent/agent_version.h"
 #include "utils/ExtensionInitUtils.h"
 
diff --git a/extensions/sftp/SFTPLoader.cpp b/extensions/sftp/SFTPLoader.cpp
@@ -18,7 +18,7 @@
 
 #include "client/SFTPClient.h"
 #include "core/Resource.h"
-#include "minifi-c/minifi-api.h"
+#include "minifi-api.h"
 #include "minifi-cpp/agent/agent_version.h"
 #include "minifi-cpp/properties/Configure.h"
 #include "utils/ExtensionInitUtils.h"
diff --git a/extensions/standard-processors/tests/unit/ProcessorTests.cpp b/extensions/standard-processors/tests/unit/ProcessorTests.cpp
@@ -545,7 +545,8 @@ void testRPGBypass(const std::string &host, const std::string &port, bool has_er
   std::shared_ptr<core::Repository> test_repo = std::make_shared<TestRepository>();
   std::shared_ptr<TestRepository> repo = std::dynamic_pointer_cast<TestRepository>(test_repo);
 
-  auto rpg = minifi::test::utils::make_custom_processor<minifi::RemoteProcessGroupPort>("rpg", "http://localhost:8989/nifi", configuration, utils::IdGenerator::getIdGenerator()->generate());
+  auto rpg = minifi::test::utils::make_custom_processor<minifi::RemoteProcessGroupPort>("rpg", "http://localhost:8989/nifi", configuration, utils::IdGenerator::getIdGenerator()->generate(),
+      minifi::sitetosite::TransferDirection::SEND);
   rpg->initialize();
   REQUIRE(rpg->setProperty(minifi::RemoteProcessGroupPort::hostName.name, host));
   REQUIRE(rpg->setProperty(minifi::RemoteProcessGroupPort::port.name, port));
diff --git a/libminifi/include/RemoteProcessGroupPort.h b/libminifi/include/RemoteProcessGroupPort.h
@@ -49,10 +49,10 @@ struct RPG {
 
 class RemoteProcessGroupPort : public core::ProcessorImpl {
  public:
-  RemoteProcessGroupPort(std::string_view name, std::string url, std::shared_ptr<Configure> configure, const utils::Identifier &uuid, std::shared_ptr<core::logging::Logger> logger = nullptr)
+  RemoteProcessGroupPort(std::string_view name, std::string url, std::shared_ptr<Configure> configure, const utils::Identifier &uuid, sitetosite::TransferDirection direction, std::shared_ptr<core::logging::Logger> logger = nullptr)
       : core::ProcessorImpl({.uuid = uuid, .name = std::string{name}, .logger = logger ? logger : core::logging::LoggerFactory<RemoteProcessGroupPort>::getLogger(uuid)}),
         configure_(std::move(configure)),
-        direction_(sitetosite::TransferDirection::SEND),
+        direction_(direction),
         transmitting_(false),
         protocol_uuid_(uuid),
         client_type_(sitetosite::ClientType::RAW),
@@ -103,10 +103,6 @@ class RemoteProcessGroupPort : public core::ProcessorImpl {
   void onTrigger(core::ProcessContext& context, core::ProcessSession& session) override;
   void initialize() override;
 
-  void setDirection(sitetosite::TransferDirection direction) {
-    direction_ = direction;
-  }
-
   void setTimeout(std::chrono::milliseconds timeout) {
     timeout_ = timeout;
   }
@@ -183,7 +179,7 @@ class RemoteProcessGroupPort : public core::ProcessorImpl {
 
   moodycamel::ConcurrentQueue<std::unique_ptr<sitetosite::SiteToSiteClient>> available_protocols_;
   std::shared_ptr<Configure> configure_;
-  sitetosite::TransferDirection direction_;
+  const sitetosite::TransferDirection direction_;
   std::atomic<bool> transmitting_;
   std::optional<std::chrono::milliseconds> timeout_;
   std::string local_network_interface_;
diff --git a/libminifi/include/core/extension/Extension.h b/libminifi/include/core/extension/Extension.h
@@ -25,7 +25,7 @@
 #include <string>
 
 #include "ApiVersion.h"
-#include "minifi-c/minifi-api.h"
+#include "minifi-api.h"
 #include "minifi-cpp/core/logging/Logger.h"
 #include "minifi-cpp/properties/Configure.h"
 
diff --git a/libminifi/include/core/reporting/SiteToSiteProvenanceReportingTask.h b/libminifi/include/core/reporting/SiteToSiteProvenanceReportingTask.h
@@ -35,7 +35,7 @@ class SiteToSiteProvenanceReportingTask : public minifi::RemoteProcessGroupPort
  public:
   explicit SiteToSiteProvenanceReportingTask(std::shared_ptr<Configure> configure)
       : minifi::RemoteProcessGroupPort(ReportTaskName, "", std::move(configure),
-        utils::IdGenerator::getIdGenerator()->generate(), logging::LoggerFactory<SiteToSiteProvenanceReportingTask>::getLogger()) {
+        utils::IdGenerator::getIdGenerator()->generate(), sitetosite::TransferDirection::SEND, logging::LoggerFactory<SiteToSiteProvenanceReportingTask>::getLogger()) {
     batch_size_ = 100;
   }
 
diff --git a/libminifi/include/utils/CControllerService.h b/libminifi/include/utils/CControllerService.h
@@ -20,7 +20,7 @@
 #include <string>
 #include <vector>
 
-#include "minifi-c/minifi-api.h"
+#include "minifi-api.h"
 #include "minifi-cpp/Exception.h"
 #include "minifi-cpp/core/ControllerServiceMetadata.h"
 #include "minifi-cpp/core/Property.h"
diff --git a/libminifi/include/utils/CProcessor.h b/libminifi/include/utils/CProcessor.h
@@ -21,7 +21,7 @@
 #include <utility>
 
 #include "core/ProcessorMetrics.h"
-#include "minifi-c/minifi-api.h"
+#include "minifi-api.h"
 #include "minifi-cpp/agent/agent_docs.h"
 #include "minifi-cpp/core/Annotation.h"
 #include "minifi-cpp/core/ProcessContext.h"
diff --git a/libminifi/src/core/ProcessSession.cpp b/libminifi/src/core/ProcessSession.cpp
@@ -34,7 +34,7 @@
 #include "core/Processor.h"
 #include "io/StreamPipe.h"
 #include "io/StreamSlice.h"
-#include "minifi-c/minifi-api.h"
+#include "minifi-api.h"
 #include "minifi-cpp/utils/gsl.h"
 
 /* This implementation is only for native Windows systems.  */
diff --git a/libminifi/src/core/Processor.cpp b/libminifi/src/core/Processor.cpp
@@ -59,6 +59,7 @@ Processor::Processor(std::string_view name, std::unique_ptr<ProcessorApi> impl)
       run_duration_(DEFAULT_RUN_DURATION),
       yield_period_(DEFAULT_YIELD_PERIOD_SECONDS),
       active_tasks_(0),
+      trigger_when_empty_(false),
       logger_(logging::LoggerFactory<Processor>::getLogger(uuid_)),
       metrics_(gsl::make_not_null(std::make_shared<ProcessorMetrics>(*this))),
       impl_(std::move(impl)) {
@@ -78,6 +79,7 @@ Processor::Processor(std::string_view name, const utils::Identifier& uuid, std::
       run_duration_(DEFAULT_RUN_DURATION),
       yield_period_(DEFAULT_YIELD_PERIOD_SECONDS),
       active_tasks_(0),
+      trigger_when_empty_(false),
       logger_(logging::LoggerFactory<Processor>::getLogger(uuid_)),
       metrics_(gsl::make_not_null(std::make_shared<ProcessorMetrics>(*this))),
       impl_(std::move(impl)) {
diff --git a/libminifi/src/core/extension/ApiVersion.cpp b/libminifi/src/core/extension/ApiVersion.cpp
@@ -17,7 +17,7 @@
 
 #include "core/extension/ApiVersion.h"
 
-#include "minifi-c/minifi-api.h"
+#include "minifi-api.h"
 
 namespace org::apache::nifi::minifi::core::extension {
 
diff --git a/libminifi/src/core/extension/Extension.cpp b/libminifi/src/core/extension/Extension.cpp
@@ -36,7 +36,7 @@
 #include "core/ClassLoader.h"
 #include "core/extension/Extension.h"
 #include "core/logging/LoggerFactory.h"
-#include "minifi-c/minifi-api.h"
+#include "minifi-api.h"
 #include "minifi-cpp/agent/agent_docs.h"
 #include "utils/GeneralUtils.h"
 #include "utils/RegexUtils.h"
diff --git a/libminifi/src/core/flow/StructuredConfiguration.cpp b/libminifi/src/core/flow/StructuredConfiguration.cpp
@@ -739,10 +739,9 @@ void StructuredConfiguration::parseRPGPort(const Node& port_node, core::ProcessG
   uuid = portId;
 
   auto port_impl = std::make_unique<minifi::RemoteProcessGroupPort>(
-          nameStr, parent->getURL(), this->configuration_, uuid);
+          nameStr, parent->getURL(), this->configuration_, uuid, direction);
   auto* port = port_impl.get();
   auto port_wrapper = std::make_unique<core::Processor>(nameStr, uuid, std::move(port_impl));
-  port->setDirection(direction);
   port->setTimeout(std::chrono::milliseconds(parent->getTimeout()));
   port->setTransmitting(true);
   port_wrapper->setYieldPeriodMsec(parent->getYieldPeriodMsec());
diff --git a/libminifi/src/core/state/nodes/AgentInformation.cpp b/libminifi/src/core/state/nodes/AgentInformation.cpp
@@ -21,7 +21,7 @@
 #include "core/Resource.h"
 #include "core/state/nodes/SchedulingNodes.h"
 #include "core/state/nodes/SupportedOperations.h"
-#include "minifi-c/minifi-api.h"
+#include "minifi-api.h"
 #include "minifi-cpp/agent/agent_version.h"
 #include "minifi-cpp/controllers/AttributeProviderService.h"
 #include "minifi-cpp/controllers/ProxyConfigurationServiceInterface.h"
diff --git a/libminifi/src/minifi-api.cpp b/libminifi/src/minifi-api.cpp
@@ -22,7 +22,7 @@
 #include "core/Processor.h"
 #include "core/ProcessorMetrics.h"
 #include "core/extension/ExtensionManager.h"
-#include "minifi-c/minifi-api.h"
+#include "minifi-api.h"
 #include "minifi-cpp/controllers/ProxyConfigurationServiceInterface.h"
 #include "minifi-cpp/controllers/SSLContextServiceInterface.h"
 #include "minifi-cpp/core/Annotation.h"
diff --git a/libminifi/test/libtest/unit/ContentRepositoryDependentTests.h b/libminifi/test/libtest/unit/ContentRepositoryDependentTests.h
@@ -26,7 +26,7 @@
 #include "core/ProcessSession.h"
 #include "core/Processor.h"
 #include "io/StreamPipe.h"
-#include "minifi-c/minifi-api.h"
+#include "minifi-api.h"
 #include "unit/DummyProcessor.h"
 #include "unit/TestBase.h"
 
diff --git a/minifi-api/CMakeLists.txt b/minifi-api/CMakeLists.txt
@@ -9,7 +9,7 @@ target_link_libraries(minifi-api INTERFACE minifi-api-common)
 target_compile_definitions(minifi-api INTERFACE MINIFI_REGISTER_EXTENSION_FN=MinifiRegisterCppExtension_${BUILD_IDENTIFIER})
 
 add_library(minifi-c-api INTERFACE)
-target_include_directories(minifi-c-api INTERFACE include/minifi-c)
+target_include_directories(minifi-c-api INTERFACE include)
 if (APPLE)
   target_link_options(minifi-c-api INTERFACE -undefined dynamic_lookup)
 endif()
diff --git a/minifi-api/common/include/minifi-cpp/io/StreamCallback.h b/minifi-api/common/include/minifi-cpp/io/StreamCallback.h
@@ -20,7 +20,7 @@
 #include <functional>
 #include <memory>
 
-#include "../../minifi-api/include/minifi-c/minifi-api.h"
+#include "minifi-api.h"
 #include "Stream.h"
 #include "minifi-cpp/utils/gsl.h"
 #include "utils/expected.h"
diff --git a/minifi-api/include/minifi-api.h b/minifi-api/include/minifi-api.h
