Update to ElasticSearch 8.2.0 (#368)

Port of changes in #320 which were lost in merge

buildSrc/src/main/groovy/io.micronaut.build.internal.elasticsearch-base.gradle

@@ -2,10 +2,3 @@ repositories {
     mavenCentral()
     maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
 }
-
-configurations.all {
-    resolutionStrategy.dependencySubstitution {
-        substitute(module("org.codehaus.groovy:groovy"))
-                .using(module("org.apache.groovy:groovy:4.0.10"))
-    }
-}

elasticsearch-bom/build.gradle.kts

@@ -1,3 +1,9 @@
 plugins {
     id("io.micronaut.build.internal.bom")
 }
+micronautBuild {
+    micronautBuild {
+        // required because elasticsearch-rest-high-level-client was removed
+        tasks.named("checkVersionCatalogCompatibility") { onlyIf { false } }
+    }
+}

elasticsearch/build.gradle.kts

@@ -7,9 +7,7 @@ dependencies {
 
     compileOnly(libs.graal.svm)
     implementation(mn.micronaut.management)
-
     api(libs.managed.elasticsearch.java)
-    api(libs.managed.elasticsearch.rest.high.level.client)
     api(mn.micronaut.http)
 
     implementation(mn.micronaut.jackson.databind)
@@ -27,3 +25,8 @@ tasks {
     }
 }
 
+micronautBuild {
+    binaryCompatibility {
+        enabled.set(false)
+    }
+}

elasticsearch/src/main/java/io/micronaut/elasticsearch/DefaultElasticsearchClientFactory.java

@@ -25,7 +25,6 @@
 
 import org.elasticsearch.client.RestClient;
 import org.elasticsearch.client.RestClientBuilder;
-import org.elasticsearch.client.RestHighLevelClient;
 
 import co.elastic.clients.elasticsearch.ElasticsearchAsyncClient;
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
@@ -44,17 +43,6 @@
 @Factory
 public class DefaultElasticsearchClientFactory {
 
-    /**
-     * Create the {@link RestHighLevelClient} bean for the given configuration.
-     *
-     * @param elasticsearchConfiguration The {@link DefaultElasticsearchConfigurationProperties} object
-     * @return A {@link RestHighLevelClient} bean
-     */
-    @Bean(preDestroy = "close")
-    RestHighLevelClient restHighLevelClient(DefaultElasticsearchConfigurationProperties elasticsearchConfiguration) {
-        return new RestHighLevelClient(restClientBuilder(elasticsearchConfiguration));
-    }
-
     /**
      * @param elasticsearchConfiguration The {@link DefaultElasticsearchConfigurationProperties} object
      * @return The Elasticsearch Rest Client

elasticsearch/src/main/java/io/micronaut/elasticsearch/DefaultHttpAsyncClientBuilderFactory.java

@@ -19,8 +19,7 @@
 import io.micronaut.context.annotation.Factory;
 import io.micronaut.context.annotation.Requires;
 import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
-import org.elasticsearch.client.RestHighLevelClient;
-
+import org.elasticsearch.client.RestClient;
 import jakarta.inject.Singleton;
 
 /**
@@ -29,7 +28,7 @@
  * @author Puneet Behl
  * @since 1.0.0
  */
-@Requires(classes = {RestHighLevelClient.class})
+@Requires(classes = {RestClient.class})
 @Factory
 public class DefaultHttpAsyncClientBuilderFactory {
 

elasticsearch/src/main/java/io/micronaut/elasticsearch/conditon/RequiresElasticsearch.java

@@ -17,7 +17,7 @@
 
 import io.micronaut.elasticsearch.ElasticsearchSettings;
 import io.micronaut.context.annotation.Requires;
-import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.client.RestClient;
 
 import java.lang.annotation.*;
 
@@ -31,6 +31,6 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.PACKAGE, ElementType.TYPE})
 @Requires(property = ElasticsearchSettings.PREFIX)
-@Requires(classes = {RestHighLevelClient.class})
+@Requires(classes = {RestClient.class})
 public @interface RequiresElasticsearch {
 }

elasticsearch/src/main/java/io/micronaut/elasticsearch/graalvm/RestClientSubstitutions.java

@@ -47,7 +47,7 @@
  *
  * We substitute it with an implementation which does not use serialization.
  *
- * Forked from Quarkus: https://github.com/quarkusio/quarkus/blob/c9cba824e8812fa3f15474b8382ac5d90f7238aa/extensions/elasticsearch-rest-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/runtime/graal/Substitute_RestClient.java
+ * Forked from Quarkus: https://github.com/quarkusio/quarkus/blob/main/extensions/elasticsearch-rest-client-common/runtime/src/main/java/io/quarkus/elasticsearch/restclient/common/runtime/graal/Substitute_RestClient.java
  *
  * @author Iván López
  * @since 2.0.0
@@ -109,7 +109,7 @@ public NoSerializationBasicAuthCache() {
             this(null);
         }
 
-        protected HttpHost getKey(final HttpHost host) {
+        private HttpHost getKey(final HttpHost host) {
             if (host.getPort() <= 0) {
                 final int port;
                 try {

elasticsearch/src/main/java/io/micronaut/elasticsearch/health/ElasticsearchClientHealthIndicator.java

@@ -23,11 +23,12 @@
 import org.reactivestreams.Publisher;
 
 import co.elastic.clients.elasticsearch.ElasticsearchAsyncClient;
+import co.elastic.clients.elasticsearch.cluster.HealthResponse;
 import jakarta.inject.Singleton;
-import java.io.IOException;
 
 import static io.micronaut.health.HealthStatus.DOWN;
 import static io.micronaut.health.HealthStatus.UP;
+import java.util.Locale;
 
 /**
  * A {@link HealthIndicator} for Elasticsearch that uses an automatically-configured high-level REST client, injected as a dependency, to communicate
@@ -39,7 +40,6 @@
  */
 @Requires(beans = HealthEndpoint.class)
 @Requires(property = HealthEndpoint.PREFIX + ".elasticsearch.enabled", notEquals = "false")
-@Requires(property = HealthEndpoint.PREFIX + ".elasticsearch.rest.high.level.enabled", notEquals = "true") // we don't want to clash with the deprecated check
 @Singleton
 public class ElasticsearchClientHealthIndicator implements HealthIndicator {
 
@@ -65,24 +65,41 @@ public ElasticsearchClientHealthIndicator(ElasticsearchAsyncClient client) {
      */
     @Override
     public Publisher<HealthResult> getResult() {
-        return (subscriber -> {
-            final HealthResult.Builder resultBuilder = HealthResult.builder(NAME);
-            try {
-                client.cluster().health().handle((health, exception) -> {
-                    if (exception != null) {
-                        subscriber.onNext(resultBuilder.status(DOWN).exception(exception).build());
-                        subscriber.onComplete();
-                    } else {
-                        HealthStatus status = health.status() == co.elastic.clients.elasticsearch._types.HealthStatus.Red ? DOWN : UP;
-                        subscriber.onNext(resultBuilder.status(status).details(health).build());
-                        subscriber.onComplete();
-                    }
-                    return health;
-                });
-            } catch (IOException e) {
-                subscriber.onNext(resultBuilder.status(DOWN).exception(e).build());
-                subscriber.onComplete();
-            }
-        });
+        return (subscriber -> client.cluster().health()
+            .handle((health, exception) -> {
+                final HealthResult.Builder resultBuilder = HealthResult.builder(NAME);
+                if (exception != null) {
+                    subscriber.onNext(resultBuilder.status(DOWN).exception(exception).build());
+                    subscriber.onComplete();
+                } else {
+                    HealthStatus status = health.status() == co.elastic.clients.elasticsearch._types.HealthStatus.Red ? DOWN : UP;
+                    subscriber.onNext(resultBuilder.status(status).details(healthResultDetails(health)).build());
+                    subscriber.onComplete();
+                }
+                return health;
+            }));
+    }
+
+    private String healthResultDetails(HealthResponse response) {
+        return "{"
+            + "\"cluster_name\":\"" + response.clusterName() + "\","
+            + "\"status\":\"" + response.status().name().toLowerCase(Locale.ENGLISH) + "\","
+            + "\"timed_out\":" + response.timedOut() + ","
+            + "\"number_of_nodes\":" + response.numberOfNodes() + ","
+            + "\"number_of_data_nodes\":" + response.numberOfDataNodes() + ","
+            + "\"number_of_pending_tasks\":" + response.numberOfPendingTasks() + ","
+            + "\"number_of_in_flight_fetch\":" + response.numberOfInFlightFetch() + ","
+            + "\"task_max_waiting_in_queue\":\"" + response.taskMaxWaitingInQueueMillis() + "\","
+            + "\"task_max_waiting_in_queue_millis\":" + response.taskMaxWaitingInQueueMillis() + ","
+            + "\"active_shards_percent_as_number\":\"" + response.activeShardsPercentAsNumber() + "\","
+            + "\"active_primary_shards\":" + response.activePrimaryShards() + ","
+            + "\"active_shards\":" + response.activeShards() + ","
+            + "\"relocating_shards\":" + response.relocatingShards() + ","
+            + "\"initializing_shards\":" + response.initializingShards() + ","
+            + "\"unassigned_shards\":" + response.unassignedShards() + ","
+            + "\"delayed_unassigned_shards\":" + response.delayedUnassignedShards()
+            + "}";
     }
 }
+
+

elasticsearch/src/test/groovy/io/micronaut/elasticsearch/DefaultElasticsearchConfigurationPropertiesSpec.groovy

@@ -16,6 +16,7 @@
 
 package io.micronaut.elasticsearch
 
+import co.elastic.clients.elasticsearch.ElasticsearchClient
 import io.micronaut.context.ApplicationContext
 import io.micronaut.context.annotation.Factory
 import io.micronaut.context.annotation.Replaces
@@ -27,7 +28,6 @@ import org.apache.http.impl.client.BasicCredentialsProvider
 import org.apache.http.impl.nio.client.HttpAsyncClientBuilder
 import org.apache.http.impl.nio.reactor.IOReactorConfig
 import org.elasticsearch.client.NodeSelector
-import org.elasticsearch.client.RestHighLevelClient
 import spock.lang.Specification
 
 import jakarta.inject.Singleton
@@ -38,8 +38,7 @@ import jakarta.inject.Singleton
  */
 class DefaultElasticsearchConfigurationPropertiesSpec extends Specification {
 
-    void "Test Elasticsearch high level rest client configrations"() {
-
+    void "Test Elasticsearch rest client configrations"() {
         when:
         ApplicationContext applicationContext = ApplicationContext.run(
 
@@ -108,7 +107,7 @@ class DefaultElasticsearchConfigurationPropertiesSpec extends Specification {
 
         expect:
         applicationContext.containsBean(DefaultElasticsearchConfigurationProperties)
-        applicationContext.containsBean(RestHighLevelClient)
+        applicationContext.containsBean(ElasticsearchClient)
         applicationContext.getBean(DefaultElasticsearchConfigurationProperties).httpHosts.size() == 2
 
     }