Merge pull request #1505 from moradology/fix/avro-type-error-detail

Add detail to avro exception message
locationtech · Jun 28, 2016 · 4a80fb9 · 4a80fb9
2 parents 6700643 + e75c336
commit 4a80fb9
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/spark/src/main/scala/geotrellis/spark/io/avro/AvroEncoder.scala b/spark/src/main/scala/geotrellis/spark/io/avro/AvroEncoder.scala
@@ -52,8 +52,14 @@ object AvroEncoder {
 
     val reader = new GenericDatumReader[GenericRecord](writerSchema, schema)
     val decoder = DecoderFactory.get().binaryDecoder(decompress(bytes), null)
-    val rec = reader.read(null.asInstanceOf[GenericRecord], decoder)
-    format.decode(rec)
+    try {
+      val rec = reader.read(null.asInstanceOf[GenericRecord], decoder)
+      format.decode(rec)
+    } catch {
+      case e: AvroTypeException =>
+        throw new AvroTypeException(e.getMessage + ". " +
+          "This can be caused by using a type parameter which doesn't match the object being deserialized.")
+    }
   }
 
   def toJson[T: AvroRecordCodec](thing: T): String = {
@@ -74,7 +80,13 @@ object AvroEncoder {
 
     val reader = new GenericDatumReader[GenericRecord](schema)
     val decoder = DecoderFactory.get().jsonDecoder(schema, json)
-    val rec = reader.read(null.asInstanceOf[GenericRecord], decoder)
-    format.decode(rec)
+    try {
+      val rec = reader.read(null.asInstanceOf[GenericRecord], decoder)
+      format.decode(rec)
+    } catch {
+      case e: AvroTypeException =>
+        throw new AvroTypeException(e.getMessage + ". " +
+          "This can be caused by using a type parameter which doesn't match the object being deserialized.")
+    }
   }
 }