aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvlad <vlad@driver.xyz>2017-04-11 16:21:09 -0700
committervlad <vlad@driver.xyz>2017-04-11 16:21:09 -0700
commitf92036251d778a6c7a0445a46c1fdda930e19cfc (patch)
treeaccdaf6c1450745bdbac97a7ba69d46130ad00cc
parent30d771fe7d2e19c1d26a04bbe0eb771fd8513d67 (diff)
downloaddriver-core-f92036251d778a6c7a0445a46c1fdda930e19cfc.tar.gz
driver-core-f92036251d778a6c7a0445a46c1fdda930e19cfc.tar.bz2
driver-core-f92036251d778a6c7a0445a46c1fdda930e19cfc.zip
Review comments
-rw-r--r--src/main/scala/xyz/driver/core/database/Dal.scala8
-rw-r--r--src/main/scala/xyz/driver/core/swagger.scala6
2 files changed, 10 insertions, 4 deletions
diff --git a/src/main/scala/xyz/driver/core/database/Dal.scala b/src/main/scala/xyz/driver/core/database/Dal.scala
index d863e50..1bc3827 100644
--- a/src/main/scala/xyz/driver/core/database/Dal.scala
+++ b/src/main/scala/xyz/driver/core/database/Dal.scala
@@ -3,7 +3,7 @@ package xyz.driver.core.database
import slick.lifted.AbstractTable
import scala.concurrent.{ExecutionContext, Future}
-import scalaz.{ListT, Monad}
+import scalaz.{ListT, Monad, OptionT}
import scalaz.std.scalaFuture._
trait Dal {
@@ -13,6 +13,12 @@ trait Dal {
def execute[D](operations: T[D]): Future[D]
def noAction[V](v: V): T[V]
def customAction[R](action: => Future[R]): T[R]
+
+ def execute[D](action: => OptionT[T, D]): OptionT[Future, D] =
+ action.mapT(execute[Option[D]])
+
+ def customAction[R](action: => OptionT[Future, R]): OptionT[T, R] =
+ OptionT[T, R](customAction(action.run))
}
class FutureDal(executionContext: ExecutionContext) extends Dal {
diff --git a/src/main/scala/xyz/driver/core/swagger.scala b/src/main/scala/xyz/driver/core/swagger.scala
index 09dae1e..3a6faff 100644
--- a/src/main/scala/xyz/driver/core/swagger.scala
+++ b/src/main/scala/xyz/driver/core/swagger.scala
@@ -20,8 +20,8 @@ object swagger {
def stringProperty(pattern: Option[String] = None, example: Option[String] = None): Property = {
make(new StringProperty()) { sp =>
sp.required(true)
- example.map(sp.example)
- pattern.map(sp.pattern)
+ example.foreach(sp.example)
+ pattern.foreach(sp.pattern)
}
}
@@ -35,7 +35,7 @@ object swagger {
def numericProperty(example: Option[AnyRef] = None): Property = {
make(PrimitiveType.DECIMAL.createProperty()) { dp =>
dp.setRequired(true)
- example.foreach(e => dp.setExample(e))
+ example.foreach(dp.setExample)
}
}