Skip to content

Commit

Permalink
dave - removed DynamicPathParameter as unused
Browse files Browse the repository at this point in the history
  • Loading branch information
david denton committed Mar 7, 2015
1 parent 921ee21 commit baf3feb
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 17 deletions.
Expand Up @@ -4,7 +4,7 @@ import com.twitter.finagle.http.path.Path
import io.github.daviddenton.fintrospect.parameters.PathParameter

class ModuleRoute(val description: Description, rootPath: Path, pathParams: Seq[PathParameter[_]]) {
val params = pathParams.flatMap(_.toParameter) ++ description.params
val params = pathParams.flatten ++ description.params

override def toString: String = (description.complete(rootPath).toString :: pathParams.map(_.toString).toList).mkString("/")
}

This file was deleted.

Expand Up @@ -6,7 +6,6 @@ import scala.reflect.ClassTag

abstract class Parameter[T] protected[fintrospect](val name: String, val where: String, val required: Boolean)(implicit ct: ClassTag[T]) {
val paramType = decapitalize(ct.runtimeClass.getSimpleName)
override def toString = name
}


Expand Down
Expand Up @@ -8,13 +8,15 @@ object Path extends Parameters[PathParameter]() {

override def toString = s"{$name}"

override val toParameter: Option[PathParameter[_]] = Some(this)
override def iterator: Iterator[PathParameter[_]] = Some(this).iterator
}


def fixed(value: String): PathParameter[String] = new PathParameter[String](value) {
val toParameter: Option[PathParameter[_]] = None

override def toString = name

override def unapply(str: String): Option[String] = if (str == value) Some(str) else None

override def iterator: Iterator[PathParameter[_]] = Nil.iterator
}
}
Expand Up @@ -2,7 +2,8 @@ package io.github.daviddenton.fintrospect.parameters

import scala.reflect.ClassTag

abstract class PathParameter[T](name: String)(implicit ct: ClassTag[T]) extends Parameter[T](name, "path", true)(ct) {
val toParameter: Option[PathParameter[_]]
abstract class PathParameter[T](name: String)(implicit ct: ClassTag[T])
extends Parameter[T](name, "path", true)(ct)
with Iterable[PathParameter[_]] {
def unapply(str: String): Option[T]
}
Expand Up @@ -24,7 +24,7 @@ abstract class JsonRendererTest(name: String, renderer: FintrospectModule.Render

val expected = parse(Source.fromInputStream(renderer.getClass.getResourceAsStream(s"$name.json")).mkString)
val actual = Await.result(module.toService(Request("/"))).content.toString(Utf8)
// println(actual)
// println(actual)
parse(actual) should be === expected
}
}
Expand Down

0 comments on commit baf3feb

Please sign in to comment.