diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-08-18 12:19:51 +0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-08-18 12:19:51 +0800 |
commit | 907695586cf144a63b59c26f76bad53907a7fb38 (patch) | |
tree | 7a086c58d9677d30d0a22cb479ffdca91ca31477 | |
parent | 1440ae9010e6615e83ee44d8d74d9708a568b07b (diff) | |
download | cask-907695586cf144a63b59c26f76bad53907a7fb38.tar.gz cask-907695586cf144a63b59c26f76bad53907a7fb38.tar.bz2 cask-907695586cf144a63b59c26f76bad53907a7fb38.zip |
Swap out `WebsocketParam` for identical `QueryParamReader`
-rw-r--r-- | cask/src/cask/endpoints/WebSocketEndpoint.scala | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/cask/src/cask/endpoints/WebSocketEndpoint.scala b/cask/src/cask/endpoints/WebSocketEndpoint.scala index 8c6bc16..f747341 100644 --- a/cask/src/cask/endpoints/WebSocketEndpoint.scala +++ b/cask/src/cask/endpoints/WebSocketEndpoint.scala @@ -2,32 +2,7 @@ package cask.endpoints import cask.internal.Router import cask.model.Request -import io.undertow.server.HttpServerExchange import io.undertow.websockets.WebSocketConnectionCallback -trait WebsocketParam[T] extends Router.ArgReader[Seq[String], T, cask.model.Request] - -object WebsocketParam{ - class NilParam[T](f: (Request, String) => T) extends WebsocketParam[T]{ - def arity = 0 - def read(ctx: Request, label: String, v: Seq[String]): T = f(ctx, label) - } - implicit object HttpExchangeParam extends NilParam[HttpServerExchange]( - (ctx, label) => ctx.exchange - ) - class SimpleParam[T](f: String => T) extends WebsocketParam[T]{ - def arity = 1 - def read(ctx: cask.model.Request, label: String, v: Seq[String]): T = f(v.head) - } - - implicit object StringParam extends SimpleParam[String](x => x) - implicit object BooleanParam extends SimpleParam[Boolean](_.toBoolean) - implicit object ByteParam extends SimpleParam[Byte](_.toByte) - implicit object ShortParam extends SimpleParam[Short](_.toShort) - implicit object IntParam extends SimpleParam[Int](_.toInt) - implicit object LongParam extends SimpleParam[Long](_.toLong) - implicit object DoubleParam extends SimpleParam[Double](_.toDouble) - implicit object FloatParam extends SimpleParam[Float](_.toFloat) -} sealed trait WebsocketResult object WebsocketResult{ @@ -39,7 +14,7 @@ class websocket(val path: String, override val subpath: Boolean = false) extends type Output = WebsocketResult val methods = Seq("websocket") type Input = Seq[String] - type InputParser[T] = WebsocketParam[T] + type InputParser[T] = QueryParamReader[T] type Returned = Router.Result[WebsocketResult] def wrapFunction(ctx: Request, delegate: Delegate): Returned = delegate(Map()) |