Merge pull request #55 from jewertow/better-message-in-avro-conversion-exception

Piotr Rżysko · web-flow · commit 205d845bbfdb · 2021-02-05T10:11:33.000+01:00
Add more detailed message to AvroConversionException
diff --git a/converter/src/main/java/tech/allegro/schema/json2avro/converter/JsonGenericRecordReader.java b/converter/src/main/java/tech/allegro/schema/json2avro/converter/JsonGenericRecordReader.java
@@ -56,6 +56,8 @@ public GenericData.Record read(Map<String, Object> json, Schema schema) {
         Deque<String> path = new ArrayDeque<>();
         try {
             return readRecord(json, schema, path);
+        } catch (AvroTypeException ex) {
+            throw new AvroConversionException("Failed to convert JSON to Avro: " + ex.getMessage(), ex);
         } catch (AvroRuntimeException ex) {
             throw new AvroConversionException("Failed to convert JSON to Avro", ex);
         }
diff --git a/converter/src/test/groovy/tech/allegro/schema/json2avro/converter/JsonAvroConverterSpec.groovy b/converter/src/test/groovy/tech/allegro/schema/json2avro/converter/JsonAvroConverterSpec.groovy
@@ -122,7 +122,8 @@ class JsonAvroConverterSpec extends Specification {
         converter.convertToAvro(json.bytes, schema)
 
         then:
-        thrown AvroConversionException
+        def e = thrown AvroConversionException
+        e.message == "Failed to convert JSON to Avro: Field field_integer is expected to be type: java.lang.Number"
     }
 
     def "should ignore unknown fields"() {

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,8 @@ public GenericData.Record read(Map<String, Object> json, Schema schema) {`
`56`	`56`	`Deque<String> path = new ArrayDeque<>();`
`57`	`57`	`try {`
`58`	`58`	`return readRecord(json, schema, path);`
	`59`	`+ } catch (AvroTypeException ex) {`
	`60`	`+ throw new AvroConversionException("Failed to convert JSON to Avro: " + ex.getMessage(), ex);`
`59`	`61`	`} catch (AvroRuntimeException ex) {`
`60`	`62`	`throw new AvroConversionException("Failed to convert JSON to Avro", ex);`
`61`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,8 @@ class JsonAvroConverterSpec extends Specification {`
`122`	`122`	`converter.convertToAvro(json.bytes, schema)`
`123`	`123`
`124`	`124`	`then:`
`125`		`- thrown AvroConversionException`
	`125`	`+ def e = thrown AvroConversionException`
	`126`	`+ e.message == "Failed to convert JSON to Avro: Field field_integer is expected to be type: java.lang.Number"`
`126`	`127`	`}`
`127`	`128`
`128`	`129`	`def "should ignore unknown fields"() {`