This is an automated email from the ASF dual-hosted git repository. adebreceni pushed a commit to branch minifi-api in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit d6d47f96af210e61c3dde00243b33f1821e5c158 Author: Adam Debreceni <[email protected]> AuthorDate: Mon Dec 2 17:31:37 2024 +0100 Rebase fix --- extensions/couchbase/controllerservices/CouchbaseClusterService.h | 6 +++--- extensions/couchbase/processors/PutCouchbaseKey.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/couchbase/controllerservices/CouchbaseClusterService.h b/extensions/couchbase/controllerservices/CouchbaseClusterService.h index 1c7a98fb6..ba2064004 100644 --- a/extensions/couchbase/controllerservices/CouchbaseClusterService.h +++ b/extensions/couchbase/controllerservices/CouchbaseClusterService.h @@ -101,14 +101,14 @@ class CouchbaseClient { namespace controllers { -class CouchbaseClusterService : public core::controller::ControllerService { +class CouchbaseClusterService : public core::controller::ControllerServiceImpl { public: explicit CouchbaseClusterService(std::string_view name, const minifi::utils::Identifier &uuid = {}) - : ControllerService(name, uuid) { + : ControllerServiceImpl(name, uuid) { } explicit CouchbaseClusterService(std::string_view name, const std::shared_ptr<Configure>& /*configuration*/) - : ControllerService(name) { + : ControllerServiceImpl(name) { } EXTENSIONAPI static constexpr const char* Description = "Provides a centralized Couchbase connection and bucket passwords management. Bucket passwords can be specified via dynamic properties."; diff --git a/extensions/couchbase/processors/PutCouchbaseKey.h b/extensions/couchbase/processors/PutCouchbaseKey.h index 1991488ed..a1e3601af 100644 --- a/extensions/couchbase/processors/PutCouchbaseKey.h +++ b/extensions/couchbase/processors/PutCouchbaseKey.h @@ -24,7 +24,7 @@ #include "core/AbstractProcessor.h" #include "core/ProcessSession.h" #include "utils/Enum.h" -#include "core/logging/LoggerConfiguration.h" +#include "core/logging/LoggerFactory.h" #include "CouchbaseClusterService.h" #include "couchbase/persist_to.hxx" #include "couchbase/replicate_to.hxx"
