Release version 4.2.7 (2021.0.7).

See #1964
Prepare 4.2.7 (2021.0.7).
2026-05-23 12:43:17 +00:00 · 2021-11-12 10:27:21 +01:00 · 2021-11-12 10:26:44 +01:00 · 2021-10-26 21:45:02 +02:00 · 2021-10-26 19:18:23 +02:00 · 2021-10-26 18:49:24 +02:00
11 changed files with 108 additions and 36 deletions
@@ -1,2 +1,3 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+#Fri Sep 10 15:39:43 CEST 2021
+wrapperUrl=https\://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.2/apache-maven-3.8.2-bin.zip
@@ -5,12 +5,12 @@

 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>4.2.4</version>
+	<version>4.2.7</version>

 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>2.5.4</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.4</springdata.commons>
+		<springdata.commons>2.5.7</springdata.commons>
 		<testcontainers>1.15.1</testcontainers>
 		<java-module-name>spring.data.elasticsearch</java-module-name>
 	</properties>
@@ -54,6 +54,7 @@ import org.springframework.util.Assert;
 * @author Huw Ayling-Miller
 * @author Henrique Amaral
 * @author Peter-Josef Meisch
+ * @author Nic Hines
 * @since 3.2
 */
 public final class RestClients {
@@ -104,15 +105,14 @@ public final class RestClients {
 			Duration connectTimeout = clientConfiguration.getConnectTimeout();

 			if (!connectTimeout.isNegative()) {
-
 				requestConfigBuilder.setConnectTimeout(Math.toIntExact(connectTimeout.toMillis()));
-				requestConfigBuilder.setConnectionRequestTimeout(Math.toIntExact(connectTimeout.toMillis()));
 			}

-			Duration timeout = clientConfiguration.getSocketTimeout();
+			Duration socketTimeout = clientConfiguration.getSocketTimeout();

-			if (!timeout.isNegative()) {
-				requestConfigBuilder.setSocketTimeout(Math.toIntExact(timeout.toMillis()));
+			if (!socketTimeout.isNegative()) {
+				requestConfigBuilder.setSocketTimeout(Math.toIntExact(socketTimeout.toMillis()));
+				requestConfigBuilder.setConnectionRequestTimeout(Math.toIntExact(socketTimeout.toMillis()));
 			}

 			clientBuilder.setDefaultRequestConfig(requestConfigBuilder.build());
@@ -29,7 +29,7 @@ import org.springframework.data.mapping.context.PersistentEntities;
 * @author Peter-Josef Meisch
 * @since 4.1
 */
-class PersistentEntitiesFactoryBean implements FactoryBean<PersistentEntities> {
+public class PersistentEntitiesFactoryBean implements FactoryBean<PersistentEntities> {

 	private final MappingElasticsearchConverter converter;

@@ -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;
 	}
@@ -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;
 	}

@@ -17,6 +17,7 @@ package org.springframework.data.elasticsearch.repository.query;

 import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.SearchHitSupport;
 import org.springframework.data.elasticsearch.core.SearchHits;
@@ -84,16 +85,11 @@ public class ElasticsearchStringQuery extends AbstractElasticsearchRepositoryQue
 						.unwrapSearchHits(SearchHitSupport.searchPageFor(searchHits, stringQuery.getPageable()));
 			}
 		} else if (queryMethod.isStreamQuery()) {
-			if (accessor.getPageable().isUnpaged()) {
-				stringQuery.setPageable(PageRequest.of(0, DEFAULT_STREAM_BATCH_SIZE));
-			} else {
-				stringQuery.setPageable(accessor.getPageable());
-			}
+			stringQuery.setPageable(
+					accessor.getPageable().isPaged() ? accessor.getPageable() : PageRequest.of(0, DEFAULT_STREAM_BATCH_SIZE));
 			result = StreamUtils.createStreamFromIterator(elasticsearchOperations.searchForStream(stringQuery, clazz, index));
 		} else if (queryMethod.isCollectionQuery()) {
-			if (accessor.getPageable().isPaged()) {
-				stringQuery.setPageable(accessor.getPageable());
-			}
+			stringQuery.setPageable(accessor.getPageable().isPaged() ? accessor.getPageable() : Pageable.unpaged());
 			result = elasticsearchOperations.search(stringQuery, clazz, index);
 		} else {
 			result = elasticsearchOperations.searchOne(stringQuery, clazz, index);
@@ -1,4 +1,4 @@
-Spring Data Elasticsearch 4.2.4 (2021.0.4)
+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").
@@ -27,6 +27,9 @@ conditions of the subcomponent's license, as noted in the LICENSE file.



+
+
+



@@ -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")
@@ -1610,19 +1610,18 @@ public abstract class CustomMethodRepositoryBaseTests {
 		assertThat((nextPageable.getPageNumber())).isEqualTo(1);
 	}

-	private List<SampleEntity> createSampleEntities(String type, int numberOfEntities) {
+	@Test // #1917
+	@DisplayName("shouldReturnAllDocumentsWithUnpagedQuery")
+	void shouldReturnAllDocumentsWithUnpagedQuery() {

-		List<SampleEntity> entities = new ArrayList<>();
-		for (int i = 0; i < numberOfEntities; i++) {
-			SampleEntity entity = new SampleEntity();
-			entity.setId(UUID.randomUUID().toString());
-			entity.setAvailable(true);
-			entity.setMessage("Message");
-			entity.setType(type);
-			entities.add(entity);
-		}
+		List<SampleEntity> entities = createSampleEntities("abc", 20);
+		repository.saveAll(entities);

-		return entities;
+		SearchHits<SampleEntity> searchHits = repository.searchWithQueryByMessageUnpaged("Message");
+
+		assertThat(searchHits).isNotNull();
+		assertThat((searchHits.getTotalHits())).isEqualTo(20);
+		assertThat(searchHits.getSearchHits()).hasSize(20);
 	}

 	@Test // DATAES-891
@@ -1647,6 +1646,21 @@ public abstract class CustomMethodRepositoryBaseTests {
 		assertThat(count).isEqualTo(20);
 	}

+	private List<SampleEntity> createSampleEntities(String type, int numberOfEntities) {
+
+		List<SampleEntity> entities = new ArrayList<>();
+		for (int i = 0; i < numberOfEntities; i++) {
+			SampleEntity entity = new SampleEntity();
+			entity.setId(UUID.randomUUID().toString());
+			entity.setAvailable(true);
+			entity.setMessage("Message");
+			entity.setType(type);
+			entities.add(entity);
+		}
+
+		return entities;
+	}
+
 	@Document(indexName = "test-index-sample-repositories-custom-method")
 	static class SampleEntity {
 		@Nullable @Id private String id;
@@ -1854,6 +1868,9 @@ public abstract class CustomMethodRepositoryBaseTests {
 		@Query("{\"match\": {\"message\": \"?0\"}}")
 		SearchPage<SampleEntity> searchWithQueryByMessage(String message, Pageable pageable);

+		@Query("{\"match\": {\"message\": \"?0\"}}")
+		SearchHits<SampleEntity> searchWithQueryByMessageUnpaged(String message);
+
 		@CountQuery("{\"bool\" : {\"must\" : {\"term\" : {\"type\" : \"?0\"}}}}")
 		long countWithQueryByType(String type);
 	}
@@ -28,6 +28,7 @@ import java.lang.Long;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 import java.util.stream.IntStream;

 import org.elasticsearch.ElasticsearchStatusException;
@@ -541,14 +542,36 @@ class SimpleReactiveElasticsearchRepositoryTests {
 	@Test // DATAES-519
 	void annotatedFinderMethodShouldBeExecutedCorrectly() {

-		bulkIndex(new SampleEntity("id-one", "message"), //
-				new SampleEntity("id-two", "test message"), //
-				new SampleEntity("id-three", "test test")) //
-						.block();
+		int count = 30;
+		SampleEntity[] sampleEntities = IntStream.range(1, count + 1)
+				.mapToObj(i -> new SampleEntity("id-" + i, "test " + i)).collect(Collectors.toList())
+				.toArray(new SampleEntity[count]);
+
+		bulkIndex(sampleEntities).block();

 		repository.findAllViaAnnotatedQueryByMessageLike("test") //
 				.as(StepVerifier::create) //
-				.expectNextCount(2) //
+				.expectNextCount(count) //
+				.verifyComplete();
+	}
+
+	@Test // #1917
+	void annotatedFinderMethodPagedShouldBeExecutedCorrectly() {
+
+		int count = 30;
+		SampleEntity[] sampleEntities = IntStream.range(1, count + 1)
+				.mapToObj(i -> new SampleEntity("id-" + i, "test " + i)).collect(Collectors.toList())
+				.toArray(new SampleEntity[count]);
+
+		bulkIndex(sampleEntities).block();
+
+		repository.findAllViaAnnotatedQueryByMessageLikePaged("test", PageRequest.of(0, 20)) //
+				.as(StepVerifier::create) //
+				.expectNextCount(20) //
+				.verifyComplete();
+		repository.findAllViaAnnotatedQueryByMessageLikePaged("test", PageRequest.of(1, 20)) //
+				.as(StepVerifier::create) //
+				.expectNextCount(10) //
 				.verifyComplete();
 	}

@@ -596,6 +619,9 @@ class SimpleReactiveElasticsearchRepositoryTests {
 		@Query("{ \"bool\" : { \"must\" : { \"term\" : { \"message\" : \"?0\" } } } }")
 		Flux<SampleEntity> findAllViaAnnotatedQueryByMessageLike(String message);

+		@Query("{ \"bool\" : { \"must\" : { \"term\" : { \"message\" : \"?0\" } } } }")
+		Flux<SampleEntity> findAllViaAnnotatedQueryByMessageLikePaged(String message, Pageable pageable);
+
 		Mono<SampleEntity> findFirstByMessageLike(String message);

 		Mono<Long> countAllByMessage(String message);
Author	SHA1	Message	Date
Jens Schauder	e5445cf56f	Release version 4.2.7 (2021.0.7). See #1964	2021-11-12 10:27:21 +01:00
Jens Schauder	09a4e59e8d	Prepare 4.2.7 (2021.0.7). See #1964	2021-11-12 10:26:44 +01:00
Peter-Josef Meisch	1e33e0f498	fix import after cherrypick	2021-10-26 21:45:02 +02:00
Anton Naydenov	e4df537382	Added RefreshPolicy setter to the AbstractElasticsearchTemplate copy method. Original Pull Request #1976 Closes #1978 (cherry picked from commit `8894dd3d21`)	2021-10-26 19:18:23 +02:00
jongchan lee	c1ab4d66e0	Add scrolltime condition when using SearchRequest. Original Pull Request #1975 Closes #1974 (cherry picked from commit `f1b4a54bc2`)	2021-10-26 18:49:24 +02:00
Mark Paluch	42cbab7ef6	After release cleanups. See #1936	2021-10-18 11:19:45 +02:00
Mark Paluch	9eed498fab	Prepare next development iteration. See #1936	2021-10-18 11:19:42 +02:00
Mark Paluch	f16f70ff0f	Release version 4.2.6 (2021.0.6). See #1936	2021-10-18 11:11:46 +02:00
Mark Paluch	7494d344c5	Prepare 4.2.6 (2021.0.6). See #1936	2021-10-18 11:10:49 +02:00
Mark Paluch	ca61901c1c	After release cleanups. See #1898	2021-09-17 09:27:40 +02:00
Mark Paluch	323ccc9729	Prepare next development iteration. See #1898	2021-09-17 09:27:36 +02:00
Mark Paluch	d2960d764f	Release version 4.2.5 (2021.0.5). See #1898	2021-09-17 09:18:33 +02:00
Mark Paluch	8bb0a60450	Prepare 4.2.5 (2021.0.5). See #1898	2021-09-17 09:17:30 +02:00
Christoph Strobl	e33fe4d9fd	Change visibility of PersistentEntitiesFactoryBean. Closes: #1934	2021-09-16 08:08:41 +02:00
Mark Paluch	0fd1b96ef3	Upgrade to Maven Wrapper 3.8.2. See #1927	2021-09-10 15:39:43 +02:00
Peter-Josef Meisch	30bc91c753	Polishing (cherry picked from commit `6941e31ba4`)	2021-09-10 08:31:51 +02:00
Nic Hines	92806d2e11	Change mapping of connectionRequestTimeout to ConnPool leaseTimeout. Original Pull Request: #1925 Closes: #1926 (cherry picked from commit `3b8f0c9d56`)	2021-09-10 08:31:51 +02:00
Peter-Josef Meisch	2dd0a6771f	Fix @Query method implementation for unpaged queries. Original Pull Request #1919 Closes #1917 (cherry picked from commit `e71758686c`)	2021-09-03 21:50:26 +02:00
Jens Schauder	79e0260f48	After release cleanups. See #1875	2021-08-12 11:37:31 +02:00
Jens Schauder	8d79a3efcf	Prepare next development iteration. See #1875	2021-08-12 11:37:30 +02:00