Fix #19

FasterXML · Aug 11, 2017 · 8ad051a · 8ad051a
1 parent d8dcc0b
commit 8ad051a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/guava/src/main/java/com/fasterxml/jackson/datatype/guava/ser/MultimapSerializer.java b/guava/src/main/java/com/fasterxml/jackson/datatype/guava/ser/MultimapSerializer.java
@@ -9,6 +9,9 @@
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
+import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonArrayFormatVisitor;
+import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
+import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitable;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonMapFormatVisitor;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
@@ -385,12 +388,25 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t
         if (v2 != null) {
             v2.keyFormat(_keySerializer, _type.getKeyType());
             JsonSerializer<?> valueSer = _valueSerializer;
-            JavaType vt = _type.getContentType();
+            final JavaType vt = _type.getContentType();
+            final SerializerProvider prov = visitor.getProvider();
             if (valueSer == null) {
-                valueSer = _findAndAddDynamic(_dynamicValueSerializers,
-                            vt, visitor.getProvider());
+                valueSer = _findAndAddDynamic(_dynamicValueSerializers, vt, prov);
             }
-            v2.valueFormat(valueSer, vt);
+            final JsonSerializer<?> valueSer2 = valueSer;
+            v2.valueFormat(new JsonFormatVisitable() {
+                final JavaType arrayType = prov.getTypeFactory().constructArrayType(vt);
+                @Override
+                public void acceptJsonFormatVisitor(
+                        JsonFormatVisitorWrapper v3, JavaType hint3)
+                    throws JsonMappingException
+                {
+                    JsonArrayFormatVisitor v4 = v3.expectArrayFormat(arrayType);
+                    if (v4 != null) {
+                        v4.itemsFormat(valueSer2, vt);
+                    }
+                }
+            }, vt);
         }
     }
 

diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -7,6 +7,10 @@ Modules:
 === Releases ===
 ------------------------------------------------------------------------
 
+2.8.10 (not yet released)
+
+#19: Multimap serializer produces wrong Schema structure
+
 2.8.9 (12-Jun-2017)
 
 No changes since 2.8.8