Skip to content

Commit

Permalink
daveD - move fields to Single and Multi
Browse files Browse the repository at this point in the history
  • Loading branch information
daviddenton committed May 15, 2016
1 parent 2423b11 commit aff3d89
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 8 deletions.
2 changes: 0 additions & 2 deletions src/main/scala/io/fintrospect/parameters/FormField.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ package io.fintrospect.parameters
trait FormField[T]
extends BodyParameter
with Bindable[T, FormFieldBinding] {
val spec: ParameterSpec[_]

override val example = None
override val where = "form"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ trait HeaderParameter[T]
extends Parameter
with Bindable[T, RequestBinding] {

val spec: ParameterSpec[_]

val where = "header"

protected def valuesFrom(message: Message): Option[Seq[String]] = {
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/io/fintrospect/parameters/Parameter.scala
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ trait Parameter {
override def toString = s"Parameter(name=$name,where=$where,paramType=${paramType.name})"
}

abstract class SingleParameter[T, From, B <: Binding](val spec: ParameterSpec[T], fn: (Parameter, String) => B) {
abstract class SingleParameter[T, From, B <: Binding](spec: ParameterSpec[T], fn: (Parameter, String) => B) {
self: Parameter with Bindable[T, B] =>

override val name = spec.name
Expand All @@ -28,7 +28,7 @@ abstract class SingleParameter[T, From, B <: Binding](val spec: ParameterSpec[T]
protected def extract(from: From) = Extraction(this, xs => spec.deserialize(xs.head), valuesFrom(from))
}

abstract class MultiParameter[T, From, B <: Binding](val spec: ParameterSpec[T], fn: (Parameter, String) => B) {
abstract class MultiParameter[T, From, B <: Binding](spec: ParameterSpec[T], fn: (Parameter, String) => B) {
self: Parameter with Bindable[Seq[T], B] =>

override val name = spec.name
Expand Down
2 changes: 0 additions & 2 deletions src/main/scala/io/fintrospect/parameters/QueryParameter.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import scala.collection.JavaConverters._

trait QueryParameter[T]
extends Parameter with Bindable[T, QueryBinding] {

val spec: ParameterSpec[_]
override val where = "query"

protected def valuesFrom(request: Request): Option[Seq[String]] =
Expand Down

0 comments on commit aff3d89

Please sign in to comment.