diff --git a/src/main/antora/modules/ROOT/pages/migration-guides/migration-guide-5.5-6.0.adoc b/src/main/antora/modules/ROOT/pages/migration-guides/migration-guide-5.5-6.0.adoc index 87c62ab42..5cb7f8c74 100644 --- a/src/main/antora/modules/ROOT/pages/migration-guides/migration-guide-5.5-6.0.adoc +++ b/src/main/antora/modules/ROOT/pages/migration-guides/migration-guide-5.5-6.0.adoc @@ -8,6 +8,8 @@ This section describes breaking changes from version 5.5.x to 6.0.x and how remo From version 6.0 on, Spring Data Elasticsearch uses the Elasticsearch 9 libraries and as default the new `Rest5Client` provided by these libraries. It is still possible to use the old `RestClient`, check xref:elasticsearch/clients.adoc[Elasticsearch clients] for information. The configuration callbacks for this `RestClient` have been moved from `org.springframework.data.elasticsearch.client.elc.ElasticsearchClients` to the `org.springframework.data.elasticsearch.client.elc.rest_client.RestClients` class. +In the `org.springframework.data.elasticsearch.core.query.UpdateQuery` class the type of the two fields `ifSeqNo` and `ifPrimaryTerm` has changed from `Integer` to `Long` to align with the normal query and the underlying Elasticsearch client. + [[elasticsearch-migration-guide-5.5-6.0.deprecations]] == Deprecations 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 5dc3039c0..ac9438439 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 @@ -723,12 +723,11 @@ class RequestConverter extends AbstractQueryProcessor { return a; }); - uob // - .routing(query.getRouting()) // - .ifSeqNo(query.getIfSeqNo() != null ? Long.valueOf(query.getIfSeqNo()) : null) // - .ifPrimaryTerm(query.getIfPrimaryTerm() != null ? Long.valueOf(query.getIfPrimaryTerm()) : null) // - .retryOnConflict(query.getRetryOnConflict()) // - ; + uob + .routing(query.getRouting()) + .ifSeqNo(query.getIfSeqNo()) + .ifPrimaryTerm(query.getIfPrimaryTerm()) + .retryOnConflict(query.getRetryOnConflict()); // no refresh, timeout, waitForActiveShards on UpdateOperation or UpdateAction @@ -1095,17 +1094,16 @@ class RequestConverter extends AbstractQueryProcessor { }); } - uqb // - .doc(query.getDocument()) // - .upsert(query.getUpsert()) // - .routing(query.getRouting() != null ? query.getRouting() : routing) // - .scriptedUpsert(query.getScriptedUpsert()) // - .docAsUpsert(query.getDocAsUpsert()) // - .ifSeqNo(query.getIfSeqNo() != null ? Long.valueOf(query.getIfSeqNo()) : null) // - .ifPrimaryTerm(query.getIfPrimaryTerm() != null ? Long.valueOf(query.getIfPrimaryTerm()) : null) // - .refresh(query.getRefreshPolicy() != null ? refresh(query.getRefreshPolicy()) : refresh(refreshPolicy)) // - .retryOnConflict(query.getRetryOnConflict()) // - ; + uqb + .doc(query.getDocument()) + .upsert(query.getUpsert()) + .routing(query.getRouting() != null ? query.getRouting() : routing) + .scriptedUpsert(query.getScriptedUpsert()) + .docAsUpsert(query.getDocAsUpsert()) + .ifSeqNo(query.getIfSeqNo()) + .ifPrimaryTerm(query.getIfPrimaryTerm()) + .refresh(query.getRefreshPolicy() != null ? refresh(query.getRefreshPolicy()) : refresh(refreshPolicy)) + .retryOnConflict(query.getRetryOnConflict()); if (query.getFetchSource() != null) { uqb.source(sc -> sc.fetch(query.getFetchSource())); @@ -1293,7 +1291,7 @@ class RequestConverter extends AbstractQueryProcessor { .timeout(timeStringMs(query.getTimeout())) // ; - bb.from((int) (query.getPageable().isPaged() ? query.getPageable().getOffset() : 0)) + bb.from((int) (query.getPageable().isPaged() ? query.getPageable().getOffset() : 0)) .size(query.getRequestSize()); if (!isEmpty(query.getFields())) { @@ -1466,7 +1464,7 @@ class RequestConverter extends AbstractQueryProcessor { builder.seqNoPrimaryTerm(true); } - builder.from((int) (query.getPageable().isPaged() ? query.getPageable().getOffset() : 0)) + builder.from((int) (query.getPageable().isPaged() ? query.getPageable().getOffset() : 0)) .size(query.getRequestSize()); if (!isEmpty(query.getFields())) {