Start work for supporting root values: serialization works, deser next

Author: cowtowncoder

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

@@ -99,15 +99,15 @@ private Feature(boolean defaultState) {
     protected int _formatFeatures;
 
     protected AvroSchema _rootSchema;
-    
+
     /*
     /**********************************************************
     /* Output state
     /**********************************************************
      */
 
     final protected OutputStream _output;
-    
+
     /**
      * Reference to the root context since that is needed for serialization
      */
@@ -118,12 +118,17 @@ private Feature(boolean defaultState) {
      */
     protected AvroWriteContext _avroContext;
 
+    /**
+     * Lazily constructed encoder; reused in case of writing root-value sequences.
+     */
+    protected BinaryEncoder _encoder;
+
     /**
      * Flag that is set when the whole content is complete, can
      * be output.
      */
     protected boolean _complete;
-    
+
     /*
     /**********************************************************
     /* Life-cycle
@@ -356,6 +361,7 @@ public void close() throws IOException
     @Override
     public final void writeStartArray() throws IOException {
         _avroContext = _avroContext.createChildArrayContext();
+        _complete = false;
     }
 
     @Override
@@ -373,6 +379,7 @@ public final void writeEndArray() throws IOException
     @Override
     public final void writeStartObject() throws IOException {
         _avroContext = _avroContext.createChildObjectContext();
+        _complete = false;
     }
 
     @Override
@@ -578,18 +585,18 @@ protected void _releaseBuffers() {
     protected void _complete() throws IOException
     {
         _complete = true;
-        
+
         // add defensive coding here but only because this often gets triggered due
         // to forced closure resulting from another exception; so, we typically
         // do not want to hide the original problem...
-    	// First one sanity check, for a (relatively?) common case
+        // First one sanity check, for a (relatively?) common case
         if (_rootContext == null) {
-        	return;
+            return;
+        }
+        if (_encoder == null) {
+            _encoder = AvroSchema.encoder(_output, isEnabled(Feature.AVRO_BUFFERING));
         }
-        BinaryEncoder encoder = AvroSchema.encoder(
-            _output, isEnabled(Feature.AVRO_BUFFERING)
-        );
-        _rootContext.complete(encoder);
-        encoder.flush();
+        _rootContext.complete(_encoder);
+        _encoder.flush();
     }
 }

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

@@ -13,7 +13,7 @@
  * Need to sub-class to prevent encoder from crapping on writing an optional
  * Enum value (see [dataformat-avro#12])
  * 
- * @since 2.5.0
+ * @since 2.5
  */
 public class NonBSGenericDatumWriter<D>
 	extends GenericDatumWriter<D>

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

@@ -72,10 +72,18 @@ public void writeValue(Object value) {
     public void writeString(String value) {
         _reportError();
     }
-    
+
+    /**
+     * Lazily created instance for encoding: reused in case of root value sequences.
+     */
+    private NonBSGenericDatumWriter<GenericContainer> _writer;
+
     @Override
     public void complete(BinaryEncoder encoder) throws IOException {
-        new NonBSGenericDatumWriter<GenericContainer>(_schema).write(_rootValue, encoder);
+        if (_writer == null) {
+            _writer = new NonBSGenericDatumWriter<GenericContainer>(_schema);
+        }
+        _writer.write(_rootValue, encoder);
     }
 
     @Override

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

@@ -35,11 +35,22 @@ public abstract class AvroTestBase extends TestCase
     /* Test classes
     /**********************************************************
      */
-    
+
     protected static class Employee
     {
         public Employee() { }
-        
+
+        public Employee(String n,  int a, String[] e, Employee b) {
+            name = n;
+            age = a;
+            emails = e;
+            boss = b;
+        }
+
+        public static Employee construct() {
+            return new Employee();
+        }
+
         public String name;
         public int age;
         public String[] emails;