DATAES-785 - Polishing.

Author: sothawo

src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java

@@ -593,7 +593,7 @@ protected class ReadSearchScrollDocumentResponseCallback<T>
 		private final Class<T> type;
 
 		public ReadSearchScrollDocumentResponseCallback(Class<T> type, IndexCoordinates index) {
-			
+
 			Assert.notNull(type, "type is null");
 
 			this.delegate = new ReadDocumentCallback<>(elasticsearchConverter, type, index);

src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java

@@ -194,8 +194,7 @@ public <T> Mono<T> save(T entity, IndexCoordinates index) {
 					IndexResponse indexResponse = it.getT2();
 					AdaptibleEntity<T> adaptableEntity = operations.forEntity(savedEntity, converter.getConversionService());
 					return adaptableEntity.populateIdIfNecessary(indexResponse.getId());
-				})
-				.flatMap(saved -> maybeCallAfterSave(saved, index));
+				}).flatMap(saved -> maybeCallAfterSave(saved, index));
 	}
 
 	@Override
@@ -208,31 +207,25 @@ public <T> Flux<T> saveAll(Mono<? extends Collection<? extends T>> entitiesPubli
 
 		Assert.notNull(entitiesPublisher, "Entities must not be null!");
 
-		return entitiesPublisher
-				.flatMapMany(entities -> {
-					return Flux.fromIterable(entities) //
-							.concatMap(entity -> maybeCallBeforeConvert(entity, index));
-				})
-				.collectList()
-				.map(Entities::new)
-				.flatMapMany(entities -> {
-					if (entities.isEmpty()) {
-						return Flux.empty();
-					}
+		return entitiesPublisher.flatMapMany(entities -> {
+			return Flux.fromIterable(entities) //
+					.concatMap(entity -> maybeCallBeforeConvert(entity, index));
+		}).collectList().map(Entities::new).flatMapMany(entities -> {
+			if (entities.isEmpty()) {
+				return Flux.empty();
+			}
 
-					return doBulkOperation(entities.indexQueries(), BulkOptions.defaultOptions(), index) //
-							.index()
-							.flatMap(indexAndResponse -> {
-								T savedEntity = entities.entityAt(indexAndResponse.getT1());
-								BulkItemResponse bulkItemResponse = indexAndResponse.getT2();
+			return doBulkOperation(entities.indexQueries(), BulkOptions.defaultOptions(), index) //
+					.index().flatMap(indexAndResponse -> {
+						T savedEntity = entities.entityAt(indexAndResponse.getT1());
+						BulkItemResponse bulkItemResponse = indexAndResponse.getT2();
 
-								AdaptibleEntity<T> adaptibleEntity = operations.forEntity(savedEntity,
-										converter.getConversionService());
-								adaptibleEntity.populateIdIfNecessary(bulkItemResponse.getResponse().getId());
+						AdaptibleEntity<T> adaptibleEntity = operations.forEntity(savedEntity, converter.getConversionService());
+						adaptibleEntity.populateIdIfNecessary(bulkItemResponse.getResponse().getId());
 
-								return maybeCallAfterSave(savedEntity, index);
-							});
-				});
+						return maybeCallAfterSave(savedEntity, index);
+					});
+		});
 	}
 
 	@Override
@@ -1017,9 +1010,7 @@ private boolean isEmpty() {
 		}
 
 		private List<IndexQuery> indexQueries() {
-			return entities.stream()
-					.map(ReactiveElasticsearchTemplate.this::getIndexQuery)
-					.collect(Collectors.toList());
+			return entities.stream().map(ReactiveElasticsearchTemplate.this::getIndexQuery).collect(Collectors.toList());
 		}
 
 		private T entityAt(long index) {

src/main/java/org/springframework/data/elasticsearch/core/event/ReactiveAuditingEntityCallback.java

@@ -15,12 +15,12 @@
  */
 package org.springframework.data.elasticsearch.core.event;
 
-import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import reactor.core.publisher.Mono;
 
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.core.Ordered;
 import org.springframework.data.auditing.IsNewAwareAuditingHandler;
+import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.data.mapping.callback.EntityCallback;
 import org.springframework.util.Assert;
 

src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplateCallbackTests.java

@@ -201,8 +201,8 @@ void saveFromMonoAllShouldInvokeAfterSaveCallbacks() {
 		Person entity1 = new Person("init1", "luke1");
 		Person entity2 = new Person("init2", "luke2");
 
-		List<Person> saved = template.saveAll(Mono.just(Arrays.asList(entity1, entity2)), index)
-				.toStream().collect(Collectors.toList());
+		List<Person> saved = template.saveAll(Mono.just(Arrays.asList(entity1, entity2)), index).toStream()
+				.collect(Collectors.toList());
 
 		verify(afterSaveCallback, times(2)).onAfterSave(any(), eq(index));
 		assertThat(saved.get(0).firstname).isEqualTo("after-save");

src/test/java/org/springframework/data/elasticsearch/core/event/ReactiveAuditingEntityCallbackTests.java

@@ -18,7 +18,6 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import reactor.test.StepVerifier;
 
 import java.time.LocalDateTime;
@@ -33,6 +32,7 @@
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.auditing.IsNewAwareAuditingHandler;
+import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
 import org.springframework.data.mapping.context.PersistentEntities;
 import org.springframework.lang.Nullable;