Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-3879: Allow null Avro default values 

- Avro uses their own class for null values, so a standard check against
  null isn't picking them up.

This closes #1792.
This commit is contained in:
Steve Champagne 2017-05-12 17:32:14 +00:00 committed by Mark Payne
parent e9848f4276
commit 382eef2183
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/src/main/java/org/apache/nifi/avro/AvroTypeUtil.java
View File

@ -25,6 +25,7 @@ import org.apache.avro.generic.GenericData;
import org.apache.avro.generic.GenericFixed; import org.apache.avro.generic.GenericFixed;
import org.apache.avro.generic.GenericRecord; import org.apache.avro.generic.GenericRecord;
import org.apache.avro.util.Utf8; import org.apache.avro.util.Utf8;
import org.apache.avro.JsonProperties;
import org.apache.nifi.schema.access.SchemaNotFoundException; import org.apache.nifi.schema.access.SchemaNotFoundException;
import org.apache.nifi.serialization.SimpleRecordSchema; import org.apache.nifi.serialization.SimpleRecordSchema;
import org.apache.nifi.serialization.record.DataType; import org.apache.nifi.serialization.record.DataType;
@ -205,7 +206,11 @@ public class AvroTypeUtil {
final String fieldName = field.name(); final String fieldName = field.name();
final DataType dataType = AvroTypeUtil.determineDataType(field.schema()); final DataType dataType = AvroTypeUtil.determineDataType(field.schema());
recordFields.add(new RecordField(fieldName, dataType, field.defaultVal(), field.aliases())); if (field.defaultVal() == JsonProperties.NULL_VALUE) {
recordFields.add(new RecordField(fieldName, dataType, field.aliases()));
} else {
recordFields.add(new RecordField(fieldName, dataType, field.defaultVal(), field.aliases()));
}
} }
final RecordSchema recordSchema = new SimpleRecordSchema(recordFields, schemaText, AVRO_SCHEMA_FORMAT, schemaId); final RecordSchema recordSchema = new SimpleRecordSchema(recordFields, schemaText, AVRO_SCHEMA_FORMAT, schemaId);