From e3e666fd2e5a017f052c150054a6d7dab49f5d19 Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Sat, 16 Jul 2022 21:30:41 +0200 Subject: [PATCH] Upgrade to Elasticsearch 7.17.5. Original Pull Request #2224 Closes #2215 --- pom.xml | 4 ++-- src/main/asciidoc/preface.adoc | 8 +++---- ...elasticsearch-migration-guide-4.3-4.4.adoc | 4 ++-- .../asciidoc/reference/elasticsearch-new.adoc | 2 +- .../client/elc/RequestConverter.java | 23 +++++++++++++++---- .../testcontainers-elasticsearch.properties | 2 +- 6 files changed, 29 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 0c136bbba..a42bdcef6 100644 --- a/pom.xml +++ b/pom.xml @@ -19,9 +19,9 @@ - 7.17.4 + 7.17.5 - 7.17.4 + 7.17.5 2.17.1 4.1.65.Final 2.7.3-SNAPSHOT diff --git a/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc index 95f9d37f2..779d79154 100644 --- a/src/main/asciidoc/preface.adoc +++ b/src/main/asciidoc/preface.adoc @@ -29,15 +29,15 @@ Requires an installation of https://www.elastic.co/products/elasticsearch[Elasti [[preface.versions]] === Versions -The following table shows the Elasticsearch versions that are used by Spring Data release trains and version of -Spring Data Elasticsearch included in that, as well as the Spring Boot versions referring to that particular Spring -Data release train. The Elasticsearch version given shows with which client libraries Spring Data Elasticsearch was +The following table shows the Elasticsearch versions that are used by Spring Data release trains and version of +Spring Data Elasticsearch included in that, as well as the Spring Boot versions referring to that particular Spring +Data release train. The Elasticsearch version given shows with which client libraries Spring Data Elasticsearch was built and tested. [cols="^,^,^,^,^",options="header"] |=== | Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework | Spring Boot -| 2021.2 (Raj) | 4.4.x | 7.17.4 | 5.3.x | 2.7.x +| 2021.2 (Raj) | 4.4.x | 7.17.5 | 5.3.x | 2.7.x | 2021.1 (Q) | 4.3.x | 7.15.2 | 5.3.x | 2.6.x | 2021.0 (Pascal) | 4.2.xfootnote:oom[Out of maintenance] | 7.12.0 | 5.3.x | 2.5.x | 2020.0 (Ockham)footnote:oom[] | 4.1.xfootnote:oom[] | 7.9.3 | 5.3.2 | 2.4.x diff --git a/src/main/asciidoc/reference/elasticsearch-migration-guide-4.3-4.4.adoc b/src/main/asciidoc/reference/elasticsearch-migration-guide-4.3-4.4.adoc index 34db2e694..8209fcf30 100644 --- a/src/main/asciidoc/reference/elasticsearch-migration-guide-4.3-4.4.adoc +++ b/src/main/asciidoc/reference/elasticsearch-migration-guide-4.3-4.4.adoc @@ -82,7 +82,7 @@ The dependencies for the new Elasticsearch client are still optional in Spring D co.elastic.clients elasticsearch-java - 7.17.4 + 7.17.5 commons-logging @@ -93,7 +93,7 @@ The dependencies for the new Elasticsearch client are still optional in Spring D org.elasticsearch.client elasticsearch-rest-client - 7.17.4 + 7.17.5 commons-logging diff --git a/src/main/asciidoc/reference/elasticsearch-new.adoc b/src/main/asciidoc/reference/elasticsearch-new.adoc index a3cbee2d1..de180383a 100644 --- a/src/main/asciidoc/reference/elasticsearch-new.adoc +++ b/src/main/asciidoc/reference/elasticsearch-new.adoc @@ -5,7 +5,7 @@ == New in Spring Data Elasticsearch 4.4 * Introduction of new imperative and reactive clients using the classes from the new Elasticsearch Java client -* Upgrade to Elasticsearch 7.17.4. +* Upgrade to Elasticsearch 7.17.5. [[new-features.4-3-0]] == New in Spring Data Elasticsearch 4.3 diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java index fec2d1ac4..8edf02e7b 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java @@ -32,7 +32,16 @@ import co.elastic.clients.elasticsearch._types.mapping.RuntimeFieldType; import co.elastic.clients.elasticsearch._types.mapping.TypeMapping; import co.elastic.clients.elasticsearch._types.query_dsl.Like; import co.elastic.clients.elasticsearch.cluster.HealthRequest; -import co.elastic.clients.elasticsearch.core.*; +import co.elastic.clients.elasticsearch.core.BulkRequest; +import co.elastic.clients.elasticsearch.core.DeleteByQueryRequest; +import co.elastic.clients.elasticsearch.core.DeleteRequest; +import co.elastic.clients.elasticsearch.core.GetRequest; +import co.elastic.clients.elasticsearch.core.IndexRequest; +import co.elastic.clients.elasticsearch.core.MgetRequest; +import co.elastic.clients.elasticsearch.core.MsearchRequest; +import co.elastic.clients.elasticsearch.core.SearchRequest; +import co.elastic.clients.elasticsearch.core.UpdateByQueryRequest; +import co.elastic.clients.elasticsearch.core.UpdateRequest; import co.elastic.clients.elasticsearch.core.bulk.BulkOperation; import co.elastic.clients.elasticsearch.core.bulk.CreateOperation; import co.elastic.clients.elasticsearch.core.bulk.IndexOperation; @@ -42,7 +51,6 @@ import co.elastic.clients.elasticsearch.core.search.Highlight; import co.elastic.clients.elasticsearch.core.search.Rescore; import co.elastic.clients.elasticsearch.core.search.SourceConfig; import co.elastic.clients.elasticsearch.indices.*; -import co.elastic.clients.elasticsearch.indices.ExistsRequest; import co.elastic.clients.elasticsearch.indices.update_aliases.Action; import co.elastic.clients.json.JsonData; import co.elastic.clients.json.JsonpDeserializer; @@ -820,7 +828,11 @@ class RequestConverter { .refresh(reindexRequest.getRefresh()) // .requireAlias(reindexRequest.getRequireAlias()) // .requestsPerSecond(reindexRequest.getRequestsPerSecond()) // - .slices(reindexRequest.getSlices()); + ; + + if (reindexRequest.getSlices() != null) { + builder.slices(sb -> sb.value(reindexRequest.getSlices().intValue())); + } return builder.build(); } @@ -963,9 +975,12 @@ class RequestConverter { .pipeline(updateQuery.getPipeline()) // .requestsPerSecond( updateQuery.getRequestsPerSecond() != null ? updateQuery.getRequestsPerSecond().longValue() : null) // - .slices(updateQuery.getSlices() != null ? Long.valueOf(updateQuery.getSlices()) : null) // ; + if (updateQuery.getSlices() != null) { + ub.slices(sb -> sb.value(updateQuery.getSlices() != null ? updateQuery.getSlices() : null)); + } + if (updateQuery.getAbortOnVersionConflict() != null) { ub.conflicts(updateQuery.getAbortOnVersionConflict() ? Conflicts.Abort : Conflicts.Proceed); } diff --git a/src/test/resources/testcontainers-elasticsearch.properties b/src/test/resources/testcontainers-elasticsearch.properties index 14fb910fa..3171b7046 100644 --- a/src/test/resources/testcontainers-elasticsearch.properties +++ b/src/test/resources/testcontainers-elasticsearch.properties @@ -15,7 +15,7 @@ # # sde.testcontainers.image-name=docker.elastic.co/elasticsearch/elasticsearch -sde.testcontainers.image-version=7.17.4 +sde.testcontainers.image-version=7.17.5 # # # needed as we do a DELETE /* at the end of the tests, will be required from 8.0 on, produces a warning since 7.13