Test optimizations

pom.xml

@@ -23,7 +23,7 @@
 		<log4j>2.13.3</log4j>
 		<netty>4.1.52.Final</netty>
 		<springdata.commons>2.6.0-SNAPSHOT</springdata.commons>
-		<testcontainers>1.15.1</testcontainers>
+		<testcontainers>1.15.3</testcontainers>
 		<blockhound-junit>1.0.6.RELEASE</blockhound-junit>
 		<java-module-name>spring.data.elasticsearch</java-module-name>
 	</properties>

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

@@ -15,7 +15,10 @@
  */
 package org.springframework.data.elasticsearch.core;
 
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 import org.elasticsearch.action.ActionFuture;
@@ -290,12 +293,21 @@ public ByQueryResponse updateByQuery(UpdateQuery query, IndexCoordinates index)
 
 	public List<IndexedObjectInformation> doBulkOperation(List<?> queries, BulkOptions bulkOptions,
 			IndexCoordinates index) {
-		BulkRequestBuilder bulkRequestBuilder = requestFactory.bulkRequestBuilder(client, queries, bulkOptions, index);
-		bulkRequestBuilder = prepareWriteRequestBuilder(bulkRequestBuilder);
-		final List<IndexedObjectInformation> indexedObjectInformations = checkForBulkOperationFailure(
-				bulkRequestBuilder.execute().actionGet());
-		updateIndexedObjectsWithQueries(queries, indexedObjectInformations);
-		return indexedObjectInformations;
+
+		// do it in batches; test code on some machines kills the transport node when the size gets too much
+		Collection<? extends List<?>> queryLists = partitionBasedOnSize(queries, 2500);
+		List<IndexedObjectInformation> allIndexedObjectInformations = new ArrayList<>(queries.size());
+
+		queryLists.forEach(queryList -> {
+			BulkRequestBuilder bulkRequestBuilder = requestFactory.bulkRequestBuilder(client, queryList, bulkOptions, index);
+			bulkRequestBuilder = prepareWriteRequestBuilder(bulkRequestBuilder);
+			final List<IndexedObjectInformation> indexedObjectInformations = checkForBulkOperationFailure(
+					bulkRequestBuilder.execute().actionGet());
+			updateIndexedObjectsWithQueries(queryList, indexedObjectInformations);
+			allIndexedObjectInformations.addAll(indexedObjectInformations);
+		});
+
+		return allIndexedObjectInformations;
 	}
 	// endregion
 
@@ -411,6 +423,11 @@ protected String getClusterVersion() {
 	public Client getClient() {
 		return client;
 	}
+
+	<T> Collection<List<T>> partitionBasedOnSize(List<T> inputList, int size) {
+		final AtomicInteger counter = new AtomicInteger(0);
+		return inputList.stream().collect(Collectors.groupingBy(s -> counter.getAndIncrement() / size)).values();
+	}
 	// endregion
 
 	/**

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

@@ -18,10 +18,8 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.elasticsearch.index.query.QueryBuilders.*;
 import static org.skyscreamer.jsonassert.JSONAssert.*;
-import static org.springframework.data.elasticsearch.annotations.FieldType.*;
 import static org.springframework.data.elasticsearch.utils.IdGenerator.*;
 
-import java.lang.Object;
 import java.time.Duration;
 import java.util.Collections;
 import java.util.HashMap;
@@ -37,16 +35,16 @@
 import org.json.JSONException;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.springframework.data.annotation.Id;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
-import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
 import org.springframework.data.elasticsearch.core.query.UpdateQuery;
 import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchRestTemplateConfiguration;
-import org.springframework.lang.Nullable;
+import org.springframework.data.elasticsearch.utils.IndexNameProvider;
 import org.springframework.test.context.ContextConfiguration;
 
 /**
@@ -64,46 +62,30 @@
  * @author Peter-Josef Meisch
  * @author Farid Faoudi
  */
-@ContextConfiguration(classes = { ElasticsearchRestTemplateConfiguration.class })
+@ContextConfiguration(classes = { ElasticsearchRestTemplateTests.Config.class })
 @DisplayName("ElasticsearchRestTemplate")
 public class ElasticsearchRestTemplateTests extends ElasticsearchTemplateTests {
 
+	@Configuration
+	@Import({ ElasticsearchRestTemplateConfiguration.class })
+	static class Config {
+		@Bean
+		IndexNameProvider indexNameProvider() {
+			return new IndexNameProvider("rest-template");
+		}
+	}
+
 	@Test
 	public void shouldThrowExceptionIfDocumentDoesNotExistWhileDoingPartialUpdate() {
 
 		// when
 		org.springframework.data.elasticsearch.core.document.Document document = org.springframework.data.elasticsearch.core.document.Document
 				.create();
 		UpdateQuery updateQuery = UpdateQuery.builder(nextIdAsString()).withDocument(document).build();
-		assertThatThrownBy(() -> operations.update(updateQuery, index))
+		assertThatThrownBy(() -> operations.update(updateQuery, IndexCoordinates.of(indexNameProvider.indexName())))
 				.isInstanceOf(UncategorizedElasticsearchException.class);
 	}
 
-	@Document(indexName = "test-index-sample-core-rest-template")
-	static class SampleEntity {
-		@Nullable @Id private String id;
-		@Nullable
-		@Field(type = Text, store = true, fielddata = true) private String type;
-
-		@Nullable
-		public String getId() {
-			return id;
-		}
-
-		public void setId(@Nullable String id) {
-			this.id = id;
-		}
-
-		@Nullable
-		public String getType() {
-			return type;
-		}
-
-		public void setType(@Nullable String type) {
-			this.type = type;
-		}
-	}
-
 	@Test // DATAES-768
 	void shouldUseAllOptionsFromUpdateQuery() {
 		Map<String, Object> doc = new HashMap<>();