From bed43f2c8050f34ccb96f231cba58119915fcdbc Mon Sep 17 00:00:00 2001 From: Peter Banda Date: Wed, 17 Jul 2019 23:55:46 +0200 Subject: [PATCH] Version bump --- README.md | 7 ++++--- build.sbt | 4 ++-- .../incal/access/elastic/ElasticAsyncReadonlyRepo.scala | 4 +++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7db2896..59ba48f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# InCal Access ElasticSearch [![version](https://img.shields.io/badge/version-0.2.1-green.svg)](https://in-cal.org) [![License](https://img.shields.io/badge/License-Apache%202.0-lightgrey.svg)](https://www.apache.org/licenses/LICENSE-2.0) +# InCal Access ElasticSearch [![version](https://img.shields.io/badge/version-0.2.2-green.svg)](https://in-cal.org) [![License](https://img.shields.io/badge/License-Apache%202.0-lightgrey.svg)](https://www.apache.org/licenses/LICENSE-2.0) This is a convenient repo-like access layer for Elastic Search based on [Elastic4S](https://github.com/sksamuel/elastic4s) library. @@ -7,7 +7,7 @@ This is a convenient repo-like access layer for Elastic Search based on [Elastic All you need is **Scala 2.11**. To pull the library you have to add the following dependency to *build.sbt* ``` -"org.in-cal" %% "incal-access-elastic" % "0.2.1" +"org.in-cal" %% "incal-access-elastic" % "0.2.2" ``` or to *pom.xml* (if you use maven) @@ -16,7 +16,7 @@ or to *pom.xml* (if you use maven) org.in-cal incal-access-elastic_2.11 - 0.2.1 + 0.2.2 ``` @@ -28,4 +28,5 @@ Elastic Search **5.6.10** is required. Any other version might not work correctl wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.10.deb sudo dpkg -i elasticsearch-5.6.10.deb sudo systemctl enable elasticsearch.service +sudo service elasticsearch start ``` \ No newline at end of file diff --git a/build.sbt b/build.sbt index 0913227..d57531b 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ organization := "org.in-cal" name := "incal-access-elastic" -version := "0.2.1" +version := "0.2.2" description := "Provides a convenient access layer for Elastic Search based on Elastic4S library." @@ -17,7 +17,7 @@ libraryDependencies ++= Seq( "com.sksamuel.elastic4s" %% "elastic4s-http" % esVersion, "com.sksamuel.elastic4s" %% "elastic4s-http-streams" % esVersion, "javax.inject" % "javax.inject" % "1", - "org.in-cal" %% "incal-core" % "0.2.0", + "org.in-cal" %% "incal-core" % "0.2.1", "org.apache.commons" % "commons-lang3" % "3.5", "org.slf4j" % "slf4j-api" % "1.7.21" ) diff --git a/src/main/scala/org/incal/access/elastic/ElasticAsyncReadonlyRepo.scala b/src/main/scala/org/incal/access/elastic/ElasticAsyncReadonlyRepo.scala index a84aad7..5659ac8 100644 --- a/src/main/scala/org/incal/access/elastic/ElasticAsyncReadonlyRepo.scala +++ b/src/main/scala/org/incal/access/elastic/ElasticAsyncReadonlyRepo.scala @@ -13,6 +13,7 @@ import scala.concurrent.Await.result import java.util.Date import akka.actor.ActorSystem +import akka.stream.Materializer import akka.stream.scaladsl.Source import com.sksamuel.elastic4s.{IndexAndType, Indexes} import com.sksamuel.elastic4s.admin.IndexExistsDefinition @@ -102,7 +103,8 @@ abstract class ElasticAsyncReadonlyRepo[E, ID]( sort: Seq[Sort], projection: Traversable[String], limit: Option[Int], - skip: Option[Int] + skip: Option[Int])( + implicit materializer: Materializer ): Future[Source[E, _]] = { val scrollLimit = limit.getOrElse(setting.scrollBatchSize)