From cfea2749380d367f4a525c90792b66241df42273 Mon Sep 17 00:00:00 2001 From: Kseniya Tomskikh Date: Wed, 7 Mar 2018 11:28:08 +0700 Subject: Review fix --- src/main/scala/xyz/driver/core/rest/package.scala | 2 +- src/test/scala/xyz/driver/core/rest/RestTest.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/xyz/driver/core/rest/package.scala b/src/main/scala/xyz/driver/core/rest/package.scala index fb5f4ec..e3c0c40 100644 --- a/src/main/scala/xyz/driver/core/rest/package.scala +++ b/src/main/scala/xyz/driver/core/rest/package.scala @@ -226,7 +226,7 @@ object `package` { case (_, _) => throw new IllegalArgumentException("Pagination's parameters are incorrect") } - val optionalPaginated: Directive1[Option[Pagination]] = + val optionalPagination: Directive1[Option[Pagination]] = parameters(("pageSize".as[Int].?, "pageNumber".as[Int].?)).as(extractPagination) def paginationQuery(pagination: Pagination) = diff --git a/src/test/scala/xyz/driver/core/rest/RestTest.scala b/src/test/scala/xyz/driver/core/rest/RestTest.scala index 80e4fd5..68fe419 100644 --- a/src/test/scala/xyz/driver/core/rest/RestTest.scala +++ b/src/test/scala/xyz/driver/core/rest/RestTest.scala @@ -49,7 +49,7 @@ class RestTest extends WordSpec with Matchers with ScalatestRouteTest with Direc } "optional paginated directive" should { - val route: Route = rest.optionalPaginated { paginated => + val route: Route = rest.optionalPagination { paginated => complete(StatusCodes.OK -> paginated.map(p => s"${p.pageNumber},${p.pageSize}").getOrElse("no pagination")) } "accept a pagination" in { -- cgit v1.2.3