Bit cleanup, update release notes (wrt avro)

Author: cowtowncoder

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

@@ -363,7 +363,7 @@ public void close() throws IOException
 
     @Override
     public final void writeStartArray() throws IOException {
-        _avroContext = _avroContext.createChildArrayContext();
+        _avroContext = _avroContext.createChildArrayContext(null);
         _complete = false;
     }
 
@@ -389,11 +389,6 @@ public final void writeStartObject() throws IOException {
     public void writeStartObject(Object forValue) throws IOException {
         _avroContext = _avroContext.createChildObjectContext(forValue);
         _complete = false;
-        if(this._writeContext != null && forValue != null) {
-            this._writeContext.setCurrentValue(forValue);
-        }
-
-        this.setCurrentValue(forValue);
     }
 
     @Override

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

@@ -13,7 +13,7 @@ public class ArrayWriteContext
     public ArrayWriteContext(AvroWriteContext parent, AvroGenerator generator,
             GenericArray<Object> array, Object currValue)
     {
-        super(TYPE_ARRAY, parent, generator, array.getSchema());
+        super(TYPE_ARRAY, parent, generator, array.getSchema(), currValue);
         _array = array;
     }
 

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

@@ -44,16 +44,6 @@ public abstract class AvroWriteContext
     /* Life-cycle
     /**********************************************************
      */
-    
-    protected AvroWriteContext(int type, AvroWriteContext parent,
-            AvroGenerator generator, Schema schema)
-    {
-        super();
-        _type = type;
-        _parent = parent;
-        _generator = generator;
-        _schema = schema;
-    }
 
     protected AvroWriteContext(int type, AvroWriteContext parent,
             AvroGenerator generator, Schema schema, Object currValue)
@@ -81,10 +71,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 {
@@ -533,7 +519,7 @@ private final static class NullContext
         public final static NullContext instance = new NullContext();
 
         private NullContext() {
-            super(TYPE_ROOT, null, null, null);
+            super(TYPE_ROOT, null, null, null, null);
         }
 
         @Override

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

@@ -32,7 +32,7 @@ class RootContext
     private NonBSGenericDatumWriter<Object> _writer;
 
     public RootContext(AvroGenerator generator, Schema schema, BinaryEncoder encoder) {
-        super(TYPE_ROOT, null, generator, schema);
+        super(TYPE_ROOT, null, generator, schema, null);
         _encoder = encoder;
     }
 

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)