Rebase fix

apache · Feb 19, 2025 · 2228878 · 2228878
1 parent 54aed3f
commit 2228878
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 69 deletions.
diff --git a/libminifi/include/core/ParameterProvider.h b/libminifi/include/core/ParameterProvider.h
@@ -50,9 +50,9 @@ struct ParameterProviderConfig {
   }
 };
 
-class ParameterProvider : public ConfigurableComponent, public CoreComponent {
+class ParameterProvider : public ConfigurableComponentImpl, public CoreComponentImpl {
  public:
-  using CoreComponent::CoreComponent;
+  using CoreComponentImpl::CoreComponentImpl;
   ParameterProvider(const ParameterProvider &other) = delete;
   ParameterProvider &operator=(const ParameterProvider &other) = delete;
 

diff --git a/libminifi/include/parameter-providers/EnvironmentVariableParameterProvider.h b/libminifi/include/parameter-providers/EnvironmentVariableParameterProvider.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include "core/ParameterProvider.h"
-#include "core/logging/LoggerConfiguration.h"
+#include "core/logging/LoggerFactory.h"
 
 namespace org::apache::nifi::minifi::parameter_providers {
 

diff --git a/minifi-api/include/minifi-cpp/core/ParameterContext.h b/minifi-api/include/minifi-cpp/core/ParameterContext.h