Merge branch 'hotfix/1.4.4'

TheHive-Project · Feb 8, 2018 · 234ce1e · 234ce1e
2 parents 4837deb + bcc276d
commit 234ce1e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## [1.4.4](https://github.com/TheHive-Project/elastic4play/tree/1.4.4) (2018-02-08)
+[Full Changelog](https://github.com/TheHive-Project/elastic4play/compare/1.4.3...1.4.4)
+
+**Fixed bugs:**
+
+- Version of document is not retrieve [\#49](https://github.com/TheHive-Project/elastic4play/issues/49)
+
 ## [1.4.3](https://github.com/TheHive-Project/elastic4play/tree/1.4.3) (2018-02-02)
 [Full Changelog](https://github.com/TheHive-Project/elastic4play/compare/1.4.2...1.4.3)
 

diff --git a/app/org/elastic4play/database/DBFind.scala b/app/org/elastic4play/database/DBFind.scala
@@ -101,7 +101,7 @@ class DBFind(
   def apply(range: Option[String], sortBy: Seq[String])(query: (String) ⇒ SearchDefinition): (Source[JsObject, NotUsed], Future[Long]) = {
     val (offset, limit) = getOffsetAndLimitFromRange(range)
     val sortDef = DBUtils.sortDefinition(sortBy)
-    val searchDefinition = query(db.indexName).storedFields("_source", "_routing", "_parent").start(offset).sortBy(sortDef)
+    val searchDefinition = query(db.indexName).storedFields("_source", "_routing", "_parent").start(offset).sortBy(sortDef).version(true)
 
     logger.debug(s"search in ${searchDefinition.indexesTypes.indexes.mkString(",")} / ${searchDefinition.indexesTypes.types.mkString(",")} ${SearchBuilderFn(db.client.java, searchDefinition)}")
     val (src, total) = if (limit > 2 * pageSize) {

diff --git a/app/org/elastic4play/database/DBGet.scala b/app/org/elastic4play/database/DBGet.scala
@@ -29,6 +29,7 @@ class DBGet @Inject() (
         search(db.indexName)
           .query(idsQuery(id).types(modelName))
           .size(1)
+          .version(true)
       }
       .map { searchResponse ⇒
         searchResponse

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.0.3
+sbt.version=1.1.0
diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version := "1.4.3"
+version := "1.4.4"