Fix issue when multiple records were omitted

Author: Celos

pom.xml

@@ -5,7 +5,7 @@
 	<groupId>org.mihkel</groupId>
 	<artifactId>avro-json-decoder</artifactId>
 	<packaging>jar</packaging>
-	<version>1.0</version>
+	<version>1.1</version>
 	<name>avro-json-decoder</name>
 	<url>http://maven.apache.org</url>
 

src/main/java/org/mihkel/avro/io/ExtendedJsonDecoder.java

@@ -745,18 +745,24 @@ private static Field findField(Schema schema, String name) {
 			return schema.getField(name);
 		}
 
+		Field foundField = null;
+		
 		for (Field field : schema.getFields()) {
 			Schema fieldSchema = field.schema();
 			if (Type.RECORD.equals(fieldSchema.getType())) {
-				return findField(fieldSchema, name);
+				foundField = findField(fieldSchema, name);
 			} else if (Type.ARRAY.equals(fieldSchema.getType())) {
-				return findField(fieldSchema.getElementType(), name);
+				foundField = findField(fieldSchema.getElementType(), name);
 			} else if (Type.MAP.equals(fieldSchema.getType())) {
-				return findField(fieldSchema.getValueType(), name);
+				foundField = findField(fieldSchema.getValueType(), name);
+			}
+			
+			if (foundField != null) {
+				return foundField;
 			}
 		}
 
-		return null;
+		return foundField;
 	}
 }
 

src/test/java/org/mihkel/avro/io/ExtendedJsonDecoderTest.java

@@ -1,5 +1,7 @@
 package org.mihkel.avro.io;
 
+import java.io.IOException;
+
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericDatumReader;
 import org.apache.avro.generic.GenericRecord;
@@ -60,4 +62,67 @@ private void checkNumeric(String type, Object value) throws Exception {
 		Assert.assertEquals(200, in.readLong());
 		in.skipArray();
 	}
+	
+	@Test
+	public void testNullsAreInferred() throws IOException {
+		String w = "{\"type\":\"record\",\"name\":\"R\",\"fields\":[{\"type\":[\"null\",\"long\"],\"name\":\"a\",\"default\":null}]}";
+		GenericRecord record = readRecord(w, "{}");
+		
+		Assert.assertNull(record.get("a"));
+	}
+	
+	@Test
+	public void testDefaultValuesAreInferred() throws IOException {
+		String w = "{\"type\":\"record\",\"name\":\"R\",\"fields\":[{\"type\":\"long\",\"name\":\"a\",\"default\":7}]}";
+		GenericRecord record = readRecord(w, "{}");
+		
+		Assert.assertEquals(7L, record.get("a"));
+	}
+	
+	@Test
+	public void testNestedNullsAreInferred() throws IOException {
+		String w = "{\"type\":\"record\",\"name\":\"R\",\"fields\":[{\"name\":\"S\",\"type\":" +
+				"{\"type\":\"record\",\"name\":\"S\",\"fields\":[{\"type\":[\"null\",\"long\"],\"name\":\"a\",\"default\":null},{\"type\":\"long\",\"name\":\"b\"}]}}]}";
+		String data = "{\"S\": {\"b\":1}}";
+		GenericRecord record = ((GenericRecord)readRecord(w, data).get("S"));
+		Assert.assertNull(record.get("a"));
+	}
+	
+	@Test
+	public void testArraysCanBeNull() throws IOException {
+		String w = "{\"type\":\"record\",\"name\":\"R\",\"fields\":[{\"type\":[\"null\",{\"type\":\"array\",\"items\":\"long\"}],\"name\":\"A\",\"default\":null}]}";
+		String data = "{}";
+		GenericRecord record = readRecord(w, data);
+		Assert.assertNull(record.get("A"));
+	}
+	
+	@Test
+	public void testRecordCanBeNull() throws IOException {
+		String w = "{\"type\":\"record\",\"name\":\"R\",\"namespace\":\"com.playtech.bex.massupdate.api\",\"fields\":" +
+				"[{\"name\":\"S\",\"type\":[\"null\",{\"type\":\"record\",\"name\":\"S\",\"fields\":[{\"name\":\"A\",\"type\":\"long\"}]}],\"default\":null}]}";
+		String data = "{}";
+		GenericRecord record = readRecord(w, data);
+		Assert.assertNull(record.get("S"));
+	}
+	
+	@Test
+	public void testWtf() throws IOException {
+		String w = "{\"type\":\"record\",\"name\":\"wrapper\",\"fields\":[{\"name\":\"data\",\"type\":" +
+				"{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"r1\",\"fields\":" +
+				"[{\"name\":\"r1\",\"type\":{\"type\":\"array\",\"items\":{\"type\":\"record\",\"name\":\"sr2\",\"fields\":" +
+				"[{\"name\":\"sr2\",\"type\":\"string\"}]}}},{\"name\":\"r2\",\"type\":{\"type\":\"array\",\"items\":" +
+				"{\"type\":\"record\",\"name\":\"r2\",\"fields\":[{\"name\":\"notfound1\",\"type\":[\"null\"," +
+				"{\"type\":\"array\",\"items\":\"string\"}],\"default\":null},{\"name\":\"notfound2\",\"type\":" +
+				"[\"null\",{\"type\":\"array\",\"items\":\"string\"}],\"default\":null}]}}}]}}}]}";
+		String data = "{\"data\":[{\"r1\":[],\"r2\":[{\"notfound1\":{\"array\":[\"val1\",\"val2\"]}}]}]}";
+		GenericRecord record = readRecord(w, data);
+		Assert.assertNull(record.get("S"));
+	}
+	
+	public GenericRecord readRecord(String schemaString, String jsonData) throws IOException {
+		Schema schema = Schema.parse(schemaString);
+		Decoder decoder = new ExtendedJsonDecoder(schema, jsonData);
+		DatumReader<GenericRecord> datumReader = new GenericDatumReader<GenericRecord>(schema);
+		return datumReader.read(null, decoder);
+	}
 }