Release version 5.0.6 (2022.0.6).

See #2528

.mvn/wrapper/maven-wrapper.properties

@@ -1,3 +1,3 @@
-#Mon Feb 20 11:59:41 CET 2023
+#Thu Apr 06 16:17:39 CEST 2023
 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.9.0/apache-maven-3.9.0-bin.zip
+distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip

Jenkinsfile

@@ -1,7 +1,7 @@
 def p = [:]
 node {
-    checkout scm
-    p = readProperties interpolate: true, file: 'ci/pipeline.properties'
+		checkout scm
+		p = readProperties interpolate: true, file: 'ci/pipeline.properties'
 }
 
 pipeline {
@@ -18,7 +18,7 @@ pipeline {
 	}
 
 	stages {
-		stage("test: baseline (Java 17)") {
+		stage("test: baseline (main)") {
 			when {
 				beforeAgent(true)
 				anyOf {
@@ -32,17 +32,42 @@ pipeline {
 			options { timeout(time: 30, unit: 'MINUTES') }
 
 			environment {
-				DOCKER_HUB = credentials("${p['docker.credentials']}")
 				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
 			}
 
 			steps {
 				script {
-					docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
-							sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
-							sh 'PROFILE=none ci/verify.sh'
-							sh "ci/clean.sh"
+					docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
+						sh 'PROFILE=none ci/verify.sh'
+						sh "ci/clean.sh"
+					}
+				}
+			}
+		}
+
+		stage("Test other configurations") {
+			when {
+				beforeAgent(true)
+				allOf {
+					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
+					not { triggeredBy 'UpstreamCause' }
+				}
+			}
+			parallel {
+				stage("test: baseline (next)") {
+					agent {
+						label 'data'
+					}
+					options { timeout(time: 30, unit: 'MINUTES') }
+					environment {
+						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+					}
+					steps {
+						script {
+							docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
+								sh 'PROFILE=none ci/verify.sh'
+								sh "ci/clean.sh"
+							}
 						}
 					}
 				}
@@ -68,17 +93,15 @@ pipeline {
 
 			steps {
 				script {
-					docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
-							sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch-non-root ' +
-									'-Dartifactory.server=https://repo.spring.io ' +
-									"-Dartifactory.username=${ARTIFACTORY_USR} " +
-									"-Dartifactory.password=${ARTIFACTORY_PSW} " +
-									"-Dartifactory.staging-repository=libs-snapshot-local " +
-									"-Dartifactory.build-name=spring-data-elasticsearch " +
-									"-Dartifactory.build-number=${BUILD_NUMBER} " +
-									'-Dmaven.test.skip=true clean deploy -U -B'
-						}
+					docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
+						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch-non-root ' +
+								'-Dartifactory.server=https://repo.spring.io ' +
+								"-Dartifactory.username=${ARTIFACTORY_USR} " +
+								"-Dartifactory.password=${ARTIFACTORY_PSW} " +
+								"-Dartifactory.staging-repository=libs-snapshot-local " +
+								"-Dartifactory.build-name=spring-data-elasticsearch " +
+								"-Dartifactory.build-number=${BUILD_NUMBER} " +
+								'-Dmaven.test.skip=true clean deploy -U -B'
 					}
 				}
 			}

ci/pipeline.properties

@@ -1,8 +1,10 @@
 # Java versions
 java.main.tag=17.0.6_10-jdk-focal
+java.next.tag=20-jdk-jammy
 
 # Docker container images - standard
 docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
+docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.next.tag}
 
 # Supported versions of MongoDB
 docker.mongodb.4.4.version=4.4.18

pom.xml

@@ -5,12 +5,12 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>5.0.4</version>
+	<version>5.0.6</version>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>3.0.4</version>
+		<version>3.0.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.0.4</springdata.commons>
+		<springdata.commons>3.0.6</springdata.commons>
 
 		<!-- version of the RestHighLevelClient	-->
 		<elasticsearch-rhlc>7.17.9</elasticsearch-rhlc>
@@ -28,7 +28,7 @@
 		<log4j>2.18.0</log4j>
 		<netty>4.1.65.Final</netty>
 
-		<blockhound-junit>1.0.6.RELEASE</blockhound-junit>
+		<blockhound-junit>1.0.7.RELEASE</blockhound-junit>
 		<hoverfly>0.14.3</hoverfly>
 		<jsonassert>1.5.1</jsonassert>
 		<testcontainers>1.17.3</testcontainers>

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

@@ -184,7 +184,7 @@ public class NativeQueryBuilder extends BaseQueryBuilder<NativeQuery, NativeQuer
 
 		Assert.notNull(searchExtensions, "searchExtensions must not be null");
 
-		searchExtensions.putAll(searchExtensions);
+		this.searchExtensions.putAll(searchExtensions);
 		return this;
 	}
 

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

@@ -45,6 +45,7 @@ import org.springframework.util.Assert;
  * @author Roman Puchkovskiy
  * @author Matt Gilene
  * @author Sascha Woo
+ * @author Jakob Hoeper
  * @since 4.0
  */
 public class SearchHitMapping<T> {
@@ -199,9 +200,10 @@ public class SearchHitMapping<T> {
 		}
 
 		try {
+			ElasticsearchPersistentEntity<?> persistentEntityForType = mappingContext.getPersistentEntity(type);
 			NestedMetaData nestedMetaData = searchHits.getSearchHit(0).getContent().getNestedMetaData();
 			ElasticsearchPersistentEntityWithNestedMetaData persistentEntityWithNestedMetaData = getPersistentEntity(
-					mappingContext.getPersistentEntity(type), nestedMetaData);
+					persistentEntityForType, nestedMetaData);
 
 			if (persistentEntityWithNestedMetaData.entity != null) {
 				List<SearchHit<Object>> convertedSearchHits = new ArrayList<>();
@@ -219,7 +221,8 @@ public class SearchHitMapping<T> {
 							searchDocument.getSortValues(), //
 							searchDocument.getHighlightFields(), //
 							searchHit.getInnerHits(), //
-							persistentEntityWithNestedMetaData.nestedMetaData, //
+							getPersistentEntity(persistentEntityForType, //
+									searchHit.getContent().getNestedMetaData()).nestedMetaData, //
 							searchHit.getExplanation(), //
 							searchHit.getMatchedQueries(), //
 							targetObject));

src/main/resources/notice.txt

@@ -1,4 +1,4 @@
-Spring Data Elasticsearch 5.0.4 (2022.0.4)
+Spring Data Elasticsearch 5.0.6 (2022.0.6)
 Copyright (c) [2013-2021] Pivotal Software, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").
@@ -20,3 +20,5 @@ conditions of the subcomponent's license, as noted in the LICENSE file.
 
 
 
+
+

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

@@ -42,6 +42,7 @@ import org.springframework.lang.Nullable;
  * Testing the querying and parsing of inner_hits.
  *
  * @author Peter-Josef Meisch
+ * @author Jakob Hoeper
  */
 @SpringIntegrationTest
 public abstract class InnerHitsIntegrationTests {
@@ -58,8 +59,9 @@ public abstract class InnerHitsIntegrationTests {
 		indexOps.createWithMapping();
 
 		Inhabitant john = new Inhabitant("John", "Smith");
-		Inhabitant carla = new Inhabitant("Carla", "Miller");
-		House cornerHouse = new House("Round the corner", "7", Arrays.asList(john, carla));
+		Inhabitant carla1 = new Inhabitant("Carla", "Miller");
+		Inhabitant carla2 = new Inhabitant("Carla", "Nguyen");
+		House cornerHouse = new House("Round the corner", "7", Arrays.asList(john, carla1, carla2));
 		City metropole = new City("Metropole", Arrays.asList(cornerHouse));
 
 		Inhabitant jack = new Inhabitant("Jack", "Wayne");
@@ -76,7 +78,7 @@ public abstract class InnerHitsIntegrationTests {
 		operations.indexOps(IndexCoordinates.of(indexNameProvider.getPrefix() + "*")).delete();
 	}
 
-	@Test
+	@Test // #2521
 	void shouldReturnInnerHits() {
 
 		Query query = buildQueryForInnerHits("inner_hit_name", "hou-ses.in-habi-tants", "hou-ses.in-habi-tants.first-name",
@@ -91,7 +93,7 @@ public abstract class InnerHitsIntegrationTests {
 		softly.assertThat(searchHit.getInnerHits()).hasSize(1);
 
 		SearchHits<?> innerHits = searchHit.getInnerHits("inner_hit_name");
-		softly.assertThat(innerHits).hasSize(1);
+		softly.assertThat(innerHits).hasSize(2);
 
 		SearchHit<?> innerHit = innerHits.getSearchHit(0);
 		Object content = innerHit.getContent();
@@ -106,6 +108,10 @@ public abstract class InnerHitsIntegrationTests {
 		softly.assertThat(nestedMetaData.getChild().getField()).isEqualTo("inhabitants");
 		softly.assertThat(nestedMetaData.getChild().getOffset()).isEqualTo(1);
 
+		innerHit = innerHits.getSearchHit(1);
+		softly.assertThat(((Inhabitant) innerHit.getContent()).getLastName()).isEqualTo("Nguyen");
+		softly.assertThat(innerHit.getNestedMetaData().getChild().getOffset()).isEqualTo(2);
+
 		softly.assertAll();
 	}