This is an automated email from the ASF dual-hosted git repository. fgerlits pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 49dec5430bdd0bb548247f9902643a68b0aa32a9 Author: Martin Zink <[email protected]> AuthorDate: Wed Aug 30 11:04:15 2023 +0200 MINIFICPP-2206 use string_view in the ctors of Connectable's children Signed-off-by: Ferenc Gerlits <[email protected]> This closes #1646 --- .../aws/controllerservices/AWSCredentialsService.h | 8 +-- extensions/aws/processors/DeleteS3Object.h | 4 +- extensions/aws/processors/FetchS3Object.h | 4 +- extensions/aws/processors/ListS3.h | 4 +- extensions/aws/processors/PutS3Object.h | 4 +- extensions/aws/processors/S3Processor.cpp | 8 +-- extensions/aws/processors/S3Processor.h | 4 +- .../AzureStorageCredentialsService.h | 8 +-- .../processors/AzureBlobStorageProcessorBase.h | 4 +- .../AzureBlobStorageSingleBlobProcessorBase.h | 4 +- .../AzureDataLakeStorageFileProcessorBase.h | 8 +-- .../processors/AzureDataLakeStorageProcessorBase.h | 8 +-- .../azure/processors/AzureStorageProcessorBase.h | 4 +- .../azure/processors/DeleteAzureBlobStorage.h | 8 +-- .../azure/processors/DeleteAzureDataLakeStorage.h | 8 +-- .../azure/processors/FetchAzureBlobStorage.h | 8 +-- .../azure/processors/FetchAzureDataLakeStorage.h | 8 +-- extensions/azure/processors/ListAzureBlobStorage.h | 8 +-- .../azure/processors/ListAzureDataLakeStorage.h | 8 +-- extensions/azure/processors/PutAzureBlobStorage.h | 8 +-- .../azure/processors/PutAzureDataLakeStorage.h | 8 +-- extensions/civetweb/processors/ListenHTTP.h | 4 +- extensions/civetweb/protocols/RESTReceiver.cpp | 4 +- extensions/civetweb/protocols/RESTReceiver.h | 2 +- .../ExpressionContextBuilder.cpp | 8 +-- .../expression-language/ExpressionContextBuilder.h | 4 +- extensions/gcp/processors/DeleteGCSObject.h | 4 +- extensions/gcp/processors/FetchGCSObject.h | 4 +- extensions/gcp/processors/GCSProcessor.h | 4 +- extensions/gcp/processors/ListGCSBucket.h | 4 +- extensions/gcp/processors/PutGCSObject.h | 4 +- extensions/http-curl/processors/InvokeHTTP.h | 4 +- extensions/http-curl/protocols/RESTSender.cpp | 4 +- extensions/http-curl/protocols/RESTSender.h | 2 +- extensions/libarchive/CompressContent.h | 4 +- extensions/libarchive/FocusArchiveEntry.h | 4 +- extensions/libarchive/ManipulateArchive.h | 4 +- extensions/libarchive/UnfocusArchiveEntry.h | 4 +- extensions/librdkafka/ConsumeKafka.h | 4 +- extensions/librdkafka/KafkaProcessorBase.h | 4 +- extensions/librdkafka/PublishKafka.h | 4 +- extensions/lua/LuaScriptExecutor.cpp | 2 +- extensions/lua/LuaScriptExecutor.h | 2 +- extensions/mqtt/processors/AbstractMQTTProcessor.h | 4 +- extensions/mqtt/processors/ConsumeMQTT.h | 4 +- extensions/mqtt/processors/PublishMQTT.h | 4 +- extensions/opc/include/fetchopc.h | 4 +- extensions/opc/include/opcbase.h | 4 +- extensions/opc/include/putopc.h | 4 +- extensions/python/ExecutePythonProcessor.h | 4 +- extensions/python/PythonScriptExecutor.cpp | 2 +- extensions/python/PythonScriptExecutor.h | 2 +- extensions/rocksdb-repos/ProvenanceRepository.h | 4 +- extensions/script/ExecuteScript.h | 4 +- extensions/script/ScriptExecutor.h | 2 +- extensions/splunk/PutSplunkHTTP.h | 4 +- extensions/splunk/QuerySplunkIndexingStatus.h | 4 +- extensions/splunk/SplunkHECProcessor.h | 4 +- extensions/sql/processors/ExecuteSQL.cpp | 4 +- extensions/sql/processors/ExecuteSQL.h | 2 +- extensions/sql/processors/PutSQL.cpp | 4 +- extensions/sql/processors/PutSQL.h | 2 +- extensions/sql/processors/QueryDatabaseTable.cpp | 4 +- extensions/sql/processors/QueryDatabaseTable.h | 2 +- extensions/sql/processors/SQLProcessor.h | 4 +- extensions/sql/services/DatabaseService.h | 8 +-- extensions/sql/services/ODBCConnector.h | 4 +- .../processors/AppendHostInfo.h | 4 +- .../processors/AttributesToJSON.h | 4 +- .../processors/DefragmentText.h | 4 +- .../processors/ExecuteProcess.h | 4 +- .../standard-processors/processors/ExtractText.h | 4 +- .../standard-processors/processors/FetchFile.h | 4 +- .../processors/GenerateFlowFile.h | 4 +- .../standard-processors/processors/GetFile.h | 4 +- extensions/standard-processors/processors/GetTCP.h | 4 +- .../standard-processors/processors/HashContent.h | 4 +- .../standard-processors/processors/ListFile.h | 4 +- .../standard-processors/processors/ListenSyslog.h | 4 +- .../standard-processors/processors/ListenTCP.h | 4 +- .../standard-processors/processors/LogAttribute.h | 4 +- .../processors/NetworkListenerProcessor.h | 4 +- .../standard-processors/processors/PutFile.h | 4 +- .../standard-processors/processors/PutUDP.cpp | 4 +- extensions/standard-processors/processors/PutUDP.h | 2 +- .../standard-processors/processors/ReplaceText.cpp | 4 +- .../standard-processors/processors/ReplaceText.h | 2 +- .../standard-processors/processors/RetryFlowFile.h | 4 +- .../processors/RouteOnAttribute.h | 4 +- .../standard-processors/processors/RouteText.cpp | 4 +- .../standard-processors/processors/RouteText.h | 2 +- .../standard-processors/processors/TailFile.h | 4 +- .../processors/UpdateAttribute.h | 4 +- .../tests/unit/DefragmentTextTests.cpp | 4 +- extensions/test-processors/KamikazeProcessor.h | 4 +- .../test-processors/LogOnDestructionProcessor.h | 4 +- libminifi/include/Connection.h | 10 ++-- libminifi/include/ForwardingNode.h | 4 +- libminifi/include/Funnel.h | 4 +- libminifi/include/Port.h | 4 +- libminifi/include/RemoteProcessorGroupPort.h | 4 +- libminifi/include/c2/C2Protocol.h | 4 +- libminifi/include/c2/C2Trigger.h | 4 +- libminifi/include/c2/HeartbeatLogger.h | 2 +- libminifi/include/c2/HeartbeatReporter.h | 4 +- .../controllers/LinuxPowerManagementService.h | 8 +-- .../controllers/NetworkPrioritizerService.h | 8 +-- libminifi/include/controllers/SSLContextService.h | 8 +-- .../include/controllers/ThreadManagementService.h | 8 +-- .../controllers/UpdatePolicyControllerService.h | 8 +-- libminifi/include/core/ProcessContextBuilder.h | 4 +- libminifi/include/core/ProcessGroup.h | 8 +-- .../include/core/controller/ControllerService.h | 8 +-- .../include/core/state/nodes/AgentInformation.h | 60 +++++++++++----------- .../include/core/state/nodes/BuildInformation.h | 8 +-- .../include/core/state/nodes/DeviceInformation.h | 8 +-- .../include/core/state/nodes/FlowInformation.h | 16 +++--- libminifi/include/core/state/nodes/MetricsBase.h | 16 +++--- .../include/core/state/nodes/RepositoryMetrics.h | 8 +-- .../include/core/state/nodes/SchedulingNodes.h | 8 +-- libminifi/include/core/state/nodes/StateMonitor.h | 8 +-- .../include/core/state/nodes/SupportedOperations.h | 4 +- libminifi/src/Connection.cpp | 20 ++++---- libminifi/src/c2/HeartbeatLogger.cpp | 4 +- libminifi/src/core/ProcessContextBuilder.cpp | 8 +-- libminifi/src/core/ProcessGroup.cpp | 16 +++--- .../src/core/state/nodes/SupportedOperations.cpp | 8 +-- libminifi/test/DummyProcessor.h | 4 +- libminifi/test/ReadFromFlowFileTestProcessor.h | 4 +- libminifi/test/WriteToFlowFileTestProcessor.h | 4 +- libminifi/test/flow-tests/CustomProcessors.h | 4 +- libminifi/test/sql-tests/mocks/MockODBCService.h | 8 +-- libminifi/test/unit/MockClasses.h | 16 +++--- 133 files changed, 375 insertions(+), 375 deletions(-) diff --git a/extensions/aws/controllerservices/AWSCredentialsService.h b/extensions/aws/controllerservices/AWSCredentialsService.h index 8e5859a3b..46049572f 100644 --- a/extensions/aws/controllerservices/AWSCredentialsService.h +++ b/extensions/aws/controllerservices/AWSCredentialsService.h @@ -39,12 +39,12 @@ namespace org::apache::nifi::minifi::aws::controllers { class AWSCredentialsService : public core::controller::ControllerService { public: - explicit AWSCredentialsService(std::string name, const minifi::utils::Identifier &uuid = {}) - : ControllerService(std::move(name), uuid) { + explicit AWSCredentialsService(std::string_view name, const minifi::utils::Identifier &uuid = {}) + : ControllerService(name, uuid) { } - explicit AWSCredentialsService(std::string name, const std::shared_ptr<Configure>& /*configuration*/) - : ControllerService(std::move(name)) { + explicit AWSCredentialsService(std::string_view name, const std::shared_ptr<Configure>& /*configuration*/) + : ControllerService(name) { } EXTENSIONAPI static constexpr const char* Description = "AWS Credentials Management Service"; diff --git a/extensions/aws/processors/DeleteS3Object.h b/extensions/aws/processors/DeleteS3Object.h index 876a2d1a6..8e41565a2 100644 --- a/extensions/aws/processors/DeleteS3Object.h +++ b/extensions/aws/processors/DeleteS3Object.h @@ -76,8 +76,8 @@ class DeleteS3Object : public S3Processor { private: friend class ::S3TestsFixture<DeleteS3Object>; - explicit DeleteS3Object(std::string name, const minifi::utils::Identifier& uuid, std::unique_ptr<aws::s3::S3RequestSender> s3_request_sender) - : S3Processor(std::move(name), uuid, core::logging::LoggerFactory<DeleteS3Object>::getLogger(uuid), std::move(s3_request_sender)) { + explicit DeleteS3Object(std::string_view name, const minifi::utils::Identifier& uuid, std::unique_ptr<aws::s3::S3RequestSender> s3_request_sender) + : S3Processor(name, uuid, core::logging::LoggerFactory<DeleteS3Object>::getLogger(uuid), std::move(s3_request_sender)) { } std::optional<aws::s3::DeleteObjectRequestParameters> buildDeleteS3RequestParams( diff --git a/extensions/aws/processors/FetchS3Object.h b/extensions/aws/processors/FetchS3Object.h index d9b6447aa..c1ebe4a3f 100644 --- a/extensions/aws/processors/FetchS3Object.h +++ b/extensions/aws/processors/FetchS3Object.h @@ -74,8 +74,8 @@ class FetchS3Object : public S3Processor { ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit FetchS3Object(std::string name, const minifi::utils::Identifier& uuid = minifi::utils::Identifier()) - : S3Processor(std::move(name), uuid, core::logging::LoggerFactory<FetchS3Object>::getLogger(uuid)) { + explicit FetchS3Object(std::string_view name, const minifi::utils::Identifier& uuid = minifi::utils::Identifier()) + : S3Processor(name, uuid, core::logging::LoggerFactory<FetchS3Object>::getLogger(uuid)) { } ~FetchS3Object() override = default; diff --git a/extensions/aws/processors/ListS3.h b/extensions/aws/processors/ListS3.h index d7216a0cd..70bdaacd9 100644 --- a/extensions/aws/processors/ListS3.h +++ b/extensions/aws/processors/ListS3.h @@ -94,8 +94,8 @@ class ListS3 : public S3Processor { ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit ListS3(std::string name, const minifi::utils::Identifier& uuid = minifi::utils::Identifier()) - : S3Processor(std::move(name), uuid, core::logging::LoggerFactory<ListS3>::getLogger(uuid)) { + explicit ListS3(std::string_view name, const minifi::utils::Identifier& uuid = minifi::utils::Identifier()) + : S3Processor(name, uuid, core::logging::LoggerFactory<ListS3>::getLogger(uuid)) { } explicit ListS3(const std::string& name, minifi::utils::Identifier uuid, std::unique_ptr<aws::s3::S3RequestSender> s3_request_sender) : S3Processor(name, uuid, core::logging::LoggerFactory<ListS3>::getLogger(uuid), std::move(s3_request_sender)) { diff --git a/extensions/aws/processors/PutS3Object.h b/extensions/aws/processors/PutS3Object.h index a67fdeccc..10dc3f604 100644 --- a/extensions/aws/processors/PutS3Object.h +++ b/extensions/aws/processors/PutS3Object.h @@ -167,8 +167,8 @@ class PutS3Object : public S3Processor { ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit PutS3Object(std::string name, const minifi::utils::Identifier& uuid = minifi::utils::Identifier()) - : S3Processor(std::move(name), uuid, core::logging::LoggerFactory<PutS3Object>::getLogger(uuid)) { + explicit PutS3Object(std::string_view name, const minifi::utils::Identifier& uuid = minifi::utils::Identifier()) + : S3Processor(name, uuid, core::logging::LoggerFactory<PutS3Object>::getLogger(uuid)) { } ~PutS3Object() override = default; diff --git a/extensions/aws/processors/S3Processor.cpp b/extensions/aws/processors/S3Processor.cpp index 0d6e983e5..960b4de17 100644 --- a/extensions/aws/processors/S3Processor.cpp +++ b/extensions/aws/processors/S3Processor.cpp @@ -31,13 +31,13 @@ namespace org::apache::nifi::minifi::aws::processors { -S3Processor::S3Processor(std::string name, const minifi::utils::Identifier& uuid, std::shared_ptr<core::logging::Logger> logger) - : core::Processor(std::move(name), uuid), +S3Processor::S3Processor(std::string_view name, const minifi::utils::Identifier& uuid, std::shared_ptr<core::logging::Logger> logger) + : core::Processor(name, uuid), logger_(std::move(logger)) { } -S3Processor::S3Processor(std::string name, const minifi::utils::Identifier& uuid, std::shared_ptr<core::logging::Logger> logger, std::unique_ptr<aws::s3::S3RequestSender> s3_request_sender) - : core::Processor(std::move(name), uuid), +S3Processor::S3Processor(std::string_view name, const minifi::utils::Identifier& uuid, std::shared_ptr<core::logging::Logger> logger, std::unique_ptr<aws::s3::S3RequestSender> s3_request_sender) + : core::Processor(name, uuid), logger_(std::move(logger)), s3_wrapper_(std::move(s3_request_sender)) { } diff --git a/extensions/aws/processors/S3Processor.h b/extensions/aws/processors/S3Processor.h index 6b78e8be6..86cd84fea 100644 --- a/extensions/aws/processors/S3Processor.h +++ b/extensions/aws/processors/S3Processor.h @@ -167,12 +167,12 @@ class S3Processor : public core::Processor { }; - explicit S3Processor(std::string name, const minifi::utils::Identifier& uuid, std::shared_ptr<core::logging::Logger> logger); + explicit S3Processor(std::string_view name, const minifi::utils::Identifier& uuid, std::shared_ptr<core::logging::Logger> logger); void onSchedule(const std::shared_ptr<core::ProcessContext> &context, const std::shared_ptr<core::ProcessSessionFactory> &sessionFactory) override; protected: - explicit S3Processor(std::string name, const minifi::utils::Identifier& uuid, std::shared_ptr<core::logging::Logger> logger, std::unique_ptr<aws::s3::S3RequestSender> s3_request_sender); + explicit S3Processor(std::string_view name, const minifi::utils::Identifier& uuid, std::shared_ptr<core::logging::Logger> logger, std::unique_ptr<aws::s3::S3RequestSender> s3_request_sender); std::optional<Aws::Auth::AWSCredentials> getAWSCredentialsFromControllerService(const std::shared_ptr<core::ProcessContext> &context) const; std::optional<Aws::Auth::AWSCredentials> getAWSCredentials(const std::shared_ptr<core::ProcessContext> &context, const std::shared_ptr<core::FlowFile> &flow_file); diff --git a/extensions/azure/controllerservices/AzureStorageCredentialsService.h b/extensions/azure/controllerservices/AzureStorageCredentialsService.h index 2fcdae69d..968be0aa9 100644 --- a/extensions/azure/controllerservices/AzureStorageCredentialsService.h +++ b/extensions/azure/controllerservices/AzureStorageCredentialsService.h @@ -72,12 +72,12 @@ class AzureStorageCredentialsService : public core::controller::ControllerServic EXTENSIONAPI static constexpr bool SupportsDynamicProperties = false; ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_CONTROLLER_SERVICES - explicit AzureStorageCredentialsService(std::string name, const minifi::utils::Identifier& uuid = {}) - : ControllerService(std::move(name), uuid) { + explicit AzureStorageCredentialsService(std::string_view name, const minifi::utils::Identifier& uuid = {}) + : ControllerService(name, uuid) { } - explicit AzureStorageCredentialsService(std::string name, const std::shared_ptr<Configure>& /*configuration*/) - : ControllerService(std::move(name)) { + explicit AzureStorageCredentialsService(std::string_view name, const std::shared_ptr<Configure>& /*configuration*/) + : ControllerService(name) { } void initialize() override; diff --git a/extensions/azure/processors/AzureBlobStorageProcessorBase.h b/extensions/azure/processors/AzureBlobStorageProcessorBase.h index 33095020c..5b6f655fc 100644 --- a/extensions/azure/processors/AzureBlobStorageProcessorBase.h +++ b/extensions/azure/processors/AzureBlobStorageProcessorBase.h @@ -85,11 +85,11 @@ class AzureBlobStorageProcessorBase : public AzureStorageProcessorBase { protected: explicit AzureBlobStorageProcessorBase( - std::string name, + std::string_view name, const minifi::utils::Identifier& uuid, const std::shared_ptr<core::logging::Logger>& logger, std::unique_ptr<storage::BlobStorageClient> blob_storage_client) - : AzureStorageProcessorBase(std::move(name), uuid, logger), + : AzureStorageProcessorBase(name, uuid, logger), azure_blob_storage_(std::move(blob_storage_client)) { } diff --git a/extensions/azure/processors/AzureBlobStorageSingleBlobProcessorBase.h b/extensions/azure/processors/AzureBlobStorageSingleBlobProcessorBase.h index e7f86012a..1d2f16e19 100644 --- a/extensions/azure/processors/AzureBlobStorageSingleBlobProcessorBase.h +++ b/extensions/azure/processors/AzureBlobStorageSingleBlobProcessorBase.h @@ -41,11 +41,11 @@ class AzureBlobStorageSingleBlobProcessorBase : public AzureBlobStorageProcessor protected: explicit AzureBlobStorageSingleBlobProcessorBase( - std::string name, + std::string_view name, const minifi::utils::Identifier& uuid, const std::shared_ptr<core::logging::Logger>& logger, std::unique_ptr<storage::BlobStorageClient> blob_storage_client) - : AzureBlobStorageProcessorBase(std::move(name), uuid, logger, std::move(blob_storage_client)) { + : AzureBlobStorageProcessorBase(name, uuid, logger, std::move(blob_storage_client)) { } bool setBlobOperationParameters( diff --git a/extensions/azure/processors/AzureDataLakeStorageFileProcessorBase.h b/extensions/azure/processors/AzureDataLakeStorageFileProcessorBase.h index f3be468f5..838cd2375 100644 --- a/extensions/azure/processors/AzureDataLakeStorageFileProcessorBase.h +++ b/extensions/azure/processors/AzureDataLakeStorageFileProcessorBase.h @@ -36,16 +36,16 @@ class AzureDataLakeStorageFileProcessorBase : public AzureDataLakeStorageProcess .build(); EXTENSIONAPI static constexpr auto Properties = utils::array_cat(AzureDataLakeStorageProcessorBase::Properties, std::array<core::PropertyReference, 1>{FileName}); - explicit AzureDataLakeStorageFileProcessorBase(std::string name, const minifi::utils::Identifier& uuid, const std::shared_ptr<core::logging::Logger> &logger) - : AzureDataLakeStorageProcessorBase(std::move(name), uuid, logger) { + explicit AzureDataLakeStorageFileProcessorBase(std::string_view name, const minifi::utils::Identifier& uuid, const std::shared_ptr<core::logging::Logger> &logger) + : AzureDataLakeStorageProcessorBase(name, uuid, logger) { } ~AzureDataLakeStorageFileProcessorBase() override = default; protected: - explicit AzureDataLakeStorageFileProcessorBase(std::string name, const minifi::utils::Identifier& uuid, const std::shared_ptr<core::logging::Logger> &logger, + explicit AzureDataLakeStorageFileProcessorBase(std::string_view name, const minifi::utils::Identifier& uuid, const std::shared_ptr<core::logging::Logger> &logger, std::unique_ptr<storage::DataLakeStorageClient> data_lake_storage_client) - : AzureDataLakeStorageProcessorBase(std::move(name), uuid, logger, std::move(data_lake_storage_client)) { + : AzureDataLakeStorageProcessorBase(name, uuid, logger, std::move(data_lake_storage_client)) { } bool setFileOperationCommonParameters( diff --git a/extensions/azure/processors/AzureDataLakeStorageProcessorBase.h b/extensions/azure/processors/AzureDataLakeStorageProcessorBase.h index 4d03e7ec1..7449ca2af 100644 --- a/extensions/azure/processors/AzureDataLakeStorageProcessorBase.h +++ b/extensions/azure/processors/AzureDataLakeStorageProcessorBase.h @@ -53,8 +53,8 @@ class AzureDataLakeStorageProcessorBase : public AzureStorageProcessorBase { }); - explicit AzureDataLakeStorageProcessorBase(std::string name, const minifi::utils::Identifier& uuid, const std::shared_ptr<core::logging::Logger> &logger) - : AzureStorageProcessorBase(std::move(name), uuid, logger) { + explicit AzureDataLakeStorageProcessorBase(std::string_view name, const minifi::utils::Identifier& uuid, const std::shared_ptr<core::logging::Logger> &logger) + : AzureStorageProcessorBase(name, uuid, logger) { } ~AzureDataLakeStorageProcessorBase() override = default; @@ -62,9 +62,9 @@ class AzureDataLakeStorageProcessorBase : public AzureStorageProcessorBase { void onSchedule(const std::shared_ptr<core::ProcessContext> &context, const std::shared_ptr<core::ProcessSessionFactory> &sessionFactory) override; protected: - explicit AzureDataLakeStorageProcessorBase(std::string name, const minifi::utils::Identifier& uuid, const std::shared_ptr<core::logging::Logger> &logger, + explicit AzureDataLakeStorageProcessorBase(std::string_view name, const minifi::utils::Identifier& uuid, const std::shared_ptr<core::logging::Logger> &logger, std::unique_ptr<storage::DataLakeStorageClient> data_lake_storage_client) - : AzureStorageProcessorBase(std::move(name), uuid, logger), + : AzureStorageProcessorBase(name, uuid, logger), azure_data_lake_storage_(std::move(data_lake_storage_client)) { } diff --git a/extensions/azure/processors/AzureStorageProcessorBase.h b/extensions/azure/processors/AzureStorageProcessorBase.h index 0bd68ae6d..0143f1407 100644 --- a/extensions/azure/processors/AzureStorageProcessorBase.h +++ b/extensions/azure/processors/AzureStorageProcessorBase.h @@ -42,8 +42,8 @@ class AzureStorageProcessorBase : public core::Processor { .build(); EXTENSIONAPI static constexpr auto Properties = std::array<core::PropertyReference, 1>{AzureStorageCredentialsService}; - AzureStorageProcessorBase(std::string name, const minifi::utils::Identifier& uuid, const std::shared_ptr<core::logging::Logger>& logger) - : core::Processor(std::move(name), uuid), + AzureStorageProcessorBase(std::string_view name, const minifi::utils::Identifier& uuid, const std::shared_ptr<core::logging::Logger>& logger) + : core::Processor(name, uuid), logger_(logger) { } diff --git a/extensions/azure/processors/DeleteAzureBlobStorage.h b/extensions/azure/processors/DeleteAzureBlobStorage.h index b6e469c7a..109e07f19 100644 --- a/extensions/azure/processors/DeleteAzureBlobStorage.h +++ b/extensions/azure/processors/DeleteAzureBlobStorage.h @@ -62,8 +62,8 @@ class DeleteAzureBlobStorage final : public AzureBlobStorageSingleBlobProcessorB ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit DeleteAzureBlobStorage(std::string name, const minifi::utils::Identifier& uuid = minifi::utils::Identifier()) - : DeleteAzureBlobStorage(std::move(name), uuid, nullptr) { + explicit DeleteAzureBlobStorage(std::string_view name, const minifi::utils::Identifier& uuid = minifi::utils::Identifier()) + : DeleteAzureBlobStorage(name, uuid, nullptr) { } void initialize() override; @@ -73,8 +73,8 @@ class DeleteAzureBlobStorage final : public AzureBlobStorageSingleBlobProcessorB private: friend class ::AzureBlobStorageTestsFixture<DeleteAzureBlobStorage>; - explicit DeleteAzureBlobStorage(std::string name, const minifi::utils::Identifier& uuid, std::unique_ptr<storage::BlobStorageClient> blob_storage_client) - : AzureBlobStorageSingleBlobProcessorBase(std::move(name), uuid, core::logging::LoggerFactory<DeleteAzureBlobStorage>::getLogger(), std::move(blob_storage_client)) { + explicit DeleteAzureBlobStorage(std::string_view name, const minifi::utils::Identifier& uuid, std::unique_ptr<storage::BlobStorageClient> blob_storage_client) + : AzureBlobStorageSingleBlobProcessorBase(name, uuid, core::logging::LoggerFactory<DeleteAzureBlobStorage>::getLogger(), std::move(blob_storage_client)) { } std::optional<storage::DeleteAzureBlobStorageParameters> buildDeleteAzureBlobStorageParameters( diff --git a/extensions/azure/processors/DeleteAzureDataLakeStorage.h b/extensions/azure/processors/DeleteAzureDataLakeStorage.h index 17781f85b..1a32f05ae 100644 --- a/extensions/azure/processors/DeleteAzureDataLakeStorage.h +++ b/extensions/azure/processors/DeleteAzureDataLakeStorage.h @@ -48,8 +48,8 @@ class DeleteAzureDataLakeStorage final : public AzureDataLakeStorageFileProcesso ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit DeleteAzureDataLakeStorage(std::string name, const minifi::utils::Identifier& uuid = minifi::utils::Identifier()) - : AzureDataLakeStorageFileProcessorBase(std::move(name), uuid, core::logging::LoggerFactory<DeleteAzureDataLakeStorage>::getLogger(uuid)) { + explicit DeleteAzureDataLakeStorage(std::string_view name, const minifi::utils::Identifier& uuid = minifi::utils::Identifier()) + : AzureDataLakeStorageFileProcessorBase(name, uuid, core::logging::LoggerFactory<DeleteAzureDataLakeStorage>::getLogger(uuid)) { } ~DeleteAzureDataLakeStorage() override = default; @@ -60,8 +60,8 @@ class DeleteAzureDataLakeStorage final : public AzureDataLakeStorageFileProcesso private: friend class ::AzureDataLakeStorageTestsFixture<DeleteAzureDataLakeStorage>; - explicit DeleteAzureDataLakeStorage(std::string name, const minifi::utils::Identifier& uuid, std::unique_ptr<storage::DataLakeStorageClient> data_lake_storage_client) - : AzureDataLakeStorageFileProcessorBase(std::move(name), uuid, core::logging::LoggerFactory<DeleteAzureDataLakeStorage>::getLogger(), std::move(data_lake_storage_client)) { + explicit DeleteAzureDataLakeStorage(std::string_view name, const minifi::utils::Identifier& uuid, std::unique_ptr<storage::DataLakeStorageClient> data_lake_storage_client) + : AzureDataLakeStorageFileProcessorBase(name, uuid, core::logging::LoggerFactory<DeleteAzureDataLakeStorage>::getLogger(), std::move(data_lake_storage_client)) { } std::optional<storage::DeleteAzureDataLakeStorageParameters> buildDeleteParameters(core::ProcessContext& context, const std::shared_ptr<core::FlowFile>& flow_file); diff --git a/extensions/azure/processors/FetchAzureBlobStorage.h b/extensions/azure/processors/FetchAzureBlobStorage.h index 6b70e27e8..463292d63 100644 --- a/extensions/azure/processors/FetchAzureBlobStorage.h +++ b/extensions/azure/processors/FetchAzureBlobStorage.h @@ -68,8 +68,8 @@ class FetchAzureBlobStorage final : public AzureBlobStorageSingleBlobProcessorBa ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit FetchAzureBlobStorage(std::string name, const minifi::utils::Identifier& uuid = minifi::utils::Identifier()) - : FetchAzureBlobStorage(std::move(name), uuid, nullptr) { + explicit FetchAzureBlobStorage(std::string_view name, const minifi::utils::Identifier& uuid = minifi::utils::Identifier()) + : FetchAzureBlobStorage(name, uuid, nullptr) { } void initialize() override; @@ -78,8 +78,8 @@ class FetchAzureBlobStorage final : public AzureBlobStorageSingleBlobProcessorBa private: friend class ::AzureBlobStorageTestsFixture<FetchAzureBlobStorage>; - explicit FetchAzureBlobStorage(std::string name, const minifi::utils::Identifier& uuid, std::unique_ptr<storage::BlobStorageClient> blob_storage_client) - : AzureBlobStorageSingleBlobProcessorBase(std::move(name), uuid, core::logging::LoggerFactory<FetchAzureBlobStorage>::getLogger(), std::move(blob_storage_client)) { + explicit FetchAzureBlobStorage(std::string_view name, const minifi::utils::Identifier& uuid, std::unique_ptr<storage::BlobStorageClient> blob_storage_client) + : AzureBlobStorageSingleBlobProcessorBase(name, uuid, core::logging::LoggerFactory<FetchAzureBlobStorage>::getLogger(), std::move(blob_storage_client)) { } std::optional<storage::FetchAzureBlobStorageParameters> buildFetchAzureBlobStorageParameters( diff --git a/extensions/azure/processors/FetchAzureDataLakeStorage.h b/extensions/azure/processors/FetchAzureDataLakeStorage.h index 6aa23f84e..8c7fb09ae 100644 --- a/extensions/azure/processors/FetchAzureDataLakeStorage.h +++ b/extensions/azure/processors/FetchAzureDataLakeStorage.h @@ -69,8 +69,8 @@ class FetchAzureDataLakeStorage final : public AzureDataLakeStorageFileProcessor ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit FetchAzureDataLakeStorage(std::string name, const minifi::utils::Identifier& uuid = minifi::utils::Identifier()) - : AzureDataLakeStorageFileProcessorBase(std::move(name), uuid, core::logging::LoggerFactory<FetchAzureDataLakeStorage>::getLogger(uuid)) { + explicit FetchAzureDataLakeStorage(std::string_view name, const minifi::utils::Identifier& uuid = minifi::utils::Identifier()) + : AzureDataLakeStorageFileProcessorBase(name, uuid, core::logging::LoggerFactory<FetchAzureDataLakeStorage>::getLogger(uuid)) { } ~FetchAzureDataLakeStorage() override = default; @@ -81,8 +81,8 @@ class FetchAzureDataLakeStorage final : public AzureDataLakeStorageFileProcessor private: friend class ::AzureDataLakeStorageTestsFixture<FetchAzureDataLakeStorage>; - explicit FetchAzureDataLakeStorage(std::string name, const minifi::utils::Identifier& uuid, std::unique_ptr<storage::DataLakeStorageClient> data_lake_storage_client) - : AzureDataLakeStorageFileProcessorBase(std::move(name), uuid, core::logging::LoggerFactory<FetchAzureDataLakeStorage>::getLogger(), std::move(data_lake_storage_client)) { + explicit FetchAzureDataLakeStorage(std::string_view name, const minifi::utils::Identifier& uuid, std::unique_ptr<storage::DataLakeStorageClient> data_lake_storage_client) + : AzureDataLakeStorageFileProcessorBase(name, uuid, core::logging::LoggerFactory<FetchAzureDataLakeStorage>::getLogger(), std::move(data_lake_storage_client)) { } std::optional<storage::FetchAzureDataLakeStorageParameters> buildFetchParameters(core::ProcessContext& context, const std::shared_ptr<core::FlowFile>& flow_file); diff --git a/extensions/azure/processors/ListAzureBlobStorage.h b/extensions/azure/processors/ListAzureBlobStorage.h index 34e690964..600774c58 100644 --- a/extensions/azure/processors/ListAzureBlobStorage.h +++ b/extensions/azure/processors/ListAzureBlobStorage.h @@ -64,12 +64,12 @@ class ListAzureBlobStorage final : public AzureBlobStorageProcessorBase { ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit ListAzureBlobStorage(std::string name, const minifi::utils::Identifier& uuid = minifi::utils::Identifier()) - : ListAzureBlobStorage(std::move(name), nullptr, uuid) { + explicit ListAzureBlobStorage(std::string_view name, const minifi::utils::Identifier& uuid = minifi::utils::Identifier()) + : ListAzureBlobStorage(name, nullptr, uuid) { } - explicit ListAzureBlobStorage(std::string name, std::unique_ptr<storage::BlobStorageClient> blob_storage_client, const minifi::utils::Identifier& uuid = minifi::utils::Identifier()) - : AzureBlobStorageProcessorBase(std::move(name), uuid, core::logging::LoggerFactory<ListAzureBlobStorage>::getLogger(uuid), std::move(blob_storage_client)) { + explicit ListAzureBlobStorage(std::string_view name, std::unique_ptr<storage::BlobStorageClient> blob_storage_client, const minifi::utils::Identifier& uuid = minifi::utils::Identifier()) + : AzureBlobStorageProcessorBase(name, uuid, core::logging::LoggerFactory<ListAzureBlobStorage>::getLogger(uuid), std::move(blob_storage_client)) { } void initialize() override; diff --git a/extensions/azure/processors/ListAzureDataLakeStorage.h b/extensions/azure/processors/ListAzureDataLakeStorage.h index 1c4f2bdd5..b6cb7d0ec 100644 --- a/extensions/azure/processors/ListAzureDataLakeStorage.h +++ b/extensions/azure/processors/ListAzureDataLakeStorage.h @@ -73,8 +73,8 @@ class ListAzureDataLakeStorage final : public AzureDataLakeStorageProcessorBase ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit ListAzureDataLakeStorage(std::string name, const minifi::utils::Identifier &uuid = minifi::utils::Identifier()) - : AzureDataLakeStorageProcessorBase(std::move(name), uuid, core::logging::LoggerFactory<ListAzureDataLakeStorage>::getLogger(uuid)) { + explicit ListAzureDataLakeStorage(std::string_view name, const minifi::utils::Identifier &uuid = minifi::utils::Identifier()) + : AzureDataLakeStorageProcessorBase(name, uuid, core::logging::LoggerFactory<ListAzureDataLakeStorage>::getLogger(uuid)) { } ~ListAzureDataLakeStorage() override = default; @@ -86,8 +86,8 @@ class ListAzureDataLakeStorage final : public AzureDataLakeStorageProcessorBase private: friend class ::ListAzureDataLakeStorageTestsFixture; - explicit ListAzureDataLakeStorage(std::string name, const minifi::utils::Identifier &uuid, std::unique_ptr<storage::DataLakeStorageClient> data_lake_storage_client) - : AzureDataLakeStorageProcessorBase(std::move(name), uuid, core::logging::LoggerFactory<ListAzureDataLakeStorage>::getLogger(uuid), std::move(data_lake_storage_client)) { + explicit ListAzureDataLakeStorage(std::string_view name, const minifi::utils::Identifier &uuid, std::unique_ptr<storage::DataLakeStorageClient> data_lake_storage_client) + : AzureDataLakeStorageProcessorBase(name, uuid, core::logging::LoggerFactory<ListAzureDataLakeStorage>::getLogger(uuid), std::move(data_lake_storage_client)) { } std::optional<storage::ListAzureDataLakeStorageParameters> buildListParameters(core::ProcessContext &context); diff --git a/extensions/azure/processors/PutAzureBlobStorage.h b/extensions/azure/processors/PutAzureBlobStorage.h index 89d5942f5..dde37e4bf 100644 --- a/extensions/azure/processors/PutAzureBlobStorage.h +++ b/extensions/azure/processors/PutAzureBlobStorage.h @@ -65,8 +65,8 @@ class PutAzureBlobStorage final : public AzureBlobStorageSingleBlobProcessorBase ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit PutAzureBlobStorage(std::string name, const minifi::utils::Identifier& uuid = minifi::utils::Identifier()) - : PutAzureBlobStorage(std::move(name), uuid, nullptr) { + explicit PutAzureBlobStorage(std::string_view name, const minifi::utils::Identifier& uuid = minifi::utils::Identifier()) + : PutAzureBlobStorage(name, uuid, nullptr) { } void initialize() override; @@ -107,8 +107,8 @@ class PutAzureBlobStorage final : public AzureBlobStorageSingleBlobProcessorBase private: friend class ::AzureBlobStorageTestsFixture<PutAzureBlobStorage>; - explicit PutAzureBlobStorage(std::string name, const minifi::utils::Identifier& uuid, std::unique_ptr<storage::BlobStorageClient> blob_storage_client) - : AzureBlobStorageSingleBlobProcessorBase(std::move(name), uuid, core::logging::LoggerFactory<PutAzureBlobStorage>::getLogger(), std::move(blob_storage_client)) { + explicit PutAzureBlobStorage(std::string_view name, const minifi::utils::Identifier& uuid, std::unique_ptr<storage::BlobStorageClient> blob_storage_client) + : AzureBlobStorageSingleBlobProcessorBase(name, uuid, core::logging::LoggerFactory<PutAzureBlobStorage>::getLogger(), std::move(blob_storage_client)) { } std::optional<storage::PutAzureBlobStorageParameters> buildPutAzureBlobStorageParameters(core::ProcessContext &context, const std::shared_ptr<core::FlowFile> &flow_file); diff --git a/extensions/azure/processors/PutAzureDataLakeStorage.h b/extensions/azure/processors/PutAzureDataLakeStorage.h index 0795b7551..fabdd38d2 100644 --- a/extensions/azure/processors/PutAzureDataLakeStorage.h +++ b/extensions/azure/processors/PutAzureDataLakeStorage.h @@ -69,8 +69,8 @@ class PutAzureDataLakeStorage final : public AzureDataLakeStorageFileProcessorBa ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit PutAzureDataLakeStorage(std::string name, const minifi::utils::Identifier &uuid = minifi::utils::Identifier()) - : PutAzureDataLakeStorage(std::move(name), uuid, nullptr) { + explicit PutAzureDataLakeStorage(std::string_view name, const minifi::utils::Identifier &uuid = minifi::utils::Identifier()) + : PutAzureDataLakeStorage(name, uuid, nullptr) { } void initialize() override; @@ -97,8 +97,8 @@ class PutAzureDataLakeStorage final : public AzureDataLakeStorageFileProcessorBa std::shared_ptr<core::logging::Logger> logger_; }; - explicit PutAzureDataLakeStorage(std::string name, const minifi::utils::Identifier &uuid, std::unique_ptr<storage::DataLakeStorageClient> data_lake_storage_client) - : AzureDataLakeStorageFileProcessorBase(std::move(name), uuid, core::logging::LoggerFactory<PutAzureDataLakeStorage>::getLogger(), std::move(data_lake_storage_client)) { + explicit PutAzureDataLakeStorage(std::string_view name, const minifi::utils::Identifier &uuid, std::unique_ptr<storage::DataLakeStorageClient> data_lake_storage_client) + : AzureDataLakeStorageFileProcessorBase(name, uuid, core::logging::LoggerFactory<PutAzureDataLakeStorage>::getLogger(), std::move(data_lake_storage_client)) { } std::optional<storage::PutAzureDataLakeStorageParameters> buildUploadParameters(core::ProcessContext &context, const std::shared_ptr<core::FlowFile> &flow_file); diff --git a/extensions/civetweb/processors/ListenHTTP.h b/extensions/civetweb/processors/ListenHTTP.h index d4a4066eb..a514f8563 100644 --- a/extensions/civetweb/processors/ListenHTTP.h +++ b/extensions/civetweb/processors/ListenHTTP.h @@ -49,8 +49,8 @@ class ListenHTTP : public core::Processor { public: using FlowFileBufferPair = std::pair<std::shared_ptr<FlowFileRecord>, std::unique_ptr<io::BufferStream>>; - explicit ListenHTTP(std::string name, const utils::Identifier& uuid = {}) - : Processor(std::move(name), uuid) { + explicit ListenHTTP(std::string_view name, const utils::Identifier& uuid = {}) + : Processor(name, uuid) { callbacks_.log_message = &logMessage; callbacks_.log_access = &logAccess; } diff --git a/extensions/civetweb/protocols/RESTReceiver.cpp b/extensions/civetweb/protocols/RESTReceiver.cpp index 99fcaa2e7..12562463f 100644 --- a/extensions/civetweb/protocols/RESTReceiver.cpp +++ b/extensions/civetweb/protocols/RESTReceiver.cpp @@ -38,8 +38,8 @@ int ssl_protocol_en(void* /*ssl_context*/, void* /*user_data*/) { return 0; } -RESTReceiver::RESTReceiver(std::string name, const utils::Identifier& uuid) - : HeartbeatReporter(std::move(name), uuid) { +RESTReceiver::RESTReceiver(std::string_view name, const utils::Identifier& uuid) + : HeartbeatReporter(name, uuid) { } void RESTReceiver::initialize(core::controller::ControllerServiceProvider* controller, state::StateMonitor* updateSink, const std::shared_ptr<Configure> &configure) { diff --git a/extensions/civetweb/protocols/RESTReceiver.h b/extensions/civetweb/protocols/RESTReceiver.h index 970ba6324..443350689 100644 --- a/extensions/civetweb/protocols/RESTReceiver.h +++ b/extensions/civetweb/protocols/RESTReceiver.h @@ -39,7 +39,7 @@ int ssl_protocol_en(void *ssl_context, void *user_data); */ class RESTReceiver : public RESTProtocol, public HeartbeatReporter { public: - explicit RESTReceiver(std::string name, const utils::Identifier& uuid = {}); + explicit RESTReceiver(std::string_view name, const utils::Identifier& uuid = {}); EXTENSIONAPI static constexpr const char* Description = "Provides a webserver to display C2 heartbeat information"; diff --git a/extensions/expression-language/ExpressionContextBuilder.cpp b/extensions/expression-language/ExpressionContextBuilder.cpp index 8c730a818..9c85ab778 100644 --- a/extensions/expression-language/ExpressionContextBuilder.cpp +++ b/extensions/expression-language/ExpressionContextBuilder.cpp @@ -25,12 +25,12 @@ namespace org::apache::nifi::minifi::core::expressions { -ExpressionContextBuilder::ExpressionContextBuilder(std::string name, const minifi::utils::Identifier &uuid) - : core::ProcessContextBuilder(std::move(name), uuid) { +ExpressionContextBuilder::ExpressionContextBuilder(std::string_view name, const minifi::utils::Identifier &uuid) + : core::ProcessContextBuilder(name, uuid) { } -ExpressionContextBuilder::ExpressionContextBuilder(std::string name) - : core::ProcessContextBuilder(std::move(name)) { +ExpressionContextBuilder::ExpressionContextBuilder(std::string_view name) + : core::ProcessContextBuilder(name) { } ExpressionContextBuilder::~ExpressionContextBuilder() = default; diff --git a/extensions/expression-language/ExpressionContextBuilder.h b/extensions/expression-language/ExpressionContextBuilder.h index 1b1bc7d15..5e7ae9806 100644 --- a/extensions/expression-language/ExpressionContextBuilder.h +++ b/extensions/expression-language/ExpressionContextBuilder.h @@ -34,9 +34,9 @@ namespace org::apache::nifi::minifi::core::expressions { */ class ExpressionContextBuilder : public core::ProcessContextBuilder { public: - ExpressionContextBuilder(std::string name, const minifi::utils::Identifier &uuid); + ExpressionContextBuilder(std::string_view name, const minifi::utils::Identifier &uuid); - explicit ExpressionContextBuilder(std::string name); + explicit ExpressionContextBuilder(std::string_view name); virtual ~ExpressionContextBuilder(); diff --git a/extensions/gcp/processors/DeleteGCSObject.h b/extensions/gcp/processors/DeleteGCSObject.h index c88d332bc..348a95ce9 100644 --- a/extensions/gcp/processors/DeleteGCSObject.h +++ b/extensions/gcp/processors/DeleteGCSObject.h @@ -33,8 +33,8 @@ namespace org::apache::nifi::minifi::extensions::gcp { class DeleteGCSObject : public GCSProcessor { public: - explicit DeleteGCSObject(std::string name, const utils::Identifier& uuid = {}) - : GCSProcessor(std::move(name), uuid, core::logging::LoggerFactory<DeleteGCSObject>::getLogger(uuid)) { + explicit DeleteGCSObject(std::string_view name, const utils::Identifier& uuid = {}) + : GCSProcessor(name, uuid, core::logging::LoggerFactory<DeleteGCSObject>::getLogger(uuid)) { } ~DeleteGCSObject() override = default; diff --git a/extensions/gcp/processors/FetchGCSObject.h b/extensions/gcp/processors/FetchGCSObject.h index 42d2aedc0..eef1975b9 100644 --- a/extensions/gcp/processors/FetchGCSObject.h +++ b/extensions/gcp/processors/FetchGCSObject.h @@ -34,8 +34,8 @@ namespace org::apache::nifi::minifi::extensions::gcp { class FetchGCSObject : public GCSProcessor { public: - explicit FetchGCSObject(std::string name, const utils::Identifier& uuid = {}) - : GCSProcessor(std::move(name), uuid, core::logging::LoggerFactory<FetchGCSObject>::getLogger(uuid)) { + explicit FetchGCSObject(std::string_view name, const utils::Identifier& uuid = {}) + : GCSProcessor(name, uuid, core::logging::LoggerFactory<FetchGCSObject>::getLogger(uuid)) { } ~FetchGCSObject() override = default; diff --git a/extensions/gcp/processors/GCSProcessor.h b/extensions/gcp/processors/GCSProcessor.h index 8cfbe9c1d..ea14eb7c7 100644 --- a/extensions/gcp/processors/GCSProcessor.h +++ b/extensions/gcp/processors/GCSProcessor.h @@ -34,8 +34,8 @@ namespace org::apache::nifi::minifi::extensions::gcp { class GCSProcessor : public core::Processor { public: - GCSProcessor(std::string name, const minifi::utils::Identifier& uuid, std::shared_ptr<core::logging::Logger> logger) - : core::Processor(std::move(name), uuid), + GCSProcessor(std::string_view name, const minifi::utils::Identifier& uuid, std::shared_ptr<core::logging::Logger> logger) + : core::Processor(name, uuid), logger_(std::move(logger)) { } diff --git a/extensions/gcp/processors/ListGCSBucket.h b/extensions/gcp/processors/ListGCSBucket.h index 4a65dd0e1..91051c3cc 100644 --- a/extensions/gcp/processors/ListGCSBucket.h +++ b/extensions/gcp/processors/ListGCSBucket.h @@ -43,8 +43,8 @@ inline constexpr auto FILENAME_OUTPUT_ATTRIBUTE_DESCRIPTION = utils::array_to_st class ListGCSBucket : public GCSProcessor { public: - explicit ListGCSBucket(std::string name, const utils::Identifier& uuid = {}) - : GCSProcessor(std::move(name), uuid, core::logging::LoggerFactory<ListGCSBucket>::getLogger(uuid)) { + explicit ListGCSBucket(std::string_view name, const utils::Identifier& uuid = {}) + : GCSProcessor(name, uuid, core::logging::LoggerFactory<ListGCSBucket>::getLogger(uuid)) { } ~ListGCSBucket() override = default; diff --git a/extensions/gcp/processors/PutGCSObject.h b/extensions/gcp/processors/PutGCSObject.h index c6daa36c5..843d1726d 100644 --- a/extensions/gcp/processors/PutGCSObject.h +++ b/extensions/gcp/processors/PutGCSObject.h @@ -73,8 +73,8 @@ namespace org::apache::nifi::minifi::extensions::gcp { class PutGCSObject : public GCSProcessor { public: - explicit PutGCSObject(std::string name, const utils::Identifier& uuid = {}) - : GCSProcessor(std::move(name), uuid, core::logging::LoggerFactory<PutGCSObject>::getLogger(uuid)) { + explicit PutGCSObject(std::string_view name, const utils::Identifier& uuid = {}) + : GCSProcessor(name, uuid, core::logging::LoggerFactory<PutGCSObject>::getLogger(uuid)) { } ~PutGCSObject() override = default; diff --git a/extensions/http-curl/processors/InvokeHTTP.h b/extensions/http-curl/processors/InvokeHTTP.h index 99a6a8968..d82be800e 100644 --- a/extensions/http-curl/processors/InvokeHTTP.h +++ b/extensions/http-curl/processors/InvokeHTTP.h @@ -58,8 +58,8 @@ class InvokeHTTP : public core::Processor { EXTENSIONAPI static constexpr std::string_view REQUEST_URL = "invokehttp.request.url"; EXTENSIONAPI static constexpr std::string_view TRANSACTION_ID = "invokehttp.tx.id"; - explicit InvokeHTTP(std::string name, const utils::Identifier& uuid = {}) - : Processor(std::move(name), uuid) { + explicit InvokeHTTP(std::string_view name, const utils::Identifier& uuid = {}) + : Processor(name, uuid) { setTriggerWhenEmpty(true); } diff --git a/extensions/http-curl/protocols/RESTSender.cpp b/extensions/http-curl/protocols/RESTSender.cpp index b5894cc6c..44575f734 100644 --- a/extensions/http-curl/protocols/RESTSender.cpp +++ b/extensions/http-curl/protocols/RESTSender.cpp @@ -32,8 +32,8 @@ using namespace std::literals::chrono_literals; namespace org::apache::nifi::minifi::c2 { -RESTSender::RESTSender(std::string name, const utils::Identifier &uuid) - : C2Protocol(std::move(name), uuid) { +RESTSender::RESTSender(std::string_view name, const utils::Identifier &uuid) + : C2Protocol(name, uuid) { } void RESTSender::initialize(core::controller::ControllerServiceProvider* controller, const std::shared_ptr<Configure> &configure) { diff --git a/extensions/http-curl/protocols/RESTSender.h b/extensions/http-curl/protocols/RESTSender.h index 73490fc22..feb604bed 100644 --- a/extensions/http-curl/protocols/RESTSender.h +++ b/extensions/http-curl/protocols/RESTSender.h @@ -44,7 +44,7 @@ class RESTSender : public RESTProtocol, public C2Protocol { gzip }; - explicit RESTSender(std::string name, const utils::Identifier &uuid = utils::Identifier()); + explicit RESTSender(std::string_view name, const utils::Identifier &uuid = utils::Identifier()); EXTENSIONAPI static constexpr const char* Description = "Encapsulates the restful protocol that is built upon C2Protocol."; diff --git a/extensions/libarchive/CompressContent.h b/extensions/libarchive/CompressContent.h index 22249df79..500acd6fa 100644 --- a/extensions/libarchive/CompressContent.h +++ b/extensions/libarchive/CompressContent.h @@ -85,8 +85,8 @@ namespace org::apache::nifi::minifi::processors { class CompressContent : public core::Processor { public: - explicit CompressContent(std::string name, const utils::Identifier& uuid = {}) - : core::Processor(std::move(name), uuid) { + explicit CompressContent(std::string_view name, const utils::Identifier& uuid = {}) + : core::Processor(name, uuid) { } ~CompressContent() override = default; diff --git a/extensions/libarchive/FocusArchiveEntry.h b/extensions/libarchive/FocusArchiveEntry.h index 4f6f3c609..9ef7e977e 100644 --- a/extensions/libarchive/FocusArchiveEntry.h +++ b/extensions/libarchive/FocusArchiveEntry.h @@ -38,8 +38,8 @@ namespace org::apache::nifi::minifi::processors { class FocusArchiveEntry : public core::Processor { public: - explicit FocusArchiveEntry(std::string name, const utils::Identifier& uuid = {}) - : core::Processor(std::move(name), uuid) { + explicit FocusArchiveEntry(std::string_view name, const utils::Identifier& uuid = {}) + : core::Processor(name, uuid) { } ~FocusArchiveEntry() override = default; diff --git a/extensions/libarchive/ManipulateArchive.h b/extensions/libarchive/ManipulateArchive.h index e8cb5b2c3..2ec78eaa9 100644 --- a/extensions/libarchive/ManipulateArchive.h +++ b/extensions/libarchive/ManipulateArchive.h @@ -38,8 +38,8 @@ using core::logging::Logger; class ManipulateArchive : public core::Processor { public: - explicit ManipulateArchive(std::string name, const utils::Identifier& uuid = {}) - : core::Processor(std::move(name), uuid) { + explicit ManipulateArchive(std::string_view name, const utils::Identifier& uuid = {}) + : core::Processor(name, uuid) { } ~ManipulateArchive() override = default; diff --git a/extensions/libarchive/UnfocusArchiveEntry.h b/extensions/libarchive/UnfocusArchiveEntry.h index 05c945627..d14dee6e4 100644 --- a/extensions/libarchive/UnfocusArchiveEntry.h +++ b/extensions/libarchive/UnfocusArchiveEntry.h @@ -40,8 +40,8 @@ using core::logging::Logger; class UnfocusArchiveEntry : public core::Processor { public: - explicit UnfocusArchiveEntry(std::string name, const utils::Identifier& uuid = {}) - : core::Processor(std::move(name), uuid) { + explicit UnfocusArchiveEntry(std::string_view name, const utils::Identifier& uuid = {}) + : core::Processor(name, uuid) { } ~UnfocusArchiveEntry() override = default; diff --git a/extensions/librdkafka/ConsumeKafka.h b/extensions/librdkafka/ConsumeKafka.h index 6095d6d9b..1fd4e5a45 100644 --- a/extensions/librdkafka/ConsumeKafka.h +++ b/extensions/librdkafka/ConsumeKafka.h @@ -219,8 +219,8 @@ class ConsumeKafka : public KafkaProcessorBase { ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit ConsumeKafka(std::string name, const utils::Identifier& uuid = utils::Identifier()) : - KafkaProcessorBase(std::move(name), uuid, core::logging::LoggerFactory<ConsumeKafka>::getLogger(uuid)) {} + explicit ConsumeKafka(std::string_view name, const utils::Identifier& uuid = utils::Identifier()) : + KafkaProcessorBase(name, uuid, core::logging::LoggerFactory<ConsumeKafka>::getLogger(uuid)) {} ~ConsumeKafka() override = default; diff --git a/extensions/librdkafka/KafkaProcessorBase.h b/extensions/librdkafka/KafkaProcessorBase.h index 6e88c6689..2f3a8e7f5 100644 --- a/extensions/librdkafka/KafkaProcessorBase.h +++ b/extensions/librdkafka/KafkaProcessorBase.h @@ -90,8 +90,8 @@ class KafkaProcessorBase : public core::Processor { }; - KafkaProcessorBase(std::string name, const utils::Identifier& uuid, std::shared_ptr<core::logging::Logger> logger) - : core::Processor(std::move(name), uuid), + KafkaProcessorBase(std::string_view name, const utils::Identifier& uuid, std::shared_ptr<core::logging::Logger> logger) + : core::Processor(name, uuid), logger_(std::move(logger)) { } diff --git a/extensions/librdkafka/PublishKafka.h b/extensions/librdkafka/PublishKafka.h index 4104b3a52..94a4bd25f 100644 --- a/extensions/librdkafka/PublishKafka.h +++ b/extensions/librdkafka/PublishKafka.h @@ -216,8 +216,8 @@ class PublishKafka : public KafkaProcessorBase { ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit PublishKafka(std::string name, const utils::Identifier& uuid = {}) - : KafkaProcessorBase(std::move(name), uuid, core::logging::LoggerFactory<PublishKafka>::getLogger(uuid)) { + explicit PublishKafka(std::string_view name, const utils::Identifier& uuid = {}) + : KafkaProcessorBase(name, uuid, core::logging::LoggerFactory<PublishKafka>::getLogger(uuid)) { } ~PublishKafka() override = default; diff --git a/extensions/lua/LuaScriptExecutor.cpp b/extensions/lua/LuaScriptExecutor.cpp index 840be8f83..295976cc0 100644 --- a/extensions/lua/LuaScriptExecutor.cpp +++ b/extensions/lua/LuaScriptExecutor.cpp @@ -24,7 +24,7 @@ namespace org::apache::nifi::minifi::extensions::lua { -LuaScriptExecutor::LuaScriptExecutor(std::string name, const utils::Identifier& uuid) : script::ScriptExecutor(std::move(name), uuid) {} +LuaScriptExecutor::LuaScriptExecutor(std::string_view name, const utils::Identifier& uuid) : script::ScriptExecutor(name, uuid) {} void LuaScriptExecutor::onTrigger(const std::shared_ptr<core::ProcessContext>& context, const std::shared_ptr<core::ProcessSession>& session) { auto lua_script_engine = lua_script_engine_queue_->getResource(); diff --git a/extensions/lua/LuaScriptExecutor.h b/extensions/lua/LuaScriptExecutor.h index 654553d4a..5990012d2 100644 --- a/extensions/lua/LuaScriptExecutor.h +++ b/extensions/lua/LuaScriptExecutor.h @@ -30,7 +30,7 @@ namespace org::apache::nifi::minifi::extensions::lua { class LuaScriptExecutor : public script::ScriptExecutor { public: - explicit LuaScriptExecutor(std::string name, const utils::Identifier& uuid = {}); + explicit LuaScriptExecutor(std::string_view name, const utils::Identifier& uuid = {}); void onTrigger(const std::shared_ptr<core::ProcessContext> &context, const std::shared_ptr<core::ProcessSession> &session) override; void initialize(std::filesystem::path script_file, diff --git a/extensions/mqtt/processors/AbstractMQTTProcessor.h b/extensions/mqtt/processors/AbstractMQTTProcessor.h index 79049ef20..10da233e0 100644 --- a/extensions/mqtt/processors/AbstractMQTTProcessor.h +++ b/extensions/mqtt/processors/AbstractMQTTProcessor.h @@ -86,8 +86,8 @@ static constexpr const char* const MQTT_SECURITY_PROTOCOL_SSL = "ssl"; class AbstractMQTTProcessor : public core::Processor { public: - explicit AbstractMQTTProcessor(std::string name, const utils::Identifier& uuid = {}, std::shared_ptr<core::ProcessorMetrics> metrics = {}) - : core::Processor(std::move(name), uuid, std::move(metrics)) { + explicit AbstractMQTTProcessor(std::string_view name, const utils::Identifier& uuid = {}, std::shared_ptr<core::ProcessorMetrics> metrics = {}) + : core::Processor(name, uuid, std::move(metrics)) { } ~AbstractMQTTProcessor() override { diff --git a/extensions/mqtt/processors/ConsumeMQTT.h b/extensions/mqtt/processors/ConsumeMQTT.h index 670587073..ad2cbc1c6 100644 --- a/extensions/mqtt/processors/ConsumeMQTT.h +++ b/extensions/mqtt/processors/ConsumeMQTT.h @@ -39,8 +39,8 @@ namespace org::apache::nifi::minifi::processors { class ConsumeMQTT : public processors::AbstractMQTTProcessor { public: - explicit ConsumeMQTT(std::string name, const utils::Identifier& uuid = {}) - : processors::AbstractMQTTProcessor(std::move(name), uuid) { + explicit ConsumeMQTT(std::string_view name, const utils::Identifier& uuid = {}) + : processors::AbstractMQTTProcessor(name, uuid) { } EXTENSIONAPI static constexpr const char* Description = "This Processor gets the contents of a FlowFile from a MQTT broker for a specified topic. " diff --git a/extensions/mqtt/processors/PublishMQTT.h b/extensions/mqtt/processors/PublishMQTT.h index ed4e8aa90..2015e839b 100644 --- a/extensions/mqtt/processors/PublishMQTT.h +++ b/extensions/mqtt/processors/PublishMQTT.h @@ -40,8 +40,8 @@ namespace org::apache::nifi::minifi::processors { class PublishMQTT : public processors::AbstractMQTTProcessor { public: - explicit PublishMQTT(std::string name, const utils::Identifier& uuid = {}) - : processors::AbstractMQTTProcessor(std::move(name), uuid, std::make_shared<PublishMQTTMetrics>(*this, in_flight_message_counter_)) { + explicit PublishMQTT(std::string_view name, const utils::Identifier& uuid = {}) + : processors::AbstractMQTTProcessor(name, uuid, std::make_shared<PublishMQTTMetrics>(*this, in_flight_message_counter_)) { } EXTENSIONAPI static constexpr const char* Description = "PublishMQTT serializes FlowFile content as an MQTT payload, sending the message to the configured topic and broker."; diff --git a/extensions/opc/include/fetchopc.h b/extensions/opc/include/fetchopc.h index aed1ae83f..d251a3858 100644 --- a/extensions/opc/include/fetchopc.h +++ b/extensions/opc/include/fetchopc.h @@ -41,8 +41,8 @@ namespace org::apache::nifi::minifi::processors { class FetchOPCProcessor : public BaseOPCProcessor { public: - explicit FetchOPCProcessor(std::string name, const utils::Identifier& uuid = {}) - : BaseOPCProcessor(std::move(name), uuid) { + explicit FetchOPCProcessor(std::string_view name, const utils::Identifier& uuid = {}) + : BaseOPCProcessor(name, uuid) { logger_ = core::logging::LoggerFactory<FetchOPCProcessor>::getLogger(uuid_); } diff --git a/extensions/opc/include/opcbase.h b/extensions/opc/include/opcbase.h index df7f997a9..917c6d25b 100644 --- a/extensions/opc/include/opcbase.h +++ b/extensions/opc/include/opcbase.h @@ -68,8 +68,8 @@ class BaseOPCProcessor : public core::Processor { }; - explicit BaseOPCProcessor(std::string name, const utils::Identifier& uuid = {}) - : Processor(std::move(name), uuid) { + explicit BaseOPCProcessor(std::string_view name, const utils::Identifier& uuid = {}) + : Processor(name, uuid) { } void onSchedule(const std::shared_ptr<core::ProcessContext> &context, const std::shared_ptr<core::ProcessSessionFactory> &factory) override; diff --git a/extensions/opc/include/putopc.h b/extensions/opc/include/putopc.h index fd1cdaa53..6cbf94a8d 100644 --- a/extensions/opc/include/putopc.h +++ b/extensions/opc/include/putopc.h @@ -99,8 +99,8 @@ class PutOPCProcessor : public BaseOPCProcessor { ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit PutOPCProcessor(std::string name, const utils::Identifier& uuid = {}) - : BaseOPCProcessor(std::move(name), uuid) { + explicit PutOPCProcessor(std::string_view name, const utils::Identifier& uuid = {}) + : BaseOPCProcessor(name, uuid) { logger_ = core::logging::LoggerFactory<PutOPCProcessor>::getLogger(uuid_); } diff --git a/extensions/python/ExecutePythonProcessor.h b/extensions/python/ExecutePythonProcessor.h index 951dfb914..e2adb2654 100644 --- a/extensions/python/ExecutePythonProcessor.h +++ b/extensions/python/ExecutePythonProcessor.h @@ -42,8 +42,8 @@ namespace org::apache::nifi::minifi::extensions::python::processors { class ExecutePythonProcessor : public core::Processor { public: - explicit ExecutePythonProcessor(std::string name, const utils::Identifier &uuid = {}) - : Processor(std::move(name), uuid), + explicit ExecutePythonProcessor(std::string_view name, const utils::Identifier &uuid = {}) + : Processor(name, uuid), processor_initialized_(false), python_dynamic_(false), reload_on_script_change_(true) { diff --git a/extensions/python/PythonScriptExecutor.cpp b/extensions/python/PythonScriptExecutor.cpp index 91a34d2c5..81d68e0dd 100644 --- a/extensions/python/PythonScriptExecutor.cpp +++ b/extensions/python/PythonScriptExecutor.cpp @@ -27,7 +27,7 @@ namespace org::apache::nifi::minifi::extensions::python { -PythonScriptExecutor::PythonScriptExecutor(std::string name, const utils::Identifier& uuid) : script::ScriptExecutor(std::move(name), uuid) {} +PythonScriptExecutor::PythonScriptExecutor(std::string_view name, const utils::Identifier& uuid) : script::ScriptExecutor(name, uuid) {} void PythonScriptExecutor::onTrigger(const std::shared_ptr<core::ProcessContext>& context, const std::shared_ptr<core::ProcessSession>& session) { diff --git a/extensions/python/PythonScriptExecutor.h b/extensions/python/PythonScriptExecutor.h index ca3a3ccc6..e111464fc 100644 --- a/extensions/python/PythonScriptExecutor.h +++ b/extensions/python/PythonScriptExecutor.h @@ -27,7 +27,7 @@ namespace org::apache::nifi::minifi::extensions::python { class PythonScriptExecutor : public script::ScriptExecutor { public: - explicit PythonScriptExecutor(std::string name, const utils::Identifier& uuid = {}); + explicit PythonScriptExecutor(std::string_view name, const utils::Identifier& uuid = {}); void onTrigger(const std::shared_ptr<core::ProcessContext> &context, const std::shared_ptr<core::ProcessSession> &session) override; void initialize(std::filesystem::path script_file, diff --git a/extensions/rocksdb-repos/ProvenanceRepository.h b/extensions/rocksdb-repos/ProvenanceRepository.h index eb2f35fee..a5febea18 100644 --- a/extensions/rocksdb-repos/ProvenanceRepository.h +++ b/extensions/rocksdb-repos/ProvenanceRepository.h @@ -41,8 +41,8 @@ constexpr auto PROVENANCE_PURGE_PERIOD = std::chrono::milliseconds(2500); class ProvenanceRepository : public core::repository::RocksDbRepository { public: - ProvenanceRepository(std::string name, const utils::Identifier& /*uuid*/) - : ProvenanceRepository(std::move(name)) { + ProvenanceRepository(std::string_view name, const utils::Identifier& /*uuid*/) + : ProvenanceRepository(name) { } explicit ProvenanceRepository(std::string_view repo_name = "", diff --git a/extensions/script/ExecuteScript.h b/extensions/script/ExecuteScript.h index ce5cd2807..5a04fcf2d 100644 --- a/extensions/script/ExecuteScript.h +++ b/extensions/script/ExecuteScript.h @@ -46,8 +46,8 @@ enum class ScriptEngineOption { class ExecuteScript : public core::Processor { public: - explicit ExecuteScript(std::string name, const utils::Identifier &uuid = {}) - : Processor(std::move(name), uuid) { + explicit ExecuteScript(std::string_view name, const utils::Identifier &uuid = {}) + : Processor(name, uuid) { } EXTENSIONAPI static constexpr const char* Description = "Executes a script given the flow file and a process session. " diff --git a/extensions/script/ScriptExecutor.h b/extensions/script/ScriptExecutor.h index e595109b8..c33be136b 100644 --- a/extensions/script/ScriptExecutor.h +++ b/extensions/script/ScriptExecutor.h @@ -30,7 +30,7 @@ namespace org::apache::nifi::minifi::extensions::script { class ScriptExecutor : public minifi::core::CoreComponent { public: - ScriptExecutor(std::string name, const utils::Identifier& uuid) : core::CoreComponent(std::move(name), uuid) {} + ScriptExecutor(std::string_view name, const utils::Identifier& uuid) : core::CoreComponent(name, uuid) {} virtual void onTrigger(const std::shared_ptr<core::ProcessContext> &context, const std::shared_ptr<core::ProcessSession> &session) = 0; virtual void initialize(std::filesystem::path script_file, diff --git a/extensions/splunk/PutSplunkHTTP.h b/extensions/splunk/PutSplunkHTTP.h index 35bfdda61..042f0260f 100644 --- a/extensions/splunk/PutSplunkHTTP.h +++ b/extensions/splunk/PutSplunkHTTP.h @@ -34,8 +34,8 @@ namespace org::apache::nifi::minifi::extensions::splunk { class PutSplunkHTTP final : public SplunkHECProcessor { public: - explicit PutSplunkHTTP(std::string name, const utils::Identifier& uuid = {}) - : SplunkHECProcessor(std::move(name), uuid) { + explicit PutSplunkHTTP(std::string_view name, const utils::Identifier& uuid = {}) + : SplunkHECProcessor(name, uuid) { } PutSplunkHTTP(const PutSplunkHTTP&) = delete; PutSplunkHTTP(PutSplunkHTTP&&) = delete; diff --git a/extensions/splunk/QuerySplunkIndexingStatus.h b/extensions/splunk/QuerySplunkIndexingStatus.h index 868b10a31..a8b3ec1fe 100644 --- a/extensions/splunk/QuerySplunkIndexingStatus.h +++ b/extensions/splunk/QuerySplunkIndexingStatus.h @@ -35,8 +35,8 @@ namespace org::apache::nifi::minifi::extensions::splunk { class QuerySplunkIndexingStatus final : public SplunkHECProcessor { public: - explicit QuerySplunkIndexingStatus(std::string name, const utils::Identifier& uuid = {}) - : SplunkHECProcessor(std::move(name), uuid) { + explicit QuerySplunkIndexingStatus(std::string_view name, const utils::Identifier& uuid = {}) + : SplunkHECProcessor(name, uuid) { } QuerySplunkIndexingStatus(const QuerySplunkIndexingStatus&) = delete; QuerySplunkIndexingStatus(QuerySplunkIndexingStatus&&) = delete; diff --git a/extensions/splunk/SplunkHECProcessor.h b/extensions/splunk/SplunkHECProcessor.h index bc885ac13..2efdea737 100644 --- a/extensions/splunk/SplunkHECProcessor.h +++ b/extensions/splunk/SplunkHECProcessor.h @@ -68,8 +68,8 @@ class SplunkHECProcessor : public core::Processor { }; - explicit SplunkHECProcessor(std::string name, const utils::Identifier& uuid = {}) - : Processor(std::move(name), uuid) { + explicit SplunkHECProcessor(std::string_view name, const utils::Identifier& uuid = {}) + : Processor(name, uuid) { } ~SplunkHECProcessor() override = default; diff --git a/extensions/sql/processors/ExecuteSQL.cpp b/extensions/sql/processors/ExecuteSQL.cpp index f9e8d6ae7..69ac57c8e 100644 --- a/extensions/sql/processors/ExecuteSQL.cpp +++ b/extensions/sql/processors/ExecuteSQL.cpp @@ -32,8 +32,8 @@ namespace org::apache::nifi::minifi::processors { const std::string ExecuteSQL::RESULT_ROW_COUNT = "executesql.row.count"; const std::string ExecuteSQL::INPUT_FLOW_FILE_UUID = "input.flowfile.uuid"; -ExecuteSQL::ExecuteSQL(std::string name, const utils::Identifier& uuid) - : SQLProcessor(std::move(name), uuid, core::logging::LoggerFactory<ExecuteSQL>::getLogger(uuid)) { +ExecuteSQL::ExecuteSQL(std::string_view name, const utils::Identifier& uuid) + : SQLProcessor(name, uuid, core::logging::LoggerFactory<ExecuteSQL>::getLogger(uuid)) { } void ExecuteSQL::initialize() { diff --git a/extensions/sql/processors/ExecuteSQL.h b/extensions/sql/processors/ExecuteSQL.h index 6ba358104..bea85db41 100644 --- a/extensions/sql/processors/ExecuteSQL.h +++ b/extensions/sql/processors/ExecuteSQL.h @@ -35,7 +35,7 @@ namespace org::apache::nifi::minifi::processors { class ExecuteSQL : public SQLProcessor, public FlowFileSource { public: - explicit ExecuteSQL(std::string name, const utils::Identifier& uuid = {}); + explicit ExecuteSQL(std::string_view name, const utils::Identifier& uuid = {}); EXTENSIONAPI static constexpr const char* Description = "Execute provided SQL query. " "Query result rows will be outputted as new flow files with attribute keys equal to result column names and values equal to result values. " diff --git a/extensions/sql/processors/PutSQL.cpp b/extensions/sql/processors/PutSQL.cpp index ffa50a597..b9c02766b 100644 --- a/extensions/sql/processors/PutSQL.cpp +++ b/extensions/sql/processors/PutSQL.cpp @@ -29,8 +29,8 @@ namespace org::apache::nifi::minifi::processors { -PutSQL::PutSQL(std::string name, const utils::Identifier& uuid) - : SQLProcessor(std::move(name), uuid, core::logging::LoggerFactory<PutSQL>::getLogger(uuid)) { +PutSQL::PutSQL(std::string_view name, const utils::Identifier& uuid) + : SQLProcessor(name, uuid, core::logging::LoggerFactory<PutSQL>::getLogger(uuid)) { } void PutSQL::initialize() { diff --git a/extensions/sql/processors/PutSQL.h b/extensions/sql/processors/PutSQL.h index 985c71218..35fa47cf0 100644 --- a/extensions/sql/processors/PutSQL.h +++ b/extensions/sql/processors/PutSQL.h @@ -33,7 +33,7 @@ namespace org::apache::nifi::minifi::processors { class PutSQL : public SQLProcessor { public: - explicit PutSQL(std::string name, const utils::Identifier& uuid = {}); + explicit PutSQL(std::string_view name, const utils::Identifier& uuid = {}); EXTENSIONAPI static constexpr const char* Description = "Executes a SQL UPDATE or INSERT command. The content of an incoming FlowFile is expected to be the SQL command to execute. " diff --git a/extensions/sql/processors/QueryDatabaseTable.cpp b/extensions/sql/processors/QueryDatabaseTable.cpp index 68c480ec1..a253a492c 100644 --- a/extensions/sql/processors/QueryDatabaseTable.cpp +++ b/extensions/sql/processors/QueryDatabaseTable.cpp @@ -40,8 +40,8 @@ const std::string QueryDatabaseTable::RESULT_ROW_COUNT = "querydbtable.row.count const std::string QueryDatabaseTable::TABLENAME_KEY = "tablename"; const std::string QueryDatabaseTable::MAXVALUE_KEY_PREFIX = "maxvalue."; -QueryDatabaseTable::QueryDatabaseTable(std::string name, const utils::Identifier& uuid) - : SQLProcessor(std::move(name), uuid, core::logging::LoggerFactory<QueryDatabaseTable>::getLogger(uuid)) { +QueryDatabaseTable::QueryDatabaseTable(std::string_view name, const utils::Identifier& uuid) + : SQLProcessor(name, uuid, core::logging::LoggerFactory<QueryDatabaseTable>::getLogger(uuid)) { } void QueryDatabaseTable::initialize() { diff --git a/extensions/sql/processors/QueryDatabaseTable.h b/extensions/sql/processors/QueryDatabaseTable.h index aac71a7b8..571ecfe20 100644 --- a/extensions/sql/processors/QueryDatabaseTable.h +++ b/extensions/sql/processors/QueryDatabaseTable.h @@ -38,7 +38,7 @@ namespace org::apache::nifi::minifi::processors { class QueryDatabaseTable: public SQLProcessor, public FlowFileSource { public: - explicit QueryDatabaseTable(std::string name, const utils::Identifier& uuid = {}); + explicit QueryDatabaseTable(std::string_view name, const utils::Identifier& uuid = {}); EXTENSIONAPI static const std::string RESULT_TABLE_NAME; EXTENSIONAPI static const std::string RESULT_ROW_COUNT; diff --git a/extensions/sql/processors/SQLProcessor.h b/extensions/sql/processors/SQLProcessor.h index 13074631c..30cfd481b 100644 --- a/extensions/sql/processors/SQLProcessor.h +++ b/extensions/sql/processors/SQLProcessor.h @@ -41,8 +41,8 @@ class SQLProcessor: public core::Processor { EXTENSIONAPI static constexpr auto Properties = std::array<core::PropertyReference, 1>{DBControllerService}; protected: - SQLProcessor(std::string name, const utils::Identifier& uuid, std::shared_ptr<core::logging::Logger> logger) - : core::Processor(std::move(name), uuid), logger_(std::move(logger)) { + SQLProcessor(std::string_view name, const utils::Identifier& uuid, std::shared_ptr<core::logging::Logger> logger) + : core::Processor(name, uuid), logger_(std::move(logger)) { } static std::vector<std::string> collectArguments(const std::shared_ptr<core::FlowFile>& flow_file); diff --git a/extensions/sql/services/DatabaseService.h b/extensions/sql/services/DatabaseService.h index 9bbae328c..974e1d02e 100644 --- a/extensions/sql/services/DatabaseService.h +++ b/extensions/sql/services/DatabaseService.h @@ -36,14 +36,14 @@ namespace org::apache::nifi::minifi::sql::controllers { */ class DatabaseService : public core::controller::ControllerService { public: - explicit DatabaseService(std::string name, const utils::Identifier &uuid = {}) - : ControllerService(std::move(name), uuid), + explicit DatabaseService(std::string_view name, const utils::Identifier &uuid = {}) + : ControllerService(name, uuid), initialized_(false) { initialize(); } - explicit DatabaseService(std::string name, const std::shared_ptr<Configure> &configuration) - : ControllerService(std::move(name)), + explicit DatabaseService(std::string_view name, const std::shared_ptr<Configure> &configuration) + : ControllerService(name), initialized_(false) { setConfiguration(configuration); initialize(); diff --git a/extensions/sql/services/ODBCConnector.h b/extensions/sql/services/ODBCConnector.h index eb4492ae0..ebc449886 100644 --- a/extensions/sql/services/ODBCConnector.h +++ b/extensions/sql/services/ODBCConnector.h @@ -41,8 +41,8 @@ class ODBCService : public DatabaseService { initialize(); } - explicit ODBCService(std::string name, const std::shared_ptr<Configure> &configuration) - : DatabaseService(std::move(name)) { + explicit ODBCService(std::string_view name, const std::shared_ptr<Configure> &configuration) + : DatabaseService(name) { setConfiguration(configuration); initialize(); } diff --git a/extensions/standard-processors/processors/AppendHostInfo.h b/extensions/standard-processors/processors/AppendHostInfo.h index 3b95bee75..5eb67d41c 100644 --- a/extensions/standard-processors/processors/AppendHostInfo.h +++ b/extensions/standard-processors/processors/AppendHostInfo.h @@ -42,8 +42,8 @@ class AppendHostInfo : public core::Processor { static constexpr const char* REFRESH_POLICY_ON_TRIGGER = "On every trigger"; static constexpr const char* REFRESH_POLICY_ON_SCHEDULE = "On schedule"; - explicit AppendHostInfo(std::string name, const utils::Identifier& uuid = {}) - : core::Processor(std::move(name), uuid) { + explicit AppendHostInfo(std::string_view name, const utils::Identifier& uuid = {}) + : core::Processor(name, uuid) { } ~AppendHostInfo() override = default; diff --git a/extensions/standard-processors/processors/AttributesToJSON.h b/extensions/standard-processors/processors/AttributesToJSON.h index 14fa7c67a..6b3a7be9f 100644 --- a/extensions/standard-processors/processors/AttributesToJSON.h +++ b/extensions/standard-processors/processors/AttributesToJSON.h @@ -116,8 +116,8 @@ class AttributesToJSON : public core::Processor { ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit AttributesToJSON(std::string name, const utils::Identifier& uuid = {}) - : core::Processor(std::move(name), uuid) { + explicit AttributesToJSON(std::string_view name, const utils::Identifier& uuid = {}) + : core::Processor(name, uuid) { } void initialize() override; diff --git a/extensions/standard-processors/processors/DefragmentText.h b/extensions/standard-processors/processors/DefragmentText.h index 3531f1e82..936dd1736 100644 --- a/extensions/standard-processors/processors/DefragmentText.h +++ b/extensions/standard-processors/processors/DefragmentText.h @@ -59,8 +59,8 @@ namespace org::apache::nifi::minifi::processors { class DefragmentText : public core::Processor { public: - explicit DefragmentText(std::string name, const utils::Identifier& uuid = {}) - : Processor(std::move(name), uuid) { + explicit DefragmentText(std::string_view name, const utils::Identifier& uuid = {}) + : Processor(name, uuid) { } EXTENSIONAPI static constexpr const char* Description = "DefragmentText splits and merges incoming flowfiles so cohesive messages are not split between them. " diff --git a/extensions/standard-processors/processors/ExecuteProcess.h b/extensions/standard-processors/processors/ExecuteProcess.h index ab2839a4a..c101de204 100644 --- a/extensions/standard-processors/processors/ExecuteProcess.h +++ b/extensions/standard-processors/processors/ExecuteProcess.h @@ -49,8 +49,8 @@ namespace org::apache::nifi::minifi::processors { class ExecuteProcess : public core::Processor { public: - explicit ExecuteProcess(std::string name, const utils::Identifier& uuid = {}) - : Processor(std::move(name), uuid), + explicit ExecuteProcess(std::string_view name, const utils::Identifier& uuid = {}) + : Processor(name, uuid), working_dir_(".") { } ~ExecuteProcess() override { diff --git a/extensions/standard-processors/processors/ExtractText.h b/extensions/standard-processors/processors/ExtractText.h index ff9425771..4766d40cb 100644 --- a/extensions/standard-processors/processors/ExtractText.h +++ b/extensions/standard-processors/processors/ExtractText.h @@ -38,8 +38,8 @@ namespace org::apache::nifi::minifi::processors { class ExtractText : public core::Processor { public: - explicit ExtractText(std::string name, const utils::Identifier& uuid = {}) - : Processor(std::move(name), uuid) { + explicit ExtractText(std::string_view name, const utils::Identifier& uuid = {}) + : Processor(name, uuid) { } // Default maximum bytes to read into an attribute diff --git a/extensions/standard-processors/processors/FetchFile.h b/extensions/standard-processors/processors/FetchFile.h index 64eb5776e..ab99a5917 100644 --- a/extensions/standard-processors/processors/FetchFile.h +++ b/extensions/standard-processors/processors/FetchFile.h @@ -85,8 +85,8 @@ namespace org::apache::nifi::minifi::processors { class FetchFile : public core::Processor { public: - explicit FetchFile(std::string name, const utils::Identifier& uuid = {}) - : core::Processor(std::move(name), uuid) { + explicit FetchFile(std::string_view name, const utils::Identifier& uuid = {}) + : core::Processor(name, uuid) { } EXTENSIONAPI static constexpr const char* Description = "Reads the contents of a file from disk and streams it into the contents of an incoming FlowFile. " diff --git a/extensions/standard-processors/processors/GenerateFlowFile.h b/extensions/standard-processors/processors/GenerateFlowFile.h index 1a692293a..240f378cc 100644 --- a/extensions/standard-processors/processors/GenerateFlowFile.h +++ b/extensions/standard-processors/processors/GenerateFlowFile.h @@ -39,8 +39,8 @@ namespace org::apache::nifi::minifi::processors { class GenerateFlowFile : public core::Processor { public: - GenerateFlowFile(std::string name, const utils::Identifier& uuid = {}) // NOLINT - : Processor(std::move(name), uuid) { + GenerateFlowFile(std::string_view name, const utils::Identifier& uuid = {}) // NOLINT + : Processor(name, uuid) { batchSize_ = 1; uniqueFlowFile_ = true; fileSize_ = 1024; diff --git a/extensions/standard-processors/processors/GetFile.h b/extensions/standard-processors/processors/GetFile.h index 4c35dc73d..57860f9d4 100644 --- a/extensions/standard-processors/processors/GetFile.h +++ b/extensions/standard-processors/processors/GetFile.h @@ -84,8 +84,8 @@ class GetFileMetrics : public core::ProcessorMetrics { class GetFile : public core::Processor { public: - explicit GetFile(std::string name, const utils::Identifier& uuid = {}) - : Processor(std::move(name), uuid, std::make_shared<GetFileMetrics>(*this)) { + explicit GetFile(std::string_view name, const utils::Identifier& uuid = {}) + : Processor(name, uuid, std::make_shared<GetFileMetrics>(*this)) { } ~GetFile() override = default; diff --git a/extensions/standard-processors/processors/GetTCP.h b/extensions/standard-processors/processors/GetTCP.h index 6089d221a..ecdb5cb72 100644 --- a/extensions/standard-processors/processors/GetTCP.h +++ b/extensions/standard-processors/processors/GetTCP.h @@ -48,8 +48,8 @@ namespace org::apache::nifi::minifi::processors { class GetTCP : public core::Processor { public: - explicit GetTCP(std::string name, const utils::Identifier& uuid = {}) - : Processor(std::move(name), uuid) { + explicit GetTCP(std::string_view name, const utils::Identifier& uuid = {}) + : Processor(name, uuid) { } ~GetTCP() override { diff --git a/extensions/standard-processors/processors/HashContent.h b/extensions/standard-processors/processors/HashContent.h index 4c2109874..4ae1410a3 100644 --- a/extensions/standard-processors/processors/HashContent.h +++ b/extensions/standard-processors/processors/HashContent.h @@ -139,8 +139,8 @@ static const std::map<std::string, const std::function<HashReturnType(const std: class HashContent : public core::Processor { public: - explicit HashContent(std::string name, const utils::Identifier& uuid = {}) - : Processor(std::move(name), uuid) { + explicit HashContent(std::string_view name, const utils::Identifier& uuid = {}) + : Processor(name, uuid) { } EXTENSIONAPI static constexpr const char* Description = "HashContent calculates the checksum of the content of the flowfile and adds it as an attribute. " diff --git a/extensions/standard-processors/processors/ListFile.h b/extensions/standard-processors/processors/ListFile.h index 8fead27a1..49de33adf 100644 --- a/extensions/standard-processors/processors/ListFile.h +++ b/extensions/standard-processors/processors/ListFile.h @@ -37,8 +37,8 @@ namespace org::apache::nifi::minifi::processors { class ListFile : public core::Processor { public: - explicit ListFile(std::string name, const utils::Identifier& uuid = {}) - : core::Processor(std::move(name), uuid) { + explicit ListFile(std::string_view name, const utils::Identifier& uuid = {}) + : core::Processor(name, uuid) { } EXTENSIONAPI static constexpr const char* Description = "Retrieves a listing of files from the local filesystem. For each file that is listed, " diff --git a/extensions/standard-processors/processors/ListenSyslog.h b/extensions/standard-processors/processors/ListenSyslog.h index 0f172e35e..85b434c60 100644 --- a/extensions/standard-processors/processors/ListenSyslog.h +++ b/extensions/standard-processors/processors/ListenSyslog.h @@ -36,8 +36,8 @@ namespace org::apache::nifi::minifi::processors { class ListenSyslog : public NetworkListenerProcessor { public: - explicit ListenSyslog(std::string name, const utils::Identifier& uuid = {}) - : NetworkListenerProcessor(std::move(name), uuid, core::logging::LoggerFactory<ListenSyslog>::getLogger(uuid)) { + explicit ListenSyslog(std::string_view name, const utils::Identifier& uuid = {}) + : NetworkListenerProcessor(name, uuid, core::logging::LoggerFactory<ListenSyslog>::getLogger(uuid)) { } EXTENSIONAPI static constexpr const char* Description = "Listens for Syslog messages being sent to a given port over TCP or UDP. " diff --git a/extensions/standard-processors/processors/ListenTCP.h b/extensions/standard-processors/processors/ListenTCP.h index 79d13fa1b..4f1d2c899 100644 --- a/extensions/standard-processors/processors/ListenTCP.h +++ b/extensions/standard-processors/processors/ListenTCP.h @@ -35,8 +35,8 @@ namespace org::apache::nifi::minifi::processors { class ListenTCP : public NetworkListenerProcessor { public: - explicit ListenTCP(std::string name, const utils::Identifier& uuid = {}) - : NetworkListenerProcessor(std::move(name), uuid, core::logging::LoggerFactory<ListenTCP>::getLogger(uuid)) { + explicit ListenTCP(std::string_view name, const utils::Identifier& uuid = {}) + : NetworkListenerProcessor(name, uuid, core::logging::LoggerFactory<ListenTCP>::getLogger(uuid)) { } EXTENSIONAPI static constexpr const char* Description = "Listens for incoming TCP connections and reads data from each connection using a line separator as the message demarcator. " diff --git a/extensions/standard-processors/processors/LogAttribute.h b/extensions/standard-processors/processors/LogAttribute.h index 18e222d3d..63be84e0d 100644 --- a/extensions/standard-processors/processors/LogAttribute.h +++ b/extensions/standard-processors/processors/LogAttribute.h @@ -40,8 +40,8 @@ namespace org::apache::nifi::minifi::processors { class LogAttribute : public core::Processor { public: - explicit LogAttribute(std::string name, const utils::Identifier& uuid = {}) - : Processor(std::move(name), uuid) { + explicit LogAttribute(std::string_view name, const utils::Identifier& uuid = {}) + : Processor(name, uuid) { logger_->set_max_log_size(-1); } ~LogAttribute() override = default; diff --git a/extensions/standard-processors/processors/NetworkListenerProcessor.h b/extensions/standard-processors/processors/NetworkListenerProcessor.h index e0bb95f3a..ef766cf56 100644 --- a/extensions/standard-processors/processors/NetworkListenerProcessor.h +++ b/extensions/standard-processors/processors/NetworkListenerProcessor.h @@ -31,8 +31,8 @@ namespace org::apache::nifi::minifi::processors { class NetworkListenerProcessor : public core::Processor { public: - NetworkListenerProcessor(std::string name, const utils::Identifier& uuid, std::shared_ptr<core::logging::Logger> logger) - : core::Processor(std::move(name), uuid), + NetworkListenerProcessor(std::string_view name, const utils::Identifier& uuid, std::shared_ptr<core::logging::Logger> logger) + : core::Processor(name, uuid), logger_(std::move(logger)) { } ~NetworkListenerProcessor() override; diff --git a/extensions/standard-processors/processors/PutFile.h b/extensions/standard-processors/processors/PutFile.h index 9067a1f6c..b9eff26d3 100644 --- a/extensions/standard-processors/processors/PutFile.h +++ b/extensions/standard-processors/processors/PutFile.h @@ -43,8 +43,8 @@ class PutFile : public core::Processor { static constexpr std::string_view CONFLICT_RESOLUTION_STRATEGY_IGNORE = "ignore"; static constexpr std::string_view CONFLICT_RESOLUTION_STRATEGY_FAIL = "fail"; - explicit PutFile(std::string name, const utils::Identifier& uuid = {}) - : core::Processor(std::move(name), uuid) { + explicit PutFile(std::string_view name, const utils::Identifier& uuid = {}) + : core::Processor(name, uuid) { } ~PutFile() override = default; diff --git a/extensions/standard-processors/processors/PutUDP.cpp b/extensions/standard-processors/processors/PutUDP.cpp index 2eeb776eb..19b6899e4 100644 --- a/extensions/standard-processors/processors/PutUDP.cpp +++ b/extensions/standard-processors/processors/PutUDP.cpp @@ -31,8 +31,8 @@ using asio::ip::udp; namespace org::apache::nifi::minifi::processors { -PutUDP::PutUDP(std::string name, const utils::Identifier& uuid) - : Processor(std::move(name), uuid), logger_{core::logging::LoggerFactory<PutUDP>::getLogger(uuid)} +PutUDP::PutUDP(std::string_view name, const utils::Identifier& uuid) + : Processor(name, uuid), logger_{core::logging::LoggerFactory<PutUDP>::getLogger(uuid)} { } PutUDP::~PutUDP() = default; diff --git a/extensions/standard-processors/processors/PutUDP.h b/extensions/standard-processors/processors/PutUDP.h index b43722153..76632eaeb 100644 --- a/extensions/standard-processors/processors/PutUDP.h +++ b/extensions/standard-processors/processors/PutUDP.h @@ -60,7 +60,7 @@ class PutUDP final : public core::Processor { ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit PutUDP(std::string name, const utils::Identifier& uuid = {}); + explicit PutUDP(std::string_view name, const utils::Identifier& uuid = {}); PutUDP(const PutUDP&) = delete; PutUDP& operator=(const PutUDP&) = delete; ~PutUDP() final; diff --git a/extensions/standard-processors/processors/ReplaceText.cpp b/extensions/standard-processors/processors/ReplaceText.cpp index b88f6cd2b..6d3ccd3fa 100644 --- a/extensions/standard-processors/processors/ReplaceText.cpp +++ b/extensions/standard-processors/processors/ReplaceText.cpp @@ -28,8 +28,8 @@ namespace org::apache::nifi::minifi::processors { -ReplaceText::ReplaceText(std::string name, const utils::Identifier& uuid) - : core::Processor(std::move(name), uuid), +ReplaceText::ReplaceText(std::string_view name, const utils::Identifier& uuid) + : core::Processor(name, uuid), logger_(core::logging::LoggerFactory<ReplaceText>::getLogger(uuid)) { } diff --git a/extensions/standard-processors/processors/ReplaceText.h b/extensions/standard-processors/processors/ReplaceText.h index 1b1937988..440b908fd 100644 --- a/extensions/standard-processors/processors/ReplaceText.h +++ b/extensions/standard-processors/processors/ReplaceText.h @@ -178,7 +178,7 @@ class ReplaceText : public core::Processor { ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit ReplaceText(std::string name, const utils::Identifier& uuid = {}); + explicit ReplaceText(std::string_view name, const utils::Identifier& uuid = {}); void initialize() override; void onSchedule(const std::shared_ptr<core::ProcessContext>& context, const std::shared_ptr<core::ProcessSessionFactory>&) override; void onTrigger(const std::shared_ptr<core::ProcessContext>& context, const std::shared_ptr<core::ProcessSession>& session) override; diff --git a/extensions/standard-processors/processors/RetryFlowFile.h b/extensions/standard-processors/processors/RetryFlowFile.h index 01c04077b..1b254e1b7 100644 --- a/extensions/standard-processors/processors/RetryFlowFile.h +++ b/extensions/standard-processors/processors/RetryFlowFile.h @@ -43,8 +43,8 @@ namespace org::apache::nifi::minifi::processors { class RetryFlowFile : public core::Processor { public: - explicit RetryFlowFile(std::string name, const utils::Identifier& uuid = {}) - : Processor(std::move(name), uuid) {} + explicit RetryFlowFile(std::string_view name, const utils::Identifier& uuid = {}) + : Processor(name, uuid) {} ~RetryFlowFile() override = default; // ReuseMode allowed values diff --git a/extensions/standard-processors/processors/RouteOnAttribute.h b/extensions/standard-processors/processors/RouteOnAttribute.h index 455ccfd83..6c2916368 100644 --- a/extensions/standard-processors/processors/RouteOnAttribute.h +++ b/extensions/standard-processors/processors/RouteOnAttribute.h @@ -35,8 +35,8 @@ namespace org::apache::nifi::minifi::processors { class RouteOnAttribute : public core::Processor { public: - explicit RouteOnAttribute(std::string name, const utils::Identifier& uuid = {}) - : core::Processor(std::move(name), uuid) { + explicit RouteOnAttribute(std::string_view name, const utils::Identifier& uuid = {}) + : core::Processor(name, uuid) { } EXTENSIONAPI static constexpr const char* Description = "Routes FlowFiles based on their Attributes using the Attribute Expression Language.\n\n" diff --git a/extensions/standard-processors/processors/RouteText.cpp b/extensions/standard-processors/processors/RouteText.cpp index fe9f03c3a..6092e0530 100644 --- a/extensions/standard-processors/processors/RouteText.cpp +++ b/extensions/standard-processors/processors/RouteText.cpp @@ -36,8 +36,8 @@ namespace org::apache::nifi::minifi::processors { -RouteText::RouteText(std::string name, const utils::Identifier& uuid) - : core::Processor(std::move(name), uuid), logger_(core::logging::LoggerFactory<RouteText>::getLogger(uuid)) {} +RouteText::RouteText(std::string_view name, const utils::Identifier& uuid) + : core::Processor(name, uuid), logger_(core::logging::LoggerFactory<RouteText>::getLogger(uuid)) {} void RouteText::initialize() { setSupportedProperties(Properties); diff --git a/extensions/standard-processors/processors/RouteText.h b/extensions/standard-processors/processors/RouteText.h index 57287e505..765dbaf5d 100644 --- a/extensions/standard-processors/processors/RouteText.h +++ b/extensions/standard-processors/processors/RouteText.h @@ -205,7 +205,7 @@ class RouteText : public core::Processor { ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit RouteText(std::string name, const utils::Identifier& uuid = {}); + explicit RouteText(std::string_view name, const utils::Identifier& uuid = {}); void initialize() override; void onSchedule(core::ProcessContext *context, core::ProcessSessionFactory* sessionFactory) override; diff --git a/extensions/standard-processors/processors/TailFile.h b/extensions/standard-processors/processors/TailFile.h index 015eab7d9..6e3237047 100644 --- a/extensions/standard-processors/processors/TailFile.h +++ b/extensions/standard-processors/processors/TailFile.h @@ -105,8 +105,8 @@ enum class Mode { class TailFile : public core::Processor { public: - explicit TailFile(std::string name, const utils::Identifier& uuid = {}) - : core::Processor(std::move(name), uuid) { + explicit TailFile(std::string_view name, const utils::Identifier& uuid = {}) + : core::Processor(name, uuid) { } ~TailFile() override = default; diff --git a/extensions/standard-processors/processors/UpdateAttribute.h b/extensions/standard-processors/processors/UpdateAttribute.h index 3adc33c00..f059a00a5 100644 --- a/extensions/standard-processors/processors/UpdateAttribute.h +++ b/extensions/standard-processors/processors/UpdateAttribute.h @@ -36,8 +36,8 @@ namespace org::apache::nifi::minifi::processors { class UpdateAttribute : public core::Processor { public: - UpdateAttribute(std::string name, const utils::Identifier& uuid = {}) // NOLINT - : core::Processor(std::move(name), uuid) { + UpdateAttribute(std::string_view name, const utils::Identifier& uuid = {}) // NOLINT + : core::Processor(name, uuid) { } EXTENSIONAPI static constexpr const char* Description = "This processor updates the attributes of a FlowFile using properties that are added by the user. " diff --git a/extensions/standard-processors/tests/unit/DefragmentTextTests.cpp b/extensions/standard-processors/tests/unit/DefragmentTextTests.cpp index 9f875db81..43a5305d3 100644 --- a/extensions/standard-processors/tests/unit/DefragmentTextTests.cpp +++ b/extensions/standard-processors/tests/unit/DefragmentTextTests.cpp @@ -323,8 +323,8 @@ class FragmentGenerator : public core::Processor { static constexpr bool IsSingleThreaded = false; ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS - explicit FragmentGenerator(std::string name, const utils::Identifier& uuid = utils::Identifier()) - : Processor(std::move(name), uuid) { + explicit FragmentGenerator(std::string_view name, const utils::Identifier& uuid = utils::Identifier()) + : Processor(name, uuid) { } void onTrigger(core::ProcessContext*, core::ProcessSession* session) override { diff --git a/extensions/test-processors/KamikazeProcessor.h b/extensions/test-processors/KamikazeProcessor.h index 1d3be9896..9b3bd3695 100644 --- a/extensions/test-processors/KamikazeProcessor.h +++ b/extensions/test-processors/KamikazeProcessor.h @@ -39,8 +39,8 @@ class KamikazeProcessor : public core::Processor { EXTENSIONAPI static const std::string OnTriggerLogStr; EXTENSIONAPI static const std::string OnUnScheduleLogStr; - explicit KamikazeProcessor(std::string name, const utils::Identifier& uuid = utils::Identifier()) - : Processor(std::move(name), uuid) { + explicit KamikazeProcessor(std::string_view name, const utils::Identifier& uuid = utils::Identifier()) + : Processor(name, uuid) { } EXTENSIONAPI static constexpr const char* Description = "This processor can throw exceptions in onTrigger and onSchedule calls based on configuration. Only for testing purposes."; diff --git a/extensions/test-processors/LogOnDestructionProcessor.h b/extensions/test-processors/LogOnDestructionProcessor.h index e6ebe1edf..7306818bf 100644 --- a/extensions/test-processors/LogOnDestructionProcessor.h +++ b/extensions/test-processors/LogOnDestructionProcessor.h @@ -29,8 +29,8 @@ namespace org::apache::nifi::minifi::processors { class LogOnDestructionProcessor : public core::Processor { public: - explicit LogOnDestructionProcessor(std::string name, const utils::Identifier& uuid = utils::Identifier()) - : Processor(std::move(name), uuid) { + explicit LogOnDestructionProcessor(std::string_view name, const utils::Identifier& uuid = utils::Identifier()) + : Processor(name, uuid) { } ~LogOnDestructionProcessor() override { diff --git a/libminifi/include/Connection.h b/libminifi/include/Connection.h index 154958ba6..0cabbfdd3 100644 --- a/libminifi/include/Connection.h +++ b/libminifi/include/Connection.h @@ -45,14 +45,14 @@ struct ConnectionTestAccessor; class Connection : public core::Connectable { friend struct test::utils::ConnectionTestAccessor; public: - explicit Connection(std::shared_ptr<core::Repository> flow_repository, std::shared_ptr<core::ContentRepository> content_repo, std::string name); - explicit Connection(std::shared_ptr<core::Repository> flow_repository, std::shared_ptr<core::ContentRepository> content_repo, std::string name, const utils::Identifier &uuid); - explicit Connection(std::shared_ptr<core::Repository> flow_repository, std::shared_ptr<core::ContentRepository> content_repo, std::string name, const utils::Identifier &uuid, + explicit Connection(std::shared_ptr<core::Repository> flow_repository, std::shared_ptr<core::ContentRepository> content_repo, std::string_view name); + explicit Connection(std::shared_ptr<core::Repository> flow_repository, std::shared_ptr<core::ContentRepository> content_repo, std::string_view name, const utils::Identifier &uuid); + explicit Connection(std::shared_ptr<core::Repository> flow_repository, std::shared_ptr<core::ContentRepository> content_repo, std::string_view name, const utils::Identifier &uuid, const utils::Identifier &srcUUID); - explicit Connection(std::shared_ptr<core::Repository> flow_repository, std::shared_ptr<core::ContentRepository> content_repo, std::string name, const utils::Identifier &uuid, + explicit Connection(std::shared_ptr<core::Repository> flow_repository, std::shared_ptr<core::ContentRepository> content_repo, std::string_view name, const utils::Identifier &uuid, const utils::Identifier &srcUUID, const utils::Identifier &destUUID); explicit Connection(std::shared_ptr<core::Repository> flow_repository, std::shared_ptr<core::ContentRepository> content_repo, std::shared_ptr<SwapManager> swap_manager, - std::string name, const utils::Identifier& uuid); + std::string_view name, const utils::Identifier& uuid); ~Connection() override = default; Connection(const Connection &parent) = delete; diff --git a/libminifi/include/ForwardingNode.h b/libminifi/include/ForwardingNode.h index 9293301d7..5bd0de281 100644 --- a/libminifi/include/ForwardingNode.h +++ b/libminifi/include/ForwardingNode.h @@ -28,10 +28,10 @@ namespace org::apache::nifi::minifi { class ForwardingNode : public core::Processor { public: - ForwardingNode(std::string name, const utils::Identifier& uuid, std::shared_ptr<core::logging::Logger> logger) : Processor(std::move(name), uuid), logger_(std::move(logger)) { + ForwardingNode(std::string_view name, const utils::Identifier& uuid, std::shared_ptr<core::logging::Logger> logger) : Processor(name, uuid), logger_(std::move(logger)) { strategy_ = core::SchedulingStrategy::EVENT_DRIVEN; } - ForwardingNode(std::string name, std::shared_ptr<core::logging::Logger> logger) : Processor(std::move(name)), logger_(std::move(logger)) {} + ForwardingNode(std::string_view name, std::shared_ptr<core::logging::Logger> logger) : Processor(name), logger_(std::move(logger)) {} MINIFIAPI static constexpr auto Properties = std::array<core::PropertyReference, 0>{}; MINIFIAPI static constexpr auto Success = core::RelationshipDefinition{"success", "FlowFiles are routed to success relationship"}; diff --git a/libminifi/include/Funnel.h b/libminifi/include/Funnel.h index 02e8aaa8b..dfdcca7df 100644 --- a/libminifi/include/Funnel.h +++ b/libminifi/include/Funnel.h @@ -26,8 +26,8 @@ namespace org::apache::nifi::minifi { class Funnel final : public ForwardingNode { public: - Funnel(std::string name, const utils::Identifier& uuid) : ForwardingNode(std::move(name), uuid, core::logging::LoggerFactory<Funnel>::getLogger(uuid)) {} - explicit Funnel(std::string name) : ForwardingNode(std::move(name), core::logging::LoggerFactory<Funnel>::getLogger()) {} + Funnel(std::string_view name, const utils::Identifier& uuid) : ForwardingNode(name, uuid, core::logging::LoggerFactory<Funnel>::getLogger(uuid)) {} + explicit Funnel(std::string_view name) : ForwardingNode(name, core::logging::LoggerFactory<Funnel>::getLogger()) {} MINIFIAPI static constexpr core::annotation::Input InputRequirement = core::annotation::Input::INPUT_REQUIRED; ADD_COMMON_VIRTUAL_FUNCTIONS_FOR_PROCESSORS diff --git a/libminifi/include/Port.h b/libminifi/include/Port.h index 1f17519fe..c4186de2b 100644 --- a/libminifi/include/Port.h +++ b/libminifi/include/Port.h @@ -31,8 +31,8 @@ enum class PortType { class Port final : public ForwardingNode { public: - Port(std::string name, const utils::Identifier& uuid, PortType port_type) : ForwardingNode(std::move(name), uuid, core::logging::LoggerFactory<Port>::getLogger(uuid)), port_type_(port_type) {} - Port(std::string name, PortType port_type) : ForwardingNode(std::move(name), core::logging::LoggerFactory<Port>::getLogger()), port_type_(port_type) {} + Port(std::string_view name, const utils::Identifier& uuid, PortType port_type) : ForwardingNode(name, uuid, core::logging::LoggerFactory<Port>::getLogger(uuid)), port_type_(port_type) {} + Port(std::string_view name, PortType port_type) : ForwardingNode(name, core::logging::LoggerFactory<Port>::getLogger()), port_type_(port_type) {} PortType getPortType() const { return port_type_; } diff --git a/libminifi/include/RemoteProcessorGroupPort.h b/libminifi/include/RemoteProcessorGroupPort.h index 7cf3c9435..09bb18521 100644 --- a/libminifi/include/RemoteProcessorGroupPort.h +++ b/libminifi/include/RemoteProcessorGroupPort.h @@ -76,8 +76,8 @@ struct RPG { class RemoteProcessorGroupPort : public core::Processor { public: - RemoteProcessorGroupPort(std::string name, std::string url, std::shared_ptr<Configure> configure, const utils::Identifier &uuid = {}) - : core::Processor(std::move(name), uuid), + RemoteProcessorGroupPort(std::string_view name, std::string url, std::shared_ptr<Configure> configure, const utils::Identifier &uuid = {}) + : core::Processor(name, uuid), configure_(std::move(configure)), direction_(sitetosite::SEND), transmitting_(false), diff --git a/libminifi/include/c2/C2Protocol.h b/libminifi/include/c2/C2Protocol.h index 02eee182a..d843afa60 100644 --- a/libminifi/include/c2/C2Protocol.h +++ b/libminifi/include/c2/C2Protocol.h @@ -34,8 +34,8 @@ namespace org::apache::nifi::minifi::c2 { */ class C2Protocol : public core::Connectable { public: - C2Protocol(std::string name, const utils::Identifier &uuid) - : core::Connectable(std::move(name), uuid), + C2Protocol(std::string_view name, const utils::Identifier &uuid) + : core::Connectable(name, uuid), running_(true) { } diff --git a/libminifi/include/c2/C2Trigger.h b/libminifi/include/c2/C2Trigger.h index 8641ba5a1..2c2f33209 100644 --- a/libminifi/include/c2/C2Trigger.h +++ b/libminifi/include/c2/C2Trigger.h @@ -37,8 +37,8 @@ namespace org::apache::nifi::minifi::c2 { */ class C2Trigger : public core::Connectable { public: - C2Trigger(std::string name, const utils::Identifier& uuid) - : core::Connectable(std::move(name), uuid) { + C2Trigger(std::string_view name, const utils::Identifier& uuid) + : core::Connectable(name, uuid) { } ~C2Trigger() override = default; diff --git a/libminifi/include/c2/HeartbeatLogger.h b/libminifi/include/c2/HeartbeatLogger.h index 80e516dcb..cd2c4b062 100644 --- a/libminifi/include/c2/HeartbeatLogger.h +++ b/libminifi/include/c2/HeartbeatLogger.h @@ -30,7 +30,7 @@ class HeartbeatLogger : public RESTProtocol, public HeartbeatReporter { public: MINIFIAPI static constexpr const char* Description = "Logs heartbeats at TRACE level."; - explicit HeartbeatLogger(std::string name, const utils::Identifier& id = {}); + explicit HeartbeatLogger(std::string_view name, const utils::Identifier& id = {}); int16_t heartbeat(const C2Payload &heartbeat) override; void initialize(core::controller::ControllerServiceProvider* controller, state::StateMonitor* updateSink, const std::shared_ptr<Configure> &configure) override; diff --git a/libminifi/include/c2/HeartbeatReporter.h b/libminifi/include/c2/HeartbeatReporter.h index 5b4435ddd..0bcdfb057 100644 --- a/libminifi/include/c2/HeartbeatReporter.h +++ b/libminifi/include/c2/HeartbeatReporter.h @@ -36,8 +36,8 @@ namespace org::apache::nifi::minifi::c2 { */ class HeartbeatReporter : public core::Connectable { public: - HeartbeatReporter(std::string name, const utils::Identifier& uuid) - : core::Connectable(std::move(name), uuid), + HeartbeatReporter(std::string_view name, const utils::Identifier& uuid) + : core::Connectable(name, uuid), controller_(nullptr), update_sink_(nullptr), configuration_(nullptr) { diff --git a/libminifi/include/controllers/LinuxPowerManagementService.h b/libminifi/include/controllers/LinuxPowerManagementService.h index 11424954e..a450c1004 100644 --- a/libminifi/include/controllers/LinuxPowerManagementService.h +++ b/libminifi/include/controllers/LinuxPowerManagementService.h @@ -39,8 +39,8 @@ namespace org::apache::nifi::minifi::controllers { */ class LinuxPowerManagerService : public ThreadManagementService { public: - explicit LinuxPowerManagerService(std::string name, const utils::Identifier &uuid = {}) - : ThreadManagementService(std::move(name), uuid), + explicit LinuxPowerManagerService(std::string_view name, const utils::Identifier &uuid = {}) + : ThreadManagementService(name, uuid), enabled_(false), battery_level_(0), wait_period_(0), @@ -49,8 +49,8 @@ class LinuxPowerManagerService : public ThreadManagementService { low_battery_trigger_(0) { } - explicit LinuxPowerManagerService(std::string name, const std::shared_ptr<Configure> &configuration) - : LinuxPowerManagerService(std::move(name)) { + explicit LinuxPowerManagerService(std::string_view name, const std::shared_ptr<Configure> &configuration) + : LinuxPowerManagerService(name) { setConfiguration(configuration); initialize(); } diff --git a/libminifi/include/controllers/NetworkPrioritizerService.h b/libminifi/include/controllers/NetworkPrioritizerService.h index 1a3dad8a3..2ba25712c 100644 --- a/libminifi/include/controllers/NetworkPrioritizerService.h +++ b/libminifi/include/controllers/NetworkPrioritizerService.h @@ -42,10 +42,10 @@ namespace org::apache::nifi::minifi::controllers { */ class NetworkPrioritizerService : public core::controller::ControllerService, public minifi::io::NetworkPrioritizer, public std::enable_shared_from_this<NetworkPrioritizerService> { public: - explicit NetworkPrioritizerService(std::string name, + explicit NetworkPrioritizerService(std::string_view name, const utils::Identifier& uuid = {}, std::shared_ptr<utils::timeutils::Clock> clock = std::make_shared<utils::timeutils::SteadyClock>()) - : ControllerService(std::move(name), uuid), + : ControllerService(name, uuid), enabled_(false), max_throughput_(std::numeric_limits<uint64_t>::max()), max_payload_(std::numeric_limits<uint64_t>::max()), @@ -57,8 +57,8 @@ class NetworkPrioritizerService : public core::controller::ControllerService, pu clock_(std::move(clock)) { } - explicit NetworkPrioritizerService(std::string name, const std::shared_ptr<Configure> &configuration) - : NetworkPrioritizerService(std::move(name)) { + explicit NetworkPrioritizerService(std::string_view name, const std::shared_ptr<Configure> &configuration) + : NetworkPrioritizerService(name) { setConfiguration(configuration); initialize(); } diff --git a/libminifi/include/controllers/SSLContextService.h b/libminifi/include/controllers/SSLContextService.h index e5204f233..1c2c74a41 100644 --- a/libminifi/include/controllers/SSLContextService.h +++ b/libminifi/include/controllers/SSLContextService.h @@ -82,14 +82,14 @@ class SSLContext { */ class SSLContextService : public core::controller::ControllerService { public: - explicit SSLContextService(std::string name, const utils::Identifier &uuid = {}) - : ControllerService(std::move(name), uuid), + explicit SSLContextService(std::string_view name, const utils::Identifier &uuid = {}) + : ControllerService(name, uuid), initialized_(false), logger_(core::logging::LoggerFactory<SSLContextService>::getLogger(uuid_)) { } - explicit SSLContextService(std::string name, const std::shared_ptr<Configure> &configuration) - : ControllerService(std::move(name)), + explicit SSLContextService(std::string_view name, const std::shared_ptr<Configure> &configuration) + : ControllerService(name), initialized_(false), logger_(core::logging::LoggerFactory<SSLContextService>::getLogger(uuid_)) { setConfiguration(configuration); diff --git a/libminifi/include/controllers/ThreadManagementService.h b/libminifi/include/controllers/ThreadManagementService.h index d41c3e830..2d3edd7ba 100644 --- a/libminifi/include/controllers/ThreadManagementService.h +++ b/libminifi/include/controllers/ThreadManagementService.h @@ -36,13 +36,13 @@ namespace org::apache::nifi::minifi::controllers { */ class ThreadManagementService : public core::controller::ControllerService { public: - explicit ThreadManagementService(std::string name, const utils::Identifier &uuid = {}) - : ControllerService(std::move(name), uuid), + explicit ThreadManagementService(std::string_view name, const utils::Identifier &uuid = {}) + : ControllerService(name, uuid), logger_(core::logging::LoggerFactory<ThreadManagementService>::getLogger()) { } - explicit ThreadManagementService(std::string name, const std::shared_ptr<Configure>& /*configuration*/) - : ControllerService(std::move(name)), + explicit ThreadManagementService(std::string_view name, const std::shared_ptr<Configure>& /*configuration*/) + : ControllerService(name), logger_(core::logging::LoggerFactory<ThreadManagementService>::getLogger()) { } diff --git a/libminifi/include/controllers/UpdatePolicyControllerService.h b/libminifi/include/controllers/UpdatePolicyControllerService.h index 667adbb72..2031cfd8d 100644 --- a/libminifi/include/controllers/UpdatePolicyControllerService.h +++ b/libminifi/include/controllers/UpdatePolicyControllerService.h @@ -40,12 +40,12 @@ namespace org::apache::nifi::minifi::controllers { */ class UpdatePolicyControllerService : public core::controller::ControllerService, public std::enable_shared_from_this<UpdatePolicyControllerService> { public: - explicit UpdatePolicyControllerService(std::string name, const utils::Identifier &uuid = {}) - : ControllerService(std::move(name), uuid) { + explicit UpdatePolicyControllerService(std::string_view name, const utils::Identifier &uuid = {}) + : ControllerService(name, uuid) { } - explicit UpdatePolicyControllerService(std::string name, const std::shared_ptr<Configure> &configuration) - : UpdatePolicyControllerService(std::move(name)) { + explicit UpdatePolicyControllerService(std::string_view name, const std::shared_ptr<Configure> &configuration) + : UpdatePolicyControllerService(name) { setConfiguration(configuration); initialize(); } diff --git a/libminifi/include/core/ProcessContextBuilder.h b/libminifi/include/core/ProcessContextBuilder.h index cb2925bb7..8bb765d55 100644 --- a/libminifi/include/core/ProcessContextBuilder.h +++ b/libminifi/include/core/ProcessContextBuilder.h @@ -50,9 +50,9 @@ namespace org::apache::nifi::minifi::core { */ class ProcessContextBuilder : public core::CoreComponent, public std::enable_shared_from_this<ProcessContextBuilder> { public: - ProcessContextBuilder(std::string name, const minifi::utils::Identifier &uuid); + ProcessContextBuilder(std::string_view name, const minifi::utils::Identifier &uuid); - explicit ProcessContextBuilder(std::string name); + explicit ProcessContextBuilder(std::string_view name); ~ProcessContextBuilder() override = default; diff --git a/libminifi/include/core/ProcessGroup.h b/libminifi/include/core/ProcessGroup.h index 89b1aa2cd..ce507cb9a 100644 --- a/libminifi/include/core/ProcessGroup.h +++ b/libminifi/include/core/ProcessGroup.h @@ -68,10 +68,10 @@ class ProcessGroup : public CoreComponent { IncludeChildren }; - ProcessGroup(ProcessGroupType type, std::string name, const utils::Identifier& uuid, int version, ProcessGroup *parent); - ProcessGroup(ProcessGroupType type, std::string name); - ProcessGroup(ProcessGroupType type, std::string name, const utils::Identifier& uuid); - ProcessGroup(ProcessGroupType type, std::string name, const utils::Identifier& uuid, int version); + ProcessGroup(ProcessGroupType type, std::string_view name, const utils::Identifier& uuid, int version, ProcessGroup *parent); + ProcessGroup(ProcessGroupType type, std::string_view name); + ProcessGroup(ProcessGroupType type, std::string_view name, const utils::Identifier& uuid); + ProcessGroup(ProcessGroupType type, std::string_view name, const utils::Identifier& uuid, int version); // Destructor ~ProcessGroup() override; // Set URL diff --git a/libminifi/include/core/controller/ControllerService.h b/libminifi/include/core/controller/ControllerService.h index 1e21d3091..256466849 100644 --- a/libminifi/include/core/controller/ControllerService.h +++ b/libminifi/include/core/controller/ControllerService.h @@ -66,14 +66,14 @@ class ControllerService : public ConfigurableComponent, public Connectable { current_state_ = DISABLED; } - explicit ControllerService(std::string name, const utils::Identifier &uuid) - : Connectable(std::move(name), uuid), + explicit ControllerService(std::string_view name, const utils::Identifier &uuid) + : Connectable(name, uuid), configuration_(std::make_shared<Configure>()) { current_state_ = DISABLED; } - explicit ControllerService(std::string name) - : Connectable(std::move(name)), + explicit ControllerService(std::string_view name) + : Connectable(name), configuration_(std::make_shared<Configure>()) { current_state_ = DISABLED; } diff --git a/libminifi/include/core/state/nodes/AgentInformation.h b/libminifi/include/core/state/nodes/AgentInformation.h index d4d013f18..1d403aff7 100644 --- a/libminifi/include/core/state/nodes/AgentInformation.h +++ b/libminifi/include/core/state/nodes/AgentInformation.h @@ -39,12 +39,12 @@ namespace org::apache::nifi::minifi::state::response { class ComponentManifest : public DeviceInformation { public: - ComponentManifest(std::string name, const utils::Identifier& uuid) - : DeviceInformation(std::move(name), uuid) { + ComponentManifest(std::string_view name, const utils::Identifier& uuid) + : DeviceInformation(name, uuid) { } - explicit ComponentManifest(std::string name) - : DeviceInformation(std::move(name)) { + explicit ComponentManifest(std::string_view name) + : DeviceInformation(name) { } std::string getName() const override { @@ -62,12 +62,12 @@ class ComponentManifest : public DeviceInformation { class ExternalManifest : public ComponentManifest { public: - ExternalManifest(std::string name, const utils::Identifier& uuid) - : ComponentManifest(std::move(name), uuid) { + ExternalManifest(std::string_view name, const utils::Identifier& uuid) + : ComponentManifest(name, uuid) { } - explicit ExternalManifest(std::string name) - : ComponentManifest(std::move(name)) { + explicit ExternalManifest(std::string_view name) + : ComponentManifest(name) { } std::vector<SerializedResponseNode> serialize() override; @@ -75,13 +75,13 @@ class ExternalManifest : public ComponentManifest { class Bundles : public DeviceInformation { public: - Bundles(std::string name, const utils::Identifier& uuid) - : DeviceInformation(std::move(name), uuid) { + Bundles(std::string_view name, const utils::Identifier& uuid) + : DeviceInformation(name, uuid) { setArray(true); } - explicit Bundles(std::string name) - : DeviceInformation(std::move(name)) { + explicit Bundles(std::string_view name) + : DeviceInformation(name) { setArray(true); } @@ -97,18 +97,18 @@ class Bundles : public DeviceInformation { */ class AgentStatus : public StateMonitorNode { public: - AgentStatus(std::string name, const utils::Identifier& uuid) - : StateMonitorNode(std::move(name), uuid), + AgentStatus(std::string_view name, const utils::Identifier& uuid) + : StateMonitorNode(name, uuid), repository_metrics_source_store_(getName()) { } - explicit AgentStatus(std::string name) - : StateMonitorNode(std::move(name)), + explicit AgentStatus(std::string_view name) + : StateMonitorNode(name), repository_metrics_source_store_(getName()) { } - explicit AgentStatus(std::string name, std::string parent_metrics_name) - : StateMonitorNode(std::move(name)), + explicit AgentStatus(std::string_view name, std::string parent_metrics_name) + : StateMonitorNode(name), repository_metrics_source_store_(std::move(parent_metrics_name)) { } @@ -187,12 +187,12 @@ class AgentMonitor { */ class AgentManifest : public DeviceInformation { public: - AgentManifest(std::string name, const utils::Identifier& uuid) - : DeviceInformation(std::move(name), uuid) { + AgentManifest(std::string_view name, const utils::Identifier& uuid) + : DeviceInformation(name, uuid) { } - explicit AgentManifest(std::string name) - : DeviceInformation(std::move(name)) { + explicit AgentManifest(std::string_view name) + : DeviceInformation(name) { } std::string getName() const override { @@ -221,13 +221,13 @@ class AgentManifest : public DeviceInformation { class AgentNode : public DeviceInformation, public AgentMonitor, public AgentIdentifier { public: - AgentNode(std::string name, const utils::Identifier& uuid) - : DeviceInformation(std::move(name), uuid) { + AgentNode(std::string_view name, const utils::Identifier& uuid) + : DeviceInformation(name, uuid) { setArray(false); } - explicit AgentNode(std::string name) - : DeviceInformation(std::move(name)) { + explicit AgentNode(std::string_view name) + : DeviceInformation(name) { setArray(false); } @@ -260,14 +260,14 @@ class AgentNode : public DeviceInformation, public AgentMonitor, public AgentIde */ class AgentInformation : public AgentNode { public: - AgentInformation(std::string name, const utils::Identifier& uuid) - : AgentNode(std::move(name), uuid), + AgentInformation(std::string_view name, const utils::Identifier& uuid) + : AgentNode(name, uuid), include_agent_status_(true) { setArray(false); } - explicit AgentInformation(std::string name) - : AgentNode(std::move(name)), + explicit AgentInformation(std::string_view name) + : AgentNode(name), include_agent_status_(true) { setArray(false); } diff --git a/libminifi/include/core/state/nodes/BuildInformation.h b/libminifi/include/core/state/nodes/BuildInformation.h index fc8e096ac..acea2fbf0 100644 --- a/libminifi/include/core/state/nodes/BuildInformation.h +++ b/libminifi/include/core/state/nodes/BuildInformation.h @@ -30,12 +30,12 @@ namespace org::apache::nifi::minifi::state::response { */ class BuildInformation : public DeviceInformation { public: - BuildInformation(std::string name, const utils::Identifier &uuid) - : DeviceInformation(std::move(name), uuid) { + BuildInformation(std::string_view name, const utils::Identifier &uuid) + : DeviceInformation(name, uuid) { } - explicit BuildInformation(std::string name) - : DeviceInformation(std::move(name)) { + explicit BuildInformation(std::string_view name) + : DeviceInformation(name) { } MINIFIAPI static constexpr const char* Description = "Metric node that defines the pertinent build information for this agent binary"; diff --git a/libminifi/include/core/state/nodes/DeviceInformation.h b/libminifi/include/core/state/nodes/DeviceInformation.h index a934e48dd..a44a6887b 100644 --- a/libminifi/include/core/state/nodes/DeviceInformation.h +++ b/libminifi/include/core/state/nodes/DeviceInformation.h @@ -77,16 +77,16 @@ class Device { */ class DeviceInfoNode : public DeviceInformation { public: - DeviceInfoNode(std::string name, const utils::Identifier& uuid) - : DeviceInformation(std::move(name), uuid) { + DeviceInfoNode(std::string_view name, const utils::Identifier& uuid) + : DeviceInformation(name, uuid) { static Device device; hostname_ = device.canonical_hostname_; ip_ = device.ip_; device_id_ = device.device_id_; } - explicit DeviceInfoNode(std::string name) - : DeviceInformation(std::move(name)) { + explicit DeviceInfoNode(std::string_view name) + : DeviceInformation(name) { static Device device; hostname_ = device.canonical_hostname_; ip_ = device.ip_; diff --git a/libminifi/include/core/state/nodes/FlowInformation.h b/libminifi/include/core/state/nodes/FlowInformation.h index 494257cd6..a605bd8b2 100644 --- a/libminifi/include/core/state/nodes/FlowInformation.h +++ b/libminifi/include/core/state/nodes/FlowInformation.h @@ -94,12 +94,12 @@ class FlowVersion : public DeviceInformation { class FlowMonitor : public StateMonitorNode { public: - FlowMonitor(std::string name, const utils::Identifier &uuid) - : StateMonitorNode(std::move(name), uuid) { + FlowMonitor(std::string_view name, const utils::Identifier &uuid) + : StateMonitorNode(name, uuid) { } - explicit FlowMonitor(std::string name) - : StateMonitorNode(std::move(name)) { + explicit FlowMonitor(std::string_view name) + : StateMonitorNode(name) { } void setFlowVersion(std::shared_ptr<state::response::FlowVersion> flow_version) { @@ -120,12 +120,12 @@ class FlowMonitor : public StateMonitorNode { */ class FlowInformation : public FlowMonitor { public: - FlowInformation(std::string name, const utils::Identifier &uuid) - : FlowMonitor(std::move(name), uuid) { + FlowInformation(std::string_view name, const utils::Identifier &uuid) + : FlowMonitor(name, uuid) { } - explicit FlowInformation(std::string name) - : FlowMonitor(std::move(name)) { + explicit FlowInformation(std::string_view name) + : FlowMonitor(name) { } MINIFIAPI static constexpr const char* Description = "Metric node that defines the flow ID and flow URL deployed to this agent"; diff --git a/libminifi/include/core/state/nodes/MetricsBase.h b/libminifi/include/core/state/nodes/MetricsBase.h index e8f16a627..a6c59a754 100644 --- a/libminifi/include/core/state/nodes/MetricsBase.h +++ b/libminifi/include/core/state/nodes/MetricsBase.h @@ -44,13 +44,13 @@ class ResponseNode : public core::Connectable, public PublishedMetricProvider { is_array_(false) { } - explicit ResponseNode(std::string name) - : core::Connectable(std::move(name)), + explicit ResponseNode(std::string_view name) + : core::Connectable(name), is_array_(false) { } - ResponseNode(std::string name, const utils::Identifier& uuid) - : core::Connectable(std::move(name), uuid), + ResponseNode(std::string_view name, const utils::Identifier& uuid) + : core::Connectable(name, uuid), is_array_(false) { } @@ -92,12 +92,12 @@ class ResponseNode : public core::Connectable, public PublishedMetricProvider { */ class DeviceInformation : public ResponseNode { public: - DeviceInformation(std::string name, const utils::Identifier& uuid) - : ResponseNode(std::move(name), uuid) { + DeviceInformation(std::string_view name, const utils::Identifier& uuid) + : ResponseNode(name, uuid) { } - explicit DeviceInformation(std::string name) - : ResponseNode(std::move(name)) { + explicit DeviceInformation(std::string_view name) + : ResponseNode(name) { } }; diff --git a/libminifi/include/core/state/nodes/RepositoryMetrics.h b/libminifi/include/core/state/nodes/RepositoryMetrics.h index da3c2d51f..a7d69ea09 100644 --- a/libminifi/include/core/state/nodes/RepositoryMetrics.h +++ b/libminifi/include/core/state/nodes/RepositoryMetrics.h @@ -35,13 +35,13 @@ namespace org::apache::nifi::minifi::state::response { */ class RepositoryMetrics : public ResponseNode { public: - RepositoryMetrics(std::string name, const utils::Identifier &uuid) - : ResponseNode(std::move(name), uuid), + RepositoryMetrics(std::string_view name, const utils::Identifier &uuid) + : ResponseNode(name, uuid), repository_metrics_source_store_(getName()) { } - explicit RepositoryMetrics(std::string name) - : ResponseNode(std::move(name)), + explicit RepositoryMetrics(std::string_view name) + : ResponseNode(name), repository_metrics_source_store_(getName()) { } diff --git a/libminifi/include/core/state/nodes/SchedulingNodes.h b/libminifi/include/core/state/nodes/SchedulingNodes.h index 841fcb15c..7321b8467 100644 --- a/libminifi/include/core/state/nodes/SchedulingNodes.h +++ b/libminifi/include/core/state/nodes/SchedulingNodes.h @@ -28,12 +28,12 @@ namespace org::apache::nifi::minifi::state::response { class SchedulingDefaults : public DeviceInformation { public: - SchedulingDefaults(std::string name, const utils::Identifier &uuid) - : DeviceInformation(std::move(name), uuid) { + SchedulingDefaults(std::string_view name, const utils::Identifier &uuid) + : DeviceInformation(name, uuid) { } - explicit SchedulingDefaults(std::string name) - : DeviceInformation(std::move(name)) { + explicit SchedulingDefaults(std::string_view name) + : DeviceInformation(name) { } std::string getName() const override { diff --git a/libminifi/include/core/state/nodes/StateMonitor.h b/libminifi/include/core/state/nodes/StateMonitor.h index 7278645aa..a558998c4 100644 --- a/libminifi/include/core/state/nodes/StateMonitor.h +++ b/libminifi/include/core/state/nodes/StateMonitor.h @@ -27,13 +27,13 @@ namespace org::apache::nifi::minifi::state::response { class StateMonitorNode : public DeviceInformation { public: - StateMonitorNode(std::string name, const utils::Identifier& uuid) - : DeviceInformation(std::move(name), uuid), + StateMonitorNode(std::string_view name, const utils::Identifier& uuid) + : DeviceInformation(name, uuid), monitor_(nullptr) { } - explicit StateMonitorNode(std::string name) - : DeviceInformation(std::move(name)), + explicit StateMonitorNode(std::string_view name) + : DeviceInformation(name), monitor_(nullptr) { } diff --git a/libminifi/include/core/state/nodes/SupportedOperations.h b/libminifi/include/core/state/nodes/SupportedOperations.h index ccd414fac..1eaff2a9e 100644 --- a/libminifi/include/core/state/nodes/SupportedOperations.h +++ b/libminifi/include/core/state/nodes/SupportedOperations.h @@ -30,8 +30,8 @@ namespace org::apache::nifi::minifi::state::response { class SupportedOperations : public DeviceInformation { public: - SupportedOperations(std::string name, const utils::Identifier &uuid); - explicit SupportedOperations(std::string name); + SupportedOperations(std::string_view name, const utils::Identifier &uuid); + explicit SupportedOperations(std::string_view name); MINIFIAPI static constexpr const char* Description = "Metric node that defines the supported C2 operations in the Agent Manifest."; diff --git a/libminifi/src/Connection.cpp b/libminifi/src/Connection.cpp index 7c3145c39..aac00838b 100644 --- a/libminifi/src/Connection.cpp +++ b/libminifi/src/Connection.cpp @@ -32,32 +32,32 @@ using namespace std::literals::chrono_literals; namespace org::apache::nifi::minifi { -Connection::Connection(std::shared_ptr<core::Repository> flow_repository, std::shared_ptr<core::ContentRepository> content_repo, std::string name) - : core::Connectable(std::move(name)), +Connection::Connection(std::shared_ptr<core::Repository> flow_repository, std::shared_ptr<core::ContentRepository> content_repo, std::string_view name) + : core::Connectable(name), flow_repository_(std::move(flow_repository)), content_repo_(std::move(content_repo)) { logger_->log_debug("Connection %s created", name_); } -Connection::Connection(std::shared_ptr<core::Repository> flow_repository, std::shared_ptr<core::ContentRepository> content_repo, std::string name, const utils::Identifier &uuid) - : core::Connectable(std::move(name), uuid), +Connection::Connection(std::shared_ptr<core::Repository> flow_repository, std::shared_ptr<core::ContentRepository> content_repo, std::string_view name, const utils::Identifier &uuid) + : core::Connectable(name, uuid), flow_repository_(std::move(flow_repository)), content_repo_(std::move(content_repo)) { logger_->log_debug("Connection %s created", name_); } -Connection::Connection(std::shared_ptr<core::Repository> flow_repository, std::shared_ptr<core::ContentRepository> content_repo, std::string name, const utils::Identifier &uuid, +Connection::Connection(std::shared_ptr<core::Repository> flow_repository, std::shared_ptr<core::ContentRepository> content_repo, std::string_view name, const utils::Identifier &uuid, const utils::Identifier& srcUUID) - : core::Connectable(std::move(name), uuid), + : core::Connectable(name, uuid), flow_repository_(std::move(flow_repository)), content_repo_(std::move(content_repo)) { src_uuid_ = srcUUID; logger_->log_debug("Connection %s created", name_); } -Connection::Connection(std::shared_ptr<core::Repository> flow_repository, std::shared_ptr<core::ContentRepository> content_repo, std::string name, const utils::Identifier &uuid, +Connection::Connection(std::shared_ptr<core::Repository> flow_repository, std::shared_ptr<core::ContentRepository> content_repo, std::string_view name, const utils::Identifier &uuid, const utils::Identifier& srcUUID, const utils::Identifier& destUUID) - : core::Connectable(std::move(name), uuid), + : core::Connectable(name, uuid), flow_repository_(std::move(flow_repository)), content_repo_(std::move(content_repo)) { src_uuid_ = srcUUID; @@ -66,8 +66,8 @@ Connection::Connection(std::shared_ptr<core::Repository> flow_repository, std::s } Connection::Connection(std::shared_ptr<core::Repository> flow_repository, std::shared_ptr<core::ContentRepository> content_repo, std::shared_ptr<SwapManager> swap_manager, - std::string name, const utils::Identifier& uuid) - : core::Connectable(std::move(name), uuid), + std::string_view name, const utils::Identifier& uuid) + : core::Connectable(name, uuid), flow_repository_(std::move(flow_repository)), content_repo_(std::move(content_repo)), queue_(std::move(swap_manager)) { diff --git a/libminifi/src/c2/HeartbeatLogger.cpp b/libminifi/src/c2/HeartbeatLogger.cpp index a764de632..db22f43a2 100644 --- a/libminifi/src/c2/HeartbeatLogger.cpp +++ b/libminifi/src/c2/HeartbeatLogger.cpp @@ -20,8 +20,8 @@ namespace org::apache::nifi::minifi::c2 { -HeartbeatLogger::HeartbeatLogger(std::string name, const utils::Identifier& id) - : HeartbeatReporter(std::move(name), id) { +HeartbeatLogger::HeartbeatLogger(std::string_view name, const utils::Identifier& id) + : HeartbeatReporter(name, id) { logger_->set_max_log_size(-1); // log however huge the heartbeat is } diff --git a/libminifi/src/core/ProcessContextBuilder.cpp b/libminifi/src/core/ProcessContextBuilder.cpp index e7adb178f..6408a8fc9 100644 --- a/libminifi/src/core/ProcessContextBuilder.cpp +++ b/libminifi/src/core/ProcessContextBuilder.cpp @@ -22,14 +22,14 @@ namespace org::apache::nifi::minifi::core { -ProcessContextBuilder::ProcessContextBuilder(std::string name, const minifi::utils::Identifier &uuid) - : core::CoreComponent(std::move(name), uuid) { +ProcessContextBuilder::ProcessContextBuilder(std::string_view name, const minifi::utils::Identifier &uuid) + : core::CoreComponent(name, uuid) { content_repo_ = std::make_shared<core::repository::FileSystemRepository>(); configuration_ = std::make_shared<minifi::Configure>(); } -ProcessContextBuilder::ProcessContextBuilder(std::string name) - : core::CoreComponent(std::move(name)) { +ProcessContextBuilder::ProcessContextBuilder(std::string_view name) + : core::CoreComponent(name) { content_repo_ = std::make_shared<core::repository::FileSystemRepository>(); configuration_ = std::make_shared<minifi::Configure>(); } diff --git a/libminifi/src/core/ProcessGroup.cpp b/libminifi/src/core/ProcessGroup.cpp index 942cefdf4..7f18cd0c9 100644 --- a/libminifi/src/core/ProcessGroup.cpp +++ b/libminifi/src/core/ProcessGroup.cpp @@ -37,16 +37,16 @@ constexpr int DEFAULT_ONSCHEDULE_RETRY_INTERVAL_MS = 30000; std::shared_ptr<utils::IdGenerator> ProcessGroup::id_generator_ = utils::IdGenerator::getIdGenerator(); -ProcessGroup::ProcessGroup(ProcessGroupType type, std::string name, const utils::Identifier& uuid) - : ProcessGroup(type, std::move(name), uuid, 0, nullptr) { +ProcessGroup::ProcessGroup(ProcessGroupType type, std::string_view name, const utils::Identifier& uuid) + : ProcessGroup(type, name, uuid, 0, nullptr) { } -ProcessGroup::ProcessGroup(ProcessGroupType type, std::string name, const utils::Identifier& uuid, int version) - : ProcessGroup(type, std::move(name), uuid, version, nullptr) { +ProcessGroup::ProcessGroup(ProcessGroupType type, std::string_view name, const utils::Identifier& uuid, int version) + : ProcessGroup(type, name, uuid, version, nullptr) { } -ProcessGroup::ProcessGroup(ProcessGroupType type, std::string name, const utils::Identifier& uuid, int version, ProcessGroup* parent) - : CoreComponent(std::move(name), uuid, id_generator_), +ProcessGroup::ProcessGroup(ProcessGroupType type, std::string_view name, const utils::Identifier& uuid, int version, ProcessGroup* parent) + : CoreComponent(name, uuid, id_generator_), config_version_(version), type_(type), parent_process_group_(parent), @@ -64,8 +64,8 @@ ProcessGroup::ProcessGroup(ProcessGroupType type, std::string name, const utils: logger_->log_debug("ProcessGroup %s created", name_); } -ProcessGroup::ProcessGroup(ProcessGroupType type, std::string name) - : CoreComponent(std::move(name), {}, id_generator_), +ProcessGroup::ProcessGroup(ProcessGroupType type, std::string_view name) + : CoreComponent(name, {}, id_generator_), config_version_(0), type_(type), parent_process_group_(nullptr), diff --git a/libminifi/src/core/state/nodes/SupportedOperations.cpp b/libminifi/src/core/state/nodes/SupportedOperations.cpp index 5d7b9cf47..b0681415f 100644 --- a/libminifi/src/core/state/nodes/SupportedOperations.cpp +++ b/libminifi/src/core/state/nodes/SupportedOperations.cpp @@ -24,13 +24,13 @@ namespace org::apache::nifi::minifi::state::response { -SupportedOperations::SupportedOperations(std::string name, const utils::Identifier &uuid) - : DeviceInformation(std::move(name), uuid) { +SupportedOperations::SupportedOperations(std::string_view name, const utils::Identifier &uuid) + : DeviceInformation(name, uuid) { setArray(true); } -SupportedOperations::SupportedOperations(std::string name) - : DeviceInformation(std::move(name)) { +SupportedOperations::SupportedOperations(std::string_view name) + : DeviceInformation(name) { setArray(true); } diff --git a/libminifi/test/DummyProcessor.h b/libminifi/test/DummyProcessor.h index daa8092b2..b120d0eca 100644 --- a/libminifi/test/DummyProcessor.h +++ b/libminifi/test/DummyProcessor.h @@ -29,8 +29,8 @@ class DummyProcessor : public minifi::core::Processor { using minifi::core::Processor::Processor; public: - DummyProcessor(std::string_view name, const minifi::utils::Identifier& uuid) : Processor(std::move(name), uuid) {} - explicit DummyProcessor(std::string_view name) : Processor(std::move(name)) {} + DummyProcessor(std::string_view name, const minifi::utils::Identifier& uuid) : Processor(name, uuid) {} + explicit DummyProcessor(std::string_view name) : Processor(name) {} static constexpr const char* Description = "A processor that does nothing."; static constexpr auto Properties = std::array<core::PropertyReference, 0>{}; static constexpr auto Relationships = std::array<core::RelationshipDefinition, 0>{}; diff --git a/libminifi/test/ReadFromFlowFileTestProcessor.h b/libminifi/test/ReadFromFlowFileTestProcessor.h index c1c73fa18..27792c0b5 100644 --- a/libminifi/test/ReadFromFlowFileTestProcessor.h +++ b/libminifi/test/ReadFromFlowFileTestProcessor.h @@ -40,8 +40,8 @@ class ReadFromFlowFileTestProcessor : public core::Processor { static constexpr const char* ON_TRIGGER_LOG_STR = "ReadFromFlowFileTestProcessor::onTrigger executed"; static constexpr const char* ON_UNSCHEDULE_LOG_STR = "ReadFromFlowFileTestProcessor::onUnSchedule executed"; - explicit ReadFromFlowFileTestProcessor(std::string name, const utils::Identifier& uuid = utils::Identifier()) - : Processor(std::move(name), uuid) { + explicit ReadFromFlowFileTestProcessor(std::string_view name, const utils::Identifier& uuid = utils::Identifier()) + : Processor(name, uuid) { } static constexpr const char* Description = "ReadFromFlowFileTestProcessor (only for testing purposes)"; diff --git a/libminifi/test/WriteToFlowFileTestProcessor.h b/libminifi/test/WriteToFlowFileTestProcessor.h index 028693032..9c911532e 100644 --- a/libminifi/test/WriteToFlowFileTestProcessor.h +++ b/libminifi/test/WriteToFlowFileTestProcessor.h @@ -38,8 +38,8 @@ class WriteToFlowFileTestProcessor : public core::Processor { static constexpr const char* ON_TRIGGER_LOG_STR = "WriteToFlowFileTestProcessor::onTrigger executed"; static constexpr const char* ON_UNSCHEDULE_LOG_STR = "WriteToFlowFileTestProcessor::onUnSchedule executed"; - explicit WriteToFlowFileTestProcessor(std::string name, const utils::Identifier& uuid = utils::Identifier()) - : Processor(std::move(name), uuid) { + explicit WriteToFlowFileTestProcessor(std::string_view name, const utils::Identifier& uuid = utils::Identifier()) + : Processor(name, uuid) { } static constexpr const char* Description = "WriteToFlowFileTestProcessor (only for testing purposes)"; diff --git a/libminifi/test/flow-tests/CustomProcessors.h b/libminifi/test/flow-tests/CustomProcessors.h index 6174a6210..1d6f0d24c 100644 --- a/libminifi/test/flow-tests/CustomProcessors.h +++ b/libminifi/test/flow-tests/CustomProcessors.h @@ -59,7 +59,7 @@ class ProcessorWithStatistics { class TestProcessor : public core::Processor, public ProcessorWithStatistics { public: - TestProcessor(std::string name, const utils::Identifier& uuid) : Processor(std::move(name), uuid) {} + TestProcessor(std::string_view name, const utils::Identifier& uuid) : Processor(name, uuid) {} explicit TestProcessor(const std::string& name) : Processor(name) {} static constexpr const char* Description = "Processor used for testing cycles"; @@ -113,7 +113,7 @@ class TestProcessor : public core::Processor, public ProcessorWithStatistics { class TestFlowFileGenerator : public processors::GenerateFlowFile, public ProcessorWithStatistics { public: - TestFlowFileGenerator(std::string name, const utils::Identifier& uuid) : GenerateFlowFile(std::move(name), uuid) {} + TestFlowFileGenerator(std::string_view name, const utils::Identifier& uuid) : GenerateFlowFile(name, uuid) {} explicit TestFlowFileGenerator(const std::string& name) : GenerateFlowFile(name) {} static constexpr const char* Description = "Processor generating files and notifying us"; diff --git a/libminifi/test/sql-tests/mocks/MockODBCService.h b/libminifi/test/sql-tests/mocks/MockODBCService.h index 25b634a8a..4de179125 100644 --- a/libminifi/test/sql-tests/mocks/MockODBCService.h +++ b/libminifi/test/sql-tests/mocks/MockODBCService.h @@ -30,14 +30,14 @@ namespace org::apache::nifi::minifi::sql::controllers { class MockODBCService : public DatabaseService { public: - explicit MockODBCService(std::string name, utils::Identifier uuid = utils::Identifier()) - : DatabaseService(std::move(name), uuid), + explicit MockODBCService(std::string_view name, utils::Identifier uuid = utils::Identifier()) + : DatabaseService(name, uuid), logger_(logging::LoggerFactory<MockODBCService>::getLogger(uuid)) { initialize(); } - explicit MockODBCService(std::string name, const std::shared_ptr<Configure> &configuration) - : DatabaseService(std::move(name)), + explicit MockODBCService(std::string_view name, const std::shared_ptr<Configure> &configuration) + : DatabaseService(name), logger_(logging::LoggerFactory<MockODBCService>::getLogger()) { setConfiguration(configuration); initialize(); diff --git a/libminifi/test/unit/MockClasses.h b/libminifi/test/unit/MockClasses.h index 7898d6a1f..dd0d0921e 100644 --- a/libminifi/test/unit/MockClasses.h +++ b/libminifi/test/unit/MockClasses.h @@ -35,12 +35,12 @@ std::mutex control_mutex; class MockControllerService : public minifi::core::controller::ControllerService { public: - explicit MockControllerService(std::string name, const minifi::utils::Identifier &uuid) - : ControllerService(std::move(name), uuid) { + explicit MockControllerService(std::string_view name, const minifi::utils::Identifier &uuid) + : ControllerService(name, uuid) { } - explicit MockControllerService(std::string name) - : ControllerService(std::move(name)) { + explicit MockControllerService(std::string_view name) + : ControllerService(name) { } MockControllerService() = default; @@ -81,13 +81,13 @@ class MockControllerService : public minifi::core::controller::ControllerService class MockProcessor : public minifi::core::Processor { public: - explicit MockProcessor(std::string name, const minifi::utils::Identifier &uuid) - : Processor(std::move(name), uuid) { + explicit MockProcessor(std::string_view name, const minifi::utils::Identifier &uuid) + : Processor(name, uuid) { setTriggerWhenEmpty(true); } - explicit MockProcessor(std::string name) - : Processor(std::move(name)) { + explicit MockProcessor(std::string_view name) + : Processor(name) { setTriggerWhenEmpty(true); }
