add copy() method to templates

Author: sothawo

Diff for: src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java

@@ -95,6 +95,21 @@ protected void initialize(ElasticsearchConverter elasticsearchConverter) {
 		VersionInfo.logVersions(getClusterVersion());
 	}
 
+	/**
+	 * @return copy of this instance.
+	 */
+	private ElasticsearchOperations copy() {
+		AbstractElasticsearchTemplate copy = doCopy();
+
+		if (entityCallbacks != null) {
+			copy.setEntityCallbacks(entityCallbacks);
+		}
+
+		return copy;
+	}
+
+	protected abstract AbstractElasticsearchTemplate doCopy();
+
 	protected ElasticsearchConverter createElasticsearchConverter() {
 		MappingElasticsearchConverter mappingElasticsearchConverter = new MappingElasticsearchConverter(
 				new SimpleElasticsearchMappingContext());

Diff for: src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java

@@ -93,15 +93,14 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate {
 	private static final Logger LOGGER = LoggerFactory.getLogger(ElasticsearchRestTemplate.class);
 
 	private final RestHighLevelClient client;
-	private final ElasticsearchExceptionTranslator exceptionTranslator;
+	private final ElasticsearchExceptionTranslator exceptionTranslator = new ElasticsearchExceptionTranslator();
 
 	// region Initialization
 	public ElasticsearchRestTemplate(RestHighLevelClient client) {
 
 		Assert.notNull(client, "Client must not be null!");
 
 		this.client = client;
-		this.exceptionTranslator = new ElasticsearchExceptionTranslator();
 
 		initialize(createElasticsearchConverter());
 	}
@@ -111,11 +110,15 @@ public ElasticsearchRestTemplate(RestHighLevelClient client, ElasticsearchConver
 		Assert.notNull(client, "Client must not be null!");
 
 		this.client = client;
-		this.exceptionTranslator = new ElasticsearchExceptionTranslator();
 
 		initialize(elasticsearchConverter);
 	}
 
+	@Override
+	protected AbstractElasticsearchTemplate doCopy() {
+		return new ElasticsearchRestTemplate(client, elasticsearchConverter);
+	}
+
 	// endregion
 
 	// region IndexOperations

Diff for: src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java

@@ -112,6 +112,14 @@ private void initialize(Client client, ElasticsearchConverter elasticsearchConve
 		this.client = client;
 		initialize(elasticsearchConverter);
 	}
+
+	@Override
+	protected AbstractElasticsearchTemplate doCopy() {
+		ElasticsearchTemplate elasticsearchTemplate = new ElasticsearchTemplate(client, elasticsearchConverter);
+		elasticsearchTemplate.setSearchTimeout(searchTimeout);
+		return elasticsearchTemplate;
+	}
+
 	// endregion
 
 	// region IndexOperations

Diff for: src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java

@@ -121,6 +121,7 @@ public ReactiveElasticsearchTemplate(ReactiveElasticsearchClient client) {
 	}
 
 	public ReactiveElasticsearchTemplate(ReactiveElasticsearchClient client, ElasticsearchConverter converter) {
+
 		Assert.notNull(client, "client must not be null");
 		Assert.notNull(converter, "converter must not be null");
 
@@ -135,6 +136,15 @@ public ReactiveElasticsearchTemplate(ReactiveElasticsearchClient client, Elastic
 		logVersions();
 	}
 
+	private ReactiveElasticsearchTemplate copy() {
+
+		ReactiveElasticsearchTemplate copy = new ReactiveElasticsearchTemplate(client, converter);
+		copy.setRefreshPolicy(refreshPolicy);
+		copy.setIndicesOptions(indicesOptions);
+		copy.setEntityCallbacks(entityCallbacks);
+		return copy;
+	}
+
 	private void logVersions() {
 		getClusterVersion() //
 				.doOnSuccess(VersionInfo::logVersions) //

Diff for: src/test/java/org/springframework/data/elasticsearch/core/StreamQueriesTest.java

@@ -24,7 +24,6 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.Test;
 import org.springframework.data.util.StreamUtils;
 
@@ -62,7 +61,6 @@ public void shouldCallClearScrollOnIteratorClose() {
 
 	}
 
-	@NotNull
 	private SearchHit<String> getOneSearchHit() {
 		return new SearchHit<String>(null, null, null, 0, null, null, "one");
 	}