Merge branch '2.10'

Author: cowtowncoder

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

@@ -80,9 +80,9 @@ private Feature(boolean defaultState) {
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Configuration
-    /**********************************************************
+    /**********************************************************************
      */
 
     final protected IOContext _ioContext;
@@ -97,9 +97,9 @@ private Feature(boolean defaultState) {
     protected AvroSchema _rootSchema;
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Output state
-    /**********************************************************
+    /**********************************************************************
      */
 
     final protected OutputStream _output;
@@ -126,9 +126,9 @@ private Feature(boolean defaultState) {
     protected boolean _complete;
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Life-cycle
-    /**********************************************************
+    /**********************************************************************
      */
 
     public AvroGenerator(ObjectWriteContext writeCtxt, IOContext ctxt,
@@ -158,9 +158,9 @@ public void setSchema(AvroSchema schema)
     }
 
     /*                                                                                       
-    /**********************************************************                              
+    /**********************************************************************
     /* Versioned                                                                             
-    /**********************************************************                              
+    /**********************************************************************
      */
 
     @Override
@@ -169,9 +169,9 @@ public Version version() {
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Output state handling
-    /**********************************************************
+    /**********************************************************************
      */
 
     @Override
@@ -186,11 +186,11 @@ public Object getCurrentValue() {
     public void setCurrentValue(Object v) {
         _tokenWriteContext.setCurrentValue(v);
     }
-    
+
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Overridden methods, configuration
-    /**********************************************************
+    /**********************************************************************
      */
 
     @Override
@@ -232,9 +232,9 @@ public void setSchema(FormatSchema schema)
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Extended API, configuration
-    /**********************************************************
+    /**********************************************************************
      */
 
     public AvroGenerator enable(Feature f) {
@@ -292,9 +292,9 @@ public final void writeStringField(String fieldName, String value)
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Public API: low-level I/O
-    /**********************************************************
+    /**********************************************************************
      */
 
     @Override
@@ -350,9 +350,9 @@ public void close() throws IOException
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Public API: structural output
-    /**********************************************************
+    /**********************************************************************
      */
 
     @Override
@@ -381,7 +381,7 @@ public final void writeEndArray() throws IOException
 
     @Override
     public final void writeStartObject() throws IOException {
-        _tokenWriteContext = _tokenWriteContext.createChildObjectContext();
+        _tokenWriteContext = _tokenWriteContext.createChildObjectContext(null);
         _complete = false;
     }
 
@@ -408,9 +408,9 @@ public final void writeEndObject() throws IOException
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Output method implementations, textual
-    /**********************************************************
+    /**********************************************************************
      */
 
     @Override
@@ -444,9 +444,9 @@ public final void writeUTF8String(byte[] text, int offset, int len) throws IOExc
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Output method implementations, unprocessed ("raw")
-    /**********************************************************
+    /**********************************************************************
      */
 
     @Override
@@ -494,9 +494,9 @@ public void writeRawValue(char[] text, int offset, int len) throws IOException {
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Output method implementations, base64-encoded binary
-    /**********************************************************
+    /**********************************************************************
      */
 
     @Override
@@ -510,9 +510,9 @@ public void writeBinary(Base64Variant b64variant, byte[] data, int offset, int l
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Output method implementations, primitive
-    /**********************************************************
+    /**********************************************************************
      */
 
     @Override
@@ -579,9 +579,9 @@ public void writeNumber(String encodedValue) throws IOException {
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Implementations for methods from base class
-    /**********************************************************
+    /**********************************************************************
      */
 
     @Override
@@ -600,9 +600,9 @@ protected void _releaseBuffers() {
     }
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Helper methods
-    /**********************************************************
+    /**********************************************************************
      */
 
     protected void _complete() throws IOException

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

@@ -70,10 +70,6 @@ public static AvroWriteContext nullContext() {
 
     public abstract AvroWriteContext createChildArrayContext(Object currValue) throws JsonMappingException;
 
-    public AvroWriteContext createChildObjectContext() throws JsonMappingException {
-        return createChildObjectContext(null);
-    }
-
     public abstract AvroWriteContext createChildObjectContext(Object currValue) throws JsonMappingException;
 
     public void complete() throws IOException {
@@ -115,6 +111,7 @@ public void setCurrentValue(Object v) {
      *    iff column was recognized)
      */
     public boolean writeFieldName(String name) throws IOException {
+        // To be overridden by Record/Map contexts
         return false;
     }
 
@@ -201,23 +198,33 @@ protected GenericArray<Object> _createArray(Schema schema)
         return new GenericData.Array<Object>(8, schema);
     }
 
+    // Removed from 2.10, should not be needed any more
+    /*
     protected AvroWriteContext _createObjectContext(Schema schema) throws JsonMappingException {
         if (schema.getType() == Type.UNION) {
             schema = _recordOrMapFromUnion(schema);
         }
         return _createObjectContext(schema, null); // Object doesn't matter as long as schema isn't a union
     }
+    */
 
     protected AvroWriteContext _createObjectContext(Schema schema, Object currValue)
             throws JsonMappingException
     {
         Type type = schema.getType();
         if (type == Schema.Type.UNION) {
-            try {
-                schema = resolveUnionSchema(schema, currValue);
-            } catch (UnresolvedUnionException e) {
-                // couldn't find an exact match
+            // 14-Aug-2019, tatu: Mapping null is bit special; and without special handling
+            //   we get an exception after fix for [dataformats-binary#168]
+            //  ... but I am not sure I fully understand what or why, actually.
+            if (currValue == null) {
                 schema = _recordOrMapFromUnion(schema);
+            } else {
+                try {
+                    schema = resolveUnionSchema(schema, currValue);
+                } catch (UnresolvedUnionException e) {
+                    // couldn't find an exact match
+                    schema = _recordOrMapFromUnion(schema);
+                }
             }
             type = schema.getType();
         }

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

@@ -47,18 +47,6 @@ public final AvroWriteContext createChildArrayContext(Object currValue)
         return child;
     }
 
-    @Override
-    public AvroWriteContext createChildObjectContext() throws JsonMappingException {
-        _verifyValueWrite();
-        Schema.Field field = _findField();
-        if (field == null) { // unknown, to ignore
-            return new NopWriteContext(TYPE_OBJECT, this, _generator, null);
-        }
-        AvroWriteContext child = _createObjectContext(field.schema());
-        _record.put(_currentName, child.rawValue());
-        return child;
-    }    
-
     @Override
     public AvroWriteContext createChildObjectContext(Object currValue) throws JsonMappingException {
         _verifyValueWrite();

ion/src/main/java/com/fasterxml/jackson/dataformat/ion/polymorphism/IonAnnotationIntrospector.java

@@ -46,11 +46,11 @@
  */
 public class IonAnnotationIntrospector extends NopAnnotationIntrospector {
     private static final long serialVersionUID = 1L;
-    
-    private final boolean resolveAllTypes;
+
+//    private final boolean resolveAllTypes;
 
     public IonAnnotationIntrospector(boolean resolveAllTypes) {
-        this.resolveAllTypes = resolveAllTypes;
+//        this.resolveAllTypes = resolveAllTypes;
     }
 
     /**