diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2019-10-09 10:54:16 +0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2019-10-09 10:54:16 +0800 |
commit | 70dbe3ed561172a80ebff0515e727434b03040bf (patch) | |
tree | 01b05644facea813452e6c548ea3458c0fc5fdb7 /example | |
parent | 0f0f945abd365c9f6f83b3d315cea30eacb6ed51 (diff) | |
download | cask-70dbe3ed561172a80ebff0515e727434b03040bf.tar.gz cask-70dbe3ed561172a80ebff0515e727434b03040bf.tar.bz2 cask-70dbe3ed561172a80ebff0515e727434b03040bf.zip |
Convert `Decorator#OuterReturned` into a type parameter
Diffstat (limited to 'example')
-rw-r--r-- | example/decorated/app/src/Decorated.scala | 4 | ||||
-rw-r--r-- | example/decorated2/app/src/Decorated2.scala | 4 | ||||
-rw-r--r-- | example/endpoints/app/src/Endpoints.scala | 2 | ||||
-rw-r--r-- | example/todo/app/src/TodoServer.scala | 2 | ||||
-rw-r--r-- | example/todoDb/app/src/TodoMvcDb.scala | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/example/decorated/app/src/Decorated.scala b/example/decorated/app/src/Decorated.scala index a88bd2e..6649988 100644 --- a/example/decorated/app/src/Decorated.scala +++ b/example/decorated/app/src/Decorated.scala @@ -4,12 +4,12 @@ object Decorated extends cask.MainRoutes{ override def toString = "[haoyi]" } class loggedIn extends cask.RawDecorator { - def wrapFunction(ctx: cask.Request, delegate: Delegate): OuterReturned = { + def wrapFunction(ctx: cask.Request, delegate: Delegate) = { delegate(Map("user" -> new User())) } } class withExtra extends cask.RawDecorator { - def wrapFunction(ctx: cask.Request, delegate: Delegate): OuterReturned = { + def wrapFunction(ctx: cask.Request, delegate: Delegate) = { delegate(Map("extra" -> 31337)) } } diff --git a/example/decorated2/app/src/Decorated2.scala b/example/decorated2/app/src/Decorated2.scala index 305281a..4a3b9cc 100644 --- a/example/decorated2/app/src/Decorated2.scala +++ b/example/decorated2/app/src/Decorated2.scala @@ -4,12 +4,12 @@ object Decorated2 extends cask.MainRoutes{ override def toString = "[haoyi]" } class loggedIn extends cask.RawDecorator { - def wrapFunction(ctx: cask.Request, delegate: Delegate): OuterReturned = { + def wrapFunction(ctx: cask.Request, delegate: Delegate) = { delegate(Map("user" -> new User())) } } class withExtra extends cask.RawDecorator { - def wrapFunction(ctx: cask.Request, delegate: Delegate): OuterReturned = { + def wrapFunction(ctx: cask.Request, delegate: Delegate) = { delegate(Map("extra" -> 31337)) } } diff --git a/example/endpoints/app/src/Endpoints.scala b/example/endpoints/app/src/Endpoints.scala index 9722673..f59983c 100644 --- a/example/endpoints/app/src/Endpoints.scala +++ b/example/endpoints/app/src/Endpoints.scala @@ -2,7 +2,7 @@ package app class custom(val path: String, val methods: Seq[String]) extends cask.HttpEndpoint[Int, Seq[String]]{ - def wrapFunction(ctx: cask.Request, delegate: Delegate): OuterReturned = { + def wrapFunction(ctx: cask.Request, delegate: Delegate) = { delegate(Map()).map{num => cask.Response("Echo " + num, statusCode = num) } diff --git a/example/todo/app/src/TodoServer.scala b/example/todo/app/src/TodoServer.scala index 2df6fb2..8b498b5 100644 --- a/example/todo/app/src/TodoServer.scala +++ b/example/todo/app/src/TodoServer.scala @@ -16,7 +16,7 @@ object TodoServer extends cask.MainRoutes{ class transactional extends cask.RawDecorator{ class TransactionFailed(val value: cask.router.Result.Error) extends Exception - def wrapFunction(pctx: cask.Request, delegate: Delegate): OuterReturned = { + def wrapFunction(pctx: cask.Request, delegate: Delegate) = { try ctx.transaction( delegate(Map()) match{ case cask.router.Result.Success(t) => cask.router.Result.Success(t) diff --git a/example/todoDb/app/src/TodoMvcDb.scala b/example/todoDb/app/src/TodoMvcDb.scala index 0bb25c0..66109f4 100644 --- a/example/todoDb/app/src/TodoMvcDb.scala +++ b/example/todoDb/app/src/TodoMvcDb.scala @@ -15,7 +15,7 @@ object TodoMvcDb extends cask.MainRoutes{ class transactional extends cask.RawDecorator{ class TransactionFailed(val value: cask.router.Result.Error) extends Exception - def wrapFunction(pctx: cask.Request, delegate: Delegate): OuterReturned = { + def wrapFunction(pctx: cask.Request, delegate: Delegate) = { try ctx.transaction( delegate(Map()) match{ case cask.router.Result.Success(t) => cask.router.Result.Success(t) |