Yet more work, now decoding of root-level scalar sequences should finally work fully

Author: cowtowncoder

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

@@ -11,34 +11,37 @@ final class ScalarReaderWrapper extends AvroStructureReader
     private final AvroScalarReader _wrappedReader;
     private final BinaryDecoder _decoder;
     private final AvroParserImpl _parser;
+    private final boolean _rootReader;
 
     public ScalarReaderWrapper(AvroScalarReader wrappedReader) {
-        this(wrappedReader, null, null);
+        this(wrappedReader, null, null, false);
     }
 
     private ScalarReaderWrapper(AvroScalarReader wrappedReader,
-            AvroParserImpl parser, BinaryDecoder decoder) {
+            AvroParserImpl parser, BinaryDecoder decoder, boolean root) {
         super(null, TYPE_ROOT);
         _wrappedReader = wrappedReader;
         _parser = parser;
         _decoder = decoder;
+        _rootReader = root;
     }
 
     @Override
     public ScalarReaderWrapper newReader(AvroReadContext parent,
             AvroParserImpl parser, BinaryDecoder decoder) {
-        return new ScalarReaderWrapper(_wrappedReader, parser, decoder);
+        return new ScalarReaderWrapper(_wrappedReader, parser, decoder, parent.inRoot());
     }
 
     @Override
     public JsonToken nextToken() throws IOException
     {
-        if (_currToken == null) {
-            JsonToken t = _wrappedReader.readValue(_parser, _decoder);
-            _currToken = t;
-            return t;
+        // 19-Jan-2017, tatu: May need to be called multiple times, for root-level
+        //    sequences. Because of this need to check for EOF. But only after reading
+        //    one token successfully...
+        if (_rootReader && _decoder.isEnd()) {
+            return (_currToken = null);
         }
-        return null;
+        return (_currToken = _wrappedReader.readValue(_parser, _decoder));
     }
 
     @Override

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

@@ -28,7 +28,6 @@ public void testReadWriteIntSequence() throws Exception
         sw.write(Integer.valueOf(-999));
         sw.close();
 
-        /*// comment out for now
         byte[] bytes = b.toByteArray();
         MappingIterator<Integer> it = MAPPER.readerFor(Integer.class)
                 .with(schema)
@@ -37,11 +36,10 @@ public void testReadWriteIntSequence() throws Exception
         assertEquals(Integer.valueOf(1), it.nextValue());
         assertTrue(it.hasNextValue());
         assertEquals(Integer.valueOf(123456), it.nextValue());
-        assertFalse(it.hasNextValue());
+        assertTrue(it.hasNextValue());
         assertEquals(Integer.valueOf(-999), it.nextValue());
         assertFalse(it.hasNextValue());
         it.close();
-        */
     }
 
     public void testReadWriteStringSequence() throws Exception
@@ -57,7 +55,6 @@ public void testReadWriteStringSequence() throws Exception
         sw.write("abcde");
         sw.close();
 
-        /*// comment out for now
         byte[] bytes = b.toByteArray();
         // should just be chars and 1-byte length for each
         assertEquals(14, bytes.length);
@@ -72,7 +69,6 @@ public void testReadWriteStringSequence() throws Exception
         assertEquals("abcde", it.nextValue());
         assertFalse(it.hasNextValue());
         it.close();
-        */
     }
 
     public void testReadWriteEmployeeSequence() throws Exception