linter fixes

Author: martinzink

extensions/standard-processors/controllers/JsonRecordSetReader.cpp

@@ -41,7 +41,7 @@ nonstd::expected<core::RecordField, std::error_code> parse(const rapidjson::Valu
   }
   if (json_value.IsString()) {
     auto json_str = json_value.GetString();
-    if (schema && schema->IsString() && std::string_view{schema->GetString()} == "std::chrono::system_clock::time_point") {
+    if (schema && schema->IsString() && std::string_view {schema->GetString()} == "std::chrono::system_clock::time_point") {
       if (auto parsed_time = utils::timeutils::parseRfc3339(json_str)) {
         return core::RecordField{.value_ = *parsed_time};
       }
@@ -95,7 +95,9 @@ nonstd::expected<core::Record, std::error_code> parseDocument(rapidjson::Documen
 }
 }  // namespace
 
-nonstd::expected<core::RecordSet, std::error_code> JsonRecordSetReader::read(const std::shared_ptr<core::FlowFile>& flow_file, core::ProcessSession& session, const core::RecordSchema* const record_schema) {
+nonstd::expected<core::RecordSet, std::error_code> JsonRecordSetReader::read(const std::shared_ptr<core::FlowFile>& flow_file,
+    core::ProcessSession& session,
+    const core::RecordSchema* const record_schema) {
   core::RecordSet record_set{};
   auto read_result = session.read(flow_file, [&record_set, &record_schema](const std::shared_ptr<io::InputStream>& input_stream) -> int64_t {
     std::string content;
@@ -106,10 +108,9 @@ nonstd::expected<core::RecordSet, std::error_code> JsonRecordSetReader::read(con
     }
     std::stringstream ss(content);
     std::string line;
-    while(std::getline(ss, line,'\n')){
+    while (std::getline(ss, line, '\n')) {
       rapidjson::Document document;
-      rapidjson::ParseResult parse_result = document.Parse<rapidjson::kParseStopWhenDoneFlag>(line);
-      if (parse_result.IsError())
+      if (rapidjson::ParseResult parse_result = document.Parse<rapidjson::kParseStopWhenDoneFlag>(line); parse_result.IsError())
         return -1;
       auto record = parseDocument(document, record_schema);
       if (!record)
@@ -123,4 +124,4 @@ nonstd::expected<core::RecordSet, std::error_code> JsonRecordSetReader::read(con
   return record_set;
 }
 
-}  // namespace org::apache::nifi::minifi::standard
+}  // namespace org::apache::nifi::minifi::standard

extensions/standard-processors/controllers/JsonRecordSetReader.h

@@ -32,9 +32,11 @@ class JsonRecordSetReader final : public core::RecordSetReader {
   ~JsonRecordSetReader() override = default;
 
   EXTENSIONAPI static constexpr const char* Description = "Parses JSON into individual Record objects. "
-    "While the reader expects each record to be well-formed JSON, the content of a FlowFile may consist of many records, each as a well-formed JSON array or JSON object with optional whitespace between them, such as the common 'JSON-per-line' format. "
+    "While the reader expects each record to be well-formed JSON, the content of a FlowFile may consist of many records, "
+    "each as a well-formed JSON array or JSON object with optional whitespace between them, such as the common 'JSON-per-line' format. "
     "If an array is encountered, each element in that array will be treated as a separate record. "
-    "If the schema that is configured contains a field that is not present in the JSON, a null value will be used. If the JSON contains a field that is not present in the schema, that field will be skipped.";
+    "If the schema that is configured contains a field that is not present in the JSON, a null value will be used. "
+    "If the JSON contains a field that is not present in the schema, that field will be skipped.";
 
   EXTENSIONAPI static constexpr auto SchemaAccessStrategy = core::PropertyDefinitionBuilder<>::createProperty("Schema Access Strategy")
       .withDescription("Specifies how to obtain the schema that is to be used for interpreting the data.")
@@ -56,4 +58,4 @@ class JsonRecordSetReader final : public core::RecordSetReader {
   bool isWorkAvailable() override { return false; }
 };
 
-}  // namespace org::apache::nifi::minifi::standard
+}  // namespace org::apache::nifi::minifi::standard

extensions/standard-processors/controllers/JsonRecordSetWriter.cpp

@@ -63,7 +63,7 @@ rapidjson::Value toJson(const core::RecordObject& record_object, rapidjson::Docu
   }
   return object_json;
 }
-}
+}  // namespace
 
 void JsonRecordSetWriter::write(const core::RecordSet& record_set, const std::shared_ptr<core::FlowFile>& flow_file, core::ProcessSession& session) {
   session.write(flow_file, [this, &record_set](const std::shared_ptr<io::OutputStream>& stream) -> int64_t {
@@ -90,4 +90,4 @@ void JsonRecordSetWriter::convertRecord(const core::Record& record, rapidjson::V
 }
 
 
-}  // namespace org::apache::nifi::minifi::standard
+}  // namespace org::apache::nifi::minifi::standard

extensions/standard-processors/controllers/JsonRecordSetWriter.h

@@ -31,20 +31,22 @@ class JsonRecordSetWriter final : public core::RecordSetWriter {
 
   ~JsonRecordSetWriter() override = default;
 
-  EXTENSIONAPI static constexpr const char* Description = "Writes the results of a RecordSet as either a JSON Array or one JSON object per line. "
-    "If using Array output, then even if the RecordSet consists of a single row, it will be written as an array with a single element. "
-    "If using One Line Per Object output, the JSON objects cannot be pretty-printed.";
+  EXTENSIONAPI static constexpr const char* Description =
+      "Writes the results of a RecordSet as either a JSON Array or one JSON object per line. "
+      "If using Array output, then even if the RecordSet consists of a single row, it will be written as an array with a single element. "
+      "If using One Line Per Object output, the JSON objects cannot be pretty-printed.";
 
   EXTENSIONAPI static constexpr auto SchemaWriteStrategy = core::PropertyDefinitionBuilder<>::createProperty("Schema Write Strategy")
       .withDescription("Specifies how the schema for a Record should be added to the data.")
       .supportsExpressionLanguage(true)
       .build();
   EXTENSIONAPI static constexpr auto OutputGrouping = core::PropertyDefinitionBuilder<>::createProperty("Output Grouping")
-    .withDescription("Specifies how the writer should output the JSON records (as an array or one object per line, e.g.) Note that if 'One Line Per Object' is selected, then Pretty Print JSON must be false.")
+    .withDescription("Specifies how the writer should output the JSON records (as an array or one object per line, e.g.) "
+                    "Note that if 'One Line Per Object' is selected, then Pretty Print JSON must be false.")
     .supportsExpressionLanguage(true)
     .build();
   EXTENSIONAPI static constexpr auto Properties = std::array<core::PropertyReference, 1>{
-    SchemaWriteStrategy,
+      SchemaWriteStrategy,
   };
 
   EXTENSIONAPI static constexpr bool SupportsDynamicProperties = false;
@@ -59,8 +61,8 @@ class JsonRecordSetWriter final : public core::RecordSetWriter {
 
  public:
   void yield() override {}
-  bool isRunning() const override {    return getState() == core::controller::ControllerServiceState::ENABLED; }
+  bool isRunning() const override { return getState() == core::controller::ControllerServiceState::ENABLED; }
   bool isWorkAvailable() override { return false; }
 };
 
-}  // namespace org::apache::nifi::minifi::standard
+}  // namespace org::apache::nifi::minifi::standard

extensions/standard-processors/tests/unit/JsonRecordTests.cpp

@@ -19,11 +19,11 @@
 #include <variant>
 
 #include "Catch.h"
+#include "RecordSetTesters.h"
 #include "TestBase.h"
 #include "TestRecord.h"
-#include "RecordSetTesters.h"
-#include "controllers/JsonRecordSetWriter.h"
 #include "controllers/JsonRecordSetReader.h"
+#include "controllers/JsonRecordSetWriter.h"
 #include "core/Record.h"
 
 namespace org::apache::nifi::minifi::standard::test {
@@ -34,7 +34,7 @@ TEST_CASE("JsonRecordSetWriter test") {
   record_set.push_back(core::test::createSampleRecord2());
 
   constexpr std::string_view expected =
-    R"({"baz":3.14,"qux":[true,false,true],"is_test":true,"bar":123,"quux":{"Apfel":"apple","Birne":"pear","Aprikose":"apricot"},"foo":"asd","when":"2012-07-01T09:53:00Z"}
+      R"({"baz":3.14,"qux":[true,false,true],"is_test":true,"bar":123,"quux":{"Apfel":"apple","Birne":"pear","Aprikose":"apricot"},"foo":"asd","when":"2012-07-01T09:53:00Z"}
 {"baz":3.141592653589793,"qux":[false,false,true],"is_test":true,"bar":98402134,"quux":{"Apfel":"pomme","Birne":"poire","Aprikose":"abricot"},"foo":"Lorem ipsum dolor sit amet, consectetur adipiscing elit.","when":"2022-11-01T19:52:11Z"}
 )";
 

libminifi/include/controllers/RecordSetReader.h

@@ -25,10 +25,10 @@
 namespace org::apache::nifi::minifi::core {
 
 class RecordSetReader : public controller::ControllerService {
-public:
+ public:
   using ControllerService::ControllerService;
 
   virtual nonstd::expected<RecordSet, std::error_code> read(const std::shared_ptr<FlowFile>& flow_file, ProcessSession& session,  const RecordSchema* record_schema) = 0;
 };
 
-}  // namespace org::apache::nifi::minifi::core
+}  // namespace org::apache::nifi::minifi::core

libminifi/include/controllers/RecordSetWriter.h

@@ -37,4 +37,4 @@ class RecordSetWriter : public controller::ControllerService {
   virtual void write(const RecordSet& record_set, const std::shared_ptr<FlowFile>& flow_file, ProcessSession& session) = 0;
 };
 
-}  // namespace org::apache::nifi::minifi::core
+}  // namespace org::apache::nifi::minifi::core

libminifi/test/RecordSetTesters.h

@@ -17,23 +17,22 @@
  */
 
 #pragma once
-#include <controllers/RecordSetReader.h>
-#include <controllers/RecordSetWriter.h>
-
-#include <numbers>
 
+#include "controllers/RecordSetReader.h"
+#include "controllers/RecordSetWriter.h"
 #include "core/Record.h"
+#include "TestBase.h"
 
 namespace org::apache::nifi::minifi::core::test {
 
 class RecordSetFixture {
-public:
+ public:
   explicit RecordSetFixture(TestController::PlanConfig config = {}): plan_config_(std::move(config)) {}
 
   [[nodiscard]] ProcessSession& processSession() const { return *process_session_; }
 
   [[nodiscard]] const Relationship& getRelationship() const { return relationship_; }
-private:
+ private:
   TestController test_controller_{};
   TestController::PlanConfig plan_config_{};
   std::shared_ptr<TestPlan> test_plan_ = test_controller_.createPlan(plan_config_);
@@ -45,7 +44,7 @@ class RecordSetFixture {
 };
 
 inline bool testRecordWriter(RecordSetWriter& record_set_writer, const RecordSet& record_set, const std::string_view expected) {
-  RecordSetFixture fixture;
+  const RecordSetFixture fixture;
   ProcessSession& process_session = fixture.processSession();
 
   const auto flow_file = process_session.create();
@@ -62,7 +61,7 @@ inline bool testRecordWriter(RecordSetWriter& record_set_writer, const RecordSet
 }
 
 inline bool testRecordReader(RecordSetReader& record_set_reader, const std::string_view serialized_record_set, const RecordSet& expected_record_set, const RecordSchema* record_schema) {
-  RecordSetFixture fixture;
+  const RecordSetFixture fixture;
   ProcessSession& process_session = fixture.processSession();
 
   const auto flow_file = process_session.create();
@@ -76,4 +75,4 @@ inline bool testRecordReader(RecordSetReader& record_set_reader, const std::stri
   return *record_set == expected_record_set;
 }
 
-}  // namespace org::apache::nifi::minifi::standard::test
+}  // namespace org::apache::nifi::minifi::core::test

libminifi/test/TestRecord.h

@@ -17,8 +17,6 @@
  */
 
 #pragma once
-#include <controllers/RecordSetWriter.h>
-
 #include <numbers>
 
 #include "core/Record.h"
@@ -44,8 +42,8 @@ inline Record createSampleRecord2() {
   quux["Birne"] = RecordField{.value_ = "poire"};
   quux["Aprikose"] = RecordField{.value_ = "abricot"};
 
-  record["qux"] = RecordField{.value_=qux};
-  record["quux"] = RecordField{.value_=quux};
+  record["qux"] = RecordField{.value_ = qux};
+  record["quux"] = RecordField{.value_ = quux};
   return record;
 }
 
@@ -68,9 +66,9 @@ inline Record createSampleRecord() {
   quux["Birne"] = RecordField{.value_ = "pear"};
   quux["Aprikose"] = RecordField{.value_ = "apricot"};
 
-  record["qux"] = RecordField{.value_=qux};
-  record["quux"] = RecordField{.value_=quux};
+  record["qux"] = RecordField{.value_ = qux};
+  record["quux"] = RecordField{.value_ = quux};
   return record;
 }
 
-}  // namespace org::apache::nifi::minifi::standard::test
+}  // namespace org::apache::nifi::minifi::core::test