[nifi] branch main updated (77c3532 -> a509571)

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markap14 pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git.


    from 77c3532  NIFI-8421 This closes #4996. increase commit frequency to ensure we commit often during these tests to minimize race conditions
     add a509571  NIFI-8365 Fix JSON AbstractJsonRowRecordReader to handle deep CHOICE-typed records properly: change the logic that selects the first  compatible schema which can have missing fields compared to the real value and search for a more strict match first and fallback to the existing logic only if not one found. - AbstractJsonRowRecordReader - Handle (meaning log a warning and not fail completely) multi-array CHOICE type when data has extra fields (not defined by the schema) a [...]

No new revisions were added by this update.

Summary of changes:
 .../serialization/record/util/DataTypeUtils.java   |  27 +-
 .../java/org/apache/nifi/util/EqualsWrapper.java   | 162 ++++++++
 .../java/org/apache/nifi/avro/AvroTypeUtil.java    |   4 +
 .../org/apache/nifi/avro/TestAvroTypeUtil.java     | 103 +++++
 .../nifi-record-serialization-services/pom.xml     |   5 +
 .../nifi/json/AbstractJsonRowRecordReader.java     |  44 ++-
 .../nifi/json/TestJsonTreeRowRecordReader.java     | 431 +++++++++++++++++++--
 .../schema/inference/TestFieldTypeInference.java   |  29 ++
 ...oice-of-different-arrays-with-extra-fields.json |  28 ++
 ...oice-of-embedded-arrays-and-single-records.json |  35 ++
 .../json/choice-of-embedded-similar-records.json   |  16 +
 ...-merged-embedded-arrays-and-single-records.json |  40 ++
 .../src/test/resources/json/similar-records.json   |  14 +
 13 files changed, 905 insertions(+), 33 deletions(-)
 create mode 100644 nifi-mock/src/main/java/org/apache/nifi/util/EqualsWrapper.java
 create mode 100644 nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/resources/json/choice-of-different-arrays-with-extra-fields.json
 create mode 100644 nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/resources/json/choice-of-embedded-arrays-and-single-records.json
 create mode 100644 nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/resources/json/choice-of-embedded-similar-records.json
 create mode 100644 nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/resources/json/choice-of-merged-embedded-arrays-and-single-records.json
 create mode 100644 nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/resources/json/similar-records.json