Fix #39

Author: cowtowncoder

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

@@ -40,8 +40,9 @@ public JsonToken nextToken() throws IOException
         // 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);
+        if (_rootReader) {
+            JsonToken t = _decoder.isEnd() ? null : _wrappedReader.readValue(_parser, _decoder);
+            return (_currToken = t);
         }
         _parser.setAvroContext(getParent());
         return (_currToken = _wrappedReader.readValue(_parser, _decoder));

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

@@ -16,8 +16,6 @@ final class UnionReader extends AvroStructureReader
     private final BinaryDecoder _decoder;
     private final AvroParserImpl _parser;
 
-    private AvroStructureReader _currentReader;
-    
     public UnionReader(AvroStructureReader[] memberReaders) {
         this(null, memberReaders, null, null);
     }
@@ -41,17 +39,15 @@ public UnionReader newReader(AvroReadContext parent,
     @Override
     public JsonToken nextToken() throws IOException
     {
-        if (_currentReader == null) {
-            int index = _decoder.readIndex();
-            if (index < 0 || index >= _memberReaders.length) {
-                throw new JsonParseException(_parser, String.format
-                        ("Invalid index (%s); union only has %d types", index, _memberReaders.length));
-            }
-            // important: remember to create new instance
-            // also: must pass our parent (not this instance)
-            _currentReader = _memberReaders[index].newReader(_parent, _parser, _decoder);
+        int index = _decoder.readIndex();
+        if (index < 0 || index >= _memberReaders.length) {
+            throw new JsonParseException(_parser, String.format
+                    ("Invalid index (%s); union only has %d types", index, _memberReaders.length));
         }
-        return (_currToken = _currentReader.nextToken());
+        // important: remember to create new instance
+        // also: must pass our parent (not this instance)
+        AvroStructureReader reader = _memberReaders[index].newReader(_parent, _parser, _decoder);
+        return (_currToken = reader.nextToken());
     }
 
     @Override

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

@@ -1,5 +1,6 @@
 package com.fasterxml.jackson.dataformat.avro;
 
+import java.io.IOException;
 import java.util.*;
 
 public class MapWithUnionTest extends AvroTestBase
@@ -14,9 +15,38 @@ public class MapWithUnionTest extends AvroTestBase
             + " ] \n"
             +"}\n");
 
+    // for [dataformats-binary#39]
+    final static String MAP_CONTAINER_SCHEMA_JSON = aposToQuotes("{\n"
+            +" 'namespace': 'com.salesforce.conduit.avro',\n"
+            +" 'type': 'record',\n"
+            +" 'name': 'MapContainer',\n"
+            +" 'fields': [\n"
+            +"     {'name':'props', \n"
+            +"        'type' : {\n"
+            +"            'type' : 'map', \n"
+            +"            'values': ['null','int','long','float','double','string','boolean',{'type':'map','values':['null','int','long','float','double','string','boolean']}]\n"
+            +"        }\n"
+            +"     }\n"
+            +" ]\n"
+            +"}");
+    static class MapContainer {
+        public Map<String, Object> props;
+
+        public MapContainer() {}
+        public MapContainer(Map<String, Object> p) {
+            props = p;
+        }
+    }
+
+    /*
+    /**********************************************************
+    /* Test methods
+    /**********************************************************
+     */
+
     private final AvroMapper MAPPER = getMapper();
 
-    public void testRecordWithMap() throws Exception
+    public void testRootMapWithUnion() throws Exception
     {
         AvroSchema schema = MAPPER.schemaFrom(MAP_WITH_UNION_SCHEMA_JSON);
         Map<String,Object> input = new LinkedHashMap<String,Object>();
@@ -33,4 +63,31 @@ public void testRecordWithMap() throws Exception
         assertEquals("123", result.get("a"));
         assertEquals("foobar", result.get("xy"));
     }
+
+    public void testMapContainerWithNested() throws IOException
+    {
+        Map<String,Object> map = new LinkedHashMap<String,Object>();
+        map.put("hello", "world");
+        Map<String,String> otherMap = new LinkedHashMap<String,String>();
+        otherMap.put("foo", "bar");
+        otherMap.put("zap", "bing");
+        map.put("otherMap", otherMap);
+        map.put("goodbye", "charlie");
+        MapContainer event = new MapContainer(map);
+
+        AvroSchema avroSchema = MAPPER.schemaFrom(MAP_CONTAINER_SCHEMA_JSON);
+        byte[] serialized = MAPPER.writer(avroSchema).writeValueAsBytes(event);
+
+        MapContainer deserialized = MAPPER.readerFor(MapContainer.class)
+                .with(avroSchema)
+                .readValue(serialized);
+        assertEquals(3, deserialized.props.size());        
+        assertEquals("world", deserialized.props.get("hello"));
+        assertEquals("charlie", deserialized.props.get("goodbye"));
+        Object ob = deserialized.props.get("otherMap");
+        assertTrue(ob instanceof Map<?,?>);
+        Map<?,?> m = (Map<?,?>) ob;
+        assertEquals("bar", m.get("foo"));
+        assertEquals("bing", m.get("zap"));
+    }
 }