aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtRand <arand@soe.ucsc.edu>2018-02-08 20:32:04 -0800
committerArtRand <arand@soe.ucsc.edu>2018-02-08 20:32:04 -0800
commit5e9a5dfd7b76ded50001dc1f9866ed4a93098ddb (patch)
tree8f8e7fb7ad256634f964c0116562df1a15da28bb
parentbcfed5f3817ae28053fe6479a106a48205eeffa2 (diff)
downloaddriver-core-5e9a5dfd7b76ded50001dc1f9866ed4a93098ddb.tar.gz
driver-core-5e9a5dfd7b76ded50001dc1f9866ed4a93098ddb.tar.bz2
driver-core-5e9a5dfd7b76ded50001dc1f9866ed4a93098ddb.zip
change type variable
-rw-r--r--src/main/scala/xyz/driver/core/database/Converters.scala7
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())
}