raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

=htp fix UnsupportedOperationException in PathMatchers.valueMap2PathMatcher

Browse source
This commit is contained in:
Mathias 2014-10-02 15:56:03 +02:00
parent 2630742885
commit f7d7a289f3
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
akka-http-tests/src/test/scala/akka/http/server/directives/PathDirectivesSpec.scala
View file

@ -94,6 +94,11 @@ class PathDirectivesSpec extends RoutingSpec {
"reject [/black]" in test()
}
"pathPrefix(Map.empty)" should {
val test = testFor(pathPrefix(Map[String, Int]()) { echoCaptureAndUnmatchedPath })
"reject [/black]" in test()
}
"pathPrefix(Segment)" should {
val test = testFor(pathPrefix(Segment) { echoCaptureAndUnmatchedPath })
"accept [/abc]" in test("abc:")

11
akka-http/src/main/scala/akka/http/server/PathMatcher.scala
View file

@ -253,7 +253,8 @@ trait ImplicitPathMatcherConstruction {
* the matcher consumes this path segment (prefix) and extracts the corresponding map value.
*/
implicit def valueMap2PathMatcher[T](valueMap: Map[String, T]): PathMatcher1[T] =
valueMap.map { case (prefix, value) ⇒ stringExtractionPair2PathMatcher(prefix, value) }.reduceLeft(_ | _)
if (valueMap.isEmpty) PathMatchers.nothingMatcher
else valueMap.map { case (prefix, value) ⇒ stringExtractionPair2PathMatcher(prefix, value) }.reduceLeft(_ | _)
}
trait PathMatchers {
@ -435,6 +436,14 @@ trait PathMatchers {
* If the path has a trailing slash this slash will *not* be matched.
*/
def Segments(maxSegments: Int): PathMatcher1[List[String]] = Segment.repeat(maxIterations = maxSegments, separator = Slash)
/**
* A PathMatcher that never matches anything.
*/
def nothingMatcher[L: Tuple]: PathMatcher[L] =
new PathMatcher[L] {
def apply(p: Path) = Unmatched
}
}
object PathMatchers extends PathMatchers