Review update

lordgamez · lordgamez · commit 888ef220505f · 2025-09-09T09:07:19.000+02:00
diff --git a/CONTROLLERS.md b/CONTROLLERS.md
@@ -348,6 +348,6 @@ In the list below, the names of required properties appear in bold. Any other pr
 | Name                        | Default Value | Allowable Values | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 |-----------------------------|---------------|------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | Field Name for Content      |               |                  | If tags with content (e. g. <field>content</field>) are defined as nested records in the schema, the name of the tag will be used as name for the record and the value of this property will be used as name for the field. If the tag contains subnodes besides the content (e.g. <field>content<subfield>subcontent</subfield></field>), or a node attribute is present, we need to define a name for the text content, so that it can be distinguished from the subnodes. If this property is not set, the default name 'value' will be used for the text content of the tag in this case. |
-| **Parse XML Attributes**    | false         | true<br/>false   | When 'Schema Access Strategy' is 'Infer Schema' and this property is 'true' then XML attributes are parsed and added to the record as new fields. When the schema is inferred but this property is 'false', XML attributes and their values are ignored.                                                                                                                                                                                                                                                                                                                                      |
+| **Parse XML Attributes**    | false         | true<br/>false   | When this property is 'true' then XML attributes are parsed and added to the record as new fields, otherwise XML attributes and their values are ignored.                                                                                                                                                                                                                                                                                                                                                                                                                                     |
 | Attribute Prefix            |               |                  | If this property is set, the name of attributes will be prepended with a prefix when they are added to a record.                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
 | **Expect Records as Array** | false         | true<br/>false   | This property defines whether the reader expects a FlowFile to consist of a single Record or a series of Records with a "wrapper element". Because XML does not provide for a way to read a series of XML documents from a stream directly, it is common to combine many XML documents by concatenating them and then wrapping the entire XML blob with a "wrapper element". This property dictates whether the reader expects a FlowFile to consist of a single Record or a series of Records with a "wrapper element" that will be ignored.                                                 |
diff --git a/LICENSE b/LICENSE
@@ -2354,29 +2354,6 @@ This product bundles 'zlib' within 'OpenCV' under the following license:
   Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
   (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
 
-This product bundles 'TinyXml2' within 'AWS SDK for C++' under a zlib license:
-
-Original code by Lee Thomason (www.grinninglizard.com)
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-
 
 This product bundles 'cJSON' within 'AWS SDK for C++' under an MIT license:
 
diff --git a/NOTICE b/NOTICE
@@ -43,7 +43,6 @@ THIRD PARTY COMPONENTS
 This software includes third party software subject to the following copyrights:
 - Very fast, header-only/compiled, C++ logging library from spdlog - Copyright (c) 2016 Gabi Melman
 - An open-source formatting library for C++ from fmt - Copyright (c) 2012 - present, Victor Zverovich
-- XML parsing and utility functions from TinyXml2 - Lee Thomason
 - JSON parsing and utility functions from JsonCpp - Copyright (c) 2007-2010 Baptiste Lepilleur
 - OpenSSL build files for cmake used for Android Builds - Copyright (C) 2007-2012 LuaDist and Copyright (C) 2013 Brian Sidebotham
 - Android tool chain cmake build files - Copyright (c) 2010-2011, Ethan Rublee and Copyright (c) 2011-2014, Andrey Kamaev
@@ -78,6 +77,7 @@ This software includes third party software subject to the following copyrights:
 - llhttp - Copyright Fedor Indutny, 2018.
 - benchmark - Copyright 2015 Google Inc.
 - llama.cpp - Copyright (c) 2023-2024 The ggml authors
+- pugixml - Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
 
 The licenses for these third party components are included in LICENSE.txt
 
diff --git a/extensions/standard-processors/controllers/XMLReader.cpp b/extensions/standard-processors/controllers/XMLReader.cpp
@@ -18,6 +18,7 @@
 #include "XMLReader.h"
 
 #include <algorithm>
+#include <ranges>
 
 #include "core/Resource.h"
 #include "utils/TimeUtil.h"
@@ -27,7 +28,7 @@ namespace org::apache::nifi::minifi::standard {
 
 namespace {
 bool hasChildNodes(const pugi::xml_node& node) {
-  return std::any_of(node.begin(), node.end(), [] (const pugi::xml_node& child) {
+  return std::ranges::any_of(node, [] (const pugi::xml_node& child) {
     return child.type() == pugi::node_element;
   });
 }
@@ -68,7 +69,7 @@ void XMLReader::writeRecordField(core::RecordObject& record_object, const std::s
     return;
   }
 
-  if (std::all_of(value.begin(), value.end(), ::isdigit)) {
+  if (std::ranges::all_of(value, ::isdigit)) {
     try {
       uint64_t value_as_uint64 = std::stoull(value);
       addRecordFieldToObject(record_object, name, core::RecordField(value_as_uint64));
@@ -77,7 +78,7 @@ void XMLReader::writeRecordField(core::RecordObject& record_object, const std::s
     }
   }
 
-  if (value.starts_with('-') && std::all_of(value.begin() + 1, value.end(), ::isdigit)) {
+  if (value.starts_with('-') && std::ranges::all_of(value | std::views::drop(1), ::isdigit)) {
     try {
       int64_t value_as_int64 = std::stoll(value);
       addRecordFieldToObject(record_object, name, core::RecordField(value_as_int64));
@@ -96,10 +97,6 @@ void XMLReader::writeRecordField(core::RecordObject& record_object, const std::s
   addRecordFieldToObject(record_object, name, core::RecordField(value));
 }
 
-void XMLReader::writeRecordFieldFromXmlNode(core::RecordObject& record_object, const pugi::xml_node& node) const {
-  writeRecordField(record_object, node.name(), node.child_value());
-}
-
 void XMLReader::parseNodeElement(core::RecordObject& record_object, const pugi::xml_node& node) const {
   gsl_Expects(node.type() == pugi::node_element);
   if (parse_xml_attributes_ && node.first_attribute()) {
@@ -119,7 +116,7 @@ void XMLReader::parseNodeElement(core::RecordObject& record_object, const pugi::
     return;
   }
 
-  writeRecordFieldFromXmlNode(record_object, node);
+  writeRecordField(record_object, node.name(), node.child_value());
 }
 
 void XMLReader::parseXmlNode(core::RecordObject& record_object, const pugi::xml_node& node) const {
@@ -177,16 +174,16 @@ void XMLReader::onEnable() {
 
 nonstd::expected<core::RecordSet, std::error_code> XMLReader::read(io::InputStream& input_stream) {
   core::RecordSet record_set{};
-  const auto read_result = [this, &record_set](io::InputStream& input_stream) -> int64_t {
+  const auto read_result = [this, &record_set](io::InputStream& input_stream) -> size_t {
     std::string content;
     content.resize(input_stream.size());
-    const auto read_ret = gsl::narrow<int64_t>(input_stream.read(as_writable_bytes(std::span(content))));
+    const auto read_ret = input_stream.read(as_writable_bytes(std::span(content)));
     if (io::isError(read_ret)) {
       logger_->log_error("Failed to read XML data from input stream");
-      return -1;
+      return io::STREAM_ERROR;
     }
     if (!parseRecordsFromXml(record_set, content)) {
-      return -1;
+      return io::STREAM_ERROR;
     }
     return read_ret;
   }(input_stream);
diff --git a/extensions/standard-processors/controllers/XMLReader.h b/extensions/standard-processors/controllers/XMLReader.h
@@ -40,13 +40,12 @@ class XMLReader final : public core::RecordSetReaderImpl {
 
   EXTENSIONAPI static constexpr auto FieldNameForContent = core::PropertyDefinitionBuilder<>::createProperty("Field Name for Content")
       .withDescription("If tags with content (e. g. <field>content</field>) are defined as nested records in the schema, the name of the tag will be used as name for the record and the value of "
-                       "this property will be used as name for the field. If the tag contains subnodes besides the content (e.g. <field>content<subfield>subcontent</subfield></field>), "
-                       "or a node attribute is present, we need to define a name for the text content, so that it can be distinguished from the subnodes. If this property is not set, the default "
-                       "name 'value' will be used for the text content of the tag in this case.")
+        "this property will be used as name for the field. If the tag contains subnodes besides the content (e.g. <field>content<subfield>subcontent</subfield></field>), "
+        "or a node attribute is present, we need to define a name for the text content, so that it can be distinguished from the subnodes. If this property is not set, the default "
+        "name 'value' will be used for the text content of the tag in this case.")
       .build();
   EXTENSIONAPI static constexpr auto ParseXMLAttributes = core::PropertyDefinitionBuilder<>::createProperty("Parse XML Attributes")
-      .withDescription("When 'Schema Access Strategy' is 'Infer Schema' and this property is 'true' then XML attributes are parsed and added to the record as new fields. When the schema is "
-                       "inferred but this property is 'false', XML attributes and their values are ignored.")
+      .withDescription("When this property is 'true' then XML attributes are parsed and added to the record as new fields, otherwise XML attributes and their values are ignored.")
       .isRequired(true)
       .withValidator(core::StandardPropertyValidators::BOOLEAN_VALIDATOR)
       .withDefaultValue("false")
@@ -56,9 +55,9 @@ class XMLReader final : public core::RecordSetReaderImpl {
       .build();
   EXTENSIONAPI static constexpr auto ExpectRecordsAsArray = core::PropertyDefinitionBuilder<>::createProperty("Expect Records as Array")
       .withDescription("This property defines whether the reader expects a FlowFile to consist of a single Record or a series of Records with a \"wrapper element\". Because XML does not provide "
-                       "for a way to read a series of XML documents from a stream directly, it is common to combine many XML documents by concatenating them and then wrapping the entire XML blob "
-                       "with a \"wrapper element\". This property dictates whether the reader expects a FlowFile to consist of a single Record or a series of Records with a \"wrapper element\" "
-                       "that will be ignored.")
+          "for a way to read a series of XML documents from a stream directly, it is common to combine many XML documents by concatenating them and then wrapping the entire XML blob "
+          "with a \"wrapper element\". This property dictates whether the reader expects a FlowFile to consist of a single Record or a series of Records with a \"wrapper element\" "
+          "that will be ignored.")
       .isRequired(true)
       .withValidator(core::StandardPropertyValidators::BOOLEAN_VALIDATOR)
       .withDefaultValue("false")
@@ -81,7 +80,6 @@ class XMLReader final : public core::RecordSetReaderImpl {
 
  private:
   void writeRecordField(core::RecordObject& record_object, const std::string& name, const std::string& value, bool write_pcdata_node = false) const;
-  void writeRecordFieldFromXmlNode(core::RecordObject& record_object, const pugi::xml_node& node) const;
   void parseNodeElement(core::RecordObject& record_object, const pugi::xml_node& node) const;
   void parseXmlNode(core::RecordObject& record_object, const pugi::xml_node& node) const;
   void addRecordFromXmlNode(const pugi::xml_node& node, core::RecordSet& record_set) const;
diff --git a/extensions/standard-processors/tests/unit/XMLReaderTests.cpp b/extensions/standard-processors/tests/unit/XMLReaderTests.cpp
@@ -27,6 +27,7 @@ namespace org::apache::nifi::minifi::standard::test {
 class XMLReaderTestFixture {
  public:
   XMLReaderTestFixture() : xml_reader_("XMLReader") {
+    LogTestController::getInstance().clear();
     LogTestController::getInstance().setTrace<XMLReader>();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ namespace org::apache::nifi::minifi::standard::test {`
`27`	`27`	`class XMLReaderTestFixture {`
`28`	`28`	`public:`
`29`	`29`	`XMLReaderTestFixture() : xml_reader_("XMLReader") {`
	`30`	`+ LogTestController::getInstance().clear();`
`30`	`31`	`LogTestController::getInstance().setTrace<XMLReader>();`
`31`	`32`	`}`
`32`	`33`