This is an automated email from the ASF dual-hosted git repository. aboda pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/master by this push: new 940225a MINIFICPP-1256 - Apply fixes recommended by modernize-equals-default clang tidy check 940225a is described below commit 940225ae110db5be397124e1884ecd113caec2b8 Author: Adam Hunyadi <hunyadi....@gmail.com> AuthorDate: Fri Jun 26 14:37:24 2020 +0200 MINIFICPP-1256 - Apply fixes recommended by modernize-equals-default clang tidy check Signed-off-by: Arpad Boda <ab...@apache.org> This closes #816 --- extensions/aws/AWSLoader.h | 4 +--- extensions/aws/s3/S3.h | 4 +--- extensions/bustache/ApplyTemplate.h | 2 +- extensions/bustache/TemplateLoader.h | 4 +--- extensions/civetweb/processors/ListenHTTP.cpp | 3 +-- extensions/coap/COAPLoader.h | 4 +--- extensions/coap/controllerservice/CoapResponse.h | 3 +-- extensions/coap/protocols/CoapC2Protocol.cpp | 3 +-- extensions/coap/server/CoapServer.h | 3 +-- .../ExpressionContextBuilder.cpp | 3 +-- extensions/expression-language/ExpressionLoader.h | 4 +--- .../expression-language/ProcessContextExpr.h | 3 +-- extensions/expression-language/common/Value.h | 3 +-- extensions/gps/GetGPS.h | 4 +--- extensions/gps/GetGPSLoader.h | 4 +--- extensions/http-curl/HTTPCurlLoader.h | 4 +--- extensions/http-curl/processors/InvokeHTTP.cpp | 3 +-- extensions/http-curl/protocols/RESTReceiver.h | 4 +--- extensions/http-curl/sitetosite/HTTPProtocol.h | 4 +--- extensions/jni/ClassRegistrar.h | 3 +-- extensions/jni/ExecuteJavaControllerService.cpp | 3 +-- extensions/jni/ExecuteJavaProcessor.cpp | 3 +-- extensions/jni/JNILoader.h | 4 +--- extensions/jni/JVMCreator.cpp | 4 +--- extensions/jni/JavaException.h | 3 +-- extensions/jni/jvm/JavaClass.h | 4 +--- extensions/jni/jvm/JavaServicer.h | 4 +--- extensions/jni/jvm/JniBundle.h | 3 +-- extensions/jni/jvm/JniConfigurationContext.h | 4 +--- extensions/jni/jvm/JniReferenceObjects.h | 8 ++------ extensions/libarchive/ArchiveLoader.h | 4 +--- extensions/libarchive/BinFiles.h | 3 +-- extensions/libarchive/CompressContent.h | 12 ++++------- extensions/libarchive/FocusArchiveEntry.cpp | 3 +-- extensions/libarchive/FocusArchiveEntry.h | 3 +-- extensions/libarchive/ManipulateArchive.h | 2 +- extensions/libarchive/MergeContent.h | 15 +++++--------- extensions/libarchive/UnfocusArchiveEntry.h | 3 +-- extensions/librdkafka/RdKafkaLoader.h | 3 +-- extensions/mqtt/MQTTLoader.h | 4 +--- .../mqtt/controllerservice/MQTTControllerService.h | 6 ++---- extensions/mqtt/processors/ConvertBase.h | 3 +-- extensions/mqtt/processors/ConvertHeartBeat.h | 3 +-- extensions/mqtt/processors/ConvertJSONAck.h | 9 +++----- extensions/mqtt/processors/ConvertUpdate.h | 3 +-- extensions/mqtt/processors/PublishMQTT.h | 6 ++---- extensions/mqtt/protocol/MQTTC2Protocol.cpp | 3 +-- extensions/opencv/OpenCVLoader.h | 4 +--- extensions/pcap/CapturePacket.cpp | 3 +-- extensions/pcap/PcapLoader.h | 4 +--- .../rocksdb-repos/DatabaseContentRepository.h | 4 +--- extensions/rocksdb-repos/RocksDBLoader.h | 4 +--- extensions/script/ScriptException.h | 3 +-- extensions/script/python/PythonCreator.cpp | 3 +-- extensions/script/python/PythonScriptEngine.h | 9 +++----- extensions/script/pythonloader/PyProcLoader.h | 3 +-- extensions/sensors/GetEnvironmentalSensors.cpp | 3 +-- extensions/sensors/GetMovementSensors.cpp | 3 +-- extensions/sensors/SensorBase.cpp | 3 +-- extensions/sensors/SensorLoader.h | 4 +--- extensions/sftp/SFTPLoader.h | 4 +--- extensions/sftp/processors/FetchSFTP.cpp | 6 ++---- extensions/sftp/processors/ListSFTP.cpp | 3 +-- extensions/sftp/processors/PutSFTP.cpp | 6 ++---- extensions/sql/SQLLoader.h | 2 +- extensions/sql/data/DatabaseConnectors.h | 9 +++----- extensions/sql/data/JSONSQLWriter.cpp | 2 +- extensions/sql/data/SQLRowSubscriber.h | 2 +- extensions/sql/processors/ExecuteSQL.cpp | 3 +-- extensions/sql/processors/PutSQL.cpp | 3 +-- extensions/sql/processors/QueryDatabaseTable.cpp | 3 +-- extensions/sql/services/ODBCConnector.h | 3 +-- .../UnorderedMapKeyValueStoreService.cpp | 3 +-- .../processors/AppendHostInfo.h | 3 +-- .../standard-processors/processors/ExtractText.h | 2 +- .../standard-processors/processors/GetFile.h | 3 +-- extensions/standard-processors/processors/GetTCP.h | 12 ++++------- .../standard-processors/processors/LogAttribute.h | 3 +-- .../standard-processors/processors/TailFile.h | 3 +-- .../CollectorInitiatedSubscription.h | 4 +--- extensions/windows-event-log/SupportedProperty.h | 2 +- extensions/windows-event-log/TailEventLog.h | 4 +--- extensions/windows-event-log/wel/WindowsEventLog.h | 2 +- libminifi/include/Connection.h | 3 +-- libminifi/include/CronDrivenSchedulingAgent.h | 3 +-- libminifi/include/FlowFileRecord.h | 6 ++---- libminifi/include/RemoteProcessorGroupPort.h | 3 +-- libminifi/include/ResourceClaim.h | 3 +-- libminifi/include/ThreadedSchedulingAgent.h | 3 +-- libminifi/include/c2/C2Protocol.h | 3 +-- libminifi/include/c2/C2Trigger.h | 3 +-- libminifi/include/c2/HeartBeatReporter.h | 3 +-- libminifi/include/c2/protocols/RESTProtocol.h | 3 +-- libminifi/include/core/ClassLoader.h | 12 ++++------- libminifi/include/core/ContentRepository.h | 3 +-- libminifi/include/core/Core.h | 3 +-- libminifi/include/core/CoreComponentState.h | 3 +-- libminifi/include/core/ProcessContext.h | 3 +-- libminifi/include/core/ProcessContextBuilder.h | 3 +-- libminifi/include/core/Property.h | 3 +-- libminifi/include/core/Relationship.h | 14 +++---------- libminifi/include/core/SerializableComponent.h | 3 +-- libminifi/include/core/TypedValues.h | 3 +-- libminifi/include/core/VariableRegistry.h | 3 +-- libminifi/include/core/WeakReference.h | 12 ++++------- .../core/controller/ControllerServiceLookup.h | 6 ++---- .../include/core/controller/ControllerServiceMap.h | 6 ++---- .../core/controller/ControllerServiceProvider.h | 3 +-- .../reporting/SiteToSiteProvenanceReportingTask.h | 3 +-- .../include/core/repository/AtomicRepoEntries.h | 6 ++---- .../include/core/repository/FileSystemRepository.h | 3 +-- libminifi/include/core/state/FlowIdentifier.h | 13 ++---------- libminifi/include/core/state/UpdateController.h | 21 ++++++------------- libminifi/include/core/state/UpdatePolicy.h | 20 ++++-------------- libminifi/include/core/state/Value.h | 3 +-- libminifi/include/core/state/nodes/MetricsBase.h | 24 ++++++++-------------- .../include/core/state/nodes/ProcessMetrics.h | 3 +-- .../include/core/state/nodes/TreeUpdateListener.h | 3 +-- libminifi/include/core/yaml/YamlConfiguration.h | 3 +-- libminifi/include/io/NonConvertingStream.h | 3 +-- libminifi/include/properties/Properties.h | 3 +-- libminifi/include/provenance/Provenance.h | 3 +-- libminifi/include/sitetosite/SiteToSite.h | 3 +-- libminifi/include/sitetosite/SiteToSiteClient.h | 3 +-- libminifi/include/utils/ByteArrayCallback.h | 3 +-- libminifi/include/utils/FileOutputCallback.h | 3 +-- libminifi/include/utils/HTTPClient.h | 3 +-- libminifi/include/utils/Id.h | 3 +-- libminifi/include/utils/Monitors.h | 6 ++---- libminifi/include/utils/ThreadPool.h | 3 +-- libminifi/include/utils/file/FileManager.h | 3 +-- libminifi/src/c2/PayloadSerializer.cpp | 6 ++---- .../controllers/keyvalue/KeyValueStoreService.cpp | 3 +-- .../keyvalue/PersistableKeyValueStoreService.cpp | 3 +-- libminifi/src/core/ClassLoader.cpp | 3 +-- libminifi/src/core/ConfigurableComponent.cpp | 3 +-- libminifi/src/core/Connectable.cpp | 3 +-- libminifi/src/core/ProcessorNode.cpp | 3 +-- libminifi/src/core/logging/Logger.cpp | 3 +-- libminifi/src/core/state/ProcessorController.cpp | 3 +-- libminifi/src/core/state/UpdateController.cpp | 13 ++---------- libminifi/src/processors/ProcessorUtils.cpp | 3 +-- libminifi/src/utils/Id.cpp | 3 +-- libminifi/test/TestBase.h | 3 +-- libminifi/test/archive-tests/MergeFileTests.cpp | 2 +- libminifi/test/unit/BackTraceTests.cpp | 3 +-- libminifi/test/unit/ControllerTests.cpp | 3 +-- libminifi/test/unit/MockClasses.h | 12 +++-------- libminifi/test/unit/ProvenanceTestHelper.h | 12 +++-------- libminifi/test/unit/SiteToSiteHelper.h | 3 +-- libminifi/test/unit/ThreadPoolTests.cpp | 3 +-- nanofi/include/cxx/C2CallbackAgent.h | 3 +-- nanofi/include/cxx/ReflexiveSession.h | 3 +-- 153 files changed, 209 insertions(+), 472 deletions(-) diff --git a/extensions/aws/AWSLoader.h b/extensions/aws/AWSLoader.h index ab868e0..9f05206 100644 --- a/extensions/aws/AWSLoader.h +++ b/extensions/aws/AWSLoader.h @@ -26,9 +26,7 @@ class AWSObjectFactory : public core::ObjectFactory { public: - AWSObjectFactory() { - - } + AWSObjectFactory() = default; /** * Gets the name of the object. diff --git a/extensions/aws/s3/S3.h b/extensions/aws/s3/S3.h index aed1c36..f5d904d 100644 --- a/extensions/aws/s3/S3.h +++ b/extensions/aws/s3/S3.h @@ -59,9 +59,7 @@ class S3Singleton{ return &init; } private: - S3Singleton(){ - - } + S3Singleton() = default; }; } /* namespace processors */ diff --git a/extensions/bustache/ApplyTemplate.h b/extensions/bustache/ApplyTemplate.h index 2b5c9ec..739d02a 100644 --- a/extensions/bustache/ApplyTemplate.h +++ b/extensions/bustache/ApplyTemplate.h @@ -44,7 +44,7 @@ class ApplyTemplate : public core::Processor { ApplyTemplate(std::string name, utils::Identifier uuid = utils::Identifier()) : Processor(name, uuid), logger_(logging::LoggerFactory<ApplyTemplate>::getLogger()) {} - ~ApplyTemplate() {} + ~ApplyTemplate() = default; static constexpr char const *ProcessorName = "ApplyTemplate"; //! Supported Properties diff --git a/extensions/bustache/TemplateLoader.h b/extensions/bustache/TemplateLoader.h index e16d973..86e3175 100644 --- a/extensions/bustache/TemplateLoader.h +++ b/extensions/bustache/TemplateLoader.h @@ -23,9 +23,7 @@ class TemplateFactory : public core::ObjectFactory { public: - TemplateFactory() { - - } + TemplateFactory() = default; /** * Gets the name of the object. diff --git a/extensions/civetweb/processors/ListenHTTP.cpp b/extensions/civetweb/processors/ListenHTTP.cpp index b9ab508..be66960 100644 --- a/extensions/civetweb/processors/ListenHTTP.cpp +++ b/extensions/civetweb/processors/ListenHTTP.cpp @@ -209,8 +209,7 @@ void ListenHTTP::onSchedule(core::ProcessContext *context, core::ProcessSessionF } } -ListenHTTP::~ListenHTTP() { -} +ListenHTTP::~ListenHTTP() = default; void ListenHTTP::onTrigger(core::ProcessContext *context, core::ProcessSession *session) { std::shared_ptr<FlowFileRecord> flow_file = std::static_pointer_cast<FlowFileRecord>(session->get()); diff --git a/extensions/coap/COAPLoader.h b/extensions/coap/COAPLoader.h index e948782..502cc8a 100644 --- a/extensions/coap/COAPLoader.h +++ b/extensions/coap/COAPLoader.h @@ -42,9 +42,7 @@ class COAPObjectFactoryInitializer : public core::ObjectFactoryInitializer { */ class COAPObjectFactory : public core::ObjectFactory { public: - COAPObjectFactory() { - - } + COAPObjectFactory() = default; /** * Gets the name of the object. diff --git a/extensions/coap/controllerservice/CoapResponse.h b/extensions/coap/controllerservice/CoapResponse.h index a8c9e33..9f0fd50 100644 --- a/extensions/coap/controllerservice/CoapResponse.h +++ b/extensions/coap/controllerservice/CoapResponse.h @@ -59,8 +59,7 @@ class CoapResponse { CoapResponse(CoapResponse &&other) = default; - ~CoapResponse() { - } + ~CoapResponse() = default; /** * Retrieve the size of the coap response. diff --git a/extensions/coap/protocols/CoapC2Protocol.cpp b/extensions/coap/protocols/CoapC2Protocol.cpp index 1eb8f63..b9d195e 100644 --- a/extensions/coap/protocols/CoapC2Protocol.cpp +++ b/extensions/coap/protocols/CoapC2Protocol.cpp @@ -37,8 +37,7 @@ CoapProtocol::CoapProtocol(const std::string &name, const utils::Identifier &uui logger_(logging::LoggerFactory<CoapProtocol>::getLogger()) { } -CoapProtocol::~CoapProtocol() { -} +CoapProtocol::~CoapProtocol() = default; void CoapProtocol::initialize(const std::shared_ptr<core::controller::ControllerServiceProvider> &controller, const std::shared_ptr<Configure> &configure) { RESTSender::initialize(controller, configure); diff --git a/extensions/coap/server/CoapServer.h b/extensions/coap/server/CoapServer.h index e949a2f..427fdc9 100644 --- a/extensions/coap/server/CoapServer.h +++ b/extensions/coap/server/CoapServer.h @@ -50,8 +50,7 @@ class CoapQuery { message_(std::move(message)) { } - virtual ~CoapQuery() { - } + virtual ~CoapQuery() = default; CoapQuery(const CoapQuery &qry) = delete; CoapQuery(CoapQuery &&qry) = default; diff --git a/extensions/expression-language/ExpressionContextBuilder.cpp b/extensions/expression-language/ExpressionContextBuilder.cpp index 5714947..9539435 100644 --- a/extensions/expression-language/ExpressionContextBuilder.cpp +++ b/extensions/expression-language/ExpressionContextBuilder.cpp @@ -32,8 +32,7 @@ ExpressionContextBuilder::ExpressionContextBuilder(const std::string &name) : core::ProcessContextBuilder(name) { } -ExpressionContextBuilder::~ExpressionContextBuilder() { -} +ExpressionContextBuilder::~ExpressionContextBuilder() = default; std::shared_ptr<core::ProcessContext> ExpressionContextBuilder::build(const std::shared_ptr<ProcessorNode> &processor) { return std::make_shared<core::ProcessContextExpr>(processor, controller_service_provider_, prov_repo_, flow_repo_, configuration_, content_repo_); diff --git a/extensions/expression-language/ExpressionLoader.h b/extensions/expression-language/ExpressionLoader.h index ba174e4..6033715 100644 --- a/extensions/expression-language/ExpressionLoader.h +++ b/extensions/expression-language/ExpressionLoader.h @@ -29,9 +29,7 @@ */ class ExpressionObjectFactory : public core::ObjectFactory { public: - ExpressionObjectFactory() { - - } + ExpressionObjectFactory() = default; /** * Gets the name of the object. diff --git a/extensions/expression-language/ProcessContextExpr.h b/extensions/expression-language/ProcessContextExpr.h index 0464228..4d0db54 100644 --- a/extensions/expression-language/ProcessContextExpr.h +++ b/extensions/expression-language/ProcessContextExpr.h @@ -51,8 +51,7 @@ class ProcessContextExpr : public core::ProcessContext { logger_(logging::LoggerFactory<ProcessContextExpr>::getLogger()) { } // Destructor - virtual ~ProcessContextExpr() { - } + virtual ~ProcessContextExpr() = default; /** * Retrieves property using EL * @param property property diff --git a/extensions/expression-language/common/Value.h b/extensions/expression-language/common/Value.h index 1666637..26918c7 100644 --- a/extensions/expression-language/common/Value.h +++ b/extensions/expression-language/common/Value.h @@ -40,8 +40,7 @@ class Value { /** * Construct a default (NULL) value */ - Value() { - } + Value() = default; /** * Construct a string value diff --git a/extensions/gps/GetGPS.h b/extensions/gps/GetGPS.h index ba10ab1..1f2e480 100644 --- a/extensions/gps/GetGPS.h +++ b/extensions/gps/GetGPS.h @@ -46,9 +46,7 @@ public: gpsdWaitTime_ = 50000000; } //! Destructor - virtual ~GetGPS() - { - } + virtual ~GetGPS() = default; //! Processor Name static const std::string ProcessorName; //! Supported Properties diff --git a/extensions/gps/GetGPSLoader.h b/extensions/gps/GetGPSLoader.h index c4c597c..532b1f9 100644 --- a/extensions/gps/GetGPSLoader.h +++ b/extensions/gps/GetGPSLoader.h @@ -24,9 +24,7 @@ class GpsFactory : public core::ObjectFactory { public: - GpsFactory() { - - } + GpsFactory() = default; /** * Gets the name of the object. diff --git a/extensions/http-curl/HTTPCurlLoader.h b/extensions/http-curl/HTTPCurlLoader.h index 9fab59d..5d418c1 100644 --- a/extensions/http-curl/HTTPCurlLoader.h +++ b/extensions/http-curl/HTTPCurlLoader.h @@ -48,9 +48,7 @@ class HttpCurlObjectFactoryInitializer : public core::ObjectFactoryInitializer { class HttpCurlObjectFactory : public core::ObjectFactory { public: - HttpCurlObjectFactory() { - - } + HttpCurlObjectFactory() = default; /** * Gets the name of the object. diff --git a/extensions/http-curl/processors/InvokeHTTP.cpp b/extensions/http-curl/processors/InvokeHTTP.cpp index de0464f..20785a0 100644 --- a/extensions/http-curl/processors/InvokeHTTP.cpp +++ b/extensions/http-curl/processors/InvokeHTTP.cpp @@ -247,8 +247,7 @@ void InvokeHTTP::onSchedule(const std::shared_ptr<core::ProcessContext> &context } } -InvokeHTTP::~InvokeHTTP() { -} +InvokeHTTP::~InvokeHTTP() = default; std::string InvokeHTTP::generateId() { utils::Identifier txId; diff --git a/extensions/http-curl/protocols/RESTReceiver.h b/extensions/http-curl/protocols/RESTReceiver.h index 6253c73..9c78a83 100644 --- a/extensions/http-curl/protocols/RESTReceiver.h +++ b/extensions/http-curl/protocols/RESTReceiver.h @@ -57,9 +57,7 @@ class RESTReceiver : public RESTProtocol, public HeartBeatReporter { class ListeningProtocol : public CivetHandler { public: - ListeningProtocol() { - - } + ListeningProtocol() = default; bool handleGet(CivetServer *server, struct mg_connection *conn) { std::string currentvalue; diff --git a/extensions/http-curl/sitetosite/HTTPProtocol.h b/extensions/http-curl/sitetosite/HTTPProtocol.h index d25814f..b75b69c 100644 --- a/extensions/http-curl/sitetosite/HTTPProtocol.h +++ b/extensions/http-curl/sitetosite/HTTPProtocol.h @@ -82,9 +82,7 @@ class HttpSiteToSiteClient : public sitetosite::SiteToSiteClient { peer_state_ = READY; } // Destructor - virtual ~HttpSiteToSiteClient() { - - } + virtual ~HttpSiteToSiteClient() = default; void setPeer(std::unique_ptr<SiteToSitePeer> peer) override { peer_ = std::move(peer); diff --git a/extensions/jni/ClassRegistrar.h b/extensions/jni/ClassRegistrar.h index 6d4b6b4..72c5a75 100644 --- a/extensions/jni/ClassRegistrar.h +++ b/extensions/jni/ClassRegistrar.h @@ -64,8 +64,7 @@ class ClassRegistrar { return false; } private: - ClassRegistrar() { - } + ClassRegistrar() = default; std::mutex mutex_; std::set<std::string> registered_classes_; diff --git a/extensions/jni/ExecuteJavaControllerService.cpp b/extensions/jni/ExecuteJavaControllerService.cpp index 66f7bfe..dd5d8a1 100644 --- a/extensions/jni/ExecuteJavaControllerService.cpp +++ b/extensions/jni/ExecuteJavaControllerService.cpp @@ -69,8 +69,7 @@ void ExecuteJavaControllerService::initialize() { } -ExecuteJavaControllerService::~ExecuteJavaControllerService() { -} +ExecuteJavaControllerService::~ExecuteJavaControllerService() = default; void ExecuteJavaControllerService::onEnable() { std::string controller_service_name; diff --git a/extensions/jni/ExecuteJavaProcessor.cpp b/extensions/jni/ExecuteJavaProcessor.cpp index aadfae2..aa64e2e 100644 --- a/extensions/jni/ExecuteJavaProcessor.cpp +++ b/extensions/jni/ExecuteJavaProcessor.cpp @@ -168,8 +168,7 @@ void ExecuteJavaProcessor::onSchedule(const std::shared_ptr<core::ProcessContext java_servicer_->attach()->DeleteGlobalRef(initializer); } -ExecuteJavaProcessor::~ExecuteJavaProcessor() { -} +ExecuteJavaProcessor::~ExecuteJavaProcessor() = default; JNINativeMethod ExecuteJavaProcessor::registerNativeMethod(const std::string &name, const std::string ¶ms, const void *ptr) { JNINativeMethod mthd; diff --git a/extensions/jni/JNILoader.h b/extensions/jni/JNILoader.h index a8bc1ef..727598c 100644 --- a/extensions/jni/JNILoader.h +++ b/extensions/jni/JNILoader.h @@ -27,9 +27,7 @@ class JNIFactory : public core::ObjectFactory { public: - JNIFactory() { - - } + JNIFactory() = default; /** * Gets the name of the object. diff --git a/extensions/jni/JVMCreator.cpp b/extensions/jni/JVMCreator.cpp index 045b2bf..5f386b9 100644 --- a/extensions/jni/JVMCreator.cpp +++ b/extensions/jni/JVMCreator.cpp @@ -38,9 +38,7 @@ namespace jni { #define W_OK 2 /* Test for write permission. */ #define F_OK 0 /* Test for existence. */ #endif -JVMCreator::~JVMCreator() { - -} +JVMCreator::~JVMCreator() = default; } /* namespace jni */ } /* namespace minifi */ diff --git a/extensions/jni/JavaException.h b/extensions/jni/JavaException.h index 11d42ca..6dfe31c 100644 --- a/extensions/jni/JavaException.h +++ b/extensions/jni/JavaException.h @@ -49,8 +49,7 @@ class JavaException : public std::exception { } // Destructor - virtual ~JavaException() noexcept { - } + virtual ~JavaException() noexcept = default; virtual const char * what() const noexcept { return message_.c_str(); } diff --git a/extensions/jni/jvm/JavaClass.h b/extensions/jni/jvm/JavaClass.h index 32d43b9..7ab914f 100644 --- a/extensions/jni/jvm/JavaClass.h +++ b/extensions/jni/jvm/JavaClass.h @@ -47,7 +47,6 @@ class JavaClass { JavaClass() : class_ref_(nullptr) { - } /** @@ -62,8 +61,7 @@ class JavaClass { cnstrctr = jenv->GetMethodID(class_ref_, "<init>", "()V"); } - ~JavaClass() { - } + ~JavaClass() = default; std::string getName() const { return name_; diff --git a/extensions/jni/jvm/JavaServicer.h b/extensions/jni/jvm/JavaServicer.h index 4c8521a..580d997 100644 --- a/extensions/jni/jvm/JavaServicer.h +++ b/extensions/jni/jvm/JavaServicer.h @@ -35,9 +35,7 @@ namespace jni { */ class JavaServicer { public: - virtual ~JavaServicer() { - - } + virtual ~JavaServicer() = default; virtual JNIEnv *attach() = 0; virtual void detach() = 0; virtual jobject getClassLoader() = 0; diff --git a/extensions/jni/jvm/JniBundle.h b/extensions/jni/jvm/JniBundle.h index 0c2801d..0818122 100644 --- a/extensions/jni/jvm/JniBundle.h +++ b/extensions/jni/jvm/JniBundle.h @@ -47,8 +47,7 @@ class JniBundle { : details_(details) { } - JniBundle() { - } + JniBundle() = default; /** * Add a description to this bundle diff --git a/extensions/jni/jvm/JniConfigurationContext.h b/extensions/jni/jvm/JniConfigurationContext.h index 66f0c47..3887128 100644 --- a/extensions/jni/jvm/JniConfigurationContext.h +++ b/extensions/jni/jvm/JniConfigurationContext.h @@ -42,9 +42,7 @@ class ConfigurationContext : public core::controller::ControllerService { : core::controller::ControllerService(name, id) { } - virtual ~ConfigurationContext() { - - } + virtual ~ConfigurationContext() = default; virtual jobject getClassInstance() = 0; }; diff --git a/extensions/jni/jvm/JniReferenceObjects.h b/extensions/jni/jvm/JniReferenceObjects.h index 0dfcd93..2e9205b 100644 --- a/extensions/jni/jvm/JniReferenceObjects.h +++ b/extensions/jni/jvm/JniReferenceObjects.h @@ -50,9 +50,7 @@ class JniFlowFile : public core::WeakReference { } - virtual ~JniFlowFile() { - - } + virtual ~JniFlowFile() = default; virtual void remove() override; @@ -104,9 +102,7 @@ class JniByteOutStream : public minifi::OutputStreamCallback { } - virtual ~JniByteOutStream() { - - } + virtual ~JniByteOutStream() = default; virtual int64_t process(std::shared_ptr<minifi::io::BaseStream> stream) { return stream->write((uint8_t*) bytes_, length_); } diff --git a/extensions/libarchive/ArchiveLoader.h b/extensions/libarchive/ArchiveLoader.h index f45e8c8..61364d9 100644 --- a/extensions/libarchive/ArchiveLoader.h +++ b/extensions/libarchive/ArchiveLoader.h @@ -27,9 +27,7 @@ class ArchiveFactory : public core::ObjectFactory { public: - ArchiveFactory() { - - } + ArchiveFactory() = default; /** * Gets the name of the object. diff --git a/extensions/libarchive/BinFiles.h b/extensions/libarchive/BinFiles.h index 1fcbfbe..098ac0e 100644 --- a/extensions/libarchive/BinFiles.h +++ b/extensions/libarchive/BinFiles.h @@ -229,8 +229,7 @@ class BinFiles : public core::Processor { maxBinCount_ = 100; } // Destructor - virtual ~BinFiles() { - } + virtual ~BinFiles() = default; // Processor Name static constexpr char const* ProcessorName = "BinFiles"; // Supported Properties diff --git a/extensions/libarchive/CompressContent.h b/extensions/libarchive/CompressContent.h index a0f9ab7..b635357 100644 --- a/extensions/libarchive/CompressContent.h +++ b/extensions/libarchive/CompressContent.h @@ -61,8 +61,7 @@ public: , encapsulateInTar_(false) { } // Destructor - virtual ~CompressContent() { - } + virtual ~CompressContent() = default; // Processor Name static constexpr char const* ProcessorName = "CompressContent"; // Supported Properties @@ -83,8 +82,7 @@ public: ReadCallbackCompress(std::shared_ptr<core::FlowFile> &flow, struct archive *arch, struct archive_entry *entry) : flow_(flow), arch_(arch), entry_(entry), status_(0), logger_(logging::LoggerFactory<CompressContent>::getLogger()) { } - ~ReadCallbackCompress() { - } + ~ReadCallbackCompress() = default; int64_t process(std::shared_ptr<io::BaseStream> stream) { uint8_t buffer[4096U]; int64_t ret = 0; @@ -129,8 +127,7 @@ public: read_size_(0), offset_(0), flow_(flow) { origin_offset_ = flow_->getOffset(); } - ~ReadCallbackDecompress() { - } + ~ReadCallbackDecompress() = default; int64_t process(std::shared_ptr<io::BaseStream> stream) { read_size_ = 0; stream->seek(offset_); @@ -160,8 +157,7 @@ public: stream_ = nullptr; status_ = 0; } - ~WriteCallback() { - } + ~WriteCallback() = default; std::string compress_mode_; int64_t compress_level_; diff --git a/extensions/libarchive/FocusArchiveEntry.cpp b/extensions/libarchive/FocusArchiveEntry.cpp index 59462ea..0795b4c 100644 --- a/extensions/libarchive/FocusArchiveEntry.cpp +++ b/extensions/libarchive/FocusArchiveEntry.cpp @@ -266,8 +266,7 @@ FocusArchiveEntry::ReadCallback::ReadCallback(core::Processor *processor, fileut _archiveMetadata = archiveMetadata; } -FocusArchiveEntry::ReadCallback::~ReadCallback() { -} +FocusArchiveEntry::ReadCallback::~ReadCallback() = default; } /* namespace processors */ } /* namespace minifi */ diff --git a/extensions/libarchive/FocusArchiveEntry.h b/extensions/libarchive/FocusArchiveEntry.h index 8812ecc..a7e5593 100644 --- a/extensions/libarchive/FocusArchiveEntry.h +++ b/extensions/libarchive/FocusArchiveEntry.h @@ -53,8 +53,7 @@ class FocusArchiveEntry : public core::Processor { logger_(logging::LoggerFactory<FocusArchiveEntry>::getLogger()) { } //! Destructor - virtual ~FocusArchiveEntry() { - } + virtual ~FocusArchiveEntry() = default; //! Processor Name static constexpr char const* ProcessorName = "FocusArchiveEntry"; //! Supported Properties diff --git a/extensions/libarchive/ManipulateArchive.h b/extensions/libarchive/ManipulateArchive.h index 7980c35..3fd207b 100644 --- a/extensions/libarchive/ManipulateArchive.h +++ b/extensions/libarchive/ManipulateArchive.h @@ -51,7 +51,7 @@ public: logger_(logging::LoggerFactory<ManipulateArchive>::getLogger()) { } //! Destructor - virtual ~ManipulateArchive() {} + virtual ~ManipulateArchive() = default; //! Processor Name static constexpr char const* ProcessorName = "ManipulateArchive"; diff --git a/extensions/libarchive/MergeContent.h b/extensions/libarchive/MergeContent.h index 5f7705b..40df40d 100644 --- a/extensions/libarchive/MergeContent.h +++ b/extensions/libarchive/MergeContent.h @@ -48,8 +48,7 @@ namespace processors { class MergeBin { public: - virtual ~MergeBin(){ - } + virtual ~MergeBin() = default; virtual std::string getMergedContentType() = 0; // merge the flows in the bin @@ -72,8 +71,7 @@ public: ReadCallback(uint64_t size, std::shared_ptr<io::BaseStream> stream) : buffer_size_(size), stream_(stream) { } - ~ReadCallback() { - } + ~ReadCallback() = default; int64_t process(std::shared_ptr<io::BaseStream> stream) { uint8_t buffer[4096U]; int64_t ret = 0; @@ -145,8 +143,7 @@ public: ReadCallback(uint64_t size, struct archive *arch, struct archive_entry *entry) : buffer_size_(size), arch_(arch), entry_(entry) { } - ~ReadCallback() { - } + ~ReadCallback() = default; int64_t process(std::shared_ptr<io::BaseStream> stream) { uint8_t buffer[4096U]; int64_t ret = 0; @@ -177,8 +174,7 @@ public: size_ = 0; stream_ = nullptr; } - ~WriteCallback() { - } + ~WriteCallback() = default; std::string merge_type_; std::deque<std::shared_ptr<core::FlowFile>> &flows_; @@ -279,8 +275,7 @@ class MergeContent : public processors::BinFiles { keepPath_ = false; } // Destructor - virtual ~MergeContent() { - } + virtual ~MergeContent() = default; // Processor Name static constexpr char const* ProcessorName = "MergeContent"; // Supported Properties diff --git a/extensions/libarchive/UnfocusArchiveEntry.h b/extensions/libarchive/UnfocusArchiveEntry.h index 41dd4cb..39c2ccc 100644 --- a/extensions/libarchive/UnfocusArchiveEntry.h +++ b/extensions/libarchive/UnfocusArchiveEntry.h @@ -54,8 +54,7 @@ class UnfocusArchiveEntry : public core::Processor { logger_(logging::LoggerFactory<UnfocusArchiveEntry>::getLogger()){ } //! Destructor - virtual ~UnfocusArchiveEntry() { - } + virtual ~UnfocusArchiveEntry() = default; //! Processor Name static constexpr char const* ProcessorName = "UnfocusArchiveEntry"; //! Supported Relationships diff --git a/extensions/librdkafka/RdKafkaLoader.h b/extensions/librdkafka/RdKafkaLoader.h index 3787e19..309b834 100644 --- a/extensions/librdkafka/RdKafkaLoader.h +++ b/extensions/librdkafka/RdKafkaLoader.h @@ -27,8 +27,7 @@ class RdKafkaFactory : public core::ObjectFactory { public: - RdKafkaFactory() { - } + RdKafkaFactory() = default; /** * Gets the name of the object. diff --git a/extensions/mqtt/MQTTLoader.h b/extensions/mqtt/MQTTLoader.h index 1472182..2b676ce 100644 --- a/extensions/mqtt/MQTTLoader.h +++ b/extensions/mqtt/MQTTLoader.h @@ -28,9 +28,7 @@ #include "ConvertUpdate.h" class MQTTFactory : public core::ObjectFactory { public: - MQTTFactory() { - - } + MQTTFactory() = default; /** * Gets the name of the object. diff --git a/extensions/mqtt/controllerservice/MQTTControllerService.h b/extensions/mqtt/controllerservice/MQTTControllerService.h index cdc4ed8..2309711 100644 --- a/extensions/mqtt/controllerservice/MQTTControllerService.h +++ b/extensions/mqtt/controllerservice/MQTTControllerService.h @@ -44,8 +44,7 @@ static constexpr const char* const MQTT_QOS_2 = "2"; class Message { public: // empty constructor facilitates moves - Message() { - } + Message() = default; explicit Message(const std::string &topic, void *data, size_t dataLen) : topic_(topic), data_((uint8_t*) data, ((uint8_t*)data + dataLen)) { @@ -54,8 +53,7 @@ class Message { : topic_(std::move(other.topic_)), data_(std::move(other.data_)) { } - ~Message() { - } + ~Message() = default; Message &operator=(const Message &&other) { topic_ = std::move(other.topic_); diff --git a/extensions/mqtt/processors/ConvertBase.h b/extensions/mqtt/processors/ConvertBase.h index e8fd07e..09c82b6 100644 --- a/extensions/mqtt/processors/ConvertBase.h +++ b/extensions/mqtt/processors/ConvertBase.h @@ -49,8 +49,7 @@ class ConvertBase : public core::Processor, public minifi::c2::RESTProtocol { : core::Processor(name, uuid) { } // Destructor - virtual ~ConvertBase() { - } + virtual ~ConvertBase() = default; // Supported Properties static core::Property MQTTControllerService; static core::Property ListeningTopic; diff --git a/extensions/mqtt/processors/ConvertHeartBeat.h b/extensions/mqtt/processors/ConvertHeartBeat.h index 0409e4d..81e075e 100644 --- a/extensions/mqtt/processors/ConvertHeartBeat.h +++ b/extensions/mqtt/processors/ConvertHeartBeat.h @@ -49,8 +49,7 @@ public: : ConvertBase(name, uuid), logger_(logging::LoggerFactory<ConvertHeartBeat>::getLogger()) { } // Destructor - virtual ~ConvertHeartBeat() { - } + virtual ~ConvertHeartBeat() = default; // Processor Name static constexpr char const* ProcessorName = "ConvertHeartBeat"; diff --git a/extensions/mqtt/processors/ConvertJSONAck.h b/extensions/mqtt/processors/ConvertJSONAck.h index 1759502..0d2cdf8 100644 --- a/extensions/mqtt/processors/ConvertJSONAck.h +++ b/extensions/mqtt/processors/ConvertJSONAck.h @@ -52,8 +52,7 @@ class ConvertJSONAck : public ConvertBase { logger_(logging::LoggerFactory<ConvertJSONAck>::getLogger()) { } // Destructor - virtual ~ConvertJSONAck() { - } + virtual ~ConvertJSONAck() = default; // Processor Name static constexpr char const* ProcessorName = "ConvertJSONAck"; @@ -72,10 +71,8 @@ class ConvertJSONAck : public ConvertBase { class ReadCallback : public InputStreamCallback { public: - ReadCallback() { - } - ~ReadCallback() { - } + ReadCallback() = default; + ~ReadCallback() = default; int64_t process(std::shared_ptr<io::BaseStream> stream) { int64_t ret = 0; if (nullptr == stream) diff --git a/extensions/mqtt/processors/ConvertUpdate.h b/extensions/mqtt/processors/ConvertUpdate.h index 3d0390e..b08ebd7 100644 --- a/extensions/mqtt/processors/ConvertUpdate.h +++ b/extensions/mqtt/processors/ConvertUpdate.h @@ -54,8 +54,7 @@ class ConvertUpdate : public ConvertBase { : ConvertBase(name, uuid), logger_(logging::LoggerFactory<ConvertUpdate>::getLogger()) { } // Destructor - virtual ~ConvertUpdate() { - } + virtual ~ConvertUpdate() = default; static core::Property SSLContext; // Processor Name diff --git a/extensions/mqtt/processors/PublishMQTT.h b/extensions/mqtt/processors/PublishMQTT.h index 6d6c834..a3f4805 100644 --- a/extensions/mqtt/processors/PublishMQTT.h +++ b/extensions/mqtt/processors/PublishMQTT.h @@ -50,8 +50,7 @@ class PublishMQTT : public processors::AbstractMQTTProcessor { max_seg_size_ = ULLONG_MAX; } // Destructor - virtual ~PublishMQTT() { - } + virtual ~PublishMQTT() = default; // Processor Name static constexpr char const* ProcessorName = "PublishMQTT"; // Supported Properties @@ -75,8 +74,7 @@ class PublishMQTT : public processors::AbstractMQTTProcessor { status_ = 0; read_size_ = 0; } - ~ReadCallback() { - } + ~ReadCallback() = default; int64_t process(std::shared_ptr<io::BaseStream> stream) { if (flow_size_ < max_seg_size_) max_seg_size_ = flow_size_; diff --git a/extensions/mqtt/protocol/MQTTC2Protocol.cpp b/extensions/mqtt/protocol/MQTTC2Protocol.cpp index 7a5df3d..9637e20 100644 --- a/extensions/mqtt/protocol/MQTTC2Protocol.cpp +++ b/extensions/mqtt/protocol/MQTTC2Protocol.cpp @@ -28,8 +28,7 @@ MQTTC2Protocol::MQTTC2Protocol(std::string name, utils::Identifier uuid) logger_(logging::LoggerFactory<Connectable>::getLogger()) { } -MQTTC2Protocol::~MQTTC2Protocol() { -} +MQTTC2Protocol::~MQTTC2Protocol() = default; void MQTTC2Protocol::initialize(const std::shared_ptr<core::controller::ControllerServiceProvider> &controller, const std::shared_ptr<Configure> &configure) { if (configure->get("nifi.c2.mqtt.connector.service", controller_service_name_)) { diff --git a/extensions/opencv/OpenCVLoader.h b/extensions/opencv/OpenCVLoader.h index 9a6f813..7863e28 100644 --- a/extensions/opencv/OpenCVLoader.h +++ b/extensions/opencv/OpenCVLoader.h @@ -39,9 +39,7 @@ class OpenCVObjectFactoryInitializer : public core::ObjectFactoryInitializer { class OpenCVObjectFactory : public core::ObjectFactory { public: - OpenCVObjectFactory() { - - } + OpenCVObjectFactory() = default; /** * Gets the name of the object. diff --git a/extensions/pcap/CapturePacket.cpp b/extensions/pcap/CapturePacket.cpp index f232d9e..a1d9b0c 100644 --- a/extensions/pcap/CapturePacket.cpp +++ b/extensions/pcap/CapturePacket.cpp @@ -213,8 +213,7 @@ void CapturePacket::onSchedule(const std::shared_ptr<core::ProcessContext> &cont } } -CapturePacket::~CapturePacket() { -} +CapturePacket::~CapturePacket() = default; void CapturePacket::onTrigger(const std::shared_ptr<core::ProcessContext> &context, const std::shared_ptr<core::ProcessSession> &session) { CapturePacketMechanism *capture; diff --git a/extensions/pcap/PcapLoader.h b/extensions/pcap/PcapLoader.h index 885e20e..4406b0c 100644 --- a/extensions/pcap/PcapLoader.h +++ b/extensions/pcap/PcapLoader.h @@ -24,9 +24,7 @@ class PcapFactory : public core::ObjectFactory { public: - PcapFactory() { - - } + PcapFactory() = default; /** * Gets the name of the object. diff --git a/extensions/rocksdb-repos/DatabaseContentRepository.h b/extensions/rocksdb-repos/DatabaseContentRepository.h index 6d12460..50a6c8c 100644 --- a/extensions/rocksdb-repos/DatabaseContentRepository.h +++ b/extensions/rocksdb-repos/DatabaseContentRepository.h @@ -35,9 +35,7 @@ namespace repository { class StringAppender : public rocksdb::AssociativeMergeOperator { public: // Constructor: specify delimiter - explicit StringAppender() { - - } + explicit StringAppender() = default; virtual bool Merge(const rocksdb::Slice& key, const rocksdb::Slice* existing_value, const rocksdb::Slice& value, std::string* new_value, rocksdb::Logger* logger) const { // Clear the *new_value for writing. diff --git a/extensions/rocksdb-repos/RocksDBLoader.h b/extensions/rocksdb-repos/RocksDBLoader.h index 5ed957f..2d3f4df 100644 --- a/extensions/rocksdb-repos/RocksDBLoader.h +++ b/extensions/rocksdb-repos/RocksDBLoader.h @@ -27,9 +27,7 @@ class RocksDBFactory : public core::ObjectFactory { public: - RocksDBFactory() { - - } + RocksDBFactory() = default; /** * Gets the name of the object. diff --git a/extensions/script/ScriptException.h b/extensions/script/ScriptException.h index 855bfc5..d3e36a0 100644 --- a/extensions/script/ScriptException.h +++ b/extensions/script/ScriptException.h @@ -44,8 +44,7 @@ class ScriptException : public std::exception { : error_(std::move(errorMsg)) { } - virtual ~ScriptException() noexcept { - } + virtual ~ScriptException() noexcept = default; virtual const char * what() const noexcept { return error_.c_str(); diff --git a/extensions/script/python/PythonCreator.cpp b/extensions/script/python/PythonCreator.cpp index 6433e6d..81fa51d 100644 --- a/extensions/script/python/PythonCreator.cpp +++ b/extensions/script/python/PythonCreator.cpp @@ -38,8 +38,7 @@ namespace python { #define W_OK 2 /* Test for write permission. */ #define F_OK 0 /* Test for existence. */ #endif -PythonCreator::~PythonCreator() { -} +PythonCreator::~PythonCreator() = default; } /* namespace python */ } /* namespace minifi */ diff --git a/extensions/script/python/PythonScriptEngine.h b/extensions/script/python/PythonScriptEngine.h index 4c4d968..7a1b466 100644 --- a/extensions/script/python/PythonScriptEngine.h +++ b/extensions/script/python/PythonScriptEngine.h @@ -45,8 +45,7 @@ struct Interpreter { : guard_(false) { } - ~Interpreter() { - } + ~Interpreter() = default; Interpreter(const Interpreter &other) = delete; @@ -163,11 +162,9 @@ class PythonScriptEngine : public script::ScriptEngine { class TriggerInit { public: - TriggerInit() { - } + TriggerInit() = default; - ~TriggerInit() { - } + ~TriggerInit() = default; private: std::shared_ptr<script::ScriptProcessContext> script_context_; diff --git a/extensions/script/pythonloader/PyProcLoader.h b/extensions/script/pythonloader/PyProcLoader.h index 5884265..fa7b47c 100644 --- a/extensions/script/pythonloader/PyProcLoader.h +++ b/extensions/script/pythonloader/PyProcLoader.h @@ -27,8 +27,7 @@ class PyProcFactory : public core::ObjectFactory { public: - PyProcFactory() { - } + PyProcFactory() = default; /** * Gets the name of the object. diff --git a/extensions/sensors/GetEnvironmentalSensors.cpp b/extensions/sensors/GetEnvironmentalSensors.cpp index 7aec8eb..36c96a9 100644 --- a/extensions/sensors/GetEnvironmentalSensors.cpp +++ b/extensions/sensors/GetEnvironmentalSensors.cpp @@ -88,8 +88,7 @@ void GetEnvironmentalSensors::notifyStop() { delete pressure_sensor_; } -GetEnvironmentalSensors::~GetEnvironmentalSensors() { -} +GetEnvironmentalSensors::~GetEnvironmentalSensors() = default; void GetEnvironmentalSensors::onTrigger(const std::shared_ptr<core::ProcessContext> &context, const std::shared_ptr<core::ProcessSession> &session) { diff --git a/extensions/sensors/GetMovementSensors.cpp b/extensions/sensors/GetMovementSensors.cpp index f7cb0f0..af39cb7 100644 --- a/extensions/sensors/GetMovementSensors.cpp +++ b/extensions/sensors/GetMovementSensors.cpp @@ -61,8 +61,7 @@ void GetMovementSensors::initialize() { setSupportedRelationships(relationships); } -GetMovementSensors::~GetMovementSensors() { -} +GetMovementSensors::~GetMovementSensors() = default; void GetMovementSensors::onTrigger(const std::shared_ptr<core::ProcessContext> &context, const std::shared_ptr<core::ProcessSession> &session) { auto flow_file_ = session->create(); diff --git a/extensions/sensors/SensorBase.cpp b/extensions/sensors/SensorBase.cpp index 0253bc6..526826d 100644 --- a/extensions/sensors/SensorBase.cpp +++ b/extensions/sensors/SensorBase.cpp @@ -62,8 +62,7 @@ void SensorBase::onSchedule(const std::shared_ptr<core::ProcessContext> &context } -SensorBase::~SensorBase() { -} +SensorBase::~SensorBase() = default; void SensorBase::onTrigger(const std::shared_ptr<core::ProcessContext> &context, const std::shared_ptr<core::ProcessSession> &session) { } diff --git a/extensions/sensors/SensorLoader.h b/extensions/sensors/SensorLoader.h index 10f5194..981d126 100644 --- a/extensions/sensors/SensorLoader.h +++ b/extensions/sensors/SensorLoader.h @@ -25,9 +25,7 @@ class SensorFactory : public core::ObjectFactory { public: - SensorFactory() { - - } + SensorFactory() = default; /** * Gets the name of the object. diff --git a/extensions/sftp/SFTPLoader.h b/extensions/sftp/SFTPLoader.h index 0ab0286..fa2b8d2 100644 --- a/extensions/sftp/SFTPLoader.h +++ b/extensions/sftp/SFTPLoader.h @@ -31,9 +31,7 @@ class SFTPFactoryInitializer : public core::ObjectFactoryInitializer { class SFTPFactory : public core::ObjectFactory { public: - SFTPFactory() { - - } + SFTPFactory() = default; /** * Gets the name of the object. diff --git a/extensions/sftp/processors/FetchSFTP.cpp b/extensions/sftp/processors/FetchSFTP.cpp index 0706451..52cd990 100644 --- a/extensions/sftp/processors/FetchSFTP.cpp +++ b/extensions/sftp/processors/FetchSFTP.cpp @@ -122,8 +122,7 @@ FetchSFTP::FetchSFTP(std::string name, utils::Identifier uuid /*= utils::Identif logger_ = logging::LoggerFactory<FetchSFTP>::getLogger(); } -FetchSFTP::~FetchSFTP() { -} +FetchSFTP::~FetchSFTP() = default; void FetchSFTP::onSchedule(const std::shared_ptr<core::ProcessContext> &context, const std::shared_ptr<core::ProcessSessionFactory> &sessionFactory) { parseCommonPropertiesOnSchedule(context); @@ -156,8 +155,7 @@ FetchSFTP::WriteCallback::WriteCallback(const std::string& remote_file, , client_(client) { } -FetchSFTP::WriteCallback::~WriteCallback() { -} +FetchSFTP::WriteCallback::~WriteCallback() = default; int64_t FetchSFTP::WriteCallback::process(std::shared_ptr<io::BaseStream> stream) { if (!client_.getFile(remote_file_, *stream)) { diff --git a/extensions/sftp/processors/ListSFTP.cpp b/extensions/sftp/processors/ListSFTP.cpp index dd49beb..8af8e4e 100644 --- a/extensions/sftp/processors/ListSFTP.cpp +++ b/extensions/sftp/processors/ListSFTP.cpp @@ -192,8 +192,7 @@ ListSFTP::ListSFTP(std::string name, utils::Identifier uuid /*= utils::Identifie logger_ = logging::LoggerFactory<ListSFTP>::getLogger(); } -ListSFTP::~ListSFTP() { -} +ListSFTP::~ListSFTP() = default; void ListSFTP::onSchedule(const std::shared_ptr<core::ProcessContext> &context, const std::shared_ptr<core::ProcessSessionFactory> &sessionFactory) { parseCommonPropertiesOnSchedule(context); diff --git a/extensions/sftp/processors/PutSFTP.cpp b/extensions/sftp/processors/PutSFTP.cpp index 33ee6ec..79c2758 100644 --- a/extensions/sftp/processors/PutSFTP.cpp +++ b/extensions/sftp/processors/PutSFTP.cpp @@ -167,8 +167,7 @@ PutSFTP::PutSFTP(std::string name, utils::Identifier uuid /*= utils::Identifier( logger_ = logging::LoggerFactory<PutSFTP>::getLogger(); } -PutSFTP::~PutSFTP() { -} +PutSFTP::~PutSFTP() = default; void PutSFTP::onSchedule(const std::shared_ptr<core::ProcessContext> &context, const std::shared_ptr<core::ProcessSessionFactory> &sessionFactory) { parseCommonPropertiesOnSchedule(context); @@ -210,8 +209,7 @@ PutSFTP::ReadCallback::ReadCallback(const std::string& target_path, , conflict_resolution_(conflict_resolution) { } -PutSFTP::ReadCallback::~ReadCallback() { -} +PutSFTP::ReadCallback::~ReadCallback() = default; int64_t PutSFTP::ReadCallback::process(std::shared_ptr<io::BaseStream> stream) { if (!client_.putFile(target_path_, diff --git a/extensions/sql/SQLLoader.h b/extensions/sql/SQLLoader.h index 992c802..b962777 100644 --- a/extensions/sql/SQLLoader.h +++ b/extensions/sql/SQLLoader.h @@ -25,7 +25,7 @@ class SQLFactory : public core::ObjectFactory { public: - SQLFactory() {} + SQLFactory() = default; /** * Gets the name of the object. diff --git a/extensions/sql/data/DatabaseConnectors.h b/extensions/sql/data/DatabaseConnectors.h index 0e94b73..c310cb0 100644 --- a/extensions/sql/data/DatabaseConnectors.h +++ b/extensions/sql/data/DatabaseConnectors.h @@ -43,8 +43,7 @@ class Statement { : session_(session), query_(query) { } - virtual ~Statement() { - } + virtual ~Statement() = default; soci::rowset<soci::row> execute() { return session_.prepare << query_; @@ -62,8 +61,7 @@ class Session { : session_(session) { } - virtual ~Session() { - } + virtual ~Session() = default; void begin() { session_.begin(); @@ -87,8 +85,7 @@ protected: class Connection { public: - virtual ~Connection() { - } + virtual ~Connection() = default; virtual bool connected(std::string& exception) const = 0; virtual std::unique_ptr<Statement> prepareStatement(const std::string &query) const = 0; virtual std::unique_ptr<Session> getSession() const = 0; diff --git a/extensions/sql/data/JSONSQLWriter.cpp b/extensions/sql/data/JSONSQLWriter.cpp index 514fd4d..f9a0384 100644 --- a/extensions/sql/data/JSONSQLWriter.cpp +++ b/extensions/sql/data/JSONSQLWriter.cpp @@ -33,7 +33,7 @@ JSONSQLWriter::JSONSQLWriter(bool pretty) : pretty_(pretty), jsonPayload_(rapidjson::kArrayType) { } -JSONSQLWriter::~JSONSQLWriter() {} +JSONSQLWriter::~JSONSQLWriter() = default; void JSONSQLWriter::beginProcessRow() { jsonRow_ = rapidjson::kObjectType; diff --git a/extensions/sql/data/SQLRowSubscriber.h b/extensions/sql/data/SQLRowSubscriber.h index 5325e71..89a2f4a 100644 --- a/extensions/sql/data/SQLRowSubscriber.h +++ b/extensions/sql/data/SQLRowSubscriber.h @@ -27,7 +27,7 @@ namespace minifi { namespace sql { struct SQLRowSubscriber { - virtual ~SQLRowSubscriber() {} + virtual ~SQLRowSubscriber() = default; virtual void beginProcessRow() = 0; virtual void endProcessRow() = 0; virtual void processColumnName(const std::string& name) = 0; diff --git a/extensions/sql/processors/ExecuteSQL.cpp b/extensions/sql/processors/ExecuteSQL.cpp index fe0df48..f9735b4 100644 --- a/extensions/sql/processors/ExecuteSQL.cpp +++ b/extensions/sql/processors/ExecuteSQL.cpp @@ -70,8 +70,7 @@ ExecuteSQL::ExecuteSQL(const std::string& name, utils::Identifier uuid) : SQLProcessor(name, uuid), max_rows_(0) { } -ExecuteSQL::~ExecuteSQL() { -} +ExecuteSQL::~ExecuteSQL() = default; void ExecuteSQL::initialize() { //! Set the supported properties diff --git a/extensions/sql/processors/PutSQL.cpp b/extensions/sql/processors/PutSQL.cpp index 5296760..77bbb0f 100644 --- a/extensions/sql/processors/PutSQL.cpp +++ b/extensions/sql/processors/PutSQL.cpp @@ -62,8 +62,7 @@ PutSQL::PutSQL(const std::string& name, utils::Identifier uuid) : SQLProcessor(name, uuid) { } -PutSQL::~PutSQL() { -} +PutSQL::~PutSQL() = default; void PutSQL::initialize() { //! Set the supported properties diff --git a/extensions/sql/processors/QueryDatabaseTable.cpp b/extensions/sql/processors/QueryDatabaseTable.cpp index 7cf7a41..a54a560 100644 --- a/extensions/sql/processors/QueryDatabaseTable.cpp +++ b/extensions/sql/processors/QueryDatabaseTable.cpp @@ -216,8 +216,7 @@ QueryDatabaseTable::QueryDatabaseTable(const std::string& name, utils::Identifie : SQLProcessor(name, uuid) { } -QueryDatabaseTable::~QueryDatabaseTable() { -} +QueryDatabaseTable::~QueryDatabaseTable() = default; void QueryDatabaseTable::initialize() { //! Set the supported properties diff --git a/extensions/sql/services/ODBCConnector.h b/extensions/sql/services/ODBCConnector.h index 4202d05..4c6cec7 100644 --- a/extensions/sql/services/ODBCConnector.h +++ b/extensions/sql/services/ODBCConnector.h @@ -46,8 +46,7 @@ class ODBCConnection : public sql::Connection { session_ = std::make_unique<soci::session>(getSessionParameters()); } - virtual ~ODBCConnection() { - } + virtual ~ODBCConnection() = default; bool connected(std::string& exception) const override { try { diff --git a/extensions/standard-processors/controllers/UnorderedMapKeyValueStoreService.cpp b/extensions/standard-processors/controllers/UnorderedMapKeyValueStoreService.cpp index bd654a3..c77aafd 100644 --- a/extensions/standard-processors/controllers/UnorderedMapKeyValueStoreService.cpp +++ b/extensions/standard-processors/controllers/UnorderedMapKeyValueStoreService.cpp @@ -40,8 +40,7 @@ UnorderedMapKeyValueStoreService::UnorderedMapKeyValueStoreService(const std::st initialize(); } -UnorderedMapKeyValueStoreService::~UnorderedMapKeyValueStoreService() { -} +UnorderedMapKeyValueStoreService::~UnorderedMapKeyValueStoreService() = default; bool UnorderedMapKeyValueStoreService::set(const std::string& key, const std::string& value) { std::lock_guard<std::recursive_mutex> lock(mutex_); diff --git a/extensions/standard-processors/processors/AppendHostInfo.h b/extensions/standard-processors/processors/AppendHostInfo.h index 2a8f907..a3acc31 100644 --- a/extensions/standard-processors/processors/AppendHostInfo.h +++ b/extensions/standard-processors/processors/AppendHostInfo.h @@ -49,8 +49,7 @@ class AppendHostInfo : public core::Processor { logger_(logging::LoggerFactory<AppendHostInfo>::getLogger()) { } // Destructor - virtual ~AppendHostInfo() { - } + virtual ~AppendHostInfo() = default; // Processor Name static constexpr char const* ProcessorName = "AppendHostInfo"; // Supported Properties diff --git a/extensions/standard-processors/processors/ExtractText.h b/extensions/standard-processors/processors/ExtractText.h index f3a7d80..e7df36f 100644 --- a/extensions/standard-processors/processors/ExtractText.h +++ b/extensions/standard-processors/processors/ExtractText.h @@ -75,7 +75,7 @@ class ExtractText : public core::Processor { class ReadCallback : public InputStreamCallback { public: ReadCallback(std::shared_ptr<core::FlowFile> flowFile, core::ProcessContext *ct, std::shared_ptr<logging::Logger> lgr); - ~ReadCallback() {} + ~ReadCallback() = default; int64_t process(std::shared_ptr<io::BaseStream> stream); private: diff --git a/extensions/standard-processors/processors/GetFile.h b/extensions/standard-processors/processors/GetFile.h index b6a0a84..fc3f069 100644 --- a/extensions/standard-processors/processors/GetFile.h +++ b/extensions/standard-processors/processors/GetFile.h @@ -67,8 +67,7 @@ class GetFileMetrics : public state::response::ResponseNode { accepted_files_ = 0; input_bytes_ = 0; } - virtual ~GetFileMetrics() { - } + virtual ~GetFileMetrics() = default; std::string getName() const override { return core::Connectable::getName(); } diff --git a/extensions/standard-processors/processors/GetTCP.h b/extensions/standard-processors/processors/GetTCP.h index b90f656..aaad66c 100644 --- a/extensions/standard-processors/processors/GetTCP.h +++ b/extensions/standard-processors/processors/GetTCP.h @@ -53,8 +53,7 @@ class SocketAfterExecute : public utils::AfterExecute<int> { explicit SocketAfterExecute(SocketAfterExecute && other) { } - ~SocketAfterExecute() { - } + ~SocketAfterExecute() = default; virtual bool isFinished(const int &result) { if (result == -1 || result == 0 || !running_) { @@ -91,8 +90,7 @@ class DataHandlerCallback : public OutputStreamCallback { size_(size) { } - virtual ~DataHandlerCallback() { - } + virtual ~DataHandlerCallback() = default; virtual int64_t process(std::shared_ptr<io::BaseStream> stream) { return stream->write(message_, size_); @@ -131,8 +129,7 @@ class GetTCPMetrics : public state::response::ResponseNode { accepted_files_ = 0; input_bytes_ = 0; } - virtual ~GetTCPMetrics() { - } + virtual ~GetTCPMetrics() = default; virtual std::string getName() const { return core::Connectable::getName(); } @@ -190,8 +187,7 @@ class GetTCP : public core::Processor, public state::response::MetricsNodeSource metrics_ = std::make_shared<GetTCPMetrics>(); } // Destructor - virtual ~GetTCP() { - } + virtual ~GetTCP() = default; // Processor Name static constexpr char const* ProcessorName = "GetTCP"; diff --git a/extensions/standard-processors/processors/LogAttribute.h b/extensions/standard-processors/processors/LogAttribute.h index d5ac6c7..076ef90 100644 --- a/extensions/standard-processors/processors/LogAttribute.h +++ b/extensions/standard-processors/processors/LogAttribute.h @@ -53,8 +53,7 @@ class LogAttribute : public core::Processor { logger_(logging::LoggerFactory<LogAttribute>::getLogger()) { } // Destructor - virtual ~LogAttribute() { - } + virtual ~LogAttribute() = default; // Processor Name static constexpr char const* ProcessorName = "LogAttribute"; // Supported Properties diff --git a/extensions/standard-processors/processors/TailFile.h b/extensions/standard-processors/processors/TailFile.h index fc003b2..958d2d5 100644 --- a/extensions/standard-processors/processors/TailFile.h +++ b/extensions/standard-processors/processors/TailFile.h @@ -67,8 +67,7 @@ class TailFile : public core::Processor { state_recovered_ = false; } // Destructor - virtual ~TailFile() { - } + virtual ~TailFile() = default; // Processor Name static constexpr char const* ProcessorName = "TailFile"; // Supported Properties diff --git a/extensions/windows-event-log/CollectorInitiatedSubscription.h b/extensions/windows-event-log/CollectorInitiatedSubscription.h index 3f17d80..6812b9d 100644 --- a/extensions/windows-event-log/CollectorInitiatedSubscription.h +++ b/extensions/windows-event-log/CollectorInitiatedSubscription.h @@ -47,9 +47,7 @@ public: CollectorInitiatedSubscription(const std::string& name, utils::Identifier uuid = utils::Identifier()); //! Destructor - virtual ~CollectorInitiatedSubscription() - { - } + virtual ~CollectorInitiatedSubscription() = default; //! Processor Name static const std::string ProcessorName; diff --git a/extensions/windows-event-log/SupportedProperty.h b/extensions/windows-event-log/SupportedProperty.h index 9f1ef95..7dd140f 100644 --- a/extensions/windows-event-log/SupportedProperty.h +++ b/extensions/windows-event-log/SupportedProperty.h @@ -55,7 +55,7 @@ public: return ret; } - SupportedProperties() {} + SupportedProperties() = default; template <typename Arg, typename ...Args> SupportedProperties(Arg& arg, Args&... args) { diff --git a/extensions/windows-event-log/TailEventLog.h b/extensions/windows-event-log/TailEventLog.h index c921387..908bed0 100644 --- a/extensions/windows-event-log/TailEventLog.h +++ b/extensions/windows-event-log/TailEventLog.h @@ -47,9 +47,7 @@ public: : core::Processor(name, uuid), logger_(logging::LoggerFactory<TailEventLog>::getLogger()),max_events_(1){ } //! Destructor - virtual ~TailEventLog() - { - } + virtual ~TailEventLog() = default; //! Processor Name static const std::string ProcessorName; //! Supported Properties diff --git a/extensions/windows-event-log/wel/WindowsEventLog.h b/extensions/windows-event-log/wel/WindowsEventLog.h index dc0be24..0714582 100644 --- a/extensions/windows-event-log/wel/WindowsEventLog.h +++ b/extensions/windows-event-log/wel/WindowsEventLog.h @@ -63,7 +63,7 @@ typedef std::vector<std::pair<METADATA, std::string>> METADATA_NAMES; class WindowsEventLogHandler { public: - WindowsEventLogHandler() : metadata_provider_(nullptr){ + WindowsEventLogHandler() : metadata_provider_(nullptr) { } explicit WindowsEventLogHandler(EVT_HANDLE metadataProvider) : metadata_provider_(metadataProvider) { diff --git a/libminifi/include/Connection.h b/libminifi/include/Connection.h index bf6f60e..64a805e 100644 --- a/libminifi/include/Connection.h +++ b/libminifi/include/Connection.h @@ -55,8 +55,7 @@ class Connection : public core::Connectable, public std::enable_shared_from_this explicit Connection(const std::shared_ptr<core::Repository> &flow_repository, const std::shared_ptr<core::ContentRepository> &content_repo, std::string name, utils::Identifier & uuid, utils::Identifier & srcUUID, utils::Identifier & destUUID); // Destructor - virtual ~Connection() { - } + virtual ~Connection() = default; // Set Source Processor UUID void setSourceUUID(utils::Identifier &uuid) { diff --git a/libminifi/include/CronDrivenSchedulingAgent.h b/libminifi/include/CronDrivenSchedulingAgent.h index 2ebf2c2..31ac37a 100644 --- a/libminifi/include/CronDrivenSchedulingAgent.h +++ b/libminifi/include/CronDrivenSchedulingAgent.h @@ -50,8 +50,7 @@ class CronDrivenSchedulingAgent : public ThreadedSchedulingAgent { : ThreadedSchedulingAgent(controller_service_provider, repo, flow_repo, content_repo, configuration, thread_pool) { } // Destructor - virtual ~CronDrivenSchedulingAgent() { - } + virtual ~CronDrivenSchedulingAgent() = default; // Run function for the thread utils::TaskRescheduleInfo run(const std::shared_ptr<core::Processor> &processor, const std::shared_ptr<core::ProcessContext> &processContext, const std::shared_ptr<core::ProcessSessionFactory> &sessionFactory) override; diff --git a/libminifi/include/FlowFileRecord.h b/libminifi/include/FlowFileRecord.h index 97cc42a..666b6d2 100644 --- a/libminifi/include/FlowFileRecord.h +++ b/libminifi/include/FlowFileRecord.h @@ -85,16 +85,14 @@ inline const char *FlowAttributeKey(FlowAttribute attribute) { // throw exception for error class InputStreamCallback { public: - virtual ~InputStreamCallback() { - } + virtual ~InputStreamCallback() = default; // virtual void process(std::ifstream *stream) = 0; virtual int64_t process(std::shared_ptr<io::BaseStream> stream) = 0; }; class OutputStreamCallback { public: - virtual ~OutputStreamCallback() { - } + virtual ~OutputStreamCallback() = default; virtual int64_t process(std::shared_ptr<io::BaseStream> stream) = 0; }; diff --git a/libminifi/include/RemoteProcessorGroupPort.h b/libminifi/include/RemoteProcessorGroupPort.h index 14ff484..3c33706 100644 --- a/libminifi/include/RemoteProcessorGroupPort.h +++ b/libminifi/include/RemoteProcessorGroupPort.h @@ -100,8 +100,7 @@ class RemoteProcessorGroupPort : public core::Processor { setURL(url); } // Destructor - virtual ~RemoteProcessorGroupPort() { - } + virtual ~RemoteProcessorGroupPort() = default; // Processor Name static const char *ProcessorName; diff --git a/libminifi/include/ResourceClaim.h b/libminifi/include/ResourceClaim.h index c02a6cc..d773c3d 100644 --- a/libminifi/include/ResourceClaim.h +++ b/libminifi/include/ResourceClaim.h @@ -58,8 +58,7 @@ class ResourceClaim : public std::enable_shared_from_this<ResourceClaim> { explicit ResourceClaim(const std::string path, std::shared_ptr<core::StreamManager<ResourceClaim>> claim_manager, bool deleted = false); // Destructor - ~ResourceClaim() { - } + ~ResourceClaim() = default; // increaseFlowFileRecordOwnedCount void increaseFlowFileRecordOwnedCount() { claim_manager_->incrementStreamCount(shared_from_this()); diff --git a/libminifi/include/ThreadedSchedulingAgent.h b/libminifi/include/ThreadedSchedulingAgent.h index 6e2f7e9..8a35580 100644 --- a/libminifi/include/ThreadedSchedulingAgent.h +++ b/libminifi/include/ThreadedSchedulingAgent.h @@ -53,8 +53,7 @@ class ThreadedSchedulingAgent : public SchedulingAgent { logger_(logging::LoggerFactory<ThreadedSchedulingAgent>::getLogger()) { } // Destructor - virtual ~ThreadedSchedulingAgent() { - } + virtual ~ThreadedSchedulingAgent() = default; // Run function for the thread virtual utils::TaskRescheduleInfo run(const std::shared_ptr<core::Processor> &processor, const std::shared_ptr<core::ProcessContext> &processContext, diff --git a/libminifi/include/c2/C2Protocol.h b/libminifi/include/c2/C2Protocol.h index 78815c9..2cbd0bd 100644 --- a/libminifi/include/c2/C2Protocol.h +++ b/libminifi/include/c2/C2Protocol.h @@ -45,8 +45,7 @@ class C2Protocol : public core::Connectable { controller_ = controller; configuration_ = configure; } - virtual ~C2Protocol() { - } + virtual ~C2Protocol() = default; /** * Update the configuration. diff --git a/libminifi/include/c2/C2Trigger.h b/libminifi/include/c2/C2Trigger.h index 2ad2f52..1370c58 100644 --- a/libminifi/include/c2/C2Trigger.h +++ b/libminifi/include/c2/C2Trigger.h @@ -43,8 +43,7 @@ class C2Trigger : public core::Connectable{ C2Trigger(std::string name, utils::Identifier uuid) : core::Connectable(name, uuid) { } - virtual ~C2Trigger() { - } + virtual ~C2Trigger() = default; /** diff --git a/libminifi/include/c2/HeartBeatReporter.h b/libminifi/include/c2/HeartBeatReporter.h index b878e64..9de242d 100644 --- a/libminifi/include/c2/HeartBeatReporter.h +++ b/libminifi/include/c2/HeartBeatReporter.h @@ -51,8 +51,7 @@ class HeartBeatReporter : public core::Connectable { update_sink_ = updateSink; configuration_ = configure; } - virtual ~HeartBeatReporter() { - } + virtual ~HeartBeatReporter() = default; /** * Send a C2 payloadd to the provided URI. The direction indicates to the protocol whether or not this a transmit or receive operation. * Depending on the protocol this may mean different things. diff --git a/libminifi/include/c2/protocols/RESTProtocol.h b/libminifi/include/c2/protocols/RESTProtocol.h index 76e851b..ce7b8b0 100644 --- a/libminifi/include/c2/protocols/RESTProtocol.h +++ b/libminifi/include/c2/protocols/RESTProtocol.h @@ -67,8 +67,7 @@ class RESTProtocol { : minimize_updates_(false) { } - virtual ~RESTProtocol() { - } + virtual ~RESTProtocol() = default; protected: virtual rapidjson::Value getStringValue(const std::string& value, rapidjson::Document::AllocatorType& alloc); diff --git a/libminifi/include/core/ClassLoader.h b/libminifi/include/core/ClassLoader.h index 1f98c40..d8dcece 100644 --- a/libminifi/include/core/ClassLoader.h +++ b/libminifi/include/core/ClassLoader.h @@ -62,8 +62,7 @@ namespace core { */ class ObjectFactoryInitializer { public: - virtual ~ObjectFactoryInitializer() { - } + virtual ~ObjectFactoryInitializer() = default; /** * This function is be called before the ObjectFactory is used. @@ -87,14 +86,12 @@ class ObjectFactory { : group_(group) { } - ObjectFactory() { - } + ObjectFactory() = default; /** * Virtual destructor. */ - virtual ~ObjectFactory() { - } + virtual ~ObjectFactory() = default; /** * Create a shared pointer to a new processor. @@ -171,8 +168,7 @@ class DefautObjectFactory : public ObjectFactory { /** * Virtual destructor. */ - virtual ~DefautObjectFactory() { - } + virtual ~DefautObjectFactory() = default; /** * Create a shared pointer to a new processor. diff --git a/libminifi/include/core/ContentRepository.h b/libminifi/include/core/ContentRepository.h index 32e8da4..2fca0a3 100644 --- a/libminifi/include/core/ContentRepository.h +++ b/libminifi/include/core/ContentRepository.h @@ -40,8 +40,7 @@ namespace core { */ class ContentRepository : public StreamManager<minifi::ResourceClaim> { public: - virtual ~ContentRepository() { - } + virtual ~ContentRepository() = default; /** * initialize this content repository using the provided configuration. diff --git a/libminifi/include/core/Core.h b/libminifi/include/core/Core.h index 48ac2a7..8fa23e7 100644 --- a/libminifi/include/core/Core.h +++ b/libminifi/include/core/Core.h @@ -172,8 +172,7 @@ class CoreComponent { explicit CoreComponent(CoreComponent &&other) = default; - virtual ~CoreComponent() { - } + virtual ~CoreComponent() = default; // Get component name Name virtual std::string getName() const; diff --git a/libminifi/include/core/CoreComponentState.h b/libminifi/include/core/CoreComponentState.h index 5476f70..328148e 100644 --- a/libminifi/include/core/CoreComponentState.h +++ b/libminifi/include/core/CoreComponentState.h @@ -33,8 +33,7 @@ namespace core { class CoreComponentStateManager { public: - virtual ~CoreComponentStateManager() { - } + virtual ~CoreComponentStateManager() = default; virtual bool set(const std::unordered_map<std::string, std::string>& kvs) = 0; diff --git a/libminifi/include/core/ProcessContext.h b/libminifi/include/core/ProcessContext.h index b2d73a1..53d42aa 100644 --- a/libminifi/include/core/ProcessContext.h +++ b/libminifi/include/core/ProcessContext.h @@ -91,8 +91,7 @@ class ProcessContext : public controller::ControllerServiceLookup, public core:: } } // Destructor - virtual ~ProcessContext() { - } + virtual ~ProcessContext() = default; // Get Processor associated with the Process Context std::shared_ptr<ProcessorNode> getProcessorNode() const { return processor_node_; diff --git a/libminifi/include/core/ProcessContextBuilder.h b/libminifi/include/core/ProcessContextBuilder.h index d5eb529..155ab41 100644 --- a/libminifi/include/core/ProcessContextBuilder.h +++ b/libminifi/include/core/ProcessContextBuilder.h @@ -60,8 +60,7 @@ class ProcessContextBuilder : public core::CoreComponent, public std::enable_sha ProcessContextBuilder(const std::string &name); // NOLINT - virtual ~ProcessContextBuilder() { - } + virtual ~ProcessContextBuilder() = default; std::shared_ptr<ProcessContextBuilder> withProvider(const std::shared_ptr<controller::ControllerServiceProvider> &controller_service_provider); diff --git a/libminifi/include/core/Property.h b/libminifi/include/core/Property.h index 85c3163..142f784 100644 --- a/libminifi/include/core/Property.h +++ b/libminifi/include/core/Property.h @@ -586,8 +586,7 @@ class PropertyBuilder : public std::enable_shared_from_this<PropertyBuilder> { private: Property prop; - PropertyBuilder() { - } + PropertyBuilder() = default; }; template<typename T> diff --git a/libminifi/include/core/Relationship.h b/libminifi/include/core/Relationship.h index 458a515..94751ef 100644 --- a/libminifi/include/core/Relationship.h +++ b/libminifi/include/core/Relationship.h @@ -54,17 +54,13 @@ class Relationship { description_(description) { } - Relationship(const Relationship &other) - : name_(other.name_), - description_(other.description_) { - } + Relationship(const Relationship &other) = default; Relationship() : name_(UNDEFINED_RELATIONSHIP) { } // Destructor - ~Relationship() { - } + ~Relationship() = default; // Get Name for the relationship std::string getName() const { return name_; @@ -78,11 +74,7 @@ class Relationship { return name_ < right.name_; } - Relationship &operator=(const Relationship &other) { - name_ = other.name_; - description_ = other.description_; - return *this; - } + Relationship &operator=(const Relationship &other) = default; // Whether it is a undefined relationship bool isRelationshipUndefined() { return isRelationshipNameUndefined(name_); diff --git a/libminifi/include/core/SerializableComponent.h b/libminifi/include/core/SerializableComponent.h index 9f62dcd..e2690ea 100644 --- a/libminifi/include/core/SerializableComponent.h +++ b/libminifi/include/core/SerializableComponent.h @@ -44,8 +44,7 @@ class SerializableComponent : public core::Connectable, public minifi::io::Seria : core::Connectable(name, uuid) { } - virtual ~SerializableComponent() { - } + virtual ~SerializableComponent() = default; /** * Serialize this object into the the store diff --git a/libminifi/include/core/TypedValues.h b/libminifi/include/core/TypedValues.h index 1b1172d..c22ed79 100644 --- a/libminifi/include/core/TypedValues.h +++ b/libminifi/include/core/TypedValues.h @@ -33,8 +33,7 @@ namespace core { class TransformableValue { public: - TransformableValue() { - } + TransformableValue() = default; }; diff --git a/libminifi/include/core/VariableRegistry.h b/libminifi/include/core/VariableRegistry.h index 0a6b64e..eba01d5 100644 --- a/libminifi/include/core/VariableRegistry.h +++ b/libminifi/include/core/VariableRegistry.h @@ -41,8 +41,7 @@ class VariableRegistry { } } - virtual ~VariableRegistry() { - } + virtual ~VariableRegistry() = default; bool getConfigurationProperty(const std::string &property, std::string &value) const { auto prop = variable_registry_.find(property); diff --git a/libminifi/include/core/WeakReference.h b/libminifi/include/core/WeakReference.h index 0311084..115562d 100644 --- a/libminifi/include/core/WeakReference.h +++ b/libminifi/include/core/WeakReference.h @@ -41,13 +41,11 @@ class WeakReference { WeakReference &operator=(const WeakReference &other) = delete; WeakReference &operator=(WeakReference &&other) = default; - virtual ~WeakReference() { - } + virtual ~WeakReference() = default; virtual void remove() = 0; protected: - WeakReference() { - } + WeakReference() = default; }; /** @@ -60,11 +58,9 @@ class WeakReference { */ class ReferenceContainer { public: - ReferenceContainer() { - } + ReferenceContainer() = default; - ~ReferenceContainer() { - } + ~ReferenceContainer() = default; void addReference(std::shared_ptr<WeakReference> ref) { std::lock_guard<std::mutex> lock(mutex); diff --git a/libminifi/include/core/controller/ControllerServiceLookup.h b/libminifi/include/core/controller/ControllerServiceLookup.h index 9237c06..73cc8da 100644 --- a/libminifi/include/core/controller/ControllerServiceLookup.h +++ b/libminifi/include/core/controller/ControllerServiceLookup.h @@ -41,11 +41,9 @@ namespace controller { */ class ControllerServiceLookup { public: - ControllerServiceLookup() { - } + ControllerServiceLookup() = default; - virtual ~ControllerServiceLookup() { - } + virtual ~ControllerServiceLookup() = default; /** * Gets the controller service via the provided identifier. diff --git a/libminifi/include/core/controller/ControllerServiceMap.h b/libminifi/include/core/controller/ControllerServiceMap.h index 031b82f..15af10a 100644 --- a/libminifi/include/core/controller/ControllerServiceMap.h +++ b/libminifi/include/core/controller/ControllerServiceMap.h @@ -42,11 +42,9 @@ namespace controller { */ class ControllerServiceMap { public: - ControllerServiceMap() { - } + ControllerServiceMap() = default; - virtual ~ControllerServiceMap() { - } + virtual ~ControllerServiceMap() = default; /** * Gets the controller service node using the <code>id</code> diff --git a/libminifi/include/core/controller/ControllerServiceProvider.h b/libminifi/include/core/controller/ControllerServiceProvider.h index 7928d7a..8628f94 100644 --- a/libminifi/include/core/controller/ControllerServiceProvider.h +++ b/libminifi/include/core/controller/ControllerServiceProvider.h @@ -64,8 +64,7 @@ class ControllerServiceProvider : public CoreComponent, public ConfigurableCompo controller_map_(std::move(other.controller_map_)) { } - virtual ~ControllerServiceProvider() { - } + virtual ~ControllerServiceProvider() = default; /** * Creates a controller service node wrapping the controller service diff --git a/libminifi/include/core/reporting/SiteToSiteProvenanceReportingTask.h b/libminifi/include/core/reporting/SiteToSiteProvenanceReportingTask.h index a2213c3..f30744c 100644 --- a/libminifi/include/core/reporting/SiteToSiteProvenanceReportingTask.h +++ b/libminifi/include/core/reporting/SiteToSiteProvenanceReportingTask.h @@ -51,8 +51,7 @@ class SiteToSiteProvenanceReportingTask : public minifi::RemoteProcessorGroupPor batch_size_ = 100; } //! Destructor - ~SiteToSiteProvenanceReportingTask() { - } + ~SiteToSiteProvenanceReportingTask() = default; //! Report Task Name static constexpr char const* ReportTaskName = "SiteToSiteProvenanceReportingTask"; static const char *ProvenanceAppStr; diff --git a/libminifi/include/core/repository/AtomicRepoEntries.h b/libminifi/include/core/repository/AtomicRepoEntries.h index 2f6558c..8c15f79 100644 --- a/libminifi/include/core/repository/AtomicRepoEntries.h +++ b/libminifi/include/core/repository/AtomicRepoEntries.h @@ -47,8 +47,7 @@ namespace repository { template<typename T> class RepoValue { public: - RepoValue() { - } + RepoValue() = default; /** * Constructor that populates the item allowing for a custom key comparator. @@ -78,8 +77,7 @@ noexcept : key_(std::move(other.key_)), comparator_(std::move(other.comparator_)) { } - ~RepoValue() { - } + ~RepoValue() = default; T &getKey() { return key_; diff --git a/libminifi/include/core/repository/FileSystemRepository.h b/libminifi/include/core/repository/FileSystemRepository.h index 82318c9..9439ec3 100644 --- a/libminifi/include/core/repository/FileSystemRepository.h +++ b/libminifi/include/core/repository/FileSystemRepository.h @@ -41,8 +41,7 @@ class FileSystemRepository : public core::ContentRepository, public core::CoreCo : core::CoreComponent(name), logger_(logging::LoggerFactory<FileSystemRepository>::getLogger()) { } - virtual ~FileSystemRepository() { - } + virtual ~FileSystemRepository() = default; virtual bool initialize(const std::shared_ptr<minifi::Configure> &configuration); diff --git a/libminifi/include/core/state/FlowIdentifier.h b/libminifi/include/core/state/FlowIdentifier.h index 34e24fc..89ef54d 100644 --- a/libminifi/include/core/state/FlowIdentifier.h +++ b/libminifi/include/core/state/FlowIdentifier.h @@ -63,17 +63,8 @@ class FlowIdentifier { } protected: - explicit FlowIdentifier(const FlowIdentifier &other) { - registry_url_ = other.registry_url_; - bucket_id_ = other.bucket_id_; - flow_id_ = other.flow_id_; - } - FlowIdentifier &operator=(const FlowIdentifier &other) { - registry_url_ = other.registry_url_; - bucket_id_ = other.bucket_id_; - flow_id_ = other.flow_id_; - return *this; - } + FlowIdentifier(const FlowIdentifier &other) = default; + FlowIdentifier &operator=(const FlowIdentifier &other) = default; private: std::string registry_url_; diff --git a/libminifi/include/core/state/UpdateController.h b/libminifi/include/core/state/UpdateController.h index f728da3..d2729a7 100644 --- a/libminifi/include/core/state/UpdateController.h +++ b/libminifi/include/core/state/UpdateController.h @@ -79,16 +79,13 @@ class Update { : status_(status) { } - Update(const Update &other) - : status_(other.status_) { - } + Update(const Update &other) = default; Update(const Update &&other) : status_(std::move(other.status_)) { } - virtual ~Update() { - } + virtual ~Update() = default; virtual bool validate() { return true; @@ -103,10 +100,7 @@ class Update { return *this; } - Update &operator=(const Update &other) { - status_ = other.status_; - return *this; - } + Update &operator=(const Update &other) = default; protected: UpdateStatus status_; @@ -131,8 +125,7 @@ class UpdateRunner : public utils::AfterExecute<Update> { delay_(std::move(other.delay_)) { } - ~UpdateRunner() { - } + ~UpdateRunner() = default; virtual bool isFinished(const Update &result) { if ((result.getStatus().getState() == UpdateState::FULLY_APPLIED || result.getStatus().getState() == UpdateState::READ_COMPLETE) && *running_) { @@ -157,8 +150,7 @@ class UpdateRunner : public utils::AfterExecute<Update> { class StateController { public: - virtual ~StateController() { - } + virtual ~StateController() = default; virtual std::string getComponentName() const = 0; @@ -185,8 +177,7 @@ class StateController { */ class StateMonitor : public StateController { public: - virtual ~StateMonitor() { - } + virtual ~StateMonitor() = default; std::atomic<bool> &isStateMonitorRunning() { return controller_running_; diff --git a/libminifi/include/core/state/UpdatePolicy.h b/libminifi/include/core/state/UpdatePolicy.h index f80c1bf..8e9eae4 100644 --- a/libminifi/include/core/state/UpdatePolicy.h +++ b/libminifi/include/core/state/UpdatePolicy.h @@ -62,21 +62,12 @@ class UpdatePolicy { return enable_all_; } - UpdatePolicy &operator=(const UpdatePolicy &&other) { - enable_all_ = std::move(other.enable_all_); - properties_ = std::move(other.properties_); - return *this; - } + UpdatePolicy &operator=(UpdatePolicy &&other) = default; protected: - explicit UpdatePolicy(const UpdatePolicy &other) - : enable_all_(other.enable_all_), properties_(other.properties_) { - } + UpdatePolicy(const UpdatePolicy &other) = default; - explicit UpdatePolicy(const UpdatePolicy &&other) - : enable_all_(std::move(other.enable_all_)), - properties_(std::move(other.properties_)) { - } + UpdatePolicy(UpdatePolicy &&other) = default; UpdatePolicy() = delete; @@ -122,10 +113,7 @@ class UpdatePolicyBuilder { protected: - explicit UpdatePolicyBuilder(const UpdatePolicyBuilder &other) - : current_policy_(other.current_policy_) { - } - + UpdatePolicyBuilder(const UpdatePolicyBuilder &other) = default; explicit UpdatePolicyBuilder(bool enable_all) { current_policy_ = std::make_shared<UpdatePolicy>(enable_all); diff --git a/libminifi/include/core/state/Value.h b/libminifi/include/core/state/Value.h index a2f2936..162e269 100644 --- a/libminifi/include/core/state/Value.h +++ b/libminifi/include/core/state/Value.h @@ -48,8 +48,7 @@ class Value { type_id(std::type_index(typeid(std::string))) { } - virtual ~Value() { - } + virtual ~Value() = default; std::string getStringValue() const { return string_value; } diff --git a/libminifi/include/core/state/nodes/MetricsBase.h b/libminifi/include/core/state/nodes/MetricsBase.h index 6a9d53f..f89a6bf 100644 --- a/libminifi/include/core/state/nodes/MetricsBase.h +++ b/libminifi/include/core/state/nodes/MetricsBase.h @@ -53,8 +53,7 @@ class ResponseNode : public core::Connectable { : core::Connectable(name, uuid), is_array_(false) { } - virtual ~ResponseNode() { - } + virtual ~ResponseNode() = default; virtual std::vector<SerializedResponseNode> serialize() = 0; @@ -143,11 +142,9 @@ class ObjectNode : public ResponseNode { */ class ResponseNodeSource { public: - ResponseNodeSource() { - } + ResponseNodeSource() = default; - virtual ~ResponseNodeSource() { - } + virtual ~ResponseNodeSource() = default; /** * Retrieves all metrics from this source. @@ -168,11 +165,9 @@ class ResponseNodeSource { */ class MetricsNodeSource : public ResponseNodeSource { public: - MetricsNodeSource() { - } + MetricsNodeSource() = default; - virtual ~MetricsNodeSource() { - } + virtual ~MetricsNodeSource() = default; /** * Retrieves all metrics from this source. @@ -191,11 +186,9 @@ class MetricsNodeSource : public ResponseNodeSource { class NodeReporter { public: - NodeReporter() { - } + NodeReporter() = default; - virtual ~NodeReporter() { - } + virtual ~NodeReporter() = default; /** * Retrieves metrics node @@ -223,8 +216,7 @@ class NodeReporter { */ class ResponseNodeSink { public: - virtual ~ResponseNodeSink() { - } + virtual ~ResponseNodeSink() = default; /** * Setter for nodes in this sink. * @param metrics metrics to insert into the current sink. diff --git a/libminifi/include/core/state/nodes/ProcessMetrics.h b/libminifi/include/core/state/nodes/ProcessMetrics.h index ac53c5a..55de718 100644 --- a/libminifi/include/core/state/nodes/ProcessMetrics.h +++ b/libminifi/include/core/state/nodes/ProcessMetrics.h @@ -56,8 +56,7 @@ class ProcessMetrics : public ResponseNode { : ResponseNode(name) { } - ProcessMetrics() { - } + ProcessMetrics() = default; virtual std::string getName() const { return "ProcessMetrics"; diff --git a/libminifi/include/core/state/nodes/TreeUpdateListener.h b/libminifi/include/core/state/nodes/TreeUpdateListener.h index 5b50c22..5636017 100644 --- a/libminifi/include/core/state/nodes/TreeUpdateListener.h +++ b/libminifi/include/core/state/nodes/TreeUpdateListener.h @@ -55,8 +55,7 @@ class OperationWatcher : public utils::AfterExecute<Update> { : running_(std::move(other.running_)) { } - ~OperationWatcher() { - } + ~OperationWatcher() = default; virtual bool isFinished(const Update &result) { if (result.getStatus().getState() == UpdateState::READ_COMPLETE && running_) { diff --git a/libminifi/include/core/yaml/YamlConfiguration.h b/libminifi/include/core/yaml/YamlConfiguration.h index 8ad8382..0674124 100644 --- a/libminifi/include/core/yaml/YamlConfiguration.h +++ b/libminifi/include/core/yaml/YamlConfiguration.h @@ -66,8 +66,7 @@ class YamlConfiguration : public FlowConfiguration { } } - virtual ~YamlConfiguration() { - } + virtual ~YamlConfiguration() = default; /** * Returns a shared pointer to a ProcessGroup object containing the diff --git a/libminifi/include/io/NonConvertingStream.h b/libminifi/include/io/NonConvertingStream.h index 7ff5c51..b6e2769 100644 --- a/libminifi/include/io/NonConvertingStream.h +++ b/libminifi/include/io/NonConvertingStream.h @@ -48,8 +48,7 @@ class NonConvertingStream : public BaseStream { : composable_stream_(other) { } - virtual ~NonConvertingStream() { - } + virtual ~NonConvertingStream() = default; /** * write 4 bytes to stream * @param base_value non encoded value diff --git a/libminifi/include/properties/Properties.h b/libminifi/include/properties/Properties.h index b458ba2..e814be8 100644 --- a/libminifi/include/properties/Properties.h +++ b/libminifi/include/properties/Properties.h @@ -35,8 +35,7 @@ class Properties { public: Properties(const std::string& name = ""); // NOLINT - virtual ~Properties() { - } + virtual ~Properties() = default; virtual const std::string& getName() const { return name_; diff --git a/libminifi/include/provenance/Provenance.h b/libminifi/include/provenance/Provenance.h index f713a00..f432121 100644 --- a/libminifi/include/provenance/Provenance.h +++ b/libminifi/include/provenance/Provenance.h @@ -169,8 +169,7 @@ class ProvenanceEventRecord : public core::SerializableComponent { } // Destructor - virtual ~ProvenanceEventRecord() { - } + virtual ~ProvenanceEventRecord() = default; // Get the Event ID std::string getEventId() { return uuidStr_; diff --git a/libminifi/include/sitetosite/SiteToSite.h b/libminifi/include/sitetosite/SiteToSite.h index feb1ed4..dbd63b0 100644 --- a/libminifi/include/sitetosite/SiteToSite.h +++ b/libminifi/include/sitetosite/SiteToSite.h @@ -253,8 +253,7 @@ class Transaction { uuid_str_ = uuid_.to_string(); } // Destructor - virtual ~Transaction() { - } + virtual ~Transaction() = default; // getUUIDStr std::string getUUIDStr() { return uuid_str_; diff --git a/libminifi/include/sitetosite/SiteToSiteClient.h b/libminifi/include/sitetosite/SiteToSiteClient.h index fdfe58d..5d874eb 100644 --- a/libminifi/include/sitetosite/SiteToSiteClient.h +++ b/libminifi/include/sitetosite/SiteToSiteClient.h @@ -77,8 +77,7 @@ class SiteToSiteClient : public core::Connectable { _currentCodecVersionIndex = 0; } - virtual ~SiteToSiteClient() { - } + virtual ~SiteToSiteClient() = default; void setSSLContextService(const std::shared_ptr<minifi::controllers::SSLContextService> &context_service) { ssl_context_service_ = context_service; diff --git a/libminifi/include/utils/ByteArrayCallback.h b/libminifi/include/utils/ByteArrayCallback.h index 9b4b3df..fdde3f6 100644 --- a/libminifi/include/utils/ByteArrayCallback.h +++ b/libminifi/include/utils/ByteArrayCallback.h @@ -40,8 +40,7 @@ class ByteInputCallBack : public InputStreamCallback { : ptr(nullptr) { } - virtual ~ByteInputCallBack() { - } + virtual ~ByteInputCallBack() = default; virtual int64_t process(std::shared_ptr<io::BaseStream> stream) { stream->seek(0); diff --git a/libminifi/include/utils/FileOutputCallback.h b/libminifi/include/utils/FileOutputCallback.h index 171d321..dfc906f 100644 --- a/libminifi/include/utils/FileOutputCallback.h +++ b/libminifi/include/utils/FileOutputCallback.h @@ -47,8 +47,7 @@ class FileOutputCallback : public ByteOutputCallback { logger_(logging::LoggerFactory<FileOutputCallback>::getLogger()) { } - virtual ~FileOutputCallback() { - } + virtual ~FileOutputCallback() = default; int64_t process(std::shared_ptr<io::BaseStream> stream) override; diff --git a/libminifi/include/utils/HTTPClient.h b/libminifi/include/utils/HTTPClient.h index da69c75..ad5f128 100644 --- a/libminifi/include/utils/HTTPClient.h +++ b/libminifi/include/utils/HTTPClient.h @@ -270,8 +270,7 @@ class BaseHTTPClient { response_code = -1; } - virtual ~BaseHTTPClient() { - } + virtual ~BaseHTTPClient() = default; virtual void setVerbose(bool use_stderr = false) { } diff --git a/libminifi/include/utils/Id.h b/libminifi/include/utils/Id.h index e4f4c4b..f8e1e49 100644 --- a/libminifi/include/utils/Id.h +++ b/libminifi/include/utils/Id.h @@ -66,8 +66,7 @@ class IdentifierBase { copyInto(other.id_); } - IdentifierBase() { - } + IdentifierBase() = default; IdentifierBase &operator=(const IdentifierBase &other) { copyInto(other.id_); diff --git a/libminifi/include/utils/Monitors.h b/libminifi/include/utils/Monitors.h index 16ddd81..136cf78 100644 --- a/libminifi/include/utils/Monitors.h +++ b/libminifi/include/utils/Monitors.h @@ -37,11 +37,9 @@ namespace utils { template<typename T> class AfterExecute { public: - virtual ~AfterExecute() { - } + virtual ~AfterExecute() = default; - AfterExecute() { - } + AfterExecute() = default; explicit AfterExecute(AfterExecute &&other) { } diff --git a/libminifi/include/utils/ThreadPool.h b/libminifi/include/utils/ThreadPool.h index 578d605..1132c7d 100644 --- a/libminifi/include/utils/ThreadPool.h +++ b/libminifi/include/utils/ThreadPool.h @@ -74,8 +74,7 @@ class Worker { next_exec_time_(std::chrono::steady_clock::now()) { } - virtual ~Worker() { - } + virtual ~Worker() = default; /** * Move constructor for worker tasks diff --git a/libminifi/include/utils/file/FileManager.h b/libminifi/include/utils/file/FileManager.h index 62a18ac..701c6a2 100644 --- a/libminifi/include/utils/file/FileManager.h +++ b/libminifi/include/utils/file/FileManager.h @@ -59,8 +59,7 @@ namespace file { */ class FileManager { public: - FileManager() { - } + FileManager() = default; ~FileManager() { for (auto file : unique_files_) { diff --git a/libminifi/src/c2/PayloadSerializer.cpp b/libminifi/src/c2/PayloadSerializer.cpp index 107b7d1..fa7713e 100644 --- a/libminifi/src/c2/PayloadSerializer.cpp +++ b/libminifi/src/c2/PayloadSerializer.cpp @@ -23,11 +23,9 @@ namespace nifi { namespace minifi { namespace c2 { -PayloadSerializer::PayloadSerializer() { -} +PayloadSerializer::PayloadSerializer() = default; -PayloadSerializer::~PayloadSerializer() { -} +PayloadSerializer::~PayloadSerializer() = default; } /* namespace c2 */ } /* namespace minifi */ diff --git a/libminifi/src/controllers/keyvalue/KeyValueStoreService.cpp b/libminifi/src/controllers/keyvalue/KeyValueStoreService.cpp index a7176ce..7986d9e 100644 --- a/libminifi/src/controllers/keyvalue/KeyValueStoreService.cpp +++ b/libminifi/src/controllers/keyvalue/KeyValueStoreService.cpp @@ -31,8 +31,7 @@ KeyValueStoreService::KeyValueStoreService(const std::string& name, utils::Ident : ControllerService(name, uuid) { } -KeyValueStoreService::~KeyValueStoreService() { -} +KeyValueStoreService::~KeyValueStoreService() = default; void KeyValueStoreService::yield() { } diff --git a/libminifi/src/controllers/keyvalue/PersistableKeyValueStoreService.cpp b/libminifi/src/controllers/keyvalue/PersistableKeyValueStoreService.cpp index 0a1c933..c9414ac 100644 --- a/libminifi/src/controllers/keyvalue/PersistableKeyValueStoreService.cpp +++ b/libminifi/src/controllers/keyvalue/PersistableKeyValueStoreService.cpp @@ -30,8 +30,7 @@ PersistableKeyValueStoreService::PersistableKeyValueStoreService(const std::stri : KeyValueStoreService(name, uuid) { } -PersistableKeyValueStoreService::~PersistableKeyValueStoreService() { -} +PersistableKeyValueStoreService::~PersistableKeyValueStoreService() = default; bool PersistableKeyValueStoreService::setImpl(const std::string& key, const std::string& value) { return set(key, value); diff --git a/libminifi/src/core/ClassLoader.cpp b/libminifi/src/core/ClassLoader.cpp index c51acaf..411071c 100644 --- a/libminifi/src/core/ClassLoader.cpp +++ b/libminifi/src/core/ClassLoader.cpp @@ -25,8 +25,7 @@ namespace nifi { namespace minifi { namespace core { -ClassLoader::ClassLoader() { -} +ClassLoader::ClassLoader() = default; ClassLoader &ClassLoader::getDefaultClassLoader() { static ClassLoader ret; diff --git a/libminifi/src/core/ConfigurableComponent.cpp b/libminifi/src/core/ConfigurableComponent.cpp index bdc92c4..0f29f05 100644 --- a/libminifi/src/core/ConfigurableComponent.cpp +++ b/libminifi/src/core/ConfigurableComponent.cpp @@ -43,8 +43,7 @@ ConfigurableComponent::ConfigurableComponent(const ConfigurableComponent &&other logger_(logging::LoggerFactory<ConfigurableComponent>::getLogger()) { } -ConfigurableComponent::~ConfigurableComponent() { -} +ConfigurableComponent::~ConfigurableComponent() = default; bool ConfigurableComponent::getProperty(const std::string &name, Property &prop) const { std::lock_guard<std::mutex> lock(configuration_mutex_); diff --git a/libminifi/src/core/Connectable.cpp b/libminifi/src/core/Connectable.cpp index c4715d6..9ac3dae 100644 --- a/libminifi/src/core/Connectable.cpp +++ b/libminifi/src/core/Connectable.cpp @@ -52,8 +52,7 @@ Connectable::Connectable(const Connectable &&other) strategy_ = other.strategy_.load(); } -Connectable::~Connectable() { -} +Connectable::~Connectable() = default; bool Connectable::setSupportedRelationships(const std::set<core::Relationship> &relationships) { if (isRunning()) { diff --git a/libminifi/src/core/ProcessorNode.cpp b/libminifi/src/core/ProcessorNode.cpp index 81f8c9b..044e3f4 100644 --- a/libminifi/src/core/ProcessorNode.cpp +++ b/libminifi/src/core/ProcessorNode.cpp @@ -46,8 +46,7 @@ ProcessorNode::ProcessorNode(const ProcessorNode &&other) processor_(std::move(other.processor_)) { } -ProcessorNode::~ProcessorNode() { -} +ProcessorNode::~ProcessorNode() = default; bool ProcessorNode::isWorkAvailable() { return processor_->isWorkAvailable(); diff --git a/libminifi/src/core/logging/Logger.cpp b/libminifi/src/core/logging/Logger.cpp index 617fccb..4d3f673 100644 --- a/libminifi/src/core/logging/Logger.cpp +++ b/libminifi/src/core/logging/Logger.cpp @@ -44,8 +44,7 @@ void LoggerControl::setEnabled(bool status) { } -BaseLogger::~BaseLogger() { -} +BaseLogger::~BaseLogger() = default; bool BaseLogger::should_log(const LOG_LEVEL &level) { return true; diff --git a/libminifi/src/core/state/ProcessorController.cpp b/libminifi/src/core/state/ProcessorController.cpp index 7a1af7d..a6a6e80 100644 --- a/libminifi/src/core/state/ProcessorController.cpp +++ b/libminifi/src/core/state/ProcessorController.cpp @@ -30,8 +30,7 @@ ProcessorController::ProcessorController(const std::shared_ptr<core::Processor> scheduler_(scheduler) { } -ProcessorController::~ProcessorController() { -} +ProcessorController::~ProcessorController() = default; /** * Start the client */ diff --git a/libminifi/src/core/state/UpdateController.cpp b/libminifi/src/core/state/UpdateController.cpp index f4215f1..11f01f0 100644 --- a/libminifi/src/core/state/UpdateController.cpp +++ b/libminifi/src/core/state/UpdateController.cpp @@ -31,11 +31,7 @@ UpdateStatus::UpdateStatus(UpdateState state, int16_t reason) reason_(reason) { } -UpdateStatus::UpdateStatus(const UpdateStatus &other) - : error_(other.error_), - reason_(other.reason_), - state_(other.state_) { -} +UpdateStatus::UpdateStatus(const UpdateStatus &other) = default; UpdateStatus::UpdateStatus(const UpdateStatus &&other) : error_(std::move(other.error_)), @@ -62,12 +58,7 @@ UpdateStatus &UpdateStatus::operator=(const UpdateStatus &&other) { return *this; } -UpdateStatus &UpdateStatus::operator=(const UpdateStatus &other) { - error_ = other.error_; - reason_ = other.reason_; - state_ = other.state_; - return *this; -} +UpdateStatus &UpdateStatus::operator=(const UpdateStatus &other) = default; } /* namespace state */ } /* namespace minifi */ diff --git a/libminifi/src/processors/ProcessorUtils.cpp b/libminifi/src/processors/ProcessorUtils.cpp index 83150bb..12610e7 100644 --- a/libminifi/src/processors/ProcessorUtils.cpp +++ b/libminifi/src/processors/ProcessorUtils.cpp @@ -25,8 +25,7 @@ namespace nifi { namespace minifi { namespace processors { -ProcessorUtils::ProcessorUtils() { -} +ProcessorUtils::ProcessorUtils() = default; } /* namespace processors */ } /* namespace minifi */ diff --git a/libminifi/src/utils/Id.cpp b/libminifi/src/utils/Id.cpp index d70b4da..79c8f7d 100644 --- a/libminifi/src/utils/Id.cpp +++ b/libminifi/src/utils/Id.cpp @@ -185,8 +185,7 @@ IdGenerator::IdGenerator() #endif } -IdGenerator::~IdGenerator() { -} +IdGenerator::~IdGenerator() = default; uint64_t IdGenerator::getDeviceSegmentFromString(const std::string& str, int numBits) const { uint64_t deviceSegment = 0; diff --git a/libminifi/test/TestBase.h b/libminifi/test/TestBase.h index 6a7fe95..03d7717 100644 --- a/libminifi/test/TestBase.h +++ b/libminifi/test/TestBase.h @@ -52,8 +52,7 @@ class LogTestController { public: - ~LogTestController() { - } + ~LogTestController() = default; static LogTestController& getInstance() { static LogTestController instance; return instance; diff --git a/libminifi/test/archive-tests/MergeFileTests.cpp b/libminifi/test/archive-tests/MergeFileTests.cpp index dd201df..a6e8315 100644 --- a/libminifi/test/archive-tests/MergeFileTests.cpp +++ b/libminifi/test/archive-tests/MergeFileTests.cpp @@ -188,7 +188,7 @@ class MergeTestController : public TestController { std::shared_ptr<core::controller::ControllerServiceProvider> controller_service_provider = nullptr; context = std::make_shared<core::ProcessContext>(node, controller_service_provider, repo, repo, content_repo); } - ~MergeTestController() {} + ~MergeTestController() = default; std::shared_ptr<core::ProcessContext> context; std::shared_ptr<core::ProcessorNode> node; std::shared_ptr<core::Processor> processor; diff --git a/libminifi/test/unit/BackTraceTests.cpp b/libminifi/test/unit/BackTraceTests.cpp index 73a9be8..37e8aaa 100644 --- a/libminifi/test/unit/BackTraceTests.cpp +++ b/libminifi/test/unit/BackTraceTests.cpp @@ -38,8 +38,7 @@ class WorkerNumberExecutions : public utils::AfterExecute<int> { tasks(std::move(other.tasks)) { } - ~WorkerNumberExecutions() { - } + ~WorkerNumberExecutions() = default; bool isFinished(const int &result) override { if (result > 0 && ++runs < tasks) { diff --git a/libminifi/test/unit/ControllerTests.cpp b/libminifi/test/unit/ControllerTests.cpp index 297a948..c5b3962 100644 --- a/libminifi/test/unit/ControllerTests.cpp +++ b/libminifi/test/unit/ControllerTests.cpp @@ -32,8 +32,7 @@ class TestStateController : public minifi::state::StateController { TestStateController() : is_running(false) { } - virtual ~TestStateController() { - } + virtual ~TestStateController() = default; virtual std::string getComponentName() const { return "TestStateController"; diff --git a/libminifi/test/unit/MockClasses.h b/libminifi/test/unit/MockClasses.h index 7f0bd88..353bdce 100644 --- a/libminifi/test/unit/MockClasses.h +++ b/libminifi/test/unit/MockClasses.h @@ -42,13 +42,9 @@ class MockControllerService : public core::controller::ControllerService { : ControllerService(name) { } - MockControllerService() { + MockControllerService() = default; - } - - ~MockControllerService() { - - } + ~MockControllerService() = default; virtual void initialize() { core::controller::ControllerService::initialize(); @@ -91,9 +87,7 @@ class MockProcessor : public core::Processor { setTriggerWhenEmpty(true); } - ~MockProcessor() { - - } + ~MockProcessor() = default; virtual void initialize() { core::Property property("linkedService", "Linked service"); diff --git a/libminifi/test/unit/ProvenanceTestHelper.h b/libminifi/test/unit/ProvenanceTestHelper.h index 2852697..ca69944 100644 --- a/libminifi/test/unit/ProvenanceTestHelper.h +++ b/libminifi/test/unit/ProvenanceTestHelper.h @@ -67,9 +67,7 @@ class TestRepository : public core::Repository { } // Destructor - virtual ~TestRepository() { - - } + virtual ~TestRepository() = default; virtual bool isNoop() { return false; @@ -177,9 +175,7 @@ class TestFlowRepository : public core::Repository { } // Destructor - virtual ~TestFlowRepository() { - - } + virtual ~TestFlowRepository() = default; bool Put(std::string key, uint8_t *buf, int bufLen) { repositoryResults.insert(std::pair<std::string, std::string>(key, std::string((const char*) buf, bufLen))); @@ -233,9 +229,7 @@ class TestFlowController : public minifi::FlowController { TestFlowController(std::shared_ptr<core::Repository> repo, std::shared_ptr<core::Repository> flow_file_repo, std::shared_ptr<core::ContentRepository> content_repo) : minifi::FlowController(repo, flow_file_repo, std::make_shared<minifi::Configure>(), nullptr, std::make_shared<core::repository::VolatileContentRepository>(), "", true) { } - ~TestFlowController() { - - } + ~TestFlowController() = default; void load() { } diff --git a/libminifi/test/unit/SiteToSiteHelper.h b/libminifi/test/unit/SiteToSiteHelper.h index 586b17a..e17788d 100644 --- a/libminifi/test/unit/SiteToSiteHelper.h +++ b/libminifi/test/unit/SiteToSiteHelper.h @@ -30,8 +30,7 @@ class SiteToSiteResponder : public minifi::io::BaseStream { std::queue<std::string> server_responses_; std::queue<std::string> client_responses_; public: - SiteToSiteResponder() { - } + SiteToSiteResponder() = default; // initialize virtual short initialize() { return 1; diff --git a/libminifi/test/unit/ThreadPoolTests.cpp b/libminifi/test/unit/ThreadPoolTests.cpp index 48301b1..23ce61c 100644 --- a/libminifi/test/unit/ThreadPoolTests.cpp +++ b/libminifi/test/unit/ThreadPoolTests.cpp @@ -38,8 +38,7 @@ class WorkerNumberExecutions : public utils::AfterExecute<int> { tasks(std::move(other.tasks)) { } - ~WorkerNumberExecutions() { - } + ~WorkerNumberExecutions() = default; bool isFinished(const int &result) override { if (result > 0 && ++runs < tasks) { diff --git a/nanofi/include/cxx/C2CallbackAgent.h b/nanofi/include/cxx/C2CallbackAgent.h index c48f779..cc8a665 100644 --- a/nanofi/include/cxx/C2CallbackAgent.h +++ b/nanofi/include/cxx/C2CallbackAgent.h @@ -49,8 +49,7 @@ class C2CallbackAgent : public c2::C2Agent { explicit C2CallbackAgent(const std::shared_ptr<core::controller::ControllerServiceProvider> &controller, const std::shared_ptr<state::StateMonitor> &updateSink, const std::shared_ptr<Configure> &configure); - virtual ~C2CallbackAgent() { - } + virtual ~C2CallbackAgent() = default; void setStopCallback(c2_ag_stop_callback *st){ stop = st; diff --git a/nanofi/include/cxx/ReflexiveSession.h b/nanofi/include/cxx/ReflexiveSession.h index 3f08548..1a2ff4b 100644 --- a/nanofi/include/cxx/ReflexiveSession.h +++ b/nanofi/include/cxx/ReflexiveSession.h @@ -46,8 +46,7 @@ class ReflexiveSession : public ProcessSession{ } // Destructor - virtual ~ReflexiveSession() { - } + virtual ~ReflexiveSession() = default; virtual std::shared_ptr<core::FlowFile> get(){ auto prevff = ff;