From 38dffda0b062d8b2300b57ad35126be5f1e73fde Mon Sep 17 00:00:00 2001 From: Cliff Resnick Date: Fri, 6 Nov 2015 21:37:45 -0500 Subject: [PATCH] fix nested map serialization --- .../dataformat/avro/ser/MapWriteContext.java | 2 +- .../dataformat/avro/NestedMapTest.java | 52 +++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 src/test/java/com/fasterxml/jackson/dataformat/avro/NestedMapTest.java diff --git a/src/main/java/com/fasterxml/jackson/dataformat/avro/ser/MapWriteContext.java b/src/main/java/com/fasterxml/jackson/dataformat/avro/ser/MapWriteContext.java index eb62e3b..d1e9a9c 100644 --- a/src/main/java/com/fasterxml/jackson/dataformat/avro/ser/MapWriteContext.java +++ b/src/main/java/com/fasterxml/jackson/dataformat/avro/ser/MapWriteContext.java @@ -46,7 +46,7 @@ public final AvroWriteContext createChildArrayContext() { public final AvroWriteContext createChildObjectContext() throws JsonMappingException { _verifyValueWrite(); - AvroWriteContext child = _createObjectContext(_schema.getElementType()); + AvroWriteContext child = _createObjectContext(_schema.getValueType()); _data.put(_currentName, child.rawValue()); return child; } diff --git a/src/test/java/com/fasterxml/jackson/dataformat/avro/NestedMapTest.java b/src/test/java/com/fasterxml/jackson/dataformat/avro/NestedMapTest.java new file mode 100644 index 0000000..9179a8f --- /dev/null +++ b/src/test/java/com/fasterxml/jackson/dataformat/avro/NestedMapTest.java @@ -0,0 +1,52 @@ +package fasterxml.jackson.dataformat.avro; + +import static org.junit.Assert.assertEquals; + +import java.io.IOException; +import java.util.Map; + +import org.apache.avro.Schema; +import org.junit.Test; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.dataformat.avro.AvroMapper; +import com.fasterxml.jackson.dataformat.avro.AvroSchema; +import com.fasterxml.jackson.dataformat.avro.schema.AvroSchemaGenerator; + + +public class NestedMapTest { + + public static class Nester { + @JsonProperty + public Map> nested; + } + + @Test + public void testSerialization() throws IOException { + + + Nester fromJson = new ObjectMapper().readValue( + "{\"nested\": {\"map\":{\"value\":1}}}" + , Nester.class); + + AvroMapper mapper = new AvroMapper(); + //Generate schema from class + AvroSchemaGenerator gen = new AvroSchemaGenerator(); + mapper.acceptJsonFormatVisitor(Nester.class, gen); + Schema schema = gen.getGeneratedSchema().getAvroSchema(); + + + //Serialize + byte[] avroData = mapper.writer(new AvroSchema(schema)) + .writeValueAsBytes(fromJson); + + //Deserialize + Nester nester = mapper.readerFor(Nester.class) + .with(new AvroSchema(schema)) + .readValue(avroData); + int val = nester.nested.get("map").get("value"); + assertEquals(1, val); + + } +}