Release version 5.2.6 (2023.1.6).

See #2895

pom.xml

@@ -5,12 +5,12 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>5.2.3</version>
+	<version>5.2.6</version>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>3.2.3</version>
+		<version>3.2.6</version>
 	</parent>
 
 	<name>Spring Data Elasticsearch</name>
@@ -18,7 +18,7 @@
 	<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
 
 	<properties>
-		<springdata.commons>3.2.3</springdata.commons>
+		<springdata.commons>3.2.6</springdata.commons>
 
 		<!-- version of the ElasticsearchClient	-->
 		<elasticsearch-java>8.11.4</elasticsearch-java>

src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java

@@ -545,13 +545,12 @@ class RequestConverter {
 		Object queryObject = query.getObject();
 
 		if (queryObject != null) {
-			String id = StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject);
-			builder //
-					.id(id) //
+			builder
+					.id(StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject))
 					.document(elasticsearchConverter.mapObject(queryObject));
 		} else if (query.getSource() != null) {
-			builder //
-					.id(query.getId()) //
+			builder
+					.id(query.getId())
 					.document(new DefaultStringObjectMap<>().fromJson(query.getSource()));
 		} else {
 			throw new InvalidDataAccessApiUsageException(
@@ -597,12 +596,13 @@ class RequestConverter {
 		Object queryObject = query.getObject();
 
 		if (queryObject != null) {
-			String id = StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject);
-			builder //
-					.id(id) //
+			builder
+					.id(StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject))
 					.document(elasticsearchConverter.mapObject(queryObject));
 		} else if (query.getSource() != null) {
-			builder.document(new DefaultStringObjectMap<>().fromJson(query.getSource()));
+			builder
+					.id(query.getId())
+					.document(new DefaultStringObjectMap<>().fromJson(query.getSource()));
 		} else {
 			throw new InvalidDataAccessApiUsageException(
 					"object or source is null, failed to index the document [id: " + query.getId() + ']');
@@ -638,12 +638,13 @@ class RequestConverter {
 		Object queryObject = query.getObject();
 
 		if (queryObject != null) {
-			String id = StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject);
-			builder //
-					.id(id) //
+            builder
+					.id(StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject))
 					.document(elasticsearchConverter.mapObject(queryObject));
 		} else if (query.getSource() != null) {
-			builder.document(new DefaultStringObjectMap<>().fromJson(query.getSource()));
+			builder
+					.id(query.getId())
+					.document(new DefaultStringObjectMap<>().fromJson(query.getSource()));
 		} else {
 			throw new InvalidDataAccessApiUsageException(
 					"object or source is null, failed to index the document [id: " + query.getId() + ']');

src/main/java/org/springframework/data/elasticsearch/core/query/Order.java

@@ -70,7 +70,7 @@ public class Order extends Sort.Order {
 
 	public Order(Sort.Direction direction, String property, Sort.NullHandling nullHandlingHint, @Nullable Mode mode,
 			@Nullable String unmappedType) {
-		this(direction, property, nullHandlingHint, null, unmappedType, null);
+		this(direction, property, nullHandlingHint, mode, unmappedType, null);
 	}
 
 	public Order(Sort.Direction direction, String property, Sort.NullHandling nullHandlingHint, @Nullable Mode mode,

src/main/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepository.java

@@ -453,9 +453,7 @@ public class SimpleElasticsearchRepository<T, ID> implements ElasticsearchReposi
 
 	@Nullable
 	public <R> R executeAndRefresh(OperationsCallback<R> callback, @Nullable RefreshPolicy refreshPolicy) {
-		R result = callback.doWithOperations(operations.withRefreshPolicy(refreshPolicy));
-		doRefresh();
-		return result;
+        return callback.doWithOperations(operations.withRefreshPolicy(refreshPolicy));
 	}
 	// endregion
 }

src/main/resources/notice.txt

@@ -1,4 +1,4 @@
-Spring Data Elasticsearch 5.2.3 (2023.1.3)
+Spring Data Elasticsearch 5.2.6 (2023.1.6)
 Copyright (c) [2013-2022] Pivotal Software, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").
@@ -21,3 +21,6 @@ conditions of the subcomponent's license, as noted in the LICENSE file.
 
 
 
+
+
+