refactoring - removing persistence module, add core/testkit for es7, 8 and 9

Author: fupelaqu

build.sbt

@@ -1,5 +1,6 @@
 import SoftClient4es.*
 import app.softnetwork.*
+import sbtbuildinfo.BuildInfoKeys.buildInfoObject
 
 /////////////////////////////////
 // Defaults
@@ -17,7 +18,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "softclient4es"
 
-ThisBuild / version := "0.1.1"
+ThisBuild / version := "0.1.2"
 
 ThisBuild / scalaVersion := scala213
 
@@ -93,16 +94,6 @@ lazy val core = project.in(file("core"))
     sql % "compile->compile;test->test;it->it"
   )
 
-lazy val persistence = project.in(file("persistence"))
-  .configs(IntegrationTest)
-  .settings(
-    Defaults.itSettings,
-    moduleSettings
-  )
-  .dependsOn(
-    core % "compile->compile;test->test;it->it"
-  )
-
 lazy val es6bridge = project.in(file("es6/sql-bridge"))
   .configs(IntegrationTest)
   .settings(
@@ -114,32 +105,36 @@ lazy val es6bridge = project.in(file("es6/sql-bridge"))
     sql % "compile->compile;test->test;it->it"
   )
 
-lazy val es6rest = project.in(file("es6/rest"))
+lazy val es6testkit = project.in(file("es6/testkit"))
   .configs(IntegrationTest)
   .settings(
     Defaults.itSettings,
+    app.softnetwork.Info.infoSettings,
     moduleSettings,
     elasticSearchVersion := Versions.es6,
+    buildInfoKeys += BuildInfoKey("elasticVersion" -> elasticSearchVersion.value),
+    buildInfoObject := "SoftClient4esCoreTestkitBuildInfo",
   )
+  .enablePlugins(BuildInfoPlugin)
   .dependsOn(
     core % "compile->compile;test->test;it->it"
   )
-  .dependsOn(
-    es6bridge % "compile->compile;test->test;it->it"
-  )
 
-lazy val es6restp = project.in(file("es6/rest/persistence"))
+lazy val es6rest = project.in(file("es6/rest"))
   .configs(IntegrationTest)
   .settings(
     Defaults.itSettings,
     moduleSettings,
     elasticSearchVersion := Versions.es6,
   )
   .dependsOn(
-    persistence % "compile->compile;test->test;it->it"
+    core % "compile->compile;test->test;it->it"
   )
   .dependsOn(
-    es6rest % "compile->compile;test->test;it->it"
+    es6bridge % "compile->compile;test->test;it->it"
+  )
+  .dependsOn(
+    es6testkit % "compile->compile;test->test;it->it"
   )
 
 lazy val es6jest = project.in(file("es6/jest"))
@@ -155,36 +150,8 @@ lazy val es6jest = project.in(file("es6/jest"))
   .dependsOn(
     es6bridge % "compile->compile;test->test;it->it"
   )
-
-lazy val es6jestp = project.in(file("es6/jest/persistence"))
-  .configs(IntegrationTest)
-  .settings(
-    Defaults.itSettings,
-    moduleSettings,
-    elasticSearchVersion := Versions.es6,
-  )
-  .dependsOn(
-    persistence % "compile->compile;test->test;it->it"
-  )
-  .dependsOn(
-    es6jest % "compile->compile;test->test;it->it"
-  )
-
-lazy val es6testkit = project.in(file("es6/testkit"))
-  .configs(IntegrationTest)
-  .settings(
-    Defaults.itSettings,
-    app.softnetwork.Info.infoSettings,
-    moduleSettings,
-    elasticSearchVersion := Versions.es6,
-    buildInfoKeys += BuildInfoKey("elasticVersion" -> elasticSearchVersion.value)
-  )
-  .enablePlugins(BuildInfoPlugin)
   .dependsOn(
-    es6restp % "compile->compile;test->test;it->it"
-  )
-  .dependsOn(
-    es6jestp % "compile->compile;test->test;it->it"
+    es6testkit % "compile->compile;test->test;it->it"
   )
 
 lazy val es6 = project.in(file("es6"))
@@ -197,11 +164,9 @@ lazy val es6 = project.in(file("es6"))
   )
   .aggregate(
     es6bridge,
+    es6testkit,
     es6rest,
-    es6restp,
-    es6jest,
-    es6jestp,
-    es6testkit
+    es6jest
   )
 
 lazy val es7bridge = project.in(file("sql/bridge"))
@@ -215,46 +180,36 @@ lazy val es7bridge = project.in(file("sql/bridge"))
     sql % "compile->compile;test->test;it->it"
   )
 
-lazy val es7rest = project.in(file("es7/rest"))
+lazy val es7testkit = project.in(file("core/testkit"))
   .configs(IntegrationTest)
   .settings(
     Defaults.itSettings,
+    app.softnetwork.Info.infoSettings,
     moduleSettings,
     elasticSearchVersion := Versions.es7,
+    buildInfoKeys += BuildInfoKey("elasticVersion" -> elasticSearchVersion.value),
+    buildInfoObject := "SoftClient4esCoreTestkitBuildInfo",
   )
+  .enablePlugins(BuildInfoPlugin)
   .dependsOn(
     core % "compile->compile;test->test;it->it"
   )
-  .dependsOn(
-    es7bridge % "compile->compile;test->test;it->it"
-  )
 
-lazy val es7restp = project.in(file("es7/rest/persistence"))
+lazy val es7rest = project.in(file("es7/rest"))
   .configs(IntegrationTest)
   .settings(
     Defaults.itSettings,
     moduleSettings,
     elasticSearchVersion := Versions.es7,
   )
   .dependsOn(
-    persistence % "compile->compile;test->test;it->it"
+    core % "compile->compile;test->test;it->it"
   )
   .dependsOn(
-    es7rest % "compile->compile;test->test;it->it"
-  )
-
-lazy val es7testkit = project.in(file("es7/testkit"))
-  .configs(IntegrationTest)
-  .settings(
-    Defaults.itSettings,
-    app.softnetwork.Info.infoSettings,
-    moduleSettings,
-    elasticSearchVersion := Versions.es7,
-    buildInfoKeys += BuildInfoKey("elasticVersion" -> elasticSearchVersion.value)
+    es7bridge % "compile->compile;test->test;it->it"
   )
-  .enablePlugins(BuildInfoPlugin)
   .dependsOn(
-    es7restp % "compile->compile;test->test;it->it"
+    es7testkit % "compile->compile;test->test;it->it"
   )
 
 lazy val es7 = project.in(file("es7"))
@@ -267,9 +222,8 @@ lazy val es7 = project.in(file("es7"))
   )
   .aggregate(
     es7bridge,
-    es7rest,
-    es7restp,
-    es7testkit
+    es7testkit,
+    es7rest
   )
 
 lazy val es8bridge = project.in(file("sql/bridge"))
@@ -283,46 +237,36 @@ lazy val es8bridge = project.in(file("sql/bridge"))
     sql % "compile->compile;test->test;it->it"
   )
 
-lazy val es8java = project.in(file("es8/java"))
+lazy val es8testkit = project.in(file("core/testkit"))
   .configs(IntegrationTest)
   .settings(
     Defaults.itSettings,
+    app.softnetwork.Info.infoSettings,
     moduleSettings,
     elasticSearchVersion := Versions.es8,
+    buildInfoKeys += BuildInfoKey("elasticVersion" -> elasticSearchVersion.value),
+    buildInfoObject := "SoftClient4esCoreTestkitBuildInfo",
   )
+  .enablePlugins(BuildInfoPlugin)
   .dependsOn(
     core % "compile->compile;test->test;it->it"
   )
-  .dependsOn(
-    es8bridge % "compile->compile;test->test;it->it"
-  )
 
-lazy val es8javap = project.in(file("es8/java/persistence"))
+lazy val es8java = project.in(file("es8/java"))
   .configs(IntegrationTest)
   .settings(
     Defaults.itSettings,
     moduleSettings,
     elasticSearchVersion := Versions.es8,
   )
   .dependsOn(
-    persistence % "compile->compile;test->test;it->it"
+    core % "compile->compile;test->test;it->it"
   )
   .dependsOn(
-    es8java % "compile->compile;test->test;it->it"
-  )
-
-lazy val es8testkit = project.in(file("es8/testkit"))
-  .configs(IntegrationTest)
-  .settings(
-    Defaults.itSettings,
-    app.softnetwork.Info.infoSettings,
-    moduleSettings,
-    elasticSearchVersion := Versions.es8,
-    buildInfoKeys += BuildInfoKey("elasticVersion" -> elasticSearchVersion.value)
+    es8bridge % "compile->compile;test->test;it->it"
   )
-  .enablePlugins(BuildInfoPlugin)
   .dependsOn(
-    es8javap % "compile->compile;test->test;it->it"
+    es8testkit % "compile->compile;test->test;it->it"
   )
 
 lazy val es8 = project.in(file("es8"))
@@ -335,9 +279,8 @@ lazy val es8 = project.in(file("es8"))
   )
   .aggregate(
     es8bridge,
-    es8java,
-    es8javap,
-    es8testkit
+    es8testkit,
+    es8java
   )
 
 lazy val es9bridge = project.in(file("sql/bridge"))
@@ -354,24 +297,25 @@ lazy val es9bridge = project.in(file("sql/bridge"))
     sql % "compile->compile;test->test;it->it"
   )
 
-lazy val es9java = project.in(file("es9/java"))
+lazy val es9testkit = project.in(file("core/testkit"))
   .configs(IntegrationTest)
   .settings(
     Defaults.itSettings,
+    app.softnetwork.Info.infoSettings,
     moduleSettings,
     scalaVersion := scala213,
     crossScalaVersions := Seq(scala213),
     elasticSearchVersion := Versions.es9,
-    javacOptions ++= Seq("-source", "17", "-target", "17")
+    javacOptions ++= Seq("-source", "17", "-target", "17"),
+    buildInfoKeys += BuildInfoKey("elasticVersion" -> elasticSearchVersion.value),
+    buildInfoObject := "SoftClient4esCoreTestkitBuildInfo",
   )
+  .enablePlugins(BuildInfoPlugin)
   .dependsOn(
     core % "compile->compile;test->test;it->it"
   )
-  .dependsOn(
-    es9bridge % "compile->compile;test->test;it->it"
-  )
 
-lazy val es9javap = project.in(file("es9/java/persistence"))
+lazy val es9java = project.in(file("es9/java"))
   .configs(IntegrationTest)
   .settings(
     Defaults.itSettings,
@@ -382,27 +326,13 @@ lazy val es9javap = project.in(file("es9/java/persistence"))
     javacOptions ++= Seq("-source", "17", "-target", "17")
   )
   .dependsOn(
-    persistence % "compile->compile;test->test;it->it"
+    core % "compile->compile;test->test;it->it"
   )
   .dependsOn(
-    es9java % "compile->compile;test->test;it->it"
-  )
-
-lazy val es9testkit = project.in(file("es9/testkit"))
-  .configs(IntegrationTest)
-  .settings(
-    Defaults.itSettings,
-    app.softnetwork.Info.infoSettings,
-    moduleSettings,
-    scalaVersion := scala213,
-    crossScalaVersions := Seq(scala213),
-    elasticSearchVersion := Versions.es9,
-    javacOptions ++= Seq("-source", "17", "-target", "17"),
-    buildInfoKeys += BuildInfoKey("elasticVersion" -> elasticSearchVersion.value)
+    es9bridge % "compile->compile;test->test;it->it"
   )
-  .enablePlugins(BuildInfoPlugin)
   .dependsOn(
-    es9javap % "compile->compile;test->test;it->it"
+    es9testkit % "compile->compile;test->test;it->it"
   )
 
 lazy val es9 = project.in(file("es9"))
@@ -415,9 +345,8 @@ lazy val es9 = project.in(file("es9"))
   )
   .aggregate(
     es9bridge,
-    es9java,
-    es9javap,
-    es9testkit
+    es9testkit,
+    es9java
   )
 
 lazy val root = project.in(file("."))
@@ -430,7 +359,6 @@ lazy val root = project.in(file("."))
   .aggregate(
     sql,
     core,
-    persistence,
     es6,
     es7,
     es8,

core/src/main/scala/app/softnetwork/elastic/client/AggregateResult.scala

@@ -30,4 +30,14 @@ case class SingleValueAggregateResult(
     case StringValue(v) => Some(v)
     case _              => None
   }
+
+  def isDouble: Boolean = value match {
+    case NumericValue(_) => true
+    case _               => false
+  }
+
+  def isString: Boolean = value match {
+    case StringValue(_) => true
+    case _              => false
+  }
 }

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

@@ -42,7 +42,7 @@ package object client {
 
   case class BulkOptions(
     index: String,
-    documentType: String,
+    documentType: String = "_doc",
     maxBulkSize: Int = 100,
     balance: Int = 1,
     disableRefresh: Boolean = false

…/persistence/query/ElasticProvider.scala …/persistence/query/ElasticProvider.scalapersistence/src/main/scala/app/softnetwork/elastic/persistence/query/ElasticProvider.scala renamed to core/src/main/scala/app/softnetwork/elastic/persistence/query/ElasticProvider.scala persistence/src/main/scala/app/softnetwork/elastic/persistence/query/ElasticProvider.scala renamed to core/src/main/scala/app/softnetwork/elastic/persistence/query/ElasticProvider.scala

@@ -9,7 +9,6 @@ import app.softnetwork.persistence.model.Timestamped
 import app.softnetwork.persistence.query.ExternalPersistenceProvider
 import app.softnetwork.serialization.commonFormats
 import app.softnetwork.elastic.persistence.typed.Elastic._
-import com.typesafe.scalalogging.StrictLogging
 
 import scala.reflect.ClassTag
 import scala.util.{Failure, Success, Try}
@@ -35,16 +34,15 @@ trait ElasticProvider[T <: Timestamped] extends ExternalPersistenceProvider[T] {
       case Success(s) =>
         s
       case Failure(f) =>
-        logger.error(s"$pathOrElse -> f.getMessage", f)
+        logger.error(s"$pathOrElse -> ${f.getMessage}", f)
         "{}"
     }
   }
 
   protected def initIndex(): Unit = {
     Try {
-      createIndex(index)
+      updateMapping(index, loadMapping(mappingPath))
       addAlias(index, alias)
-      setMapping(index, loadMapping(mappingPath))
     } match {
       case Success(_) => logger.info(s"index:$index type:${_type} alias:$alias created")
       case Failure(f) =>