Add detail to avro exception message

locationtech · Jun 1, 2016 · 69841b4 · 69841b4
1 parent 60521a8
commit 69841b4
Showing 1 changed file with 14 additions and 2 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
@@ -53,7 +53,13 @@ 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 {
+      format.decode(rec)
+    } catch {
+      case e: AvroTypeException =>
+        throw new AvroTypeException(e.getMessage + ". " +
+          "If attempting to read multiband tiles, a Reader[K, MultibandTile] is required rather than Reader[K, Tile]. Check to ensure your Reader instance is properly configured.")
+    }
   }
 
   def toJson[T: AvroRecordCodec](thing: T): String = {
@@ -75,6 +81,12 @@ 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 {
+      format.decode(rec)
+    } catch {
+      case e: AvroTypeException =>
+        throw new AvroTypeException(e.getMessage + ". " +
+          "If attempting to read multiband tiles, a Reader[K, MultibandTile] is required rather than Reader[K, Tile]. Check to ensure your Reader instance is properly configured.")
+    }
   }
 }