DATAES-245 - Updated changelog.

pom.xml

@@ -4,12 +4,12 @@
 
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-elasticsearch</artifactId>
-    <version>1.3.0.BUILD-SNAPSHOT</version>
+    <version>1.2.3.BUILD-SNAPSHOT</version>
 
     <parent>
         <groupId>org.springframework.data.build</groupId>
         <artifactId>spring-data-parent</artifactId>
-        <version>1.7.0.BUILD-SNAPSHOT</version>
+        <version>1.6.3.BUILD-SNAPSHOT</version>
         <relativePath>../spring-data-build/parent/pom.xml</relativePath>
     </parent>
 
@@ -24,7 +24,7 @@
         <commonscollections>3.2.1</commonscollections>
         <commonslang>2.6</commonslang>
         <elasticsearch>1.4.4</elasticsearch>
-        <springdata.commons>1.11.0.BUILD-SNAPSHOT</springdata.commons>
+        <springdata.commons>1.10.3.BUILD-SNAPSHOT</springdata.commons>
 
     </properties>
 

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

@@ -122,7 +122,7 @@ class CriteriaQueryProcessor {
 
 		switch (key) {
 			case EQUALS:
-				query = queryString(searchText).field(fieldName);
+				query = queryString(searchText).field(fieldName).defaultOperator(QueryStringQueryBuilder.Operator.AND);
 				break;
 			case CONTAINS:
 				query = queryString("*" + searchText + "*").field(fieldName).analyzeWildcard(true);

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

src/main/resources/changelog.txt

@@ -1,6 +1,104 @@
 Spring Data Elasticsearch Changelog
 ===================================
 
+Changes in version 2.0.0.RELEASE (2016-04-06)
+---------------------------------------------
+* DATAES-245 - Release 2.0 GA (Hopper).
+
+
+Changes in version 2.0.0.RC1 (2016-03-18)
+-----------------------------------------
+* DATAES-241 - remove commons-collections dependency and use CollectionUtils from Spring Utils.
+* DATAES-240 - Release 2.0 RC1 (Hopper).
+* DATAES-238 - ElasticsearchTemplate.prepareUpdate() does not preserve routing parameter which is required for updating child documents.
+* DATAES-237 - path-configuration fails to load configs from inside jars.
+* DATAES-236 - Clear the search contexts associated with specified scroll id.
+* DATAES-234 - CDI support can fail due to Set.toString() used as Map key.
+* DATAES-211 - Upgrade to Elasticsearch 2.0.
+* DATAES-188 - Source filtering feature Implementation.
+* DATAES-124 - ElasticSearchTemplate should expose client.
+
+
+Changes in version 1.3.4.RELEASE (2016-02-23)
+---------------------------------------------
+* DATAES-235 - Release 1.3.4 (Gosling SR4).
+
+
+Changes in version 1.4.0.M1 (2016-02-12)
+----------------------------------------
+* DATAES-232 - Add code of conduct.
+* DATAES-231 - Release 1.4 M1 (Hopper).
+* DATAES-230 - Remove unnecessary type check in AbstractElasticsearchRepository.
+* DATAES-224 - ElasticsearchTemplate discards newlines in mappings and settings files.
+* DATAES-221 - Adapt to changes in Spring Data Commons.
+* DATAES-216 - Add support to Indices Boost.
+* DATAES-210 - Typo in error message.
+* DATAES-209 - Handle dynamic mapping annotation at field level.
+* DATAES-194 - Tests should clean up "data" directory.
+* DATAES-171 - findByIdNotIn not work.
+* DATAES-94 - Bump to support ES 1.2.0.
+
+
+Changes in version 1.3.2.RELEASE (2015-12-18)
+---------------------------------------------
+* DATAES-223 - Release 1.3.2 (Gosling).
+
+
+Changes in version 1.3.1.RELEASE (2015-11-15)
+---------------------------------------------
+* DATAES-212 - Release 1.3.1 (Gosling).
+
+
+Changes in version 1.1.4.RELEASE (2015-10-14)
+---------------------------------------------
+* DATAES-202 - Release 1.1.4 (Evans).
+
+
+Changes in version 1.3.0.RELEASE (2015-09-01)
+---------------------------------------------
+* DATAES-193 - Release 1.3 GA (Gosling).
+* DATAES-137 - Should work out of the box with Spring Data REST.
+
+
+Changes in version 1.3.0.RC1 (2015-08-04)
+-----------------------------------------
+* DATAES-186 - Release 1.3 RC1 (Gosling).
+* DATAES-182 - Switch from BeanWrapper to PersistentPropertyAccessor.
+
+
+Changes in version 1.2.2.RELEASE (2015-07-28)
+---------------------------------------------
+* DATAES-184 - Release 1.2.2 (Fowler).
+
+
+Changes in version 1.0.6.RELEASE (2015-07-01)
+---------------------------------------------
+* DATAES-173 - Release 1.0.6 (Dijkstra).
+
+
+Changes in version 1.1.3.RELEASE (2015-07-01)
+---------------------------------------------
+* DATAES-174 - Release 1.1.3 (Evans).
+
+
+Changes in version 1.2.1.RELEASE (2015-06-30)
+---------------------------------------------
+* DATAES-175 - Release 1.2.1 (Fowler).
+* DATAES-164 - CriteriaQuery equals method has to use AND operator instead of OR.
+* DATAES-155 - findAll(Iterable<ID> ids) doesn't set persistent entity id.
+
+
+Changes in version 1.3.0.M1 (2015-06-02)
+----------------------------------------
+* DATAES-168 - Release 1.3 M1 (Gosling).
+* DATAES-164 - CriteriaQuery equals method has to use AND operator instead of OR.
+* DATAES-162 - Adapt API changes in Spring Data Commons to simplify custom repository base class registration.
+* DATAES-159 - Bulk update with ElasticsearchTemplate.
+* DATAES-158 - UpdateRequest.script not working.
+* DATAES-157 - support deleteBy operation.
+* DATAES-155 - findAll(Iterable<ID> ids) doesn't set persistent entity id.
+
+
 Changes in version 1.2.0.RELEASE (2015-03-23)
 ---------------------------------------------
 * DATAES-154 - Release 1.2 GA.

src/main/resources/notice.txt

@@ -1,4 +1,4 @@
-Spring Data Elasticsearch 1.2 GA
+Spring Data Elasticsearch 1.2.2
 Copyright (c) [2013-2015] Pivotal Software, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").

src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTests.java

@@ -223,12 +223,12 @@ public class CriteriaQueryTests {
 
 		elasticsearchTemplate.bulkIndex(indexQueries);
 		elasticsearchTemplate.refresh(SampleEntity.class, true);
-		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").is("some message").is("test message"));
+		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").is("some message"));
 		// when
 		Page<SampleEntity> page = elasticsearchTemplate.queryForPage(criteriaQuery, SampleEntity.class);
 		// then
 		assertThat("message", is(criteriaQuery.getCriteria().getField().getName()));
-		assertThat(page.getTotalElements(), is(greaterThanOrEqualTo(2L)));
+		assertThat(page.getTotalElements(), is(equalTo(1L)));
 	}
 
 	@Test