You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ab...@apache.org on 2020/06/26 17:51:15 UTC
[nifi-minifi-cpp] 02/02: MINIFICPP-1271 - Disable
[build/include_subdir] linter check and remove related linter suppressions
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
commit fc79ab978e3cad16d8e551da118c7c20c6364f0e
Author: Adam Hunyadi <hu...@gmail.com>
AuthorDate: Fri Jun 26 15:40:13 2020 +0200
MINIFICPP-1271 - Disable [build/include_subdir] linter check and remove related linter suppressions
MINIFICPP-1271 - Remove noparent and linter rule redefinition from libminifi/include/agent/CPPLINT.cfg
Signed-off-by: Arpad Boda <ab...@apache.org>
This closes #825
---
CPPLINT.cfg | 2 +-
extensions/aws/controllerservices/AWSCredentialsService.cpp | 2 +-
extensions/aws/s3/S3.h | 2 +-
extensions/libarchive/ArchiveTests.h | 2 +-
extensions/librdkafka/KafkaConnection.h | 2 +-
extensions/librdkafka/KafkaTopic.h | 2 +-
extensions/librdkafka/PublishKafka.h | 2 +-
extensions/script/python/ExecutePythonProcessor.h | 2 +-
extensions/standard-processors/processors/GetTCP.h | 2 +-
extensions/windows-event-log/TailEventLog.cpp | 2 +-
libminifi/include/RemoteProcessorGroupPort.h | 2 +-
libminifi/include/agent/CPPLINT.cfg | 2 --
libminifi/include/io/StreamFactory.h | 2 +-
libminifi/include/utils/ByteArrayCallback.h | 2 +-
libminifi/include/utils/FileOutputCallback.h | 2 +-
libminifi/include/utils/GeneralUtils.h | 2 +-
libminifi/include/utils/ScopeGuard.h | 2 +-
libminifi/include/utils/file/DiffUtils.h | 4 ++--
libminifi/src/io/CPPLINT.cfg | 2 +-
libminifi/src/io/StreamFactory.cpp | 2 +-
libminifi/test/tensorflow-tests/TensorFlowTests.cpp | 10 +++++-----
main/AgentDocs.cpp | 2 +-
main/AgentDocs.h | 2 +-
23 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/CPPLINT.cfg b/CPPLINT.cfg
index 85cd6a9..110ae8f 100644
--- a/CPPLINT.cfg
+++ b/CPPLINT.cfg
@@ -1,2 +1,2 @@
set noparent
-filter=-runtime/reference,-runtime/string,-build/c++11
+filter=-runtime/reference,-runtime/string,-build/c++11,-build/include_subdir
diff --git a/extensions/aws/controllerservices/AWSCredentialsService.cpp b/extensions/aws/controllerservices/AWSCredentialsService.cpp
index 4e958b3..213de5a 100644
--- a/extensions/aws/controllerservices/AWSCredentialsService.cpp
+++ b/extensions/aws/controllerservices/AWSCredentialsService.cpp
@@ -54,4 +54,4 @@ void AWSCredentialsService::onEnable() {
} /* namespace minifi */
} /* namespace nifi */
} /* namespace apache */
-} /* namespace org */
\ No newline at end of file
+} /* namespace org */
diff --git a/extensions/aws/s3/S3.h b/extensions/aws/s3/S3.h
index a78d748..aed1c36 100644
--- a/extensions/aws/s3/S3.h
+++ b/extensions/aws/s3/S3.h
@@ -70,4 +70,4 @@ class S3Singleton{
} /* namespace apache */
} /* namespace org */
-#endif
\ No newline at end of file
+#endif
diff --git a/extensions/libarchive/ArchiveTests.h b/extensions/libarchive/ArchiveTests.h
index 50bb32e..6d1698f 100644
--- a/extensions/libarchive/ArchiveTests.h
+++ b/extensions/libarchive/ArchiveTests.h
@@ -63,4 +63,4 @@ void build_test_archive(std::string, OrderedTestArchive);
bool check_archive_contents(std::string, TAE_MAP_T entries, bool check_attributes=true, FN_VEC_T order = FN_VEC_T());
bool check_archive_contents(std::string, OrderedTestArchive, bool check_attributes=true);
-#endif
\ No newline at end of file
+#endif
diff --git a/extensions/librdkafka/KafkaConnection.h b/extensions/librdkafka/KafkaConnection.h
index 1166023..816b40a 100644
--- a/extensions/librdkafka/KafkaConnection.h
+++ b/extensions/librdkafka/KafkaConnection.h
@@ -27,7 +27,7 @@
#include "core/logging/LoggerConfiguration.h"
#include "core/logging/Logger.h"
-#include "rdkafka.h" // NOLINT
+#include "rdkafka.h"
#include "KafkaTopic.h"
#include "utils/gsl.h"
diff --git a/extensions/librdkafka/KafkaTopic.h b/extensions/librdkafka/KafkaTopic.h
index 5a11ce8..ca79d73 100644
--- a/extensions/librdkafka/KafkaTopic.h
+++ b/extensions/librdkafka/KafkaTopic.h
@@ -18,7 +18,7 @@
#ifndef EXTENSIONS_LIBRDKAFKA_KAFKATOPIC_H_
#define EXTENSIONS_LIBRDKAFKA_KAFKATOPIC_H_
-#include "rdkafka.h" // NOLINT
+#include "rdkafka.h"
#include "utils/gsl.h"
diff --git a/extensions/librdkafka/PublishKafka.h b/extensions/librdkafka/PublishKafka.h
index 32fc307..5d16717 100644
--- a/extensions/librdkafka/PublishKafka.h
+++ b/extensions/librdkafka/PublishKafka.h
@@ -41,7 +41,7 @@
#include "core/logging/LoggerConfiguration.h"
#include "core/logging/Logger.h"
#include "utils/RegexUtils.h"
-#include "rdkafka.h" // NOLINT
+#include "rdkafka.h"
#include "KafkaConnection.h"
namespace org {
diff --git a/extensions/script/python/ExecutePythonProcessor.h b/extensions/script/python/ExecutePythonProcessor.h
index e138d05..b347e54 100644
--- a/extensions/script/python/ExecutePythonProcessor.h
+++ b/extensions/script/python/ExecutePythonProcessor.h
@@ -25,7 +25,7 @@
#include <string>
#include <vector>
-#include "concurrentqueue.h" // NOLINT
+#include "concurrentqueue.h"
#include "core/Resource.h"
#include "core/Processor.h"
diff --git a/extensions/standard-processors/processors/GetTCP.h b/extensions/standard-processors/processors/GetTCP.h
index c310f4d..b90f656 100644
--- a/extensions/standard-processors/processors/GetTCP.h
+++ b/extensions/standard-processors/processors/GetTCP.h
@@ -30,7 +30,7 @@
#include "core/ProcessSession.h"
#include "core/Core.h"
#include "core/Resource.h"
-#include "concurrentqueue.h" // NOLINT
+#include "concurrentqueue.h"
#include "utils/ThreadPool.h"
#include "core/logging/LoggerConfiguration.h"
#include "controllers/SSLContextService.h"
diff --git a/extensions/windows-event-log/TailEventLog.cpp b/extensions/windows-event-log/TailEventLog.cpp
index f7ac3bc..74c4aec 100644
--- a/extensions/windows-event-log/TailEventLog.cpp
+++ b/extensions/windows-event-log/TailEventLog.cpp
@@ -141,4 +141,4 @@ void TailEventLog::onTrigger(const std::shared_ptr<core::ProcessContext> &contex
} /* namespace minifi */
} /* namespace nifi */
} /* namespace apache */
-} /* namespace org */
\ No newline at end of file
+} /* namespace org */
diff --git a/libminifi/include/RemoteProcessorGroupPort.h b/libminifi/include/RemoteProcessorGroupPort.h
index 651b002..14ff484 100644
--- a/libminifi/include/RemoteProcessorGroupPort.h
+++ b/libminifi/include/RemoteProcessorGroupPort.h
@@ -27,7 +27,7 @@
#include <memory>
#include <stack>
#include "utils/HTTPClient.h"
-#include "concurrentqueue.h" // NOLINT
+#include "concurrentqueue.h"
#include "FlowFileRecord.h"
#include "core/Processor.h"
#include "core/ProcessSession.h"
diff --git a/libminifi/include/agent/CPPLINT.cfg b/libminifi/include/agent/CPPLINT.cfg
index 605f498..6d127a8 100644
--- a/libminifi/include/agent/CPPLINT.cfg
+++ b/libminifi/include/agent/CPPLINT.cfg
@@ -1,3 +1 @@
-set noparent
-filter=-runtime/reference,-runtime/string,-build/c++11
exclude_files=agent_version.h
diff --git a/libminifi/include/io/StreamFactory.h b/libminifi/include/io/StreamFactory.h
index 13b0a55..841201e 100644
--- a/libminifi/include/io/StreamFactory.h
+++ b/libminifi/include/io/StreamFactory.h
@@ -24,7 +24,7 @@
#include "properties/Configure.h"
#include "Sockets.h"
#include "utils/StringUtils.h"
-#include "validation.h" // NOLINT
+#include "validation.h"
#include "controllers/SSLContextService.h"
#include "NetworkPrioritizer.h"
namespace org {
diff --git a/libminifi/include/utils/ByteArrayCallback.h b/libminifi/include/utils/ByteArrayCallback.h
index e1839ed..9b4b3df 100644
--- a/libminifi/include/utils/ByteArrayCallback.h
+++ b/libminifi/include/utils/ByteArrayCallback.h
@@ -21,7 +21,7 @@
#include <string>
#include <vector>
-#include "concurrentqueue.h" // NOLINT
+#include "concurrentqueue.h"
#include "FlowFileRecord.h"
#include "core/logging/LoggerConfiguration.h"
diff --git a/libminifi/include/utils/FileOutputCallback.h b/libminifi/include/utils/FileOutputCallback.h
index 9d266ec..171d321 100644
--- a/libminifi/include/utils/FileOutputCallback.h
+++ b/libminifi/include/utils/FileOutputCallback.h
@@ -21,7 +21,7 @@
#include <string>
#include <vector>
#include <fstream>
-#include "concurrentqueue.h" // NOLINT
+#include "concurrentqueue.h"
#include "FlowFileRecord.h"
#include "ByteArrayCallback.h"
#include "core/logging/LoggerConfiguration.h"
diff --git a/libminifi/include/utils/GeneralUtils.h b/libminifi/include/utils/GeneralUtils.h
index 63145fe..2d45724 100644
--- a/libminifi/include/utils/GeneralUtils.h
+++ b/libminifi/include/utils/GeneralUtils.h
@@ -24,7 +24,7 @@
#include <utility>
#include <functional>
-#include "gsl.h" // NOLINT
+#include "gsl.h"
namespace org {
namespace apache {
diff --git a/libminifi/include/utils/ScopeGuard.h b/libminifi/include/utils/ScopeGuard.h
index 9584592..cc20288 100644
--- a/libminifi/include/utils/ScopeGuard.h
+++ b/libminifi/include/utils/ScopeGuard.h
@@ -23,7 +23,7 @@
#include <utility>
#include <functional>
-#include "gsl.h" // NOLINT
+#include "gsl.h"
namespace org {
namespace apache {
diff --git a/libminifi/include/utils/file/DiffUtils.h b/libminifi/include/utils/file/DiffUtils.h
index 15771c7..dbf1a58 100644
--- a/libminifi/include/utils/file/DiffUtils.h
+++ b/libminifi/include/utils/file/DiffUtils.h
@@ -34,8 +34,8 @@
#ifdef BDIFF
extern "C" {
-#include "bsdiff.h" // NOLINT
-#include "bspatch.h" // NOLINT
+#include "bsdiff.h"
+#include "bspatch.h"
}
#else
diff --git a/libminifi/src/io/CPPLINT.cfg b/libminifi/src/io/CPPLINT.cfg
index bc1cc38..7fbc504 100644
--- a/libminifi/src/io/CPPLINT.cfg
+++ b/libminifi/src/io/CPPLINT.cfg
@@ -1,4 +1,4 @@
set noparent
-filter=-build/c++11
+filter=-build/c++11,-build/include_subdir
exclude_files=ClientSocket\.cpp
diff --git a/libminifi/src/io/StreamFactory.cpp b/libminifi/src/io/StreamFactory.cpp
index 508b16a..66cd346 100644
--- a/libminifi/src/io/StreamFactory.cpp
+++ b/libminifi/src/io/StreamFactory.cpp
@@ -22,7 +22,7 @@
#include <mutex>
#include <string>
-#include <utils/GeneralUtils.h> // NOLINT
+#include "utils/GeneralUtils.h"
#ifdef OPENSSL_SUPPORT
#include "io/tls/TLSSocket.h"
#endif
diff --git a/libminifi/test/tensorflow-tests/TensorFlowTests.cpp b/libminifi/test/tensorflow-tests/TensorFlowTests.cpp
index 0d0b6a3..0334a2d 100644
--- a/libminifi/test/tensorflow-tests/TensorFlowTests.cpp
+++ b/libminifi/test/tensorflow-tests/TensorFlowTests.cpp
@@ -19,11 +19,11 @@
#include <memory>
#include <string>
-#include <processors/GetFile.h> // NOLINT
-#include <processors/LogAttribute.h> // NOLINT
-#include <processors/PutFile.h> // NOLINT
-#include <tensorflow/cc/framework/scope.h> // NOLINT
-#include <tensorflow/cc/ops/standard_ops.h> // NOLINT
+#include "processors/GetFile.h"
+#include "processors/LogAttribute.h"
+#include "processors/PutFile.h"
+#include "tensorflow/cc/framework/scope.h"
+#include "tensorflow/cc/ops/standard_ops.h"
#include "TFApplyGraph.h"
#include <TFConvertImageToTensor.h>
#include <TFExtractTopLabels.h>
diff --git a/main/AgentDocs.cpp b/main/AgentDocs.cpp
index 3d2eb76..ef9cd22 100644
--- a/main/AgentDocs.cpp
+++ b/main/AgentDocs.cpp
@@ -172,4 +172,4 @@ void AgentDocs::generate(const std::string &docsdir, std::ostream &genStream) {
} /* namespace minifi */
} /* namespace nifi */
} /* namespace apache */
-} /* namespace org */
\ No newline at end of file
+} /* namespace org */
diff --git a/main/AgentDocs.h b/main/AgentDocs.h
index b4aa5a4..0402adf 100644
--- a/main/AgentDocs.h
+++ b/main/AgentDocs.h
@@ -41,4 +41,4 @@ class AgentDocs {
} /* namespace apache */
} /* namespace org */
-#endif // MAIN_AGENTDOCS_H_
\ No newline at end of file
+#endif // MAIN_AGENTDOCS_H_