Merge pull request #173 from dadoonet/dependabot/maven/co.elastic.clients-elasticsearch-java-9.1.0

Bump co.elastic.clients:elasticsearch-java from 9.0.3 to 9.1.0

Author: mergify[bot]

README.md

@@ -11,7 +11,7 @@ I believe it could be beneficial for many, so I've made the code available here.
 
 You're welcome to contribute your own examples if you'd like.
 
-This repository is tested against Elasticsearch 9.0.3.
+This repository is tested against Elasticsearch 9.1.0.
 
 We automatically start a Docker image using the [Elasticsearch module for TestContainers](https://www.testcontainers.org/modules/elasticsearch/).
 

pom.xml

@@ -10,7 +10,7 @@
 
     <properties>
         <!-- Main dependencies -->
-        <elasticsearch.version>9.0.3</elasticsearch.version>
+        <elasticsearch.version>9.1.0</elasticsearch.version>
         <jackson.version>2.19.2</jackson.version>
         <log4j.version>2.25.1</log4j.version>
         <slf4j.version>2.0.17</slf4j.version>

src/test/java/fr/pilato/test/elasticsearch/hlclient/EsClientIT.java

@@ -31,6 +31,7 @@
 import co.elastic.clients.elasticsearch.cat.ThreadPoolResponse;
 import co.elastic.clients.elasticsearch.cluster.PutComponentTemplateResponse;
 import co.elastic.clients.elasticsearch.core.*;
+import co.elastic.clients.elasticsearch.core.search.HighlightField;
 import co.elastic.clients.elasticsearch.ilm.PutLifecycleResponse;
 import co.elastic.clients.elasticsearch.indices.*;
 import co.elastic.clients.elasticsearch.ingest.PutPipelineResponse;
@@ -43,6 +44,7 @@
 import co.elastic.clients.transport.endpoints.BinaryResponse;
 import co.elastic.clients.util.BinaryData;
 import co.elastic.clients.util.ContentType;
+import co.elastic.clients.util.NamedValue;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -328,7 +330,8 @@ void highlight() throws IOException {
         final SearchResponse<Void> response = client.search(sr -> sr
                         .index(indexName)
                         .query(q -> q.match(mq -> mq.field("foo").query("bar")))
-                        .highlight(h -> h.fields("foo", hf -> hf.maxAnalyzedOffset(10)))
+                        .highlight(h -> h
+                                .fields(NamedValue.of("foo", HighlightField.of(hf -> hf.maxAnalyzedOffset(10)))))
                 , Void.class);
         assertThat(response.hits().total()).isNotNull();
         assertThat(response.hits().total().value()).isEqualTo(1);
@@ -969,22 +972,16 @@ void esql() throws IOException, SQLException {
         {
             // Using the Raw ES|QL API
             try (final BinaryResponse response = client.esql().query(q -> q.query(query)); InputStream is = response.content()) {
-                // The response object is {
-                //  "took" : 4,
-                //  "is_partial" : false,
-                //  "columns" : [ {
-                //    "name" : "name",
-                //    "type" : "text"
-                //  } ],
-                //  "values" : [ [ "David" ] ]
-                //}
+                // The response object is {"took":173,"is_partial":false,"documents_found":1,"values_loaded":1,"columns":[{"name":"name","type":"text"}],"values":[["David"]]}
                 final ObjectMapper mapper = new ObjectMapper();
                 final JsonNode jsonNode = mapper.readTree(is);
-                assertThat(jsonNode).isNotNull().hasSize(4);
+                assertThat(jsonNode).isNotNull().hasSize(6);
                 assertThat(jsonNode.get("columns")).isNotNull().hasSize(1).first().satisfies(column -> assertThat(column.get("name").asText()).isEqualTo("name"));
                 assertThat(jsonNode.get("values")).isNotNull().hasSize(1).first().satisfies(value -> assertThat(value).hasSize(1).first().satisfies(singleValue -> assertThat(singleValue.asText()).isEqualTo("David")));
                 assertThat(jsonNode.get("took").asInt()).isGreaterThan(0);
                 assertThat(jsonNode.get("is_partial").asBoolean()).isFalse();
+                assertThat(jsonNode.get("documents_found").asLong()).isEqualTo(1);
+                assertThat(jsonNode.get("values_loaded").asLong()).isEqualTo(1);
             }
         }