Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-07-24 11:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Elasticsearch 8.17.4.

Browse Source 
Original Pull Request: #3085
Closes #3084

Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>
This commit is contained in:
Peter-Josef Meisch 2025-03-31 16:36:42 +02:00 committed by GitHub
parent 1ae6301c2f
commit 95059b3282
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 8 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -21,7 +21,7 @@
<springdata.commons>3.5.0-SNAPSHOT</springdata.commons> <springdata.commons>3.5.0-SNAPSHOT</springdata.commons>
<!-- version of the ElasticsearchClient --> <!-- version of the ElasticsearchClient -->
<elasticsearch-java>8.17.2</elasticsearch-java> <elasticsearch-java>8.17.4</elasticsearch-java>
<hoverfly>0.19.0</hoverfly> <hoverfly>0.19.0</hoverfly>
<log4j>2.23.1</log4j> <log4j>2.23.1</log4j>

2
src/main/antora/modules/ROOT/pages/elasticsearch/elasticsearch-new.adoc
View File

@ -4,7 +4,7 @@
[[new-features.5-5-0]] [[new-features.5-5-0]]
== New in Spring Data Elasticsearch 5.5 == New in Spring Data Elasticsearch 5.5
* Upgrade to Elasticsearch 8.17.2. * Upgrade to Elasticsearch 8.17.4.
* Add support for the `@SearchTemplateQuery` annotation on repository methods. * Add support for the `@SearchTemplateQuery` annotation on repository methods.
* Scripted field properties of type collection can be populated from scripts returning arrays. * Scripted field properties of type collection can be populated from scripts returning arrays.

2
src/main/antora/modules/ROOT/pages/elasticsearch/versions.adoc
View File

@ -6,7 +6,7 @@ The following table shows the Elasticsearch and Spring versions that are used by
[cols="^,^,^,^",options="header"] [cols="^,^,^,^",options="header"]
|=== |===
| Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework | Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework
| 2025.0 (in development) | 5.5.x | 8.17.2 | 6.2.x | 2025.0 (in development) | 5.5.x | 8.17.4 | 6.2.x
| 2024.1 | 5.4.x | 8.15.5 | 6.1.x | 2024.1 | 5.4.x | 8.15.5 | 6.1.x
| 2024.0 | 5.3.x | 8.13.4 | 6.1.x | 2024.0 | 5.3.x | 8.13.4 | 6.1.x
| 2023.1 (Vaughan) | 5.2.xfootnote:oom[Out of maintenance] | 8.11.1 | 6.1.x | 2023.1 (Vaughan) | 5.2.xfootnote:oom[Out of maintenance] | 8.11.1 | 6.1.x

2
src/main/java/org/springframework/data/elasticsearch/client/elc/ResponseConverter.java
View File

@ -400,7 +400,6 @@ class ResponseConverter {
private ReindexResponse.Failure reindexResponseFailureOf(BulkIndexByScrollFailure failure) { private ReindexResponse.Failure reindexResponseFailureOf(BulkIndexByScrollFailure failure) {
return ReindexResponse.Failure.builder() // return ReindexResponse.Failure.builder() //
.withIndex(failure.index()) // .withIndex(failure.index()) //
.withType(failure.type()) //
.withId(failure.id()) // .withId(failure.id()) //
.withStatus(failure.status())// .withStatus(failure.status())//
.withErrorCause(toErrorCause(failure.cause())) // .withErrorCause(toErrorCause(failure.cause())) //
@ -411,7 +410,6 @@ class ResponseConverter {
private ByQueryResponse.Failure byQueryResponseFailureOf(BulkIndexByScrollFailure failure) { private ByQueryResponse.Failure byQueryResponseFailureOf(BulkIndexByScrollFailure failure) {
return ByQueryResponse.Failure.builder() // return ByQueryResponse.Failure.builder() //
.withIndex(failure.index()) // .withIndex(failure.index()) //
.withType(failure.type()) //
.withId(failure.id()) // .withId(failure.id()) //
.withStatus(failure.status())// .withStatus(failure.status())//
.withErrorCause(toErrorCause(failure.cause())).build(); .withErrorCause(toErrorCause(failure.cause())).build();

17
src/main/java/org/springframework/data/elasticsearch/core/query/ByQueryResponse.java
View File

@ -167,7 +167,6 @@ public class ByQueryResponse {
public static class Failure { public static class Failure {
@Nullable private final String index; @Nullable private final String index;
@Nullable private final String type;
@Nullable private final String id; @Nullable private final String id;
@Nullable private final Exception cause; @Nullable private final Exception cause;
@Nullable private final Integer status; @Nullable private final Integer status;
@ -176,11 +175,10 @@ public class ByQueryResponse {
@Nullable private final Boolean aborted; @Nullable private final Boolean aborted;
@Nullable private final ElasticsearchErrorCause elasticsearchErrorCause; @Nullable private final ElasticsearchErrorCause elasticsearchErrorCause;
private Failure(@Nullable String index, @Nullable String type, @Nullable String id, @Nullable Exception cause, private Failure(@Nullable String index, @Nullable String id, @Nullable Exception cause,
@Nullable Integer status, @Nullable Long seqNo, @Nullable Long term, @Nullable Boolean aborted, @Nullable Integer status, @Nullable Long seqNo, @Nullable Long term, @Nullable Boolean aborted,
@Nullable ElasticsearchErrorCause elasticsearchErrorCause) { @Nullable ElasticsearchErrorCause elasticsearchErrorCause) {
this.index = index; this.index = index;
this.type = type;
this.id = id; this.id = id;
this.cause = cause; this.cause = cause;
this.status = status; this.status = status;
@ -195,11 +193,6 @@ public class ByQueryResponse {
return index; return index;
} }
@Nullable
public String getType() {
return type;
}
@Nullable @Nullable
public String getId() { public String getId() {
return id; return id;
@ -250,7 +243,6 @@ public class ByQueryResponse {
*/ */
public static final class FailureBuilder { public static final class FailureBuilder {
@Nullable private String index; @Nullable private String index;
@Nullable private String type;
@Nullable private String id; @Nullable private String id;
@Nullable private Exception cause; @Nullable private Exception cause;
@Nullable private Integer status; @Nullable private Integer status;
@ -266,11 +258,6 @@ public class ByQueryResponse {
return this; return this;
} }
public FailureBuilder withType(String type) {
this.type = type;
return this;
}
public FailureBuilder withId(String id) { public FailureBuilder withId(String id) {
this.id = id; this.id = id;
return this; return this;
@ -307,7 +294,7 @@ public class ByQueryResponse {
} }
public Failure build() { public Failure build() {
return new Failure(index, type, id, cause, status, seqNo, term, aborted, elasticsearchErrorCause); return new Failure(index, id, cause, status, seqNo, term, aborted, elasticsearchErrorCause);
} }
} }
} }

17
src/main/java/org/springframework/data/elasticsearch/core/reindex/ReindexResponse.java
View File

@ -187,7 +187,6 @@ public class ReindexResponse {
public static class Failure { public static class Failure {
@Nullable private final String index; @Nullable private final String index;
@Nullable private final String type;
@Nullable private final String id; @Nullable private final String id;
@Nullable private final Exception cause; @Nullable private final Exception cause;
@Nullable private final Integer status; @Nullable private final Integer status;
@ -196,11 +195,10 @@ public class ReindexResponse {
@Nullable private final Boolean aborted; @Nullable private final Boolean aborted;
@Nullable private final ElasticsearchErrorCause elasticsearchErrorCause; @Nullable private final ElasticsearchErrorCause elasticsearchErrorCause;
private Failure(@Nullable String index, @Nullable String type, @Nullable String id, @Nullable Exception cause, private Failure(@Nullable String index, @Nullable String id, @Nullable Exception cause,
@Nullable Integer status, @Nullable Long seqNo, @Nullable Long term, @Nullable Boolean aborted, @Nullable Integer status, @Nullable Long seqNo, @Nullable Long term, @Nullable Boolean aborted,
@Nullable ElasticsearchErrorCause elasticsearchErrorCause) { @Nullable ElasticsearchErrorCause elasticsearchErrorCause) {
this.index = index; this.index = index;
this.type = type;
this.id = id; this.id = id;
this.cause = cause; this.cause = cause;
this.status = status; this.status = status;
@ -215,11 +213,6 @@ public class ReindexResponse {
return index; return index;
} }
@Nullable
public String getType() {
return type;
}
@Nullable @Nullable
public String getId() { public String getId() {
return id; return id;
@ -269,7 +262,6 @@ public class ReindexResponse {
*/ */
public static final class FailureBuilder { public static final class FailureBuilder {
@Nullable private String index; @Nullable private String index;
@Nullable private String type;
@Nullable private String id; @Nullable private String id;
@Nullable private Exception cause; @Nullable private Exception cause;
@Nullable private Integer status; @Nullable private Integer status;
@ -285,11 +277,6 @@ public class ReindexResponse {
return this; return this;
} }
public Failure.FailureBuilder withType(String type) {
this.type = type;
return this;
}
public Failure.FailureBuilder withId(String id) { public Failure.FailureBuilder withId(String id) {
this.id = id; this.id = id;
return this; return this;
@ -326,7 +313,7 @@ public class ReindexResponse {
} }
public Failure build() { public Failure build() {
return new Failure(index, type, id, cause, status, seqNo, term, aborted, elasticsearchErrorCause); return new Failure(index, id, cause, status, seqNo, term, aborted, elasticsearchErrorCause);
} }
} }
} }

2
src/test/resources/testcontainers-elasticsearch.properties
View File

@ -15,7 +15,7 @@
# #
# #
sde.testcontainers.image-name=docker.elastic.co/elasticsearch/elasticsearch sde.testcontainers.image-name=docker.elastic.co/elasticsearch/elasticsearch
sde.testcontainers.image-version=8.17.2 sde.testcontainers.image-version=8.17.4
# #
# #
# 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 # 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