DATAES-184 - Release version 1.2.2.RELEASE (Fowler SR2).

pom.xml

@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-elasticsearch</artifactId>
-    <version>1.3.0.BUILD-SNAPSHOT</version>
+    <version>1.2.2.RELEASE</version>
 
     <parent>
         <groupId>org.springframework.data.build</groupId>
         <artifactId>spring-data-parent</artifactId>
-        <version>1.7.0.BUILD-SNAPSHOT</version>
+        <version>1.6.2.RELEASE</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.2.RELEASE</springdata.commons>
 
     </properties>
 
@@ -150,8 +150,8 @@
 
     <repositories>
         <repository>
-            <id>spring-libs-snapshot</id>
-            <url>https://repo.spring.io/libs-snapshot</url>
+            <id>spring-libs-release</id>
+            <url>https://repo.spring.io/libs-release</url>
         </repository>
     </repositories>
 

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,39 @@
 Spring Data Elasticsearch Changelog
 ===================================
 
+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