AVRO-3791: Include field in readField AvroTypeException (#2420)

In order to bring more clarity and save users time error messages include
the field avro fails to read. It is now immediately apparent which field
in a record has issues that need correcting.

Author: LDonoughe-mdsol

lang/java/avro/src/main/java/org/apache/avro/generic/GenericDatumReader.java

@@ -27,6 +27,7 @@
 import java.util.function.Function;
 
 import org.apache.avro.AvroRuntimeException;
+import org.apache.avro.AvroTypeException;
 import org.apache.avro.Conversion;
 import org.apache.avro.Conversions;
 import org.apache.avro.LogicalType;
@@ -257,7 +258,12 @@ protected Object readRecord(Object old, Schema expected, ResolvingDecoder in) th
    */
   protected void readField(Object record, Field field, Object oldDatum, ResolvingDecoder in, Object state)
       throws IOException {
-    data.setField(record, field.name(), field.pos(), read(oldDatum, field.schema(), in), state);
+    try {
+      data.setField(record, field.name(), field.pos(), read(oldDatum, field.schema(), in), state);
+    } catch(AvroTypeException exception) {
+      String message = "Field \"" + field.name() + "\" content mismatch: " + exception.getMessage();
+      throw new AvroTypeException(message, exception.getCause());
+    }
   }
 
   /**

lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibilityEnumDefaults.java

@@ -22,6 +22,7 @@
 import static org.apache.avro.TestSchemas.ENUM2_AB_SCHEMA;
 import static org.apache.avro.TestSchemas.ENUM_ABC_ENUM_DEFAULT_A_SCHEMA;
 import static org.apache.avro.TestSchemas.ENUM_AB_ENUM_DEFAULT_A_SCHEMA;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
@@ -53,7 +54,7 @@ void enumDefaultNotAppliedWhenWriterFieldMissing() throws Exception {
     datum.put("field2", new GenericData.EnumSymbol(writerSchema, "B"));
     AvroTypeException avroTypeException = assertThrows(AvroTypeException.class,
         () -> serializeWithWriterThenDeserializeWithReader(writerSchema, datum, readerSchema));
-    assertEquals("Found Record1, expecting Record1, missing required field field1", avroTypeException.getMessage());
+    assertTrue(avroTypeException.getMessage().contains("Found Record1, expecting Record1, missing required field field1"));
   }
 
   @Test
@@ -111,7 +112,7 @@ void fieldDefaultNotAppliedForUnknownSymbol() throws Exception {
     datum.put("field1", new GenericData.EnumSymbol(writerSchema, "C"));
     AvroTypeException avroTypeException = assertThrows(AvroTypeException.class,
         () -> serializeWithWriterThenDeserializeWithReader(writerSchema, datum, readerSchema));
-    assertEquals("No match for C", avroTypeException.getMessage());
+    assertEquals("Field \"field1\" content mismatch: No match for C", avroTypeException.getMessage());
   }
 
   private GenericRecord serializeWithWriterThenDeserializeWithReader(Schema writerSchema, GenericRecord datum,

lang/java/avro/src/test/java/org/apache/avro/TestUnionError.java

@@ -79,6 +79,6 @@ void unionErrorMessage() throws IOException {
 
     GenericDatumReader<GenericRecord> datumReader = new GenericDatumReader<>(writerSchema, readerSchema);
     AvroTypeException avroException = assertThrows(AvroTypeException.class, () -> datumReader.read(null, decoder));
-    assertEquals("Found B, expecting union[A, float]", avroException.getMessage());
+    assertEquals("Field \"c\" content mismatch: Found B, expecting union[A, float]", avroException.getMessage());
   }
 }