1 files changed, 8 insertions, 9 deletions
diff --git a/cask/src/cask/endpoints/JsonEndpoint.scala b/cask/src/cask/endpoints/JsonEndpoint.scala
index ca66f67..38e15fe 100644
--- a/cask/src/cask/endpoints/JsonEndpoint.scala
+++ b/cask/src/cask/endpoints/JsonEndpoint.scala
@@ -3,16 +3,16 @@ package cask.endpoints
 import cask.internal.Router
 import cask.internal.Router.EntryPoint
 import cask.main.Routes
-import cask.model.Response
+import cask.model.{ParamContext, Response}
 import io.undertow.server.HttpServerExchange
 
 
-sealed trait JsReader[T] extends Router.ArgReader[ujson.Js.Value, T, (HttpServerExchange, Seq[String])]
+sealed trait JsReader[T] extends Router.ArgReader[ujson.Js.Value, T, cask.model.ParamContext]
 object JsReader{
   implicit def defaultJsReader[T: upickle.default.Reader] = new JsReader[T]{
     def arity = 1
 
-    def read(ctx: (HttpServerExchange, Seq[String]), input: ujson.Js.Value): T = {
+    def read(ctx: cask.model.ParamContext, input: ujson.Js.Value): T = {
       implicitly[upickle.default.Reader[T]].apply(input)
     }
   }
@@ -20,7 +20,7 @@ object JsReader{
   implicit def paramReader[T: ParamReader] = new JsReader[T] {
     override def arity = 0
 
-    override def read(ctx: (HttpServerExchange, Seq[String]), v: ujson.Js.Value) = {
+    override def read(ctx: cask.model.ParamContext, v: ujson.Js.Value) = {
       implicitly[ParamReader[T]].read(ctx, Nil)
     }
   }
@@ -29,18 +29,17 @@ class postJson(val path: String, override val subpath: Boolean = false)  extends
   type InputType = ujson.Js.Value
   def wrapMethodOutput(t: Response) = t
   def parseMethodInput[T](implicit p: JsReader[T]) = p
-  def handle(exchange: HttpServerExchange,
-             remaining: Seq[String],
+  def handle(ctx: ParamContext,
              bindings: Map[String, String],
              routes: Routes,
-             entryPoint: EntryPoint[ujson.Js.Value, Routes, (HttpServerExchange, Seq[String])]): Router.Result[Response] = {
+             entryPoint: EntryPoint[ujson.Js.Value, Routes, cask.model.ParamContext]): Router.Result[Response] = {
 
-    val js = ujson.read(new String(exchange.getInputStream.readAllBytes())).asInstanceOf[ujson.Js.Obj]
+    val js = ujson.read(new String(ctx.exchange.getInputStream.readAllBytes())).asInstanceOf[ujson.Js.Obj]
 
     js.obj
     val allBindings = bindings.mapValues(ujson.Js.Str(_))
 
-    entryPoint.invoke(routes, (exchange, remaining), js.obj.toMap ++ allBindings)
+    entryPoint.invoke(routes, ctx, js.obj.toMap ++ allBindings)
       .asInstanceOf[Router.Result[Response]]
   }
 }