aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala
diff options
context:
space:
mode:
authorAleksandr <ognelisar@gmail.com>2017-11-14 15:45:50 +0700
committerAleksandr <ognelisar@gmail.com>2017-11-14 15:45:50 +0700
commitadd98e1a1100d5b0fb666ac4669d0a90272959ca (patch)
tree4e32e92e7bc3a6373f95f04bd28f946b5b100234 /src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala
parent2afec69b277c031eb52e1a05e57ff7bb0079f8d1 (diff)
parent29ee5de759374ceed9c856a51443a3f7c2cec029 (diff)
downloadrest-query-add98e1a1100d5b0fb666ac4669d0a90272959ca.tar.gz
rest-query-add98e1a1100d5b0fb666ac4669d0a90272959ca.tar.bz2
rest-query-add98e1a1100d5b0fb666ac4669d0a90272959ca.zip
Merge branch 'master' into PDSUI-2345
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala')
-rw-r--r--src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala b/src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala
index 4bfc669..a04d278 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala
@@ -49,7 +49,7 @@ object SortingParser {
val parser = sequentialSortingParser(validDimensions.toSeq)
parser.parse(rawSorting) match {
case Parsed.Success(x, _) => x
- case e: Parsed.Failure =>
+ case e: Parsed.Failure[_, _] =>
throw new ParseQueryArgException("sort" -> formatFailure(e))
}
@@ -57,8 +57,8 @@ object SortingParser {
}
}
- private def formatFailure(e: Parsed.Failure): String = {
- ParseError.msg(e.extra.input, e.extra.traced.expected, e.index)
+ private def formatFailure(e: Parsed.Failure[_, _]): String = {
+ fastparse.core.ParseError.msg(e.extra.input, e.extra.traced.expected, e.index)
}
}