Fix #38

Author: cowtowncoder

avro/release-notes/VERSION

@@ -19,10 +19,10 @@ final class RecordReader extends AvroStructureReader
     private final AvroParserImpl _parser;
 
     protected String _currentName;
-    
+
     protected int _state;
     protected final int _count;
-    
+
     public RecordReader(AvroFieldWrapper[] fieldReaders) {
         this(null, fieldReaders, null, null);
     }
@@ -37,7 +37,7 @@ private RecordReader(AvroReadContext parent,
         _parser = parser;
         _count = fieldReaders.length;
     }
-    
+
     @Override
     public RecordReader newReader(AvroReadContext parent,
             AvroParserImpl parser, BinaryDecoder decoder) {
@@ -60,26 +60,20 @@ public JsonToken nextToken() throws IOException
                 return t;
             }
         case STATE_NAME:
-            if (_index < _count) {
-                _currentName = _fieldReaders[_index].getName();
-                _state = STATE_VALUE;
-                {
-                    JsonToken t = JsonToken.FIELD_NAME;
-                    _currToken = t;
-                    return t;
-                }
+            if (_index >= _count) {
+                return _nextAtEndObject();
             }
-            // done; fall through
-        case STATE_END:
-            _state = STATE_DONE;
-            _parser.setAvroContext(getParent());
+            _currentName = _fieldReaders[_index].getName();
+            _state = STATE_VALUE;
             {
-                JsonToken t = JsonToken.END_OBJECT;
+                JsonToken t = JsonToken.FIELD_NAME;
                 _currToken = t;
                 return t;
             }
         case STATE_VALUE:
             break;
+        case STATE_END:
+            return _nextAtEndObject();
         case STATE_DONE:
         default:
             throwIllegalState(_state);
@@ -92,6 +86,22 @@ public JsonToken nextToken() throws IOException
         return t;
     }        
 
+    private final JsonToken _nextAtEndObject() throws IOException
+    {
+        AvroReadContext parent = getParent();
+        // as per [dataformats-binary#38], may need to reset, instead of bailing out
+        if (parent.inRoot()) {
+            if (!_decoder.isEnd()) {
+                _state = STATE_START;
+                _index = 0;
+                return (_currToken = JsonToken.END_OBJECT);
+            }
+        }
+        _state = STATE_DONE;
+        _parser.setAvroContext(getParent());
+        return (_currToken = JsonToken.END_OBJECT);
+    }
+
     @Override
     public String nextFieldName() throws IOException
     {
@@ -103,13 +113,10 @@ public String nextFieldName() throws IOException
                 _currToken = JsonToken.FIELD_NAME;
                 return name;
             }
-            // falling through to STATE_END handling
-            _state = STATE_DONE;
-            _parser.setAvroContext(getParent());
-            _currToken = JsonToken.END_OBJECT;
-            return null;
+            _nextAtEndObject();
+        } else {
+            nextToken();
         }
-        nextToken();
         return null;
     }
 

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/deser/RecordReader.java

@@ -0,0 +1,69 @@
+package com.fasterxml.jackson.dataformat.avro;
+
+import java.io.ByteArrayOutputStream;
+
+import com.fasterxml.jackson.databind.MappingIterator;
+import com.fasterxml.jackson.databind.SequenceWriter;
+
+import static org.junit.Assert.assertArrayEquals;
+
+/**
+ * Tests to ensure that it is possible to read a sequence of root-level
+ * values from a stream.
+ */
+public class RootSequenceTest extends AvroTestBase
+{
+    public void testReadWriteEmployees() throws Exception
+    {
+        AvroMapper mapper = getMapper();
+        ByteArrayOutputStream b = new ByteArrayOutputStream(1000);
+        Employee boss = new Employee("Bossman", 55, new String[] { "[email protected]" }, null);
+        Employee peon1 = new Employee("Worker#1", 24, new String[] { "[email protected]" }, boss);
+        Employee peon2 = new Employee("Worker#2", 42, new String[] { "[email protected]" }, boss);
+
+        // First: write a sequence of 3 root-level Employee Objects
+        
+        SequenceWriter sw = mapper.writerFor(Employee.class)
+                .with(getEmployeeSchema())
+                .writeValues(b);
+        sw.write(boss);
+        int curr = b.size();
+        sw.write(peon1);
+        int diff = b.size() - curr;
+        if (diff == 0) {
+            fail("Should have output more bytes for second entry, did not, total: "+curr);
+        }
+        sw.write(peon2);
+        sw.close();
+
+        byte[] bytes = b.toByteArray();
+
+        assertNotNull(bytes);
+
+        // So far so good: writing seems to work. How about reading?
+        MappingIterator<Employee> it = mapper.readerFor(Employee.class)
+                .with(getEmployeeSchema())
+                .readValues(bytes);
+        assertTrue(it.hasNextValue());
+        Employee boss2 = it.nextValue();
+        assertEquals(boss.age, boss2.age);
+        assertEquals(boss.name, boss2.name);
+        assertArrayEquals(boss.emails, boss2.emails);
+
+        assertTrue(it.hasNextValue());
+        Employee worker1 = it.nextValue();
+        assertEquals(peon1.age, worker1.age);
+        assertEquals(peon1.name, worker1.name);
+        assertArrayEquals(peon1.emails, worker1.emails);
+
+        assertTrue(it.hasNextValue());
+        Employee worker2 = it.nextValue();
+        assertEquals(peon2.age, worker2.age);
+        assertEquals(peon2.name, worker2.name);
+        assertArrayEquals(peon2.emails, worker2.emails);
+
+        assertFalse(it.hasNextValue());
+        it.close();
+    }
+}
+

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/RootSequenceTest.java

@@ -11,6 +11,12 @@ Modules:
 
 2.9.0 (not yet released)
 
+2.8.7 (not yet released)
+
+#35: Serialization of multiple objects (`SequenceWriter`
+ (reported by tomvandenberge@github)
+#38: Deserialization of multiple (root) values from Avro
+
 2.8.6 (12-Jan-2016)
 2.8.5 (14-Nov-2016)