diff options
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuicommon/parsers')
5 files changed, 17 insertions, 13 deletions
diff --git a/src/main/scala/xyz/driver/pdsuicommon/parsers/DimensionsParser.scala b/src/main/scala/xyz/driver/pdsuicommon/parsers/DimensionsParser.scala index 29f2363..17c09ed 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/parsers/DimensionsParser.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/parsers/DimensionsParser.scala @@ -10,8 +10,9 @@ object DimensionsParser { @deprecated("play-akka transition", "0") def tryParse(query: Map[String, Seq[String]]): Try[Dimensions] = - tryParse(query.toSeq.flatMap{ case (key, values) => - values.map(value => key -> value) + tryParse(query.toSeq.flatMap { + case (key, values) => + values.map(value => key -> value) }) def tryParse(query: Seq[(String, String)]): Try[Dimensions] = { diff --git a/src/main/scala/xyz/driver/pdsuicommon/parsers/ListRequestParser.scala b/src/main/scala/xyz/driver/pdsuicommon/parsers/ListRequestParser.scala index 0356784..c3146ce 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/parsers/ListRequestParser.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/parsers/ListRequestParser.scala @@ -12,8 +12,8 @@ class ListRequestParser(validSortingFields: Set[String]) { def tryParse(request: Request[AnyContent]): Try[ListRequestParameters] = { for { queryFilters <- SearchFilterParser.parse(request.queryString) - sorting <- SortingParser.parse(validSortingFields, request.queryString) - pagination <- PaginationParser.parse(request.queryString) + sorting <- SortingParser.parse(validSortingFields, request.queryString) + pagination <- PaginationParser.parse(request.queryString) } yield ListRequestParameters(queryFilters, sorting, pagination) } diff --git a/src/main/scala/xyz/driver/pdsuicommon/parsers/PagiationParser.scala b/src/main/scala/xyz/driver/pdsuicommon/parsers/PagiationParser.scala index 3381542..3988668 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/parsers/PagiationParser.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/parsers/PagiationParser.scala @@ -7,16 +7,17 @@ object PaginationParser { @deprecated("play-akka transition", "0") def parse(query: Map[String, Seq[String]]): Try[Pagination] = - parse(query.toSeq.flatMap{ case (key, values) => - values.map(value => key -> value) + parse(query.toSeq.flatMap { + case (key, values) => + values.map(value => key -> value) }) def parse(query: Seq[(String, String)]): Try[Pagination] = { val IntString = """\d+""".r - def validate(field: String) = query.collectFirst{case (`field`, size) => size} match { + def validate(field: String) = query.collectFirst { case (`field`, size) => size } match { case Some(IntString(x)) => x.toInt - case Some(str) => throw new ParseQueryArgException((field, s"must be an integer (found $str)")) - case None => throw new ParseQueryArgException((field, "must be defined")) + case Some(str) => throw new ParseQueryArgException((field, s"must be an integer (found $str)")) + case None => throw new ParseQueryArgException((field, "must be defined")) } Try { diff --git a/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala b/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala index 061f2ef..768e5f5 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala @@ -110,8 +110,9 @@ object SearchFilterParser { @deprecated("play-akka transition", "0") def parse(query: Map[String, Seq[String]]): Try[SearchFilterExpr] = - parse(query.toSeq.flatMap{ case (key, values) => - values.map(value => key -> value) + parse(query.toSeq.flatMap { + case (key, values) => + values.map(value => key -> value) }) def parse(query: Seq[(String, String)]): Try[SearchFilterExpr] = Try { diff --git a/src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala b/src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala index cc6ade3..c1c332f 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala @@ -32,8 +32,9 @@ object SortingParser { @deprecated("play-akka transition", "0") def parse(validDimensions: Set[String], query: Map[String, Seq[String]]): Try[Sorting] = - parse(validDimensions, query.toSeq.flatMap{ case (key, values) => - values.map(value => key -> value) + parse(validDimensions, query.toSeq.flatMap { + case (key, values) => + values.map(value => key -> value) }) def parse(validDimensions: Set[String], query: Seq[(String, String)]): Try[Sorting] = Try { |