fix sql specifications for es 7, 8 and 9

Author: fupelaqu

core/testkit/src/main/scala/app/softnetwork/elastic/client/ElasticClientSpec.scala

@@ -191,14 +191,14 @@ trait ElasticClientSpec extends AnyFlatSpecLike with ElasticDockerTestKit with M
       case other => fail(other.toString)
     }
 
-    pClient.search[Person]("select * from person_mapping where match(name, 'gum')") match {
+    pClient.search[Person]("select * from person_mapping where match (name) against ('gum')") match {
       case r if r.size == 1 =>
         r.map(_.uuid) should contain only "A16"
       case other => fail(other.toString)
     }
 
     pClient.search[Person](
-      "select * from person_mapping where uuid <> 'A16' and match(name, 'gum')"
+      "select * from person_mapping where uuid <> 'A16' and match (name) against ('gum')"
     ) match {
       case r if r.isEmpty =>
       case other          => fail(other.toString)
@@ -239,7 +239,7 @@ trait ElasticClientSpec extends AnyFlatSpecLike with ElasticDockerTestKit with M
 
     "person_migration" should haveCount(3)
 
-    pClient.search[Person]("select * from person_migration where match(name, 'gum')") match {
+    pClient.search[Person]("select * from person_migration where match (name) against ('gum')") match {
       case r if r.isEmpty =>
       case other          => fail(other.toString)
     }
@@ -288,7 +288,7 @@ trait ElasticClientSpec extends AnyFlatSpecLike with ElasticDockerTestKit with M
     pClient.shouldUpdateMapping("person_migration", newMapping) shouldBe true
     pClient.updateMapping("person_migration", newMapping) shouldBe true
 
-    pClient.search[Person]("select * from person_migration where match(name, 'gum')") match {
+    pClient.search[Person]("select * from person_migration where match (name) against ('gum')") match {
       case r if r.size == 1 =>
         r.map(_.uuid) should contain only "A16"
       case other => fail(other.toString)

sql/bridge/src/test/scala/app/softnetwork/elastic/sql/SQLCriteriaSpec.scala

@@ -2,7 +2,8 @@ package app.softnetwork.elastic.sql
 
 import app.softnetwork.elastic.sql.bridge._
 import com.sksamuel.elastic4s.ElasticApi.matchAllQuery
-import com.sksamuel.elastic4s.requests.searches.{SearchBodyBuilderFn, SearchRequest}
+import com.sksamuel.elastic4s.http.search.SearchBodyBuilderFn
+import com.sksamuel.elastic4s.searches.SearchRequest
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 
@@ -146,7 +147,7 @@ class SQLCriteriaSpec extends AnyFlatSpec with Matchers {
         |"query":{
         |    "bool":{"filter":[{"regexp" : {
         |      "identifier" : {
-        |        "value" : ".*?un.*?"
+        |        "value" : ".*un.*"
         |      }
         |    }
         |  }
@@ -160,7 +161,7 @@ class SQLCriteriaSpec extends AnyFlatSpec with Matchers {
         |      "filter":[{"bool":{"must_not": [{
         |        "regexp": {
         |          "identifier": {
-        |            "value": ".*?un.*?"
+        |            "value": ".*un.*"
         |          }
         |        }
         |      }]
@@ -781,10 +782,24 @@ class SQLCriteriaSpec extends AnyFlatSpec with Matchers {
     """{
         | "query":{
         |   "bool":{
-        |     "filter":[
+        |     "should":[
         |       {
         |         "match":{
-        |           "identifier":{
+        |           "identifier1":{
+        |             "query":"value"
+        |           }
+        |         }
+        |       },
+        |       {
+        |         "match":{
+        |           "identifier2":{
+        |             "query":"value"
+        |           }
+        |         }
+        |       },
+        |       {
+        |         "match":{
+        |           "identifier3":{
         |             "query":"value"
         |           }
         |         }