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 ef24e52365f8bda08028ead42953d3e473e76c12 Author: Adam Debreceni <[email protected]> AuthorDate: Mon Dec 2 12:49:04 2024 +0100 Rebase --- extensions/kafka/ConsumeKafka.h | 2 +- extensions/kafka/KafkaProcessorBase.h | 4 ++-- extensions/kafka/PublishKafka.h | 2 +- utils/include/utils/SmallString.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extensions/kafka/ConsumeKafka.h b/extensions/kafka/ConsumeKafka.h index 616c4eb95..79a99e0de 100644 --- a/extensions/kafka/ConsumeKafka.h +++ b/extensions/kafka/ConsumeKafka.h @@ -29,7 +29,7 @@ #include "core/PropertyDefinitionBuilder.h" #include "core/PropertyType.h" #include "core/RelationshipDefinition.h" -#include "core/logging/LoggerConfiguration.h" +#include "core/logging/LoggerFactory.h" #include "io/StreamPipe.h" #include "rdkafka.h" #include "rdkafka_utils.h" diff --git a/extensions/kafka/KafkaProcessorBase.h b/extensions/kafka/KafkaProcessorBase.h index 87f0fc78c..fa0c05a33 100644 --- a/extensions/kafka/KafkaProcessorBase.h +++ b/extensions/kafka/KafkaProcessorBase.h @@ -35,7 +35,7 @@ enum class SecurityProtocolOption { plaintext, ssl, sasl_plaintext, sasl_ssl }; enum class SASLMechanismOption { GSSAPI, PLAIN }; } // namespace kafka -class KafkaProcessorBase : public core::Processor { +class KafkaProcessorBase : public core::ProcessorImpl { public: EXTENSIONAPI static constexpr auto SSLContextService = core::PropertyDefinitionBuilder<>::createProperty("SSL Context Service") @@ -90,7 +90,7 @@ class KafkaProcessorBase : public core::Processor { KafkaProcessorBase( const std::string_view name, const utils::Identifier& uuid, std::shared_ptr<core::logging::Logger> logger) - : core::Processor(name, uuid), + : core::ProcessorImpl(name, uuid), logger_(std::move(logger)) {} KafkaProcessorBase(const KafkaProcessorBase&) = delete; diff --git a/extensions/kafka/PublishKafka.h b/extensions/kafka/PublishKafka.h index 1fd5e3408..5ddf035b2 100644 --- a/extensions/kafka/PublishKafka.h +++ b/extensions/kafka/PublishKafka.h @@ -38,7 +38,7 @@ #include "core/PropertyType.h" #include "core/RelationshipDefinition.h" #include "core/logging/Logger.h" -#include "core/logging/LoggerConfiguration.h" +#include "core/logging/LoggerFactory.h" #include "rdkafka.h" #include "utils/ArrayUtils.h" #include "utils/RegexUtils.h" diff --git a/utils/include/utils/SmallString.h b/utils/include/utils/SmallString.h index c2d12c6bf..6020d9c5c 100644 --- a/utils/include/utils/SmallString.h +++ b/utils/include/utils/SmallString.h @@ -33,7 +33,7 @@ struct fmt::formatter<org::apache::nifi::minifi::utils::SmallString<N>> { } template <typename FormatContext> - auto format(const org::apache::nifi::minifi::utils::SmallString<N>& small_string, FormatContext& ctx) { + auto format(const org::apache::nifi::minifi::utils::SmallString<N>& small_string, FormatContext& ctx) const { return string_view_formatter.format(small_string.view(), ctx); } };
