3 files changed, 7 insertions, 7 deletions
diff --git a/cask/src/cask/endpoints/JsonEndpoint.scala b/cask/src/cask/endpoints/JsonEndpoint.scala
index 31109d9..098bc82 100644
--- a/cask/src/cask/endpoints/JsonEndpoint.scala
+++ b/cask/src/cask/endpoints/JsonEndpoint.scala
@@ -44,7 +44,7 @@ class postJson(val path: String, override val subpath: Boolean = false)
   extends HttpEndpoint[Response[JsonData], ujson.Value]{
   val methods = Seq("post")
   type InputParser[T] = JsReader[T]
-  override type OuterReturned = Result[Response.Raw]
+
   def wrapFunction(ctx: Request,
                    delegate: Delegate): Result[Response.Raw] = {
     val obj = for{
@@ -83,7 +83,7 @@ class getJson(val path: String, override val subpath: Boolean = false)
   extends HttpEndpoint[Response[JsonData], Seq[String]]{
   val methods = Seq("get")
   type InputParser[T] = QueryParamReader[T]
-  override type OuterReturned = Result[Response.Raw]
+
   def wrapFunction(ctx: Request, delegate: Delegate): Result[Response.Raw] = {
     delegate(WebEndpoint.buildMapFromQueryParams(ctx))
   }
diff --git a/cask/src/cask/endpoints/StaticEndpoints.scala b/cask/src/cask/endpoints/StaticEndpoints.scala
index 618da5f..c36551b 100644
--- a/cask/src/cask/endpoints/StaticEndpoints.scala
+++ b/cask/src/cask/endpoints/StaticEndpoints.scala
@@ -1,6 +1,6 @@
 package cask.endpoints
 
-import cask.router.HttpEndpoint
+import cask.router.{HttpEndpoint, Result}
 import cask.model.Request
 object StaticUtil{
   def makePath(t: String, ctx: Request) = {
@@ -14,7 +14,7 @@ class staticFiles(val path: String, headers: Seq[(String, String)] = Nil) extend
   val methods = Seq("get")
   type InputParser[T] = QueryParamReader[T]
   override def subpath = true
-  def wrapFunction(ctx: Request, delegate: Delegate): OuterReturned = {
+  def wrapFunction(ctx: Request, delegate: Delegate) = {
     delegate(Map()).map(t => cask.model.StaticFile(StaticUtil.makePath(t, ctx), headers))
   }
 
@@ -28,7 +28,7 @@ class staticResources(val path: String,
   val methods = Seq("get")
   type InputParser[T] = QueryParamReader[T]
   override def subpath = true
-  def wrapFunction(ctx: Request, delegate: Delegate): OuterReturned = {
+  def wrapFunction(ctx: Request, delegate: Delegate) = {
     delegate(Map()).map(t =>
       cask.model.StaticResource(StaticUtil.makePath(t, ctx), resourceRoot, headers)
     )
diff --git a/cask/src/cask/endpoints/WebSocketEndpoint.scala b/cask/src/cask/endpoints/WebSocketEndpoint.scala
index 994f015..905c5f1 100644
--- a/cask/src/cask/endpoints/WebSocketEndpoint.scala
+++ b/cask/src/cask/endpoints/WebSocketEndpoint.scala
@@ -21,11 +21,11 @@ object WebsocketResult{
 }
 
 class websocket(val path: String, override val subpath: Boolean = false)
-  extends cask.router.Endpoint[WebsocketResult, Seq[String]]{
+  extends cask.router.Endpoint[WebsocketResult, WebsocketResult, Seq[String]]{
   val methods = Seq("websocket")
   type InputParser[T] = QueryParamReader[T]
   type OuterReturned = Result[WebsocketResult]
-  def wrapFunction(ctx: Request, delegate: Delegate): OuterReturned = {
+  def wrapFunction(ctx: Request, delegate: Delegate) = {
     delegate(WebEndpoint.buildMapFromQueryParams(ctx))
   }