diff --git a/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroFlattenerMaker.java b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroFlattenerMaker.java index d557b65c8474..007608159f43 100644 --- a/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroFlattenerMaker.java +++ b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroFlattenerMaker.java @@ -141,7 +141,11 @@ public Set discoverRootFields(final GenericRecord obj) @Override public Object getRootField(final GenericRecord record, final String key) { - return transformValue(record.get(key)); + if (record.getSchema().getField(key) != null) { + return transformValue(record.get(key)); + } else { + return null; + } } @Override diff --git a/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/AvroFlattenerMakerTest.java b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/AvroFlattenerMakerTest.java index 59e15deeb74c..18197b88e4c6 100644 --- a/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/AvroFlattenerMakerTest.java +++ b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/AvroFlattenerMakerTest.java @@ -349,6 +349,10 @@ private void getRootField_common(final SomeAvroDatum record, final AvroFlattener list, flattener.getRootField(record, "someRecordArray") ); + Assert.assertEquals( + null, + flattener.getRootField(record, "invalidField") + ); } private void makeJsonPathExtractor_common(final SomeAvroDatum record, final AvroFlattenerMaker flattener) diff --git a/licenses.yaml b/licenses.yaml index a16bdc80e9f6..e4acf36062e2 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -3634,7 +3634,7 @@ libraries: --- name: Apache Velocity Engine -version: 2.2 +version: 2.3 license_category: binary module: extensions/druid-avro-extensions license_name: Apache License version 2.0 @@ -3652,7 +3652,7 @@ name: Apache Avro license_category: binary module: extensions/druid-avro-extensions license_name: Apache License version 2.0 -version: 1.9.2 +version: 1.11.1 libraries: - org.apache.avro: avro - org.apache.avro: avro-mapred diff --git a/owasp-dependency-check-suppressions.xml b/owasp-dependency-check-suppressions.xml index 3095ed160c63..e4c2ddf73c04 100644 --- a/owasp-dependency-check-suppressions.xml +++ b/owasp-dependency-check-suppressions.xml @@ -472,14 +472,6 @@ CVE-2020-13949 - - - - CVE-2020-13936 - - 2.2.4 2.13.9 1.17.0 - 1.9.2 + 1.11.1