diff options
author | Arthur Rand <arand@ucsc.edu> | 2018-02-08 20:55:17 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-08 20:55:17 -0800 |
commit | 3765c504d8bdfcc7ca3a5bdafa44351c1908596e (patch) | |
tree | 8f8e7fb7ad256634f964c0116562df1a15da28bb | |
parent | df887f74ff73e3ba5352391dce5843806eb300e6 (diff) | |
parent | 5e9a5dfd7b76ded50001dc1f9866ed4a93098ddb (diff) | |
download | driver-core-3765c504d8bdfcc7ca3a5bdafa44351c1908596e.tar.gz driver-core-3765c504d8bdfcc7ca3a5bdafa44351c1908596e.tar.bz2 driver-core-3765c504d8bdfcc7ca3a5bdafa44351c1908596e.zip |
Merge pull request #111 from drivergroup/ar-change-type-variable
#110 - change type variable
-rw-r--r-- | src/main/scala/xyz/driver/core/database/Converters.scala | 7 |
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()) } |