diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java index 6a3b0db60..ebd98a497 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java @@ -148,9 +148,8 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate { // We should call this because we are not going through a mapper. Object queryObject = query.getObject(); if (queryObject != null) { - updateIndexedObject(queryObject, - IndexedObjectInformation.of(indexResponse.getId(), indexResponse.getSeqNo(), - indexResponse.getPrimaryTerm(), indexResponse.getVersion())); + updateIndexedObject(queryObject, IndexedObjectInformation.of(indexResponse.getId(), indexResponse.getSeqNo(), + indexResponse.getPrimaryTerm(), indexResponse.getVersion())); } maybeCallbackAfterSaveWithQuery(query, index); diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java index 493496c7e..e385fb341 100755 --- a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java @@ -162,9 +162,8 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate { // We should call this because we are not going through a mapper. Object queryObject = query.getObject(); if (queryObject != null) { - updateIndexedObject(queryObject, - IndexedObjectInformation.of(documentId, response.getSeqNo(), response.getPrimaryTerm(), - response.getVersion())); + updateIndexedObject(queryObject, IndexedObjectInformation.of(documentId, response.getSeqNo(), + response.getPrimaryTerm(), response.getVersion())); } maybeCallbackAfterSaveWithQuery(query, index); diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java index e0a4e56a8..bccdbacc8 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java @@ -15,8 +15,6 @@ */ package org.springframework.data.elasticsearch.core; -import org.elasticsearch.action.DocWriteResponse; -import org.springframework.data.mapping.PersistentPropertyAccessor; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.util.function.Tuple2; @@ -27,6 +25,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.elasticsearch.action.DocWriteResponse; import org.elasticsearch.action.bulk.BulkItemResponse; import org.elasticsearch.action.bulk.BulkRequest; import org.elasticsearch.action.bulk.BulkResponse; @@ -75,6 +74,7 @@ import org.springframework.data.elasticsearch.core.query.Query; import org.springframework.data.elasticsearch.core.query.SeqNoPrimaryTerm; import org.springframework.data.elasticsearch.core.query.UpdateQuery; import org.springframework.data.elasticsearch.support.VersionInfo; +import org.springframework.data.mapping.PersistentPropertyAccessor; import org.springframework.data.mapping.callback.ReactiveEntityCallbacks; import org.springframework.data.mapping.context.MappingContext; import org.springframework.http.HttpStatus; @@ -206,9 +206,8 @@ public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOpera .map(it -> { T savedEntity = it.getT1(); IndexResponse indexResponse = it.getT2(); - return updateIndexedObject(savedEntity, - IndexedObjectInformation.of(indexResponse.getId(), indexResponse.getSeqNo(), - indexResponse.getPrimaryTerm(), indexResponse.getVersion())); + return updateIndexedObject(savedEntity, IndexedObjectInformation.of(indexResponse.getId(), + indexResponse.getSeqNo(), indexResponse.getPrimaryTerm(), indexResponse.getVersion())); }).flatMap(saved -> maybeCallAfterSave(saved, index)); } @@ -244,9 +243,8 @@ public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOpera BulkItemResponse bulkItemResponse = indexAndResponse.getT2(); DocWriteResponse response = bulkItemResponse.getResponse(); - updateIndexedObject(savedEntity, - IndexedObjectInformation.of(response.getId(), response.getSeqNo(), - response.getPrimaryTerm(), response.getVersion())); + updateIndexedObject(savedEntity, IndexedObjectInformation.of(response.getId(), response.getSeqNo(), + response.getPrimaryTerm(), response.getVersion())); return maybeCallAfterSave(savedEntity, index); }); diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java index c6b4d4cdb..7e7aefd6e 100755 --- a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java @@ -3469,10 +3469,10 @@ public abstract class ElasticsearchTemplateTests { @Test // DATAES-908 void shouldFillVersionOnSaveArray() { - VersionedEntity[] array = {new VersionedEntity(), new VersionedEntity()}; + VersionedEntity[] array = { new VersionedEntity(), new VersionedEntity() }; Iterator results = operations.save(array).iterator(); VersionedEntity saved1 = results.next(); - VersionedEntity saved2= results.next(); + VersionedEntity saved2 = results.next(); assertThat(saved1.getVersion()).isNotNull(); assertThat(saved2.getVersion()).isNotNull(); @@ -3490,7 +3490,7 @@ public abstract class ElasticsearchTemplateTests { @Test // DATAES-908 void shouldFillVersionOnBulkIndex() { VersionedEntity entity1 = new VersionedEntity(); - VersionedEntity entity2= new VersionedEntity(); + VersionedEntity entity2 = new VersionedEntity(); IndexQuery query1 = new IndexQueryBuilder().withObject(entity1).build(); IndexQuery query2 = new IndexQueryBuilder().withObject(entity2).build(); operations.bulkIndex(Arrays.asList(query1, query2), VersionedEntity.class); diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateTests.java index 7e67883df..b2dbbbda0 100644 --- a/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateTests.java @@ -974,8 +974,7 @@ public class ReactiveElasticsearchTemplateTests { @Test // DATAES-908 void shouldFillVersionOnSaveAll() { - VersionedEntity saved = template.saveAll(singletonList(new VersionedEntity()), VersionedEntity.class) - .blockLast(); + VersionedEntity saved = template.saveAll(singletonList(new VersionedEntity()), VersionedEntity.class).blockLast(); assertThat(saved.getVersion()).isNotNull(); }