From 57d6c17212e428fc148ea304d7584f01e8b1831e Mon Sep 17 00:00:00 2001 From: Spring Buildmaster Date: Mon, 23 Mar 2015 05:00:31 -0700 Subject: [PATCH 1/4] DATAES-154 - Prepare next development iteration. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c4a4ec50d..6be5b2277 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.springframework.data spring-data-elasticsearch - 1.2.0.RELEASE + 1.3.0.BUILD-SNAPSHOT org.springframework.data.build From f7895212103ece4d17af769609c3f5e77675fc81 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Mon, 23 Mar 2015 13:51:11 +0100 Subject: [PATCH 2/4] DATAES-154 - After release cleanups. --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 6be5b2277..1dff74470 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 @@ -9,7 +9,7 @@ org.springframework.data.build spring-data-parent - 1.6.0.RELEASE + 1.7.0.BUILD-SNAPSHOT ../spring-data-build/parent/pom.xml @@ -24,7 +24,7 @@ 3.2.1 2.6 1.4.4 - 1.10.0.RELEASE + 1.11.0.BUILD-SNAPSHOT @@ -150,8 +150,8 @@ - spring-libs-release - https://repo.spring.io/libs-release + spring-libs-snapshot + https://repo.spring.io/libs-snapshot From fa996716abd183bb950e7033ea22fda7466c80a2 Mon Sep 17 00:00:00 2001 From: Mohsin Husen Date: Tue, 24 Mar 2015 10:23:33 +0000 Subject: [PATCH 3/4] DATAES-154 - After release cleanups. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index abdff05cb..6dd0f7b7b 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Add the Maven dependency: org.springframework.data spring-data-elasticsearch - 1.1.0.RELEASE + 1.2.0.RELEASE ``` @@ -42,7 +42,7 @@ the appropriate dependency version. org.springframework.data spring-data-elasticsearch - 1.2.0.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT From fa8b8da809ab51aadce597cda657eec9d1a7fa7c Mon Sep 17 00:00:00 2001 From: Kevin Leturc Date: Wed, 1 Apr 2015 11:01:22 +0200 Subject: [PATCH 4/4] DATAES-155 setPersistentEntityId in mapResutls(MultiGetResponse, Class). --- .../data/elasticsearch/core/DefaultResultMapper.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/springframework/data/elasticsearch/core/DefaultResultMapper.java b/src/main/java/org/springframework/data/elasticsearch/core/DefaultResultMapper.java index bf6020006..7f66140a7 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/DefaultResultMapper.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/DefaultResultMapper.java @@ -145,6 +145,7 @@ public class DefaultResultMapper extends AbstractResultMapper { for (MultiGetItemResponse response : responses.getResponses()) { if (!response.isFailed() && response.getResponse().isExists()) { T result = mapEntity(response.getResponse().getSourceAsString(), clazz); + setPersistentEntityId(result, response.getResponse().getId(), clazz); list.add(result); } }