diff options
author | Li Haoyi <haoyi.li@databricks.com> | 2019-09-14 18:51:36 +0800 |
---|---|---|
committer | Li Haoyi <haoyi.li@databricks.com> | 2019-09-14 18:53:05 +0800 |
commit | 0460ad2eca7fcdec1ff29c289dad4ecc76dde9c6 (patch) | |
tree | b82374dc8c564cb0b874d2beea61f0b0c37e2510 /cask/src/cask/endpoints | |
parent | 85e982a6bf9bd82524baf53546b31d85b426fa62 (diff) | |
download | cask-0460ad2eca7fcdec1ff29c289dad4ecc76dde9c6.tar.gz cask-0460ad2eca7fcdec1ff29c289dad4ecc76dde9c6.tar.bz2 cask-0460ad2eca7fcdec1ff29c289dad4ecc76dde9c6.zip |
Make `Input` a type param too
Diffstat (limited to 'cask/src/cask/endpoints')
-rw-r--r-- | cask/src/cask/endpoints/FormEndpoint.scala | 5 | ||||
-rw-r--r-- | cask/src/cask/endpoints/JsonEndpoint.scala | 8 | ||||
-rw-r--r-- | cask/src/cask/endpoints/StaticEndpoints.scala | 10 | ||||
-rw-r--r-- | cask/src/cask/endpoints/WebEndpoints.scala | 3 | ||||
-rw-r--r-- | cask/src/cask/endpoints/WebSocketEndpoint.scala | 5 |
5 files changed, 12 insertions, 19 deletions
diff --git a/cask/src/cask/endpoints/FormEndpoint.scala b/cask/src/cask/endpoints/FormEndpoint.scala index 264c169..38ce994 100644 --- a/cask/src/cask/endpoints/FormEndpoint.scala +++ b/cask/src/cask/endpoints/FormEndpoint.scala @@ -44,10 +44,9 @@ object FormReader{ } } class postForm(val path: String, override val subpath: Boolean = false) - extends Endpoint[Response.Raw] { + extends Endpoint[Response.Raw, Seq[FormEntry]] { val methods = Seq("post") - type Input = Seq[FormEntry] type InputParser[T] = FormReader[T] def wrapFunction(ctx: Request, delegate: Delegate): Router.Result[Response.Raw] = { @@ -68,6 +67,6 @@ class postForm(val path: String, override val subpath: Boolean = false) } } - def wrapPathSegment(s: String): Input = Seq(FormValue(s, new io.undertow.util.HeaderMap)) + def wrapPathSegment(s: String): Seq[FormEntry] = Seq(FormValue(s, new io.undertow.util.HeaderMap)) } diff --git a/cask/src/cask/endpoints/JsonEndpoint.scala b/cask/src/cask/endpoints/JsonEndpoint.scala index 2e3373f..c4740fd 100644 --- a/cask/src/cask/endpoints/JsonEndpoint.scala +++ b/cask/src/cask/endpoints/JsonEndpoint.scala @@ -40,9 +40,8 @@ object JsonData extends DataCompanion[JsonData]{ } class postJson(val path: String, override val subpath: Boolean = false) - extends Endpoint[Response[JsonData]]{ + extends Endpoint[Response[JsonData], ujson.Value]{ val methods = Seq("post") - type Input = ujson.Value type InputParser[T] = JsReader[T] override type OuterReturned = Router.Result[Response.Raw] def wrapFunction(ctx: Request, @@ -76,13 +75,12 @@ class postJson(val path: String, override val subpath: Boolean = false) case Right(params) => delegate(params) } } - def wrapPathSegment(s: String): Input = ujson.Str(s) + def wrapPathSegment(s: String): ujson.Value = ujson.Str(s) } class getJson(val path: String, override val subpath: Boolean = false) - extends Endpoint[Response[JsonData]]{ + extends Endpoint[Response[JsonData], Seq[String]]{ val methods = Seq("get") - type Input = Seq[String] type InputParser[T] = QueryParamReader[T] override type OuterReturned = Router.Result[Response.Raw] def wrapFunction(ctx: Request, delegate: Delegate): Router.Result[Response.Raw] = { diff --git a/cask/src/cask/endpoints/StaticEndpoints.scala b/cask/src/cask/endpoints/StaticEndpoints.scala index bf99d09..2f0568d 100644 --- a/cask/src/cask/endpoints/StaticEndpoints.scala +++ b/cask/src/cask/endpoints/StaticEndpoints.scala @@ -3,9 +3,8 @@ package cask.endpoints import cask.main.Endpoint import cask.model.Request -class staticFiles(val path: String) extends Endpoint[String]{ +class staticFiles(val path: String) extends Endpoint[String, Seq[String]]{ val methods = Seq("get") - type Input = Seq[String] type InputParser[T] = QueryParamReader[T] override def subpath = true def wrapFunction(ctx: Request, delegate: Delegate): OuterReturned = { @@ -18,13 +17,12 @@ class staticFiles(val path: String) extends Endpoint[String]{ ) } - def wrapPathSegment(s: String): Input = Seq(s) + def wrapPathSegment(s: String): Seq[String] = Seq(s) } class staticResources(val path: String, resourceRoot: ClassLoader = getClass.getClassLoader) - extends Endpoint[String]{ + extends Endpoint[String, Seq[String]]{ val methods = Seq("get") - type Input = Seq[String] type InputParser[T] = QueryParamReader[T] override def subpath = true def wrapFunction(ctx: Request, delegate: Delegate): OuterReturned = { @@ -38,5 +36,5 @@ class staticResources(val path: String, resourceRoot: ClassLoader = getClass.get ) } - def wrapPathSegment(s: String): Input = Seq(s) + def wrapPathSegment(s: String): Seq[String] = Seq(s) } diff --git a/cask/src/cask/endpoints/WebEndpoints.scala b/cask/src/cask/endpoints/WebEndpoints.scala index b52b290..ae1e178 100644 --- a/cask/src/cask/endpoints/WebEndpoints.scala +++ b/cask/src/cask/endpoints/WebEndpoints.scala @@ -7,8 +7,7 @@ import cask.model.{Request, Response} import collection.JavaConverters._ -trait WebEndpoint extends Endpoint[Response.Raw]{ - type Input = Seq[String] +trait WebEndpoint extends Endpoint[Response.Raw, Seq[String]]{ type InputParser[T] = QueryParamReader[T] def wrapFunction(ctx: Request, delegate: Delegate): Router.Result[Response.Raw] = { diff --git a/cask/src/cask/endpoints/WebSocketEndpoint.scala b/cask/src/cask/endpoints/WebSocketEndpoint.scala index ca2854f..dff2232 100644 --- a/cask/src/cask/endpoints/WebSocketEndpoint.scala +++ b/cask/src/cask/endpoints/WebSocketEndpoint.scala @@ -14,14 +14,13 @@ object WebsocketResult{ } class websocket(val path: String, override val subpath: Boolean = false) - extends cask.main.BaseEndpoint[WebsocketResult]{ + extends cask.main.BaseEndpoint[WebsocketResult, Seq[String]]{ val methods = Seq("websocket") - type Input = Seq[String] type InputParser[T] = QueryParamReader[T] type OuterReturned = Router.Result[WebsocketResult] def wrapFunction(ctx: Request, delegate: Delegate): OuterReturned = { delegate(WebEndpoint.buildMapFromQueryParams(ctx)) } - def wrapPathSegment(s: String): Input = Seq(s) + def wrapPathSegment(s: String): Seq[String] = Seq(s) } |