Release version 4.2.7 (2021.0.7).

See #1964

pom.xml

@@ -5,12 +5,12 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>4.2.5</version>
+	<version>4.2.7</version>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>2.5.5</version>
+		<version>2.5.7</version>
 	</parent>
 
 	<name>Spring Data Elasticsearch</name>
@@ -22,7 +22,7 @@
 		<elasticsearch>7.12.1</elasticsearch>
 		<log4j>2.13.3</log4j>
 		<netty>4.1.52.Final</netty>
-		<springdata.commons>2.5.5</springdata.commons>
+		<springdata.commons>2.5.7</springdata.commons>
 		<testcontainers>1.15.1</testcontainers>
 		<java-module-name>spring.data.elasticsearch</java-module-name>
 	</properties>

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

@@ -79,6 +79,8 @@ import org.springframework.util.Assert;
  * @author Peter-Josef Meisch
  * @author Roman Puchkovskiy
  * @author Subhobrata Dey
+ * @author Steven Pearce
+ * @author Anton Naydenov
  */
 public abstract class AbstractElasticsearchTemplate implements ElasticsearchOperations, ApplicationContextAware {
 
@@ -116,6 +118,7 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 		}
 
 		copy.setRoutingResolver(routingResolver);
+		copy.setRefreshPolicy(refreshPolicy);
 
 		return copy;
 	}

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

@@ -1066,6 +1066,10 @@ class RequestFactory {
 
 		query.getRescorerQueries().forEach(rescorer -> sourceBuilder.addRescorer(getQueryRescorerBuilder(rescorer)));
 
+		if (query.getScrollTime() != null) {
+			request.scroll(TimeValue.timeValueMillis(query.getScrollTime().toMillis()));
+		}
+
 		request.source(sourceBuilder);
 		return request;
 	}
@@ -1154,6 +1158,10 @@ class RequestFactory {
 
 		query.getRescorerQueries().forEach(rescorer -> searchRequestBuilder.addRescorer(getQueryRescorerBuilder(rescorer)));
 
+		if (query.getScrollTime() != null) {
+			searchRequestBuilder.setScroll(TimeValue.timeValueMillis(query.getScrollTime().toMillis()));
+		}
+
 		return searchRequestBuilder;
 	}
 

src/main/resources/notice.txt

@@ -1,4 +1,4 @@
-Spring Data Elasticsearch 4.2.5 (2021.0.5)
+Spring Data Elasticsearch 4.2.7 (2021.0.7)
 Copyright (c) [2013-2021] Pivotal Software, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").
@@ -29,6 +29,8 @@ conditions of the subcomponent's license, as noted in the LICENSE file.
 
 
 
+
+
 
 
 

src/test/java/org/springframework/data/elasticsearch/core/routing/ElasticsearchOperationsRoutingTests.java

@@ -29,10 +29,12 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Routing;
 import org.springframework.data.elasticsearch.annotations.Setting;
+import org.springframework.data.elasticsearch.core.AbstractElasticsearchTemplate;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.IndexOperations;
 import org.springframework.data.elasticsearch.core.SearchHits;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
+import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
 import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.data.elasticsearch.junit.jupiter.ElasticsearchRestTemplateConfiguration;
 import org.springframework.data.elasticsearch.junit.jupiter.SpringIntegrationTest;
@@ -41,6 +43,7 @@ import org.springframework.test.context.ContextConfiguration;
 
 /**
  * @author Peter-Josef Meisch
+ * @author Anton Naydenov
  */
 @SuppressWarnings("ConstantConditions")
 @SpringIntegrationTest
@@ -118,6 +121,21 @@ public class ElasticsearchOperationsRoutingTests {
 		assertThat(searchHits.getSearchHit(0).getRouting()).isEqualTo(ID_2);
 	}
 
+	@Test
+	void shouldCreateACopyOfTheClientWithRefreshPolicy() {
+		// given
+		AbstractElasticsearchTemplate sourceTemplate = (AbstractElasticsearchTemplate) operations;
+		SimpleElasticsearchMappingContext mappingContext = new SimpleElasticsearchMappingContext();
+		DefaultRoutingResolver defaultRoutingResolver = new DefaultRoutingResolver(mappingContext);
+
+		// when
+		ElasticsearchOperations operationsCopy = this.operations.withRouting(defaultRoutingResolver);
+		AbstractElasticsearchTemplate copyTemplate = (AbstractElasticsearchTemplate) operationsCopy;
+
+		// then
+		assertThat(sourceTemplate.getRefreshPolicy()).isEqualTo(copyTemplate.getRefreshPolicy());
+	}
+
 	@Document(indexName = INDEX)
 	@Setting(shards = 5)
 	@Routing("routing")