Cleanup

4 files changed, 11 insertions, 11 deletions

diff --git a/cask/src/cask/endpoints/FormEndpoint.scala b/cask/src/cask/endpoints/FormEndpoint.scala
index f042d74..2d9fc1f 100644
--- a/cask/src/cask/endpoints/FormEndpoint.scala
+++ b/cask/src/cask/endpoints/FormEndpoint.scala
@@ -37,9 +37,9 @@ object FormReader{
 class postForm(val path: String, override val subpath: Boolean = false) extends Routes.Endpoint[Response]{
 
   val methods = Seq("post")
-  type InputType = Seq[FormValue]
+  type Input = Seq[FormValue]
   type InputParser[T] = FormReader[T]
-  def getParamValues(ctx: ParamContext) = {
+  def getRawParams(ctx: ParamContext) = {
     val formData = FormParserFactory.builder().build().createParser(ctx.exchange).parseBlocking()
     val formDataBindings =
       formData
@@ -49,6 +49,6 @@ class postForm(val path: String, override val subpath: Boolean = false) extends
         .toMap
     formDataBindings
   }
-  def wrapPathSegment(s: String): InputType = Seq(FormValue.Plain(s, new io.undertow.util.HeaderMap))
+  def wrapPathSegment(s: String): Input = Seq(FormValue.Plain(s, new io.undertow.util.HeaderMap))
 }
 
diff --git a/cask/src/cask/endpoints/JsonEndpoint.scala b/cask/src/cask/endpoints/JsonEndpoint.scala
index 19c7b8a..80fac9a 100644
--- a/cask/src/cask/endpoints/JsonEndpoint.scala
+++ b/cask/src/cask/endpoints/JsonEndpoint.scala
@@ -26,9 +26,9 @@ object JsReader{
 }
 class postJson(val path: String, override val subpath: Boolean = false) extends Routes.Endpoint[Response]{
   val methods = Seq("post")
-  type InputType = ujson.Js.Value
+  type Input = ujson.Js.Value
   type InputParser[T] = JsReader[T]
-  def getParamValues(ctx: ParamContext) =
+  def getRawParams(ctx: ParamContext) =
     ujson.read(new String(ctx.exchange.getInputStream.readAllBytes())).obj.toMap
-  def wrapPathSegment(s: String): InputType = ujson.Js.Str(s)
+  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 a88781e..5d57144 100644
--- a/cask/src/cask/endpoints/StaticEndpoints.scala
+++ b/cask/src/cask/endpoints/StaticEndpoints.scala
@@ -6,7 +6,7 @@ import cask.model.ParamContext
 
 class static(val path: String) extends Routes.Endpoint[String] {
   val methods = Seq("get")
-  type InputType = Seq[String]
+  type Input = Seq[String]
   type InputParser[T] = QueryParamReader[T]
   override def subpath = true
   def wrapOutput(t: String) = t
@@ -14,6 +14,6 @@ class static(val path: String) extends Routes.Endpoint[String] {
     Router.Result.Success(cask.model.Static(t + "/" + ctx.remaining.mkString("/")))
   }
 
-  def getParamValues(ctx: ParamContext) = Map()
-  def wrapPathSegment(s: String): InputType = Seq(s)
+  def getRawParams(ctx: ParamContext) = 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 1885475..82009df 100644
--- a/cask/src/cask/endpoints/WebEndpoints.scala
+++ b/cask/src/cask/endpoints/WebEndpoints.scala
@@ -9,9 +9,9 @@ import collection.JavaConverters._
 
 
 trait WebEndpoint extends Routes.Endpoint[BaseResponse]{
-  type InputType = Seq[String]
+  type Input = Seq[String]
   type InputParser[T] = QueryParamReader[T]
-  def getParamValues(ctx: ParamContext) = ctx.exchange.getQueryParameters
+  def getRawParams(ctx: ParamContext) = ctx.exchange.getQueryParameters
     .asScala
     .map{case (k, vs) => (k, vs.asScala.toArray.toSeq)}
     .toMap