Merge pull request #9 from thanhtien522/fix-entities

Fix wrong place of aggregations in search response
neitomic · Aug 7, 2017 · fd698a2 · fd698a2
2 parents 94bed5b + 18b6c52
commit fd698a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ organization := "com.github.thanhtien522"
 
 name := "es-http-client"
 
-version := "0.2-SNAPSHOT"
+version := "0.2.1"
 
 scalaVersion := "2.11.11"
 
@@ -39,6 +39,7 @@ publishTo := {
     Some("releases"  at nexus + "service/local/staging/deploy/maven2")
 }
 
+
 developers := List(
   Developer(id="thanhtien522", name="Tien Nguyen", email="thanhtien522@gmail.com", url=url("https://github.com/thanhtien522"))
 )
diff --git a/src/main/scala/com/github/thanhtien522/eshttpclient/entities/APIEntities.scala b/src/main/scala/com/github/thanhtien522/eshttpclient/entities/APIEntities.scala
@@ -201,11 +201,11 @@ case class MultiSearchResponse(responses: Seq[SearchResponse])
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonNaming(classOf[LowerCaseWithUnderscoresStrategy])
-case class SearchResponse(timeOut: Boolean, took: Long, hits: SearchHits)
+case class SearchResponse(timeOut: Boolean, took: Long, hits: SearchHits, aggregations: Map[String, Any])
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonNaming(classOf[LowerCaseWithUnderscoresStrategy])
-case class SearchHits(total: Long, maxScore: Double, hits: Seq[SearchHit], aggregations: Map[String, Any])
+case class SearchHits(total: Long, maxScore: Double, hits: Seq[SearchHit])
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonNaming(classOf[LowerCaseWithUnderscoresStrategy])