init support for elasticsearch v9

Author: fupelaqu

.github/workflows/build.yml

@@ -32,10 +32,10 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v3
-    - name: Set up JDK 8
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '8'
+        java-version: '17'
         distribution: 'temurin'
 #        cache: 'sbt'
     - name: Setup sbt launcher
@@ -50,10 +50,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'temurin'
 #          cache: 'sbt'
       - name: Setup sbt launcher

.github/workflows/release.yml

@@ -29,10 +29,10 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v3
-    - name: Set up JDK 8
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '8'
+        java-version: '17'
         distribution: 'temurin'
 #        cache: 'sbt'
     - name: Setup sbt launcher
@@ -46,7 +46,7 @@ jobs:
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v3
       with:
-        files: sql/target/scala-2.12/coverage-report/cobertura.xml,client/testkit/target/scala-2.12/coverage-report/cobertura.xml,persistence/target/scala-2.12/coverage-report/cobertura.xml,teskit/target/scala-2.12/coverage-report/cobertura.xml
+        files: sql/target/scala-2.13/coverage-report/cobertura.xml,client/testkit/target/scala-2.13/coverage-report/cobertura.xml,java/testkit/target/scala-2.13/coverage-report/cobertura.xml,persistence/target/scala-2.13/coverage-report/cobertura.xml,teskit/target/scala-2.13/coverage-report/cobertura.xml
         flags: unittests
         fail_ci_if_error: false
         verbose: true

build.sbt

@@ -4,20 +4,45 @@ import app.softnetwork.*
 // Defaults
 /////////////////////////////////
 
+lazy val scala213 = "2.13.16"
+lazy val javacCompilerVersion = "17"
+lazy val scalacCompilerOptions = Seq(
+  "-deprecation",
+  "-feature",
+  "-target:jvm-1.8"
+)
+
 ThisBuild / organization := "app.softnetwork"
 
 name := "elastic"
 
-ThisBuild / version := Versions.elasticSearch
+ThisBuild / version := "9.0-SNAPSHOT" //Versions.elasticSearch
 
-ThisBuild / scalaVersion := "2.12.18"
+ThisBuild / scalaVersion := scala213
 
-ThisBuild / scalacOptions ++= Seq("-deprecation", "-feature", "-target:jvm-1.8", "-Ypartial-unification")
+ThisBuild / dependencyOverrides ++= Seq(
+  "com.fasterxml.jackson.module" %% "jackson-module-scala" % Versions.jackson,
+  "com.github.jnr" % "jnr-ffi" % "2.2.17",
+  "com.github.jnr" % "jffi"    % "1.3.13" classifier "native",
+  "org.lmdbjava" % "lmdbjava" % "0.9.1" exclude("org.slf4j", "slf4j-api"),
+)
+
+lazy val moduleSettings = Seq(
+  crossScalaVersions := Seq(scala213),
+  scalacOptions ++= {
+    CrossVersion.partialVersion(scalaVersion.value) match {
+      case Some((2, 12)) => scalacCompilerOptions :+ "-Ypartial-unification"
+      case Some((2, 13)) => scalacCompilerOptions
+      case _             => Seq.empty
+    }
+  }
+)
 
-ThisBuild / javacOptions ++= Seq("-source", "1.8", "-target", "1.8")
+ThisBuild / javacOptions ++= Seq("-source", javacCompilerVersion, "-target", javacCompilerVersion)
 
 ThisBuild / resolvers ++= Seq(
   "Softnetwork Server" at "https://softnetwork.jfrog.io/artifactory/releases/",
+  "Softnetwork Snapshots" at "https://softnetwork.jfrog.io/artifactory/snapshots/",
   "Maven Central Server" at "https://repo1.maven.org/maven2",
   "Typesafe Server" at "https://repo.typesafe.com/typesafe/releases"
 )
@@ -32,6 +57,9 @@ val logging = Seq(
 
 val jacksonExclusions = Seq(
   ExclusionRule(organization = "com.fasterxml.jackson.core"),
+  ExclusionRule(organization = "com.fasterxml.jackson.dataformat"),
+  ExclusionRule(organization = "com.fasterxml.jackson.datatype"),
+  ExclusionRule(organization = "com.fasterxml.jackson.module"),
   ExclusionRule(organization = "org.codehaus.jackson")
 )
 
@@ -41,7 +69,7 @@ val json4s = Seq(
 ).map(_.excludeAll(jacksonExclusions: _*))
 
 ThisBuild / libraryDependencies ++= Seq(
-  "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.1"
+  "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2"
 )// ++ configDependencies ++ json4s ++ logging
 
 ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
@@ -54,21 +82,30 @@ lazy val sql = project.in(file("sql"))
 
 lazy val client = project.in(file("client"))
   .configs(IntegrationTest)
-  .settings(Defaults.itSettings)
+  .settings(
+    Defaults.itSettings,
+    moduleSettings
+  )
   .dependsOn(
     sql % "compile->compile;test->test;it->it"
   )
 
 lazy val persistence = project.in(file("persistence"))
   .configs(IntegrationTest)
-  .settings(Defaults.itSettings)
+  .settings(
+    Defaults.itSettings,
+    moduleSettings
+  )
   .dependsOn(
     client % "compile->compile;test->test;it->it"
   )
 
 lazy val java = project.in(file("java"))
   .configs(IntegrationTest)
-  .settings(Defaults.itSettings)
+  .settings(
+    Defaults.itSettings,
+    moduleSettings
+  )
   .dependsOn(
     persistence % "compile->compile;test->test;it->it"
   )
@@ -77,7 +114,8 @@ lazy val testKit = project.in(file("testkit"))
   .configs(IntegrationTest)
   .settings(
     Defaults.itSettings,
-    app.softnetwork.Info.infoSettings
+    app.softnetwork.Info.infoSettings,
+    moduleSettings
   )
   .enablePlugins(BuildInfoPlugin)
   .dependsOn(
@@ -86,5 +124,9 @@ lazy val testKit = project.in(file("testkit"))
 
 lazy val root = project.in(file("."))
   .configs(IntegrationTest)
-  .settings(Defaults.itSettings, Publish.noPublishSettings)
+  .settings(
+    Defaults.itSettings,
+    Publish.noPublishSettings,
+    crossScalaVersions := Nil
+  )
   .aggregate(sql, client, persistence, java, testKit)

client/build.sbt

@@ -21,4 +21,5 @@ val json4s = Seq(
 ).map(_.excludeAll(jacksonExclusions: _*))
 
 libraryDependencies ++= configDependencies ++ json4s :+
-  "app.softnetwork.persistence" %% "persistence-core" % Versions.genericPersistence :+ "com.google.code.gson" % "gson" % Versions.gson
+  ("app.softnetwork.persistence" %% "persistence-core" % Versions.genericPersistence excludeAll(jacksonExclusions: _*)) :+
+  "com.google.code.gson" % "gson" % Versions.gson

client/src/main/scala/app/softnetwork/elastic/client/package.scala

@@ -7,7 +7,7 @@ import app.softnetwork.serialization._
 import com.google.gson.{Gson, JsonElement, JsonObject}
 import com.typesafe.config.{Config, ConfigFactory}
 import com.typesafe.scalalogging.StrictLogging
-import configs.Configs
+import configs.ConfigReader
 import org.json4s.Formats
 
 import scala.collection.immutable.Seq
@@ -33,8 +33,8 @@ package object client {
 
   object ElasticConfig extends StrictLogging {
     def apply(config: Config): ElasticConfig = {
-      Configs[ElasticConfig]
-        .get(config.withFallback(ConfigFactory.load("softnetwork-elastic.conf")), "elastic")
+      ConfigReader[ElasticConfig]
+        .read(config.withFallback(ConfigFactory.load("softnetwork-elastic.conf")), "elastic")
         .toEither match {
         case Left(configError) =>
           logger.error(s"Something went wrong with the provided arguments $configError")

java/src/main/scala/app/softnetwork/elastic/client/java/ElasticsearchClientApi.scala

@@ -16,20 +16,16 @@ import co.elastic.clients.elasticsearch.core.bulk.{
   UpdateAction,
   UpdateOperation
 }
-import co.elastic.clients.elasticsearch.core.msearch.{
-  MultisearchBody,
-  MultisearchHeader,
-  RequestItem
-}
+import co.elastic.clients.elasticsearch.core.msearch.{MultisearchHeader, RequestItem}
 import co.elastic.clients.elasticsearch.core._
+import co.elastic.clients.elasticsearch.core.search.SearchRequestBody
 import co.elastic.clients.elasticsearch.indices.update_aliases.{Action, AddAction, RemoveAction}
 import co.elastic.clients.elasticsearch.indices._
 import com.google.gson.JsonParser
 
 import _root_.java.io.StringReader
 import _root_.java.util.{Map => JMap}
-
-import scala.collection.JavaConverters.{collectionAsScalaIterableConverter, seqAsJavaListConverter}
+import scala.jdk.CollectionConverters._
 import org.json4s.Formats
 
 import scala.concurrent.{ExecutionContext, Future, Promise}
@@ -274,18 +270,18 @@ trait ElasticsearchClientSingleValueAggregateApi
                   aggType match {
                     case sql.Count =>
                       if (aggregation.distinct) {
-                        root.get(agg).cardinality().value()
+                        root.get(agg).cardinality().value().toDouble
                       } else {
-                        root.get(agg).valueCount().value()
+                        root.get(agg).valueCount().value().toDouble
                       }
                     case sql.Sum =>
-                      root.get(agg).sum().value()
+                      root.get(agg).sum().value().toDouble
                     case sql.Avg =>
-                      root.get(agg).avg().value()
+                      root.get(agg).avg().value().toDouble
                     case sql.Min =>
-                      root.get(agg).min().value()
+                      root.get(agg).min().value().toDouble
                     case sql.Max =>
-                      root.get(agg).max().value()
+                      root.get(agg).max().value().toDouble
                     case _ => 0d
                   },
                   None
@@ -643,7 +639,7 @@ trait ElasticsearchClientSearchApi extends SearchApi with ElasticsearchClientCom
     val items = queries.map { query =>
       new RequestItem.Builder()
         .header(new MultisearchHeader.Builder().index(query.indices.asJava).build())
-        .body(new MultisearchBody.Builder().withJson(new StringReader(query.query)).build())
+        .body(new SearchRequestBody.Builder().withJson(new StringReader(query.query)).build())
         .build()
     }
 
@@ -675,7 +671,7 @@ trait ElasticsearchClientSearchApi extends SearchApi with ElasticsearchClientCom
     val items = queries.map { query =>
       new RequestItem.Builder()
         .header(new MultisearchHeader.Builder().index(query.indices.asJava).build())
-        .body(new MultisearchBody.Builder().withJson(new StringReader(query.query)).build())
+        .body(new SearchRequestBody.Builder().withJson(new StringReader(query.query)).build())
         .build()
     }
 

project/Versions.scala

@@ -6,11 +6,11 @@ object Versions {
 
   val typesafeConfig = "1.4.2"
 
-  val kxbmap = "0.4.4"
+  val kxbmap = "0.6.1"
 
   val jackson = "2.19.0" // 2.13.3 -> 2.19.0
 
-  val json4s = "4.0.6" // 3.6.12 -> 4.0.6
+  val json4s = "4.0.7" // 4.0.6 -> 4.0.7
 
   val scalaLogging = "3.9.2"
 
@@ -20,15 +20,15 @@ object Versions {
 
   val log4s = "1.8.2"
 
-  val elasticSearch = "8.18.3"
+  val elasticSearch = "9.0.3"
 
-  val elastic4s = "8.18.2"
+  val elastic4s = "9.0.0"
 
   val log4j = "2.8.2"
 
   val testContainers = "1.18.0"
 
-  val genericPersistence = "0.7.1"
+  val genericPersistence = "0.8-SNAPSHOT"
 
   val gson = "2.8.0"
 

sql/build.sbt

@@ -10,13 +10,12 @@ val jackson = Seq(
   "com.fasterxml.jackson.dataformat" % "jackson-dataformat-yaml"   % Versions.jackson,
   "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8"   % Versions.jackson,
   "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % Versions.jackson,
-  "com.fasterxml.jackson.module" % "jackson-module-scala_2.12" % Versions.jackson,
   "com.fasterxml.jackson.module" % "jackson-module-parameter-names" % Versions.jackson,
   "com.fasterxml.jackson.module" %% "jackson-module-scala"    % Versions.jackson,
 )
 
 val elastic4s = Seq(
-  "nl.gn0s1s" %% "elastic4s-core"     % Versions.elastic4s exclude ("org.elasticsearch", "elasticsearch") exclude("org.slf4j", "slf4j-api"),
+  "nl.gn0s1s" %% "elastic4s-core" % Versions.elastic4s exclude ("org.elasticsearch", "elasticsearch") exclude("org.slf4j", "slf4j-api"),
 )
 
 val scalatest = Seq(
@@ -26,7 +25,7 @@ val scalatest = Seq(
 libraryDependencies ++= jackson ++ elastic4s ++ scalatest ++ Seq(
   "javax.activation" % "activation" % "1.1.1" % Test
 ) :+
-  "org.scala-lang" % "scala-reflect" % "2.12.18" :+
+  "org.scala-lang" % "scala-reflect" % "2.13.16" :+
   "com.google.code.gson" % "gson" % Versions.gson % Test
 
 

sql/src/main/scala/app/softnetwork/elastic/sql/SQLWhere.scala

@@ -461,7 +461,7 @@ case class ElasticGeoDistance(
     innerHitsNames: Set[String] = Set.empty,
     currentQuery: Option[ElasticBoolQuery]
   ): Query = {
-    geoDistanceQuery(identifier.columnName).point(lat.value, lon.value) distance distance.value
+    geoDistanceQuery(identifier.columnName, lat.value, lon.value) distance distance.value
   }
 }