Merge branch '2.10'

Author: cowtowncoder

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroGenerator.java

@@ -357,7 +357,7 @@ public void close() throws IOException
 
     @Override
     public final void writeStartArray() throws IOException {
-        _tokenWriteContext = _tokenWriteContext.createChildArrayContext();
+        _tokenWriteContext = _tokenWriteContext.createChildArrayContext(null);
         _complete = false;
     }
 

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/ser/AvroWriteContext.java

@@ -68,10 +68,6 @@ public static AvroWriteContext nullContext() {
         return NullContext.instance;
     }
 
-    public final AvroWriteContext createChildArrayContext() throws JsonMappingException {
-        return createChildArrayContext(null);
-    }
-
     public abstract AvroWriteContext createChildArrayContext(Object currValue) throws JsonMappingException;
 
     public AvroWriteContext createChildObjectContext() throws JsonMappingException {
@@ -298,8 +294,7 @@ public static int resolveUnionIndex(Schema unionSchema, Object datum) {
             // !!! TODO:
             //  - ByteBuffer
             //  - Number wrappers (Integer, ...)
-            
-            /*
+
             String typeId = AvroSchemaHelper.getTypeId(datum.getClass());
             for (int i = 0, size = types.size(); i < size; ++i) {
                 Schema schema = types.get(i);
@@ -308,7 +303,6 @@ public static int resolveUnionIndex(Schema unionSchema, Object datum) {
                     return i;
                 }
             }
-            */
         }
 //System.err.println("Missing index for: "+datum.getClass().getName()+" ("+types.size()+") ->\n"+types);  
         return ReflectData.get().resolveUnion(unionSchema, datum);
@@ -350,7 +344,6 @@ public static Schema resolveUnionType(Schema unionSchema, Object datum) {
                 return types.get(_resolveMapIndex(unionSchema, types, datum));
             }
 
-            /*
             String typeId = AvroSchemaHelper.getTypeId(datum.getClass());
             for (int i = 0, size = types.size(); i < size; ++i) {
                 Schema schema = types.get(i);
@@ -359,7 +352,6 @@ public static Schema resolveUnionType(Schema unionSchema, Object datum) {
                     return schema;
                 }
             }
-            */
         }
 //System.err.println("Missing schema for: "+datum.getClass().getName()+" ("+types.size()+") ->\n"+types);  
         int ix = ReflectData.get().resolveUnion(unionSchema, datum);

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/annotations/UnionResolvingTest.java

@@ -0,0 +1,90 @@
+package com.fasterxml.jackson.dataformat.avro.interop.annotations;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+import org.apache.avro.Schema;
+import org.apache.avro.SchemaBuilder;
+import org.apache.avro.reflect.Union;
+import org.junit.Test;
+
+import static com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil.jacksonDeserialize;
+import static com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil.jacksonSerialize;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class UnionResolvingTest {
+    private Schema SCHEMA = SchemaBuilder
+        .builder(UnionResolvingTest.class.getName() + "$")
+        .record(Box.class.getSimpleName())
+            .fields()
+            .name("animal")
+            .type()
+            .unionOf()
+                .record(Cat.class.getSimpleName())
+                    .fields()
+                    .name("name").type().stringType().noDefault()
+                .endRecord()
+            .and()
+                .record(Dog.class.getSimpleName())
+                .fields()
+                    .name("tricks").type().array().items().stringType().noDefault()
+                .endRecord()
+            .endUnion()
+            .noDefault()
+        .endRecord();
+
+
+    @Union({ Cat.class, Dog.class })
+    public interface Animal { }
+
+    static final class Cat implements Animal {
+        public Cat() {}
+
+        @Override
+        public boolean equals(Object o) {
+            return o instanceof Cat;
+        }
+    }
+
+    static final class Dog implements Animal {
+        // Unsupported schema generation
+        public Set<?> tricks = new HashSet<>();
+
+        public Dog() {
+        }
+
+        public Dog(final Set<?> tricks) {
+            this.tricks = tricks;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            return o instanceof Dog && tricks.equals(((Dog) o).tricks);
+        }
+    }
+
+    public static class Box {
+        public Animal animal;
+
+        public Box() {
+        }
+
+        public Box(Animal a) { animal = a; }
+
+        @Override
+        public boolean equals(Object o) {
+            return o instanceof Box && Objects.equals(animal, ((Box) o).animal);
+        }
+    }
+
+    @Test
+    public void testResolveUnionUsingSchemaName() throws IOException {
+        final Box box = new Box(new Dog(Collections.singleton("catch stick")));
+
+        final Box result = jacksonDeserialize(SCHEMA, Box.class, jacksonSerialize(SCHEMA, box));
+
+        assertThat(result).isEqualTo(box);
+    }
+}

release-notes/CREDITS-2.x

@@ -102,6 +102,8 @@ Juliana Amorim (amorimjuliana@github)
 Marcos Passos (marcospassos@github)
 * Contributed fix for #168: (avro) `JsonMappingException` for union types with multiple Record types
  (2.10.0)
+* Contributed fix for #173: (Avro) Improve Union type serialization performance
+ (2.10.0)
 
 
 

release-notes/VERSION-2.x

@@ -12,6 +12,8 @@ Project: jackson-datatypes-binaryModules:
 
 #168: (avro) `JsonMappingException` for union types with multiple Record types
  (reported by Juliana A; fix contributed by Marcos P)
+#173: (Avro) Improve Union type serialization performance
+ (fix contributed by Marcos P)
 
 2.10.0.pr1 (19-Jul-2019)