Cleanup ProductDeserializationError interface (#16)

azavea · Apr 11, 2022 · 91bf6f7 · 91bf6f7
1 parent 9d702ed
commit 91bf6f7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/core/src/main/scala/com/azavea/hiveless/serializers/HDeserializer.scala b/core/src/main/scala/com/azavea/hiveless/serializers/HDeserializer.scala
@@ -33,7 +33,7 @@ import org.apache.spark.sql.catalyst.util.ArrayData
 import shapeless.ops.coproduct.{CoproductToEither, EitherToCoproduct}
 import shapeless.{:+:, ::, CNil, Coproduct, Generic, HList, HNil, Inl, Inr, IsTuple}
 
-import scala.reflect.ClassTag
+import scala.reflect.{classTag, ClassTag}
 import scala.util.Try
 import scala.reflect.runtime.universe.TypeTag
 
@@ -48,11 +48,11 @@ object HDeserializer extends Serializable {
   sealed abstract class Errors(override val getMessage: String) extends RuntimeException
   object Errors {
     final case object NullArgument extends Errors("NULL argument passed.")
-    final case class ProductDeserializationError[T: HShow](clz: Class[_], name: String)
+    final case class ProductDeserializationError[T: ClassTag, A: HShow](name: String)
         extends Errors(
           s"""
-             |${clz.getName}: could not deserialize the $name input argument:
-             |should match one of the following types: ${HShow[T].show()}""".stripMargin
+             |${classTag[T]}: could not deserialize the $name input argument,
+             |it should match one of the following types: ${HShow[A].show()}""".stripMargin
         )
   }
 

diff --git a/...x/src/main/scala/com/azavea/hiveless/spark/spatial/rules/SpatialFilterPushdownRules.scala b/...x/src/main/scala/com/azavea/hiveless/spark/spatial/rules/SpatialFilterPushdownRules.scala
@@ -59,7 +59,7 @@ object SpatialFilterPushdownRules extends Rule[LogicalPlan] {
               // The second argument can be Geometry or Extent
               val (extent, isGeometry) = Try(g.convert[Geometry].extent -> true)
                 .orElse(Try(g.convert[Extent] -> false))
-                .getOrElse(throw ProductDeserializationError[ST_Intersects.Arg](classOf[ST_Intersects], "second"))
+                .getOrElse(throw ProductDeserializationError[ST_Intersects, ST_Intersects.Arg]("second"))
 
               // transform expression
               AndList(

diff --git a/spatial-index/src/main/scala/com/azavea/hiveless/spatial/index/ST_Intersects.scala b/spatial-index/src/main/scala/com/azavea/hiveless/spatial/index/ST_Intersects.scala
@@ -36,7 +36,7 @@ object ST_Intersects {
   def parseGeometry(a: Arg): Option[Geometry] = a.select[Geometry].orElse(a.select[Extent].map(_.toPolygon()))
 
   private def parseGeometryUnsafe(a: Arg, aname: String): Geometry =
-    parseGeometry(a).getOrElse(throw ProductDeserializationError[Arg](classOf[ST_Intersects], aname))
+    parseGeometry(a).getOrElse(throw ProductDeserializationError[ST_Intersects, Arg](aname))
 
   def function(left: Arg, right: Arg): Boolean = {
     val (l, r) = (parseGeometryUnsafe(left, "first"), parseGeometryUnsafe(right, "second"))