Skip to content

V8.x #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fupelaqu merged 5 commits into from
Jul 18, 2025
Merged

V8.x #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
05c98cf
update dependencies
fupelaqu Jul 16, 2025
9357026
replace high level rest client with elasticsearch java client
fupelaqu Jul 18, 2025
e9ba8c7
Merge branch 'main' into v8.x
fupelaqu Jul 18, 2025
12494da
prepare PR
fupelaqu Jul 18, 2025
bb87396
add support for asynchronous calls (index, update, delete, get and se…
fupelaqu Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ lazy val persistence = project.in(file("persistence"))
client % "compile->compile;test->test;it->it"
)

lazy val rest = project.in(file("rest"))
lazy val java = project.in(file("java"))
.configs(IntegrationTest)
.settings(Defaults.itSettings)
.dependsOn(
Expand All @@ -81,10 +81,10 @@ lazy val testKit = project.in(file("testkit"))
)
.enablePlugins(BuildInfoPlugin)
.dependsOn(
rest % "compile->compile;test->test;it->it"
java % "compile->compile;test->test;it->it"
)

lazy val root = project.in(file("."))
.configs(IntegrationTest)
.settings(Defaults.itSettings, Publish.noPublishSettings)
.aggregate(sql, client, persistence, rest, testKit)
.aggregate(sql, client, persistence, java, testKit)
4 changes: 1 addition & 3 deletions client/src/main/scala/app/softnetwork/elastic/client/ElasticClientApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,7 @@ trait UpdateApi { _: RefreshApi =>
)
def updateAsync(index: String, indexType: String, id: String, source: String, upsert: Boolean)(
implicit ec: ExecutionContext
): Future[Boolean] = {
this.updateAsync(index, id, source, upsert)
}
): Future[Boolean] = this.updateAsync(index, id, source, upsert)

def updateAsync(index: String, id: String, source: String, upsert: Boolean)(implicit
ec: ExecutionContext
Expand Down
4 changes: 2 additions & 2 deletions rest/build.sbt → java/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
organization := "app.softnetwork.elastic"

name := "elastic-rest-client"
name := "elastic-java-client"

val jacksonExclusions = Seq(
ExclusionRule(organization = "com.fasterxml.jackson.core"),
Expand All @@ -12,7 +12,7 @@ val jacksonExclusions = Seq(

val rest = Seq(
"org.elasticsearch" % "elasticsearch" % Versions.elasticSearch exclude ("org.apache.logging.log4j", "log4j-api"),
"org.elasticsearch.client" % "elasticsearch-rest-high-level-client" % Versions.elasticSearch exclude ("org.elasticsearch", "elasticsearch"),
"co.elastic.clients" % "elasticsearch-java" % Versions.elasticSearch exclude ("org.elasticsearch", "elasticsearch"),
"org.elasticsearch.client" % "elasticsearch-rest-client" % Versions.elasticSearch
).map(_.excludeAll(jacksonExclusions: _*))

Expand Down
Loading