MINIFICPP-1203 - Remove build/include suppression from linter, reorde…

…r corresponding .cpp files

MINIFICPP-1203 - Enable linting for headers

MINIFICPP-1203 - Rename header guards according to linter recommendations

MINIFICPP-1203 - Remove linter errors due to visibility modifiers following each other

MINIFICPP-1203 - Add NOLINT rule to lines longer than 200 characters

MINIFICPP-1203 - Fix missing includes according to linter recommendations

MINIFICPP-1203 - Resolve include order linter recommendations

Tool used:
https://github.com/TheOstrichIO/cpplint/tree/nitpick-sort-includes/cpplint

Signed-off-by: Arpad Boda <aboda@apache.org>

This closes #789

CPPLINT.cfg

@@ -1,3 +1,2 @@
 set noparent
 filter=-runtime/reference,-runtime/string,-build/c++11
-

extensions/expression-language/ExpressionLoader.cpp

@@ -20,9 +20,6 @@
 
 bool ExpressionObjectFactory::added = core::FlowConfiguration::add_static_func("createExpressionFactory");
 extern "C" {
-
-
-
 void *createExpressionFactory(void) {
   return new ExpressionObjectFactory();
 }

extensions/http-curl/HTTPCurlLoader.cpp

@@ -21,11 +21,7 @@
 
 bool HttpCurlObjectFactory::added = core::FlowConfiguration::add_static_func("createHttpCurlFactory");
 extern "C" {
-
-
-
 void *createHttpCurlFactory(void) {
   return new HttpCurlObjectFactory();
 }
-
 }

extensions/http-curl/client/HTTPClient.cpp

@@ -67,15 +67,13 @@ HTTPClient::~HTTPClient() {
 }
 
 void HTTPClient::forceClose() {
-
   if (nullptr != callback) {
     callback->stop = true;
   }
 
   if (nullptr != write_callback_) {
     write_callback_->stop = true;
   }
-
 }
 
 int HTTPClient::debug_callback(CURL *handle, curl_infotype type, char *data, size_t size, void *userptr) {
@@ -142,7 +140,7 @@ bool HTTPClient::setSpecificSSLVersion(SSLVersion specific_version) {
 #endif
 }
 
-/* If not set, the default will be TLS 1.0, see https://curl.haxx.se/libcurl/c/CURLOPT_SSLVERSION.html */
+// If not set, the default will be TLS 1.0, see https://curl.haxx.se/libcurl/c/CURLOPT_SSLVERSION.html
 bool HTTPClient::setMinimumSSLVersion(SSLVersion minimum_version) {
   CURLcode ret = CURLE_UNKNOWN_OPTION;
   switch (minimum_version) {
@@ -186,7 +184,7 @@ void HTTPClient::setUploadCallback(HTTPUploadCallback *callbackObj) {
   logger_->log_debug("Setting callback for %s", url_);
   write_callback_ = callbackObj;
   if (method_ == "put" || method_ == "PUT") {
-    curl_easy_setopt(http_session_, CURLOPT_INFILESIZE_LARGE, (curl_off_t ) callbackObj->ptr->getBufferSize());
+    curl_easy_setopt(http_session_, CURLOPT_INFILESIZE_LARGE, (curl_off_t) callbackObj->ptr->getBufferSize());
   }
   curl_easy_setopt(http_session_, CURLOPT_READFUNCTION, &utils::HTTPRequestResponse::send_write);
   curl_easy_setopt(http_session_, CURLOPT_READDATA, static_cast<void*>(callbackObj));
@@ -419,8 +417,8 @@ void HTTPClient::setInterface(const std::string &ifc) {
   curl_easy_setopt(http_session_, CURLOPT_INTERFACE, ifc.c_str());
 }
 
-} /* namespace utils */
-} /* namespace minifi */
-} /* namespace nifi */
-} /* namespace apache */
-} /* namespace org */
+}  // namespace utils
+}  // namespace minifi
+}  // namespace nifi
+}  // namespace apache
+}  // namespace org

extensions/http-curl/client/HTTPClient.h

@@ -15,8 +15,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef __HTTP_UTILS_H__
-#define __HTTP_UTILS_H__
+#ifndef EXTENSIONS_HTTP_CURL_CLIENT_HTTPCLIENT_H_
+#define EXTENSIONS_HTTP_CURL_CLIENT_HTTPCLIENT_H_
 
 #include "utils/HTTPClient.h"
 #ifdef WIN32
@@ -29,16 +29,18 @@
 #else
 #include <curl/curl.h>
 #endif
+#include <curl/easy.h>
 #include <vector>
+#include <memory>
 #include <iostream>
+#include <map>
+#include <chrono>
 #include <string>
-#include <curl/easy.h>
 #ifdef WIN32
 #include <regex>
 #else
 #include <regex.h>
 #endif
-#include <chrono>
 
 #include "utils/ByteArrayCallback.h"
 #include "controllers/SSLContextService.h"
@@ -63,52 +65,51 @@ namespace utils {
  */
 class HTTPClient : public BaseHTTPClient, public core::Connectable {
  public:
-
   HTTPClient();
 
   HTTPClient(std::string name, utils::Identifier uuid);
 
-  HTTPClient(const std::string &url, const std::shared_ptr<minifi::controllers::SSLContextService> ssl_context_service = nullptr);
+  explicit HTTPClient(const std::string &url, const std::shared_ptr<minifi::controllers::SSLContextService> ssl_context_service = nullptr);
 
   ~HTTPClient();
 
   static int debug_callback(CURL *handle, curl_infotype type, char *data, size_t size, void *userptr);
 
-  virtual void setVerbose(bool use_stderr = false) override;
+  void setVerbose(bool use_stderr = false) override;
 
   void forceClose();
 
-  virtual void initialize(const std::string &method, const std::string url = "", const std::shared_ptr<minifi::controllers::SSLContextService> ssl_context_service = nullptr) override;
+  void initialize(const std::string &method, const std::string url = "", const std::shared_ptr<minifi::controllers::SSLContextService> ssl_context_service = nullptr) override;
 
   // This is a bad API and deprecated. Use the std::chrono variant of this
   // It is assumed that the value of timeout provided to this function
   // is in seconds units
-  DEPRECATED(/*deprecated in*/ 0.8.0, /*will remove in */ 2.0) virtual void setConnectionTimeout(int64_t timeout) override;
+  DEPRECATED(/*deprecated in*/ 0.8.0, /*will remove in */ 2.0) void setConnectionTimeout(int64_t timeout) override;
 
   // This is a bad API and deprecated. Use the std::chrono variant of this
   // It is assumed that the value of timeout provided to this function
   // is in seconds units
-  DEPRECATED(/*deprecated in*/ 0.8.0, /*will remove in */ 2.0) virtual void setReadTimeout(int64_t timeout) override;
+  DEPRECATED(/*deprecated in*/ 0.8.0, /*will remove in */ 2.0) void setReadTimeout(int64_t timeout) override;
 
-  virtual void setConnectionTimeout(std::chrono::milliseconds timeout) override;
+  void setConnectionTimeout(std::chrono::milliseconds timeout) override;
 
-  virtual void setReadTimeout(std::chrono::milliseconds timeout) override;
+  void setReadTimeout(std::chrono::milliseconds timeout) override;
 
-  virtual void setUploadCallback(HTTPUploadCallback *callbackObj) override;
+  void setUploadCallback(HTTPUploadCallback *callbackObj) override;
 
   virtual void setReadCallback(HTTPReadCallback *callbackObj);
 
   struct curl_slist *build_header_list(std::string regex, const std::map<std::string, std::string> &attributes);
 
-  virtual void setContentType(std::string content_type) override;
+  void setContentType(std::string content_type) override;
 
-  virtual std::string escape(std::string string_to_escape) override;
+  std::string escape(std::string string_to_escape) override;
 
-  virtual void setPostFields(const std::string& input) override;
+  void setPostFields(const std::string& input) override;
 
   void setHeaders(struct curl_slist *list);
 
-  virtual void appendHeader(const std::string &new_header) override;
+  void appendHeader(const std::string &new_header) override;
 
   void appendHeader(const std::string &key, const std::string &value);
 
@@ -161,7 +162,7 @@ class HTTPClient : public BaseHTTPClient, public core::Connectable {
 
   void setInterface(const std::string &);
 
-  virtual const std::map<std::string, std::string> &getParsedHeaders() override {
+  const std::map<std::string, std::string> &getParsedHeaders() override {
     return header_response_.getHeaderMap();
   }
 
@@ -186,7 +187,7 @@ class HTTPClient : public BaseHTTPClient, public core::Connectable {
   /**
    * Determines if we are connected and operating
    */
-  virtual bool isRunning() override {
+  bool isRunning() override {
     return true;
   }
 
@@ -197,15 +198,14 @@ class HTTPClient : public BaseHTTPClient, public core::Connectable {
   void waitForWork(uint64_t timeoutMs) {
   }
 
-  virtual void yield() override {
-
+  void yield() override {
   }
 
   /**
    * Determines if work is available by this connectable
    * @return boolean if work is available.
    */
-  virtual bool isWorkAvailable() override {
+  bool isWorkAvailable() override {
     return true;
   }
 
@@ -239,7 +239,6 @@ class HTTPClient : public BaseHTTPClient, public core::Connectable {
   Progress progress_;
 
  protected:
-
   inline bool matches(const std::string &value, const std::string &sregex) override;
 
   static CURLcode configure_ssl_context(CURL *curl, void *ctx, void *param) {
@@ -287,10 +286,10 @@ class HTTPClient : public BaseHTTPClient, public core::Connectable {
   std::shared_ptr<logging::Logger> logger_{logging::LoggerFactory<HTTPClient>::getLogger()};
 };
 
-} /* namespace utils */
-} /* namespace minifi */
-} /* namespace nifi */
-} /* namespace apache */
-} /* namespace org */
+}  // namespace utils
+}  // namespace minifi
+}  // namespace nifi
+}  // namespace apache
+}  // namespace org
 
-#endif
+#endif  // EXTENSIONS_HTTP_CURL_CLIENT_HTTPCLIENT_H_

extensions/librdkafka/KafkaConnection.cpp

@@ -128,8 +128,8 @@ void KafkaConnection::logCallback(const rd_kafka_t* rk, int level, const char* /
   }
 }
 
-} /* namespace processors */
-} /* namespace minifi */
-} /* namespace nifi */
-} /* namespace apache */
-} /* namespace org */
+}  // namespace processors
+}  // namespace minifi
+}  // namespace nifi
+}  // namespace apache
+}  // namespace org

extensions/librdkafka/KafkaConnection.h

@@ -15,17 +15,19 @@
  * limitations under the License.
  */
 
-#ifndef NIFI_MINIFI_CPP_KAFKACONNECTION_H
-#define NIFI_MINIFI_CPP_KAFKACONNECTION_H
+#ifndef EXTENSIONS_LIBRDKAFKA_KAFKACONNECTION_H_
+#define EXTENSIONS_LIBRDKAFKA_KAFKACONNECTION_H_
 
 #include <atomic>
+#include <map>
+#include <memory>
 #include <mutex>
 #include <string>
 #include <unordered_map>
 
 #include "core/logging/LoggerConfiguration.h"
 #include "core/logging/Logger.h"
-#include "rdkafka.h"
+#include "rdkafka.h" // NOLINT
 #include "KafkaTopic.h"
 #include "utils/gsl.h"
 
@@ -36,7 +38,7 @@ namespace minifi {
 namespace processors {
 
 class KafkaConnectionKey {
-  public:
+ public:
     std::string client_id_;
     std::string brokers_;
 
@@ -47,7 +49,6 @@ class KafkaConnectionKey {
 
 class KafkaConnection {
  public:
-
   explicit KafkaConnection(const KafkaConnectionKey &key);
 
   KafkaConnection(const KafkaConnection&) = delete;
@@ -76,7 +77,6 @@ class KafkaConnection {
   static void logCallback(const rd_kafka_t* rk, int level, const char* /*fac*/, const char* buf);
 
  private:
-
   std::shared_ptr<logging::Logger> logger_;
 
   bool initialized_;
@@ -117,10 +117,10 @@ class KafkaConnection {
   }
 };
 
-} /* namespace processors */
-} /* namespace minifi */
-} /* namespace nifi */
-} /* namespace apache */
-} /* namespace org */
+}  // namespace processors
+}  // namespace minifi
+}  // namespace nifi
+}  // namespace apache
+}  // namespace org
 
-#endif //NIFI_MINIFI_CPP_KAFKACONNECTION_H
+#endif  // EXTENSIONS_LIBRDKAFKA_KAFKACONNECTION_H_

extensions/librdkafka/KafkaTopic.h

@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-#ifndef NIFI_MINIFI_CPP_KAFKATOPIC_H
-#define NIFI_MINIFI_CPP_KAFKATOPIC_H
+#ifndef EXTENSIONS_LIBRDKAFKA_KAFKATOPIC_H_
+#define EXTENSIONS_LIBRDKAFKA_KAFKATOPIC_H_
 
-#include "rdkafka.h"
+#include "rdkafka.h" // NOLINT
 
 #include "utils/gsl.h"
 
@@ -48,10 +48,10 @@ class KafkaTopic {
   gsl::owner<rd_kafka_topic_t*> topic_reference_;
 };
 
-} /* namespace processors */
-} /* namespace minifi */
-} /* namespace nifi */
-} /* namespace apache */
-} /* namespace org */
+}  // namespace processors
+}  // namespace minifi
+}  // namespace nifi
+}  // namespace apache
+}  // namespace org
 
-#endif //NIFI_MINIFI_CPP_KAFKATOPIC_H
+#endif  // EXTENSIONS_LIBRDKAFKA_KAFKATOPIC_H_

extensions/librdkafka/PublishKafka.cpp

@@ -707,8 +707,8 @@ void PublishKafka::onTrigger(const std::shared_ptr<core::ProcessContext> &contex
   });
 }
 
-} /* namespace processors */
-} /* namespace minifi */
-} /* namespace nifi */
-} /* namespace apache */
-} /* namespace org */
+}  // namespace processors
+}  // namespace minifi
+}  // namespace nifi
+}  // namespace apache
+}  // namespace org