5 files changed, 12 insertions, 14 deletions
diff --git a/cask/src/cask/endpoints/FormEndpoint.scala b/cask/src/cask/endpoints/FormEndpoint.scala
index 436bed4..264c169 100644
--- a/cask/src/cask/endpoints/FormEndpoint.scala
+++ b/cask/src/cask/endpoints/FormEndpoint.scala
@@ -43,8 +43,8 @@ object FormReader{
     def read(ctx: Request, label: String, input: Seq[FormEntry]) = input.map(_.asInstanceOf[FormFile])
   }
 }
-class postForm(val path: String, override val subpath: Boolean = false) extends Endpoint {
-  type InnerReturned = Response.Raw
+class postForm(val path: String, override val subpath: Boolean = false)
+  extends Endpoint[Response.Raw] {
 
   val methods = Seq("post")
   type Input = Seq[FormEntry]
diff --git a/cask/src/cask/endpoints/JsonEndpoint.scala b/cask/src/cask/endpoints/JsonEndpoint.scala
index 3b3b095..2e3373f 100644
--- a/cask/src/cask/endpoints/JsonEndpoint.scala
+++ b/cask/src/cask/endpoints/JsonEndpoint.scala
@@ -39,8 +39,8 @@ object JsonData extends DataCompanion[JsonData]{
   }
 }
 
-class postJson(val path: String, override val subpath: Boolean = false) extends Endpoint{
-  type InnerReturned = Response[JsonData]
+class postJson(val path: String, override val subpath: Boolean = false)
+  extends Endpoint[Response[JsonData]]{
   val methods = Seq("post")
   type Input = ujson.Value
   type InputParser[T] = JsReader[T]
@@ -79,8 +79,8 @@ class postJson(val path: String, override val subpath: Boolean = false) extends
   def wrapPathSegment(s: String): Input = ujson.Str(s)
 }
 
-class getJson(val path: String, override val subpath: Boolean = false) extends Endpoint{
-  type InnerReturned = Response[JsonData]
+class getJson(val path: String, override val subpath: Boolean = false)
+  extends Endpoint[Response[JsonData]]{
   val methods = Seq("get")
   type Input = Seq[String]
   type InputParser[T] = QueryParamReader[T]
diff --git a/cask/src/cask/endpoints/StaticEndpoints.scala b/cask/src/cask/endpoints/StaticEndpoints.scala
index 401f845..bf99d09 100644
--- a/cask/src/cask/endpoints/StaticEndpoints.scala
+++ b/cask/src/cask/endpoints/StaticEndpoints.scala
@@ -3,8 +3,7 @@ package cask.endpoints
 import cask.main.Endpoint
 import cask.model.Request
 
-class staticFiles(val path: String) extends Endpoint{
-  type InnerReturned = String
+class staticFiles(val path: String) extends Endpoint[String]{
   val methods = Seq("get")
   type Input = Seq[String]
   type InputParser[T] = QueryParamReader[T]
@@ -22,8 +21,8 @@ class staticFiles(val path: String) extends Endpoint{
   def wrapPathSegment(s: String): Input = Seq(s)
 }
 
-class staticResources(val path: String, resourceRoot: ClassLoader = getClass.getClassLoader) extends Endpoint{
-  type InnerReturned = String
+class staticResources(val path: String, resourceRoot: ClassLoader = getClass.getClassLoader)
+  extends Endpoint[String]{
   val methods = Seq("get")
   type Input = Seq[String]
   type InputParser[T] = QueryParamReader[T]
diff --git a/cask/src/cask/endpoints/WebEndpoints.scala b/cask/src/cask/endpoints/WebEndpoints.scala
index 7cac4f5..b52b290 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{
-  type InnerReturned = Response.Raw
+trait WebEndpoint extends Endpoint[Response.Raw]{
   type Input = Seq[String]
   type InputParser[T] = QueryParamReader[T]
   def wrapFunction(ctx: Request,
diff --git a/cask/src/cask/endpoints/WebSocketEndpoint.scala b/cask/src/cask/endpoints/WebSocketEndpoint.scala
index 5f35832..ca2854f 100644
--- a/cask/src/cask/endpoints/WebSocketEndpoint.scala
+++ b/cask/src/cask/endpoints/WebSocketEndpoint.scala
@@ -13,8 +13,8 @@ object WebsocketResult{
   implicit class Listener(val value: WebSocketConnectionCallback) extends WebsocketResult
 }
 
-class websocket(val path: String, override val subpath: Boolean = false) extends cask.main.BaseEndpoint{
-  type InnerReturned = WebsocketResult
+class websocket(val path: String, override val subpath: Boolean = false)
+  extends cask.main.BaseEndpoint[WebsocketResult]{
   val methods = Seq("websocket")
   type Input = Seq[String]
   type InputParser[T] = QueryParamReader[T]