diff options
| -rw-r--r-- | project/plugins.sbt | 2 | ||||
| -rw-r--r-- | src/main/scala/xyz/driver/core/database/Dal.scala | 20 |
2 files changed, 5 insertions, 17 deletions
diff --git a/project/plugins.sbt b/project/plugins.sbt index 981c484..a4722e8 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ resolvers += "releases" at "https://drivergrp.jfrog.io/drivergrp/releases" credentials += Credentials("Artifactory Realm", "drivergrp.jfrog.io", "sbt-publisher", "ANC-d8X-Whm-USS") -addSbtPlugin("xyz.driver" % "sbt-settings" % "0.5.47") +addSbtPlugin("xyz.driver" % "sbt-settings" % "0.5.48") diff --git a/src/main/scala/xyz/driver/core/database/Dal.scala b/src/main/scala/xyz/driver/core/database/Dal.scala index b476c0d..e920392 100644 --- a/src/main/scala/xyz/driver/core/database/Dal.scala +++ b/src/main/scala/xyz/driver/core/database/Dal.scala @@ -2,7 +2,7 @@ package xyz.driver.core.database import scala.concurrent.{ExecutionContext, Future} -import scalaz.{ListT, Monad, OptionT} +import scalaz.{ListT, Monad} import scalaz.std.scalaFuture._ trait Dal { @@ -10,8 +10,6 @@ trait Dal { protected implicit val monadT: Monad[T] protected def execute[D](operations: T[D]): Future[D] - protected def execute[D](readOperations: OptionT[T, D]): OptionT[Future, D] - protected def execute[D](readOperations: ListT[T, D]): ListT[Future, D] protected def noAction[V](v: V): T[V] protected def customAction[R](action: => Future[R]): T[R] } @@ -21,11 +19,9 @@ class FutureDal(executionContext: ExecutionContext) extends Dal { override type T[D] = Future[D] implicit val monadT = implicitly[Monad[Future]] - def execute[D](operations: T[D]): Future[D] = operations - def execute[D](operations: OptionT[T, D]): OptionT[Future, D] = OptionT(operations.run) - def execute[D](operations: ListT[T, D]): ListT[Future, D] = ListT(operations.run) - def noAction[V](v: V): T[V] = Future.successful(v) - def customAction[R](action: => Future[R]): T[R] = action + def execute[D](operations: T[D]): Future[D] = operations + def noAction[V](v: V): T[V] = Future.successful(v) + def customAction[R](action: => Future[R]): T[R] = action } class SlickDal(database: Database, executionContext: ExecutionContext) extends Dal { @@ -46,14 +42,6 @@ class SlickDal(database: Database, executionContext: ExecutionContext) extends D database.database.run(readOperations.transactionally) } - override def execute[D](readOperations: OptionT[T, D]): OptionT[Future, D] = { - OptionT(database.database.run(readOperations.run.transactionally)) - } - - override def execute[D](readOperations: ListT[T, D]): ListT[Future, D] = { - ListT(database.database.run(readOperations.run.transactionally)) - } - override def noAction[V](v: V): T[V] = DBIO.successful(v) override def customAction[R](action: => Future[R]): T[R] = DBIO.from(action) } |