add java client helpers, add ElasticsearchConversion, update java client implementations to use ElasticResult

Author: fupelaqu

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

@@ -303,7 +303,10 @@ trait AliasApi extends ElasticClientHelpers { _: IndicesApi =>
             logger.warn(s"Index '$index' not found in response")
             ElasticResult.success(Set.empty[String])
           } else {
-            val aliasesObj = indexObj.getAsJsonObject("aliases")
+            val aliasesObj =
+              indexObj
+                .getAsJsonObject(index)
+                .getAsJsonObject("aliases")
             if (aliasesObj == null || aliasesObj.size() == 0) {
               logger.debug(s"No aliases found for index '$index'")
               ElasticResult.success(Set.empty[String])

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

@@ -111,7 +111,14 @@ trait ElasticClientSpec extends AnyFlatSpecLike with ElasticDockerTestKit with M
   "Adding an alias and then removing it" should "work" in {
     pClient.addAlias("person", "person_alias")
 
-    doesAliasExists("person_alias") shouldBe true
+    pClient.aliasExists("person_alias").get shouldBe true
+
+    pClient.getAliases("person") match {
+      case ElasticSuccess(aliases) =>
+        aliases should contain("person_alias")
+      case ElasticFailure(elasticError) =>
+        fail(elasticError.fullMessage)
+    }
 
     pClient.removeAlias("person", "person_alias")
 

es6/jest/src/main/scala/app/softnetwork/elastic/client/jest/JestAliasApi.scala

@@ -65,15 +65,15 @@ trait JestAliasApi extends AliasApi with JestClientHelpers {
     *   [[AliasApi.aliasExists]]
     */
   override private[client] def executeAliasExists(alias: String): ElasticResult[Boolean] =
-    executeJestBooleanAction(
+    executeJestAction(
       operation = "aliasExists",
       index = Some(alias),
       retryable = true
     ) {
       new GetAliases.Builder()
         .addAlias(alias)
         .build()
-    }
+    }(result => !result.getJsonObject.getAsJsonObject.entrySet().isEmpty)
 
   /** Get aliases for a given index.
     * @see

es6/rest/src/main/scala/app/softnetwork/elastic/client/rest/RestHighLevelClientApi.scala

@@ -296,17 +296,7 @@ trait RestHighLevelClientAliasApi extends AliasApi with RestHighLevelClientHelpe
       request = new GetAliasesRequest().indices(index)
     )(
       executor = req => apply().indices().getAlias(req, RequestOptions.DEFAULT)
-    )(response => {
-      val aliases = response.getAliases.asScala.get(index)
-      aliases match {
-        case Some(aliasMetaDataSeq) =>
-          val aliasNames = aliasMetaDataSeq.asScala.map(_.alias()).toSeq
-          val jsonAliases = aliasNames.map(name => s""""$name": {}""").mkString(", ")
-          s"""{ "aliases": { $jsonAliases } }"""
-        case None =>
-          s"""{ "aliases": {} }"""
-      }
-    })
+    )(response => Strings.toString(response))
 
   override private[client] def executeSwapAlias(
     oldIndex: String,
@@ -945,12 +935,12 @@ trait RestHighLevelClientBulkApi extends BulkApi with RestHighLevelClientHelpers
     }
 
     // process successful items
-    val items =
+    val successfulItems =
       result.getItems.filterNot(_.isFailed).map { item =>
         Right(SuccessfulDocument(id = item.getId, index = item.getIndex))
       }
 
-    val results = failedItems ++ items
+    val results = failedItems ++ successfulItems
 
     // if no individual results but overall failure, mark all as failed
     if (results.isEmpty && originalBatch.nonEmpty) {

es7/rest/src/main/scala/app/softnetwork/elastic/client/rest/RestHighLevelClientApi.scala

@@ -301,17 +301,7 @@ trait RestHighLevelClientAliasApi extends AliasApi with RestHighLevelClientHelpe
       request = new GetAliasesRequest().indices(index)
     )(
       executor = req => apply().indices().getAlias(req, RequestOptions.DEFAULT)
-    )(response => {
-      val aliases = response.getAliases.asScala.get(index)
-      aliases match {
-        case Some(aliasMetaDataSeq) =>
-          val aliasNames = aliasMetaDataSeq.asScala.map(_.alias()).toSeq
-          val jsonAliases = aliasNames.map(name => s""""$name": {}""").mkString(", ")
-          s"""{ "aliases": { $jsonAliases } }"""
-        case None =>
-          s"""{ "aliases": {} }"""
-      }
-    })
+    )(response => Strings.toString(response))
 
   override private[client] def executeSwapAlias(
     oldIndex: String,
@@ -951,12 +941,12 @@ trait RestHighLevelClientBulkApi extends BulkApi with RestHighLevelClientHelpers
     }
 
     // process successful items
-    val items =
+    val successfulItems =
       result.getItems.filterNot(_.isFailed).map { item =>
         Right(SuccessfulDocument(id = item.getId, index = item.getIndex))
       }
 
-    val results = failedItems ++ items
+    val results = failedItems ++ successfulItems
 
     // if no individual results but overall failure, mark all as failed
     if (results.isEmpty && originalBatch.nonEmpty) {