Fix clang-tidy issues

Author: lordgamez

core-framework/src/http/BaseHTTPClient.cpp

@@ -110,7 +110,7 @@ URL::URL(const std::string& url_input) {
     std::string::const_iterator end_of_port = std::find_first_of(current_pos, url_input.end(), std::begin(PORT_TERMINATORS), std::end(PORT_TERMINATORS));
     const auto port_number = parsePortNumber(std::string{current_pos, end_of_port});
     if (port_number) {
-      port_ = *port_number;
+      port_ = port_number;
     } else {
       logger_->log_error("Could not parse the port number in URL '{}'", url_input);
       return;
@@ -226,8 +226,7 @@ size_t HTTPUploadByteArrayInputCallback::getDataChunk(char *data, size_t size) {
     if (ptr == nullptr) {
       return 0;
     }
-    if (len > size)
-      len = size;
+    len = std::min(len, size);
     memcpy(data, ptr, len);
     pos += len;
     seek(pos);

libminifi/src/RemoteProcessorGroupPort.cpp

@@ -72,7 +72,7 @@ std::unique_ptr<sitetosite::SiteToSiteClient> RemoteProcessorGroupPort::getNextP
         sitetosite::SiteToSiteClientConfiguration config(peers_[this->peer_index_].getPeer(), local_network_interface_, client_type_);
         config.setSecurityContext(ssl_service);
         peer_index_++;
-        if (peer_index_ >= static_cast<int>(peers_.size())) {
+        if (peer_index_ >= gsl::narrow<int>(peers_.size())) {
           peer_index_ = 0;
         }
         config.setHTTPProxy(this->proxy_);
@@ -89,9 +89,7 @@ std::unique_ptr<sitetosite::SiteToSiteClient> RemoteProcessorGroupPort::getNextP
 }
 
 void RemoteProcessorGroupPort::returnProtocol(core::ProcessContext& context, std::unique_ptr<sitetosite::SiteToSiteClient> return_protocol) {
-  auto count = peers_.size();
-  if (context.getProcessor().getMaxConcurrentTasks() > count)
-    count = context.getProcessor().getMaxConcurrentTasks();
+  auto count = std::max<size_t>(context.getProcessor().getMaxConcurrentTasks(), peers_.size());
   if (available_protocols_.size_approx() >= count) {
     logger_->log_debug("not enqueueing protocol {}", getUUIDStr());
     // let the memory be freed
@@ -139,15 +137,13 @@ void RemoteProcessorGroupPort::onSchedule(core::ProcessContext& context, core::P
   }
   // populate the site2site protocol for load balancing between them
   if (!peers_.empty()) {
-    auto count = peers_.size();
-    if (context.getProcessor().getMaxConcurrentTasks() > count)
-      count = context.getProcessor().getMaxConcurrentTasks();
+    auto count = std::max<size_t>(context.getProcessor().getMaxConcurrentTasks(), peers_.size());
     for (uint32_t i = 0; i < count; i++) {
       std::unique_ptr<sitetosite::SiteToSiteClient> nextProtocol = nullptr;
       sitetosite::SiteToSiteClientConfiguration config(peers_[this->peer_index_].getPeer(), this->getInterface(), client_type_);
       config.setSecurityContext(ssl_service);
       peer_index_++;
-      if (peer_index_ >= static_cast<int>(peers_.size())) {
+      if (peer_index_ >= gsl::narrow<int>(peers_.size())) {
         peer_index_ = 0;
       }
       logger_->log_trace("Creating client");
@@ -183,8 +179,6 @@ void RemoteProcessorGroupPort::onTrigger(core::ProcessContext& context, core::Pr
 
   RPGLatch count;
 
-  std::string value;
-
   logger_->log_trace("On trigger {}", getUUIDStr());
 
   std::unique_ptr<sitetosite::SiteToSiteClient> protocol_ = nullptr;

libminifi/src/c2/protocols/RESTSender.cpp

@@ -44,8 +44,6 @@ void RESTSender::initialize(core::controller::ControllerServiceProvider* control
   // base URL when one is not specified.
   if (nullptr != configure) {
     std::optional<std::string> rest_base_path = configure->get(Configuration::nifi_c2_rest_path_base);
-    std::string update_str;
-    std::string ssl_context_service_str;
     configure->get(Configuration::nifi_c2_rest_url, "c2.rest.url", rest_uri_);
     configure->get(Configuration::nifi_c2_rest_url_ack, "c2.rest.url.ack", ack_uri_);
     if (rest_uri_.starts_with("/")) {
@@ -121,7 +119,7 @@ C2Payload RESTSender::sendPayload(const std::string& url, const Direction direct
 
   auto setUpHttpRequest = [&](http::HttpRequestMethod http_method) {
     client.set_request_method(http_method);
-    if (url.find("https://") == 0) {
+    if (url.starts_with("https://")) {
       if (!ssl_context_service_) {
         setSecurityContext(client, http_method, url);
       } else {

libminifi/src/core/logging/LoggerConfiguration.cpp

@@ -82,7 +82,7 @@ std::vector<std::string> LoggerProperties::get_keys_of_type(const std::string &t
   std::vector<std::string> appenders;
   const std::string prefix = type + ".";
   for (auto const & entry : getProperties()) {
-    if (entry.first.rfind(prefix, 0) == 0 && entry.first.find(".", prefix.length() + 1) == std::string::npos) {
+    if (entry.first.starts_with(prefix) && entry.first.find(".", prefix.length() + 1) == std::string::npos) {
       appenders.push_back(entry.first);
     }
   }
@@ -145,7 +145,7 @@ void LoggerConfiguration::initialize(const std::shared_ptr<LoggerProperties> &lo
   }
 
   formatter_ = std::make_shared<spdlog::pattern_formatter>(spdlog_pattern);
-  spdlog::apply_all([&](auto spd_logger) {
+  spdlog::apply_all([&](const auto& spd_logger) {
     setupSpdLogger(lock, spd_logger, root_namespace_, spd_logger->name(), formatter_);
   });
   logger_->log_debug("Set following pattern on loggers: {}", spdlog_pattern);

libminifi/src/core/logging/alert/AlertSink.cpp

@@ -151,7 +151,7 @@ void AlertSink::run() {
     Services* expected{nullptr};
     // only restore the services pointer if no initialize set it to something else meanwhile
     if (services_.compare_exchange_strong(expected, services.get())) {
-      (void)services.release();
+      std::ignore = services.release();
     }
   }
 }

libminifi/src/sitetosite/HTTPProtocol.cpp

@@ -80,7 +80,7 @@ std::shared_ptr<sitetosite::Transaction> HttpSiteToSiteClient::createTransaction
         }
 
         transaction_client->setRequestHeader(PROTOCOL_VERSION_HEADER, "1");
-        peer_->setStream(std::unique_ptr<io::BaseStream>(new http::HttpStream(transaction_client)));
+        peer_->setStream(std::make_unique<http::HttpStream>(transaction_client));
         logger_->log_debug("Created transaction id -{}-", transaction->getUUID().to_string());
         known_transactions_[transaction->getUUID()] = transaction;
         return transaction;
@@ -235,10 +235,8 @@ void HttpSiteToSiteClient::closeTransaction(const utils::Identifier &transaction
     return;
   }
 
-  std::string append_str;
   logger_->log_trace("Site to Site closing transaction {}", transaction->getUUIDStr());
 
-
   bool data_received = transaction->getDirection() == sitetosite::RECEIVE && (current_code == sitetosite::CONFIRM_TRANSACTION || current_code == sitetosite::TRANSACTION_FINISHED);
 
   int code = sitetosite::UNRECOGNIZED_RESPONSE_CODE;

libminifi/test/unit/GeneralUtilsTest.cpp

@@ -53,7 +53,7 @@ struct does_compile : std::false_type {};
 template<int N, int D>
 struct does_compile<N, D,
     // we must force evaluation so decltype won't do
-    typename std::enable_if<(minifi::utils::intdiv_ceil(N, D), true)>::type> : std::true_type {};
+    std::enable_if_t<(minifi::utils::intdiv_ceil(N, D), true)>> : std::true_type {};
 
 static_assert(does_compile<2, 3>::value, "does_compile should work");
 static_assert(!does_compile<1, 0>::value, "constexpr division by zero shouldn't compile");