Apache/nifi
1
0
Fork 0
mirror of https://github.com/apache/nifi.git synced 2025-03-03 07:59:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

NIFI-9831: XML schema inference fix for XML elements with attributes

Browse Source 
This closes #5895.

Signed-off-by: Peter Turcsanyi <turcsanyi@apache.org>
This commit is contained in:
Peter Gyori 2022-03-24 16:04:11 +01:00 committed by Peter Turcsanyi
parent e052cf81ba
commit 3ef2ad9943
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/xml/inference/XmlRecordSource.java
View File

@ -116,13 +116,6 @@ public class XmlRecordSource implements RecordSource<XmlNode> {
arrayNode.addElement(childNode); arrayNode.addElement(childNode);
childNodes.put(childName, arrayNode); childNodes.put(childName, arrayNode);
} }
final Iterator<?> childAttributeIterator = childStartElement.getAttributes();
while (childAttributeIterator.hasNext()) {
final Attribute attribute = (Attribute) childAttributeIterator.next();
final String attributeName = attribute.getName().getLocalPart();
childNodes.put(attributeName, new XmlTextNode(attributeName, attribute.getValue()));
}
} }
} }

8
nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/xml/TestInferXmlSchema.java
View File

@ -50,6 +50,9 @@ public class TestInferXmlSchema {
public void testFlatXml() throws IOException { public void testFlatXml() throws IOException {
final RecordSchema schema = inferSchema("src/test/resources/xml/person.xml", false); final RecordSchema schema = inferSchema("src/test/resources/xml/person.xml", false);
assertEquals(7, schema.getFieldCount());
assertSame(RecordFieldType.STRING, schema.getDataType("ID").get().getFieldType());
assertSame(RecordFieldType.STRING, schema.getDataType("NAME").get().getFieldType()); assertSame(RecordFieldType.STRING, schema.getDataType("NAME").get().getFieldType());
assertSame(RecordFieldType.INT, schema.getDataType("AGE").get().getFieldType()); assertSame(RecordFieldType.INT, schema.getDataType("AGE").get().getFieldType());
assertSame(RecordFieldType.STRING, schema.getDataType("COUNTRY").get().getFieldType()); assertSame(RecordFieldType.STRING, schema.getDataType("COUNTRY").get().getFieldType());
@ -63,6 +66,8 @@ public class TestInferXmlSchema {
public void testFieldsFromAllRecordsIncluded() throws IOException { public void testFieldsFromAllRecordsIncluded() throws IOException {
final RecordSchema schema = inferSchema("src/test/resources/xml/people_nested.xml", true); final RecordSchema schema = inferSchema("src/test/resources/xml/people_nested.xml", true);
assertEquals(8, schema.getFieldCount());
assertSame(RecordFieldType.STRING, schema.getDataType("ID").get().getFieldType()); assertSame(RecordFieldType.STRING, schema.getDataType("ID").get().getFieldType());
assertSame(RecordFieldType.STRING, schema.getDataType("NAME").get().getFieldType()); assertSame(RecordFieldType.STRING, schema.getDataType("NAME").get().getFieldType());
assertSame(RecordFieldType.INT, schema.getDataType("AGE").get().getFieldType()); assertSame(RecordFieldType.INT, schema.getDataType("AGE").get().getFieldType());
@ -89,6 +94,9 @@ public class TestInferXmlSchema {
@Test @Test
public void testStringFieldWithAttributes() throws IOException { public void testStringFieldWithAttributes() throws IOException {
final RecordSchema schema = inferSchema("src/test/resources/xml/TextNodeWithAttribute.xml", true); final RecordSchema schema = inferSchema("src/test/resources/xml/TextNodeWithAttribute.xml", true);
assertEquals(3, schema.getFieldCount());
assertSame(RecordFieldType.INT, schema.getDataType("num").get().getFieldType()); assertSame(RecordFieldType.INT, schema.getDataType("num").get().getFieldType());
assertSame(RecordFieldType.STRING, schema.getDataType("name").get().getFieldType()); assertSame(RecordFieldType.STRING, schema.getDataType("name").get().getFieldType());