Merge branch '3.1' into 3.2

Author: cowtowncoder

avro/src/main/java/tools/jackson/dataformat/avro/deser/AvroFieldDefaulters.java

@@ -31,11 +31,11 @@ public static AvroFieldReader createDefaulter(String name,
         case VALUE_NUMBER_INT:
             switch (defaultAsNode.numberType()) {
             case INT:
-                return new ScalarDefaults.FloatDefaults(name, defaultAsNode.asInt());
+                return new ScalarDefaults.IntDefaults(name, defaultAsNode.asInt());
             case BIG_INTEGER: // TODO: maybe support separately?
             case LONG:
             default:
-                return new ScalarDefaults.FloatDefaults(name, defaultAsNode.asLong());
+                return new ScalarDefaults.LongDefaults(name, defaultAsNode.asLong());
             }
         case VALUE_STRING:
             return new ScalarDefaults.StringDefaults(name, defaultAsNode.asString());

avro/src/main/java/tools/jackson/dataformat/avro/ser/AvroWriteContext.java

@@ -4,6 +4,7 @@
 import java.math.BigDecimal;
 import java.util.*;
 
+import org.apache.avro.LogicalTypes;
 import org.apache.avro.Schema;
 import org.apache.avro.Schema.Type;
 import org.apache.avro.UnresolvedUnionException;
@@ -164,6 +165,7 @@ protected GenericRecord _createRecord(Schema schema, Object currValue)
                 // couldn't find an exact match
                 schema = _recordOrMapFromUnion(schema);
             }
+            type = schema.getType();
         }
         if (type == Schema.Type.MAP) {
             throw new IllegalStateException("_createRecord should never be called for elements of type MAP");
@@ -182,6 +184,7 @@ protected GenericRecord _createRecord(Schema schema)
         Type type = schema.getType();
         if (type == Schema.Type.UNION) {
             schema = _recordOrMapFromUnion(schema);
+            type = schema.getType();
         }
         if (type == Schema.Type.MAP) {
             throw new IllegalStateException("_createRecord should never be called for elements of type MAP");
@@ -432,25 +435,41 @@ private static int _findNotNullIndex(List<Schema> types)
 
     private static int _resolveBigDecimalIndex(Schema unionSchema, List<Schema> types,
             BigDecimal value) {
-        int match = -1;
+        // Branches are considered in order of how well they retain the value,
+        // regardless of declaration order: "decimal" first, then String, then Double
+        int stringMatch = -1;
+        int doubleMatch = -1;
 
         for (int i = 0, size = types.size(); i < size; ++i) {
             Schema schema = types.get(i);
             Schema.Type t = schema.getType();
 
-            if (t == Type.DOUBLE) {
-                return i;
-            }
-            // BigDecimals can be shoved into a double, but optimally would be a String or byte[] with logical type information
-            if (t == Type.DOUBLE) {
-                match = i;
-                continue;
+            if (t == Type.BYTES || t == Type.FIXED) {
+                // Best match: retains both scale and type.
+                // NOTE: plain `bytes`/`fixed` must NOT be chosen, since conversion
+                // requires the "decimal" logical type to exist
+                if (schema.getLogicalType() instanceof LogicalTypes.Decimal) {
+                    return i;
+                }
+            } else if (t == Type.STRING) {
+                // Second best: retains all digits, but reads back as String
+                if (stringMatch < 0) {
+                    stringMatch = i;
+                }
+            } else if (t == Type.DOUBLE) {
+                // Last resort: lossy
+                if (doubleMatch < 0) {
+                    doubleMatch = i;
+                }
             }
         }
-        if (match < 0) {
-            match = ReflectData.get().resolveUnion(unionSchema, value);
+        if (stringMatch >= 0) {
+            return stringMatch;
         }
-        return match;
+        if (doubleMatch >= 0) {
+            return doubleMatch;
+        }
+        return ReflectData.get().resolveUnion(unionSchema, value);
     }
 
     private static int _resolveMapIndex(Schema unionSchema, List<Schema> types,

avro/src/main/java/tools/jackson/dataformat/avro/ser/RootContext.java

@@ -59,12 +59,17 @@ public final AvroWriteContext createChildObjectContext(Object currValue) {
         // verify that root type is record (or compatible)
         switch (_schema.getType()) {
         case RECORD:
-        case UNION: // maybe
             {
                 GenericRecord rec = _createRecord(_schema, currValue);
                 _rootValue = rec;
                 return new ObjectWriteContext(this, _generator, rec, currValue);
             }
+        case UNION: // maybe: may resolve to either Record or Map
+            {
+                AvroWriteContext child = _createObjectContext(_schema, currValue);
+                _rootValue = child.rawValue();
+                return child;
+            }
         case MAP: // used to not be supported
             {
                 MapWriteContext ctxt = new MapWriteContext(this, _generator, _schema, currValue);