One click build fix

apache · Oct 2, 2024 · 146b6c9 · 146b6c9
1 parent 896d79d
commit 146b6c9
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 34 deletions.
diff --git a/libminifi/include/c2/C2Agent.h b/libminifi/include/c2/C2Agent.h
@@ -29,8 +29,8 @@
 #include <utility>
 #include <vector>
 
-#include "../core/state/nodes/MetricsBase.h"
-#include "../core/state/Value.h"
+#include "core/state/nodes/MetricsBase.h"
+#include "core/state/Value.h"
 #include "core/state/UpdateController.h"
 #include "controllers/UpdatePolicyControllerService.h"
 #include "C2Payload.h"

diff --git a/libminifi/include/c2/C2Payload.h b/libminifi/include/c2/C2Payload.h
@@ -24,7 +24,7 @@
 #include <map>
 #include <limits>
 
-#include "../core/state/Value.h"
+#include "core/state/Value.h"
 #include "core/state/UpdateController.h"
 #include "utils/Enum.h"
 #include "utils/gsl.h"

diff --git a/libminifi/include/core/state/Value.h b/libminifi/include/core/state/Value.h
diff --git a/libminifi/include/core/state/nodes/MetricsBase.h b/libminifi/include/core/state/nodes/MetricsBase.h
@@ -24,7 +24,7 @@
 #include <optional>
 #include <unordered_map>
 
-#include "../Value.h"
+#include "core/state/Value.h"
 #include "core/state/PublishedMetricProvider.h"
 #include "core/Core.h"
 #include "core/Connectable.h"

diff --git a/libminifi/test/unit/ResponseNodeValueTests.cpp b/libminifi/test/unit/ResponseNodeValueTests.cpp
@@ -17,7 +17,7 @@
  */
 #include <memory>
 
-#include "../../include/core/state/Value.h"
+#include "core/state/Value.h"
 #include "unit/TestBase.h"
 #include "unit/Catch.h"
 

diff --git a/utils/include/core/Processor.h b/utils/include/core/Processor.h
@@ -44,6 +44,8 @@
 #include "utils/gsl.h"
 #include "minifi-cpp/core/OutputAttributeDefinition.h"
 #include "minifi-cpp/core/Processor.h"
+#include "core/Property.h"
+#include "core/ProcessContext.h"
 
 #define ADD_GET_PROCESSOR_NAME \
   std::string getProcessorType() const override { \
@@ -65,7 +67,6 @@ class Connection;
 
 namespace core {
 
-class ProcessContext;
 class ProcessSession;
 class ProcessSessionFactory;
 

diff --git a/utils/include/core/state/Value.h b/utils/include/core/state/Value.h
@@ -504,4 +504,8 @@ ValueNode& ValueNode::operator=(const T ref) {
   return *this;
 }
 
+inline std::string to_string(const SerializedResponseNode& node) { return node.to_string(); }
+
+std::string hashResponseNodes(const std::vector<SerializedResponseNode>& nodes);
+
 }  // namespace org::apache::nifi::minifi::state::response
diff --git a/utils/src/core/ConfigurableComponent.cpp b/utils/src/core/ConfigurableComponent.cpp
@@ -21,6 +21,7 @@
 #include <map>
 #include <vector>
 
+#include "core/PropertyValue.h"
 #include "core/ConfigurableComponent.h"
 #include "core/logging/LoggerFactory.h"
 #include "range/v3/range/conversion.hpp"