diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-07-28 20:35:51 +0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-07-28 21:03:15 +0800 |
commit | 229ab52fe36c0882bac8aa84ae484a12d339242a (patch) | |
tree | e9f8f5de1309cec044b6eb8c83f3fc5a86e5beda /cask/src/cask/endpoints | |
parent | 8b14cd206e008b4001f9b257f48870c8d40e8498 (diff) | |
download | cask-229ab52fe36c0882bac8aa84ae484a12d339242a.tar.gz cask-229ab52fe36c0882bac8aa84ae484a12d339242a.tar.bz2 cask-229ab52fe36c0882bac8aa84ae484a12d339242a.zip |
wip more readme
Diffstat (limited to 'cask/src/cask/endpoints')
-rw-r--r-- | cask/src/cask/endpoints/FormEndpoint.scala | 4 | ||||
-rw-r--r-- | cask/src/cask/endpoints/JsonEndpoint.scala | 2 | ||||
-rw-r--r-- | cask/src/cask/endpoints/StaticEndpoints.scala | 4 | ||||
-rw-r--r-- | cask/src/cask/endpoints/WebEndpoints.scala | 10 |
4 files changed, 12 insertions, 8 deletions
diff --git a/cask/src/cask/endpoints/FormEndpoint.scala b/cask/src/cask/endpoints/FormEndpoint.scala index 715c803..525dfde 100644 --- a/cask/src/cask/endpoints/FormEndpoint.scala +++ b/cask/src/cask/endpoints/FormEndpoint.scala @@ -56,13 +56,13 @@ class postForm(val path: String, override val subpath: Boolean = false) extends "Unable to parse form data: " + e + "\n" + Util.stackTraceString(e) ))} } yield { - val formDataBindings = + cask.main.Decor( formData .iterator() .asScala .map(k => (k, formData.get(k).asScala.map(FormEntry.fromUndertow).toSeq)) .toMap - formDataBindings + ) } } def wrapPathSegment(s: String): Input = 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 425f942..853e07d 100644 --- a/cask/src/cask/endpoints/JsonEndpoint.scala +++ b/cask/src/cask/endpoints/JsonEndpoint.scala @@ -43,7 +43,7 @@ class postJson(val path: String, override val subpath: Boolean = false) extends obj <- try Right(json.obj) catch {case e: Throwable => Left(cask.model.Response("Input JSON must be a dictionary"))} - } yield obj.toMap + } yield cask.main.Decor(obj.toMap) } def wrapPathSegment(s: String): Input = ujson.Js.Str(s) } diff --git a/cask/src/cask/endpoints/StaticEndpoints.scala b/cask/src/cask/endpoints/StaticEndpoints.scala index 436fd25..7e1e6dd 100644 --- a/cask/src/cask/endpoints/StaticEndpoints.scala +++ b/cask/src/cask/endpoints/StaticEndpoints.scala @@ -14,6 +14,8 @@ class static(val path: String) extends Endpoint[String] { Router.Result.Success(cask.model.Static(t + "/" + ctx.remaining.mkString("/"))) } - def getRawParams(ctx: ParamContext) = Right(Map()) + def getRawParams(ctx: ParamContext) = Right( + cask.main.Decor(Map()) + ) def wrapPathSegment(s: String): Input = Seq(s) } diff --git a/cask/src/cask/endpoints/WebEndpoints.scala b/cask/src/cask/endpoints/WebEndpoints.scala index d0ac46d..a5b2d02 100644 --- a/cask/src/cask/endpoints/WebEndpoints.scala +++ b/cask/src/cask/endpoints/WebEndpoints.scala @@ -11,10 +11,12 @@ trait WebEndpoint extends Endpoint[BaseResponse]{ type Input = Seq[String] type InputParser[T] = QueryParamReader[T] def getRawParams(ctx: ParamContext) = Right( - ctx.exchange.getQueryParameters - .asScala - .map{case (k, vs) => (k, vs.asScala.toArray.toSeq)} - .toMap + cask.main.Decor( + ctx.exchange.getQueryParameters + .asScala + .map{case (k, vs) => (k, vs.asScala.toArray.toSeq)} + .toMap + ) ) def wrapPathSegment(s: String) = Seq(s) } |