diff options
Diffstat (limited to 'src/main/scala/xyz/driver/restquery/query')
5 files changed, 21 insertions, 29 deletions
diff --git a/src/main/scala/xyz/driver/restquery/query/Pagination.scala b/src/main/scala/xyz/driver/restquery/query/Pagination.scala index 27b8f12..b899d1b 100644 --- a/src/main/scala/xyz/driver/restquery/query/Pagination.scala +++ b/src/main/scala/xyz/driver/restquery/query/Pagination.scala @@ -1,4 +1,4 @@ -package xyz.driver.restquery.domain +package xyz.driver.restquery.query /** * @param pageNumber Starts with 1 diff --git a/src/main/scala/xyz/driver/restquery/query/SearchFilterBinaryOperation.scala b/src/main/scala/xyz/driver/restquery/query/SearchFilterBinaryOperation.scala index dab466b..30d210c 100644 --- a/src/main/scala/xyz/driver/restquery/query/SearchFilterBinaryOperation.scala +++ b/src/main/scala/xyz/driver/restquery/query/SearchFilterBinaryOperation.scala @@ -1,5 +1,15 @@ package xyz.driver.restquery.query -class SearchFilterBinaryOperation { +sealed trait SearchFilterBinaryOperation + +object SearchFilterBinaryOperation { + + case object Eq extends SearchFilterBinaryOperation + case object NotEq extends SearchFilterBinaryOperation + case object Like extends SearchFilterBinaryOperation + case object Gt extends SearchFilterBinaryOperation + case object GtEq extends SearchFilterBinaryOperation + case object Lt extends SearchFilterBinaryOperation + case object LtEq extends SearchFilterBinaryOperation } diff --git a/src/main/scala/xyz/driver/restquery/query/SearchFilterExpr.scala b/src/main/scala/xyz/driver/restquery/query/SearchFilterExpr.scala index 6d2cb9a..8cbf685 100644 --- a/src/main/scala/xyz/driver/restquery/query/SearchFilterExpr.scala +++ b/src/main/scala/xyz/driver/restquery/query/SearchFilterExpr.scala @@ -1,4 +1,4 @@ -package xyz.driver.restquery.domain +package xyz.driver.restquery.query sealed trait SearchFilterExpr { def find(p: SearchFilterExpr => Boolean): Option[SearchFilterExpr] @@ -171,26 +171,3 @@ object SearchFilterExpr { } } - -sealed trait SearchFilterBinaryOperation - -object SearchFilterBinaryOperation { - - case object Eq extends SearchFilterBinaryOperation - case object NotEq extends SearchFilterBinaryOperation - case object Like extends SearchFilterBinaryOperation - case object Gt extends SearchFilterBinaryOperation - case object GtEq extends SearchFilterBinaryOperation - case object Lt extends SearchFilterBinaryOperation - case object LtEq extends SearchFilterBinaryOperation - -} - -sealed trait SearchFilterNAryOperation - -object SearchFilterNAryOperation { - - case object In extends SearchFilterNAryOperation - case object NotIn extends SearchFilterNAryOperation - -} diff --git a/src/main/scala/xyz/driver/restquery/query/SearchFilterNAryOperation.scala b/src/main/scala/xyz/driver/restquery/query/SearchFilterNAryOperation.scala index 0604c8f..a388597 100644 --- a/src/main/scala/xyz/driver/restquery/query/SearchFilterNAryOperation.scala +++ b/src/main/scala/xyz/driver/restquery/query/SearchFilterNAryOperation.scala @@ -1,5 +1,10 @@ package xyz.driver.restquery.query -class SearchFilterNAryOperation { +sealed trait SearchFilterNAryOperation + +object SearchFilterNAryOperation { + + case object In extends SearchFilterNAryOperation + case object NotIn extends SearchFilterNAryOperation } diff --git a/src/main/scala/xyz/driver/restquery/query/Sorting.scala b/src/main/scala/xyz/driver/restquery/query/Sorting.scala index e2642ad..af0066b 100644 --- a/src/main/scala/xyz/driver/restquery/query/Sorting.scala +++ b/src/main/scala/xyz/driver/restquery/query/Sorting.scala @@ -1,4 +1,4 @@ -package xyz.driver.restquery.domain +package xyz.driver.restquery.query import scala.collection.generic.CanBuildFrom @@ -43,7 +43,7 @@ object Sorting { } def collect[B, That](sorting: Sorting)(f: PartialFunction[Dimension, B])( - implicit bf: CanBuildFrom[Seq[Dimension], B, That]): That = sorting match { + implicit bf: CanBuildFrom[Seq[Dimension], B, That]): That = sorting match { case x: Dimension if f.isDefinedAt(x) => val r = bf.apply() r += f(x) |