micronaut-projects · graemerocher · May 16, 2022 · May 8, 2022
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+* text eol=lf
diff --git a/config/accepted-api-changes.json b/config/accepted-api-changes.json
@@ -0,0 +1,202 @@
+[
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchAsyncClient3$Definition$Reference",
+        "member": "Class io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchAsyncClient3$Definition$Reference",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchAsyncClient3$Definition$Reference",
+        "member": "Field $ANNOTATION_METADATA",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchAsyncClient3$Definition$Reference",
+        "member": "Method io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchAsyncClient3$Definition$Reference.getBeanDefinitionType()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchAsyncClient3$Definition$Reference",
+        "member": "Method io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchAsyncClient3$Definition$Reference.getBeanType()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchAsyncClient3$Definition$Reference",
+        "member": "Method io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchAsyncClient3$Definition$Reference.load()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchAsyncClient3$Definition$Reference",
+        "member": "Constructor io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchAsyncClient3$Definition$Reference()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchClient2$Definition$Reference",
+        "member": "Class io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchClient2$Definition$Reference",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchClient2$Definition$Reference",
+        "member": "Field $ANNOTATION_METADATA",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchClient2$Definition$Reference",
+        "member": "Method io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchClient2$Definition$Reference.getBeanDefinitionType()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchClient2$Definition$Reference",
+        "member": "Method io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchClient2$Definition$Reference.getBeanType()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchClient2$Definition$Reference",
+        "member": "Method io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchClient2$Definition$Reference.load()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchClient2$Definition$Reference",
+        "member": "Constructor io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchClient2$Definition$Reference()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchTransport4$Definition$Reference",
+        "member": "Class io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchTransport4$Definition$Reference",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchTransport4$Definition$Reference",
+        "member": "Field $ANNOTATION_METADATA",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchTransport4$Definition$Reference",
+        "member": "Method io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchTransport4$Definition$Reference.getBeanDefinitionType()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchTransport4$Definition$Reference",
+        "member": "Method io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchTransport4$Definition$Reference.getBeanType()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchTransport4$Definition$Reference",
+        "member": "Method io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchTransport4$Definition$Reference.load()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchTransport4$Definition$Reference",
+        "member": "Constructor io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$ElasticsearchTransport4$Definition$Reference()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$RestClient1$Definition$Reference",
+        "member": "Class io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$RestClient1$Definition$Reference",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$RestClient1$Definition$Reference",
+        "member": "Field $ANNOTATION_METADATA",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$RestClient1$Definition$Reference",
+        "member": "Method io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$RestClient1$Definition$Reference.getBeanDefinitionType()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$RestClient1$Definition$Reference",
+        "member": "Method io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$RestClient1$Definition$Reference.getBeanType()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$RestClient1$Definition$Reference",
+        "member": "Method io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$RestClient1$Definition$Reference.load()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$RestClient1$Definition$Reference",
+        "member": "Constructor io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$RestClient1$Definition$Reference()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$RestHighLevelClient0$Definition$Reference",
+        "member": "Class io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$RestHighLevelClient0$Definition$Reference",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$RestHighLevelClient0$Definition$Reference",
+        "member": "Field $ANNOTATION_METADATA",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$RestHighLevelClient0$Definition$Reference",
+        "member": "Field $ANNOTATION_METADATA",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$RestHighLevelClient0$Definition$Reference",
+        "member": "Method io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$RestHighLevelClient0$Definition$Reference.getBeanType()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$RestHighLevelClient0$Definition$Reference",
+        "member": "Method io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$RestHighLevelClient0$Definition$Reference.load()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$RestHighLevelClient0$Definition$Reference",
+        "member": "Constructor io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$RestHighLevelClient0$Definition$Reference()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$RestHighLevelClient0$Definition$Reference",
+        "member": "Method io.micronaut.elasticsearch.$DefaultElasticsearchClientFactory$RestHighLevelClient0$Definition$Reference.getBeanDefinitionType()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.health.$ElasticsearchHealthIndicator$Definition$Reference",
+        "member": "Class io.micronaut.elasticsearch.health.$ElasticsearchHealthIndicator$Definition$Reference",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.health.$ElasticsearchHealthIndicator$Definition$Reference",
+        "member": "Field $ANNOTATION_METADATA",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.health.$ElasticsearchHealthIndicator$Definition$Reference",
+        "member": "Method io.micronaut.elasticsearch.health.$ElasticsearchHealthIndicator$Definition$Reference.getBeanDefinitionType()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.health.$ElasticsearchHealthIndicator$Definition$Reference",
+        "member": "Method io.micronaut.elasticsearch.health.$ElasticsearchHealthIndicator$Definition$Reference.getBeanType()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.health.$ElasticsearchHealthIndicator$Definition$Reference",
+        "member": "Method io.micronaut.elasticsearch.health.$ElasticsearchHealthIndicator$Definition$Reference.load()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.health.$ElasticsearchHealthIndicator$Definition$Reference",
+        "member": "Constructor io.micronaut.elasticsearch.health.$ElasticsearchHealthIndicator$Definition$Reference()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.health.ElasticsearchHealthIndicator",
+        "member": "Class io.micronaut.elasticsearch.health.ElasticsearchHealthIndicator",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.health.ElasticsearchHealthIndicator",
+        "member": "Method io.micronaut.elasticsearch.health.ElasticsearchHealthIndicator.getResult()",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    },
+    {
+        "type": "io.micronaut.elasticsearch.health.ElasticsearchHealthIndicator",
+        "member": "Constructor io.micronaut.elasticsearch.health.ElasticsearchHealthIndicator(org.elasticsearch.client.RestHighLevelClient)",
+        "reason": "Changes for compatibility with elasticsearch-java 8.2.0"
+    }
+]
diff --git a/elasticsearch/build.gradle b/elasticsearch/build.gradle
@@ -4,7 +4,6 @@ plugins {
 
 dependencies {
     annotationProcessor mn.micronaut.graal
-    api "org.elasticsearch.client:elasticsearch-rest-high-level-client:$elasticsearchVersion"
     api "co.elastic.clients:elasticsearch-java:$elasticsearchVersion"
     api mn.micronaut.http
     api mn.micronaut.validation

diff --git a/...ticsearch/src/main/java/io/micronaut/elasticsearch/DefaultElasticsearchClientFactory.java b/...ticsearch/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

diff --git a/...search/src/main/java/io/micronaut/elasticsearch/DefaultHttpAsyncClientBuilderFactory.java b/...search/src/main/java/io/micronaut/elasticsearch/DefaultHttpAsyncClientBuilderFactory.java
@@ -19,17 +19,17 @@
 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 jakarta.inject.Singleton;
+import org.elasticsearch.client.RestClient;
 
 /**
  * The default factory used to create {@link HttpAsyncClientBuilder} for HTTP client configurations.
  *
  * @author Puneet Behl
  * @since 1.0.0
  */
-@Requires(classes = {RestHighLevelClient.class})
+@Requires(classes = {RestClient.class})
 @Factory
 public class DefaultHttpAsyncClientBuilderFactory {
 

diff --git a/elasticsearch/src/main/java/io/micronaut/elasticsearch/conditon/RequiresElasticsearch.java b/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 {
 }
diff --git a/elasticsearch/src/main/java/io/micronaut/elasticsearch/graalvm/RestClientSubstitutions.java b/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 {