Merge pull request #111 from drivergroup/ar-change-type-variable

#110 - change type variable

1 files changed, 3 insertions, 4 deletions

diff --git a/src/main/scala/xyz/driver/core/database/Converters.scala b/src/main/scala/xyz/driver/core/database/Converters.scala
index cfc5afd..f98d6b4 100644
--- a/src/main/scala/xyz/driver/core/database/Converters.scala
+++ b/src/main/scala/xyz/driver/core/database/Converters.scala
@@ -5,10 +5,9 @@ import xyz.driver.core.rest.errors.DatabaseException
 import scala.reflect.ClassTag
 
 trait Converters {
-  def fromStringOrThrow[T](entityStr: String, mapper: (String => Option[T]), entityName: String): T =
+  def fromStringOrThrow[ADT](entityStr: String, mapper: (String => Option[ADT]), entityName: String): ADT =
     mapper(entityStr).getOrElse(throw DatabaseException(s"Invalid $entityName in database: $entityStr"))
 
-  def expectValid[T](mapper: String => Option[T], query: String)(implicit ct: ClassTag[T]): T = {
-    fromStringOrThrow[T](query, mapper, ct.toString())
-  }
+  def expectValid[ADT](mapper: String => Option[ADT], query: String)(implicit ct: ClassTag[ADT]): ADT =
+    fromStringOrThrow[ADT](query, mapper, ct.toString())
 }