From fc08317f7a8eed466f6b52a888387e96b6a85532 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Wed, 16 Aug 2017 13:22:45 -0700 Subject: Don't require parser query string --- src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/main/scala/xyz/driver/pdsuicommon/http') diff --git a/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala b/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala index ec89649..feb224a 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/http/Directives.scala @@ -19,8 +19,11 @@ import scala.util._ trait Directives { - val paginated: Directive1[Pagination] = parameters(('pageSize.as[Int], 'pageNumber.as[Int])).tmap { - case (size, number) => Pagination(size, number) + val paginated: Directive1[Pagination] = parameterSeq.flatMap { params => + PaginationParser.parse(params) match { + case Success(pagination) => provide(pagination) + case Failure(ex) => failWith(ex) + } } def sorted(validDimensions: Set[String] = Set.empty): Directive1[Sorting] = parameterSeq.flatMap { params => -- cgit v1.2.3