upgrade elastic4s

joeyksclark · Jul 2, 2015 · ced9501 · ced9501
1 parent 733a14c
commit ced9501
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/modules/forumSearch/src/main/Query.scala b/modules/forumSearch/src/main/Query.scala
@@ -14,7 +14,7 @@ private[forumSearch] final class Query private (
 
  def searchDef(from: Int = 0, size: Int = 10) =
  search in indexType query makeQuery sort (
- by field Fields.date order SortOrder.DESC
+ field sort Fields.date order SortOrder.DESC
  ) start from size size
 
  def countDef = count from indexType query makeQuery

diff --git a/modules/gameSearch/src/main/DataForm.scala b/modules/gameSearch/src/main/DataForm.scala
@@ -109,5 +109,5 @@ private[gameSearch] case class SearchPlayer(
 }
 
 private[gameSearch] case class SearchSort(
- field: String = Sorting.default.field,
+ field: String = Sorting.default.f,
  order: String = Sorting.default.order)
diff --git a/modules/gameSearch/src/main/Sorting.scala b/modules/gameSearch/src/main/Sorting.scala
@@ -3,10 +3,10 @@ package lila.gameSearch
 import com.sksamuel.elastic4s.ElasticDsl._
 import org.elasticsearch.search.sort.SortOrder
 
-case class Sorting(field: String, order: String) {
+case class Sorting(f: String, order: String) {
 
  def definition =
- by field (Sorting.fieldKeys contains field).fold(field, Sorting.default.field) order
+ field sort (Sorting.fieldKeys contains field).fold(f, Sorting.default.f) order
  (order.toLowerCase == "asc").fold(SortOrder.ASC, SortOrder.DESC)
 }
 

diff --git a/modules/teamSearch/src/main/Query.scala b/modules/teamSearch/src/main/Query.scala
@@ -12,7 +12,7 @@ private[teamSearch] final class Query private (
 
  def searchDef(from: Int = 0, size: Int = 10) =
  search in indexType query makeQuery sort (
- by field Fields.nbMembers order SortOrder.DESC
+ field sort Fields.nbMembers order SortOrder.DESC
  ) start from size size
 
  def countDef = count from indexType query makeQuery

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -34,7 +34,7 @@ object Dependencies {
  val hasher = "com.roundeights" %% "hasher" % "1.0.0"
  val jgit = "org.eclipse.jgit" % "org.eclipse.jgit" % "3.2.0.201312181205-r"
  val jodaTime = "joda-time" % "joda-time" % "2.7"
- val elastic4s = "com.sksamuel.elastic4s" %% "elastic4s" % "1.5.10"
+ val elastic4s = "com.sksamuel.elastic4s" %% "elastic4s-core" % "1.6.2"
  val RM = "org.reactivemongo" %% "reactivemongo" % "0.10.5.0.akka23"
  val PRM = "org.reactivemongo" %% "play2-reactivemongo" % "0.10.5.0.akka23"
  val maxmind = "com.sanoma.cda" %% "maxmind-geoip2-scala" % "1.2.3-THIB"