DATAES-651 - Fix regression from escaping query parameters.

Original PR: spring-projects#321

Author: sothawo

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

@@ -26,9 +26,9 @@
 import java.util.ListIterator;
 
 import org.apache.lucene.queryparser.flexible.core.util.StringUtils;
+import org.apache.lucene.queryparser.flexible.standard.QueryParserUtil;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
-import org.apache.lucene.queryparser.flexible.standard.QueryParserUtil;
 import org.springframework.data.elasticsearch.core.query.Criteria;
 import org.springframework.util.Assert;
 
@@ -143,7 +143,7 @@ private QueryBuilder processCriteriaEntry(Criteria.CriteriaEntry entry,
 		OperationKey key = entry.getKey();
 		QueryBuilder query = null;
 
-		String searchText = QueryParserUtil.escape(StringUtils.toString(value));
+		String searchText = QueryParserUtil.escape(value.toString());
 
 		switch (key) {
 			case EQUALS:
@@ -159,7 +159,7 @@ private QueryBuilder processCriteriaEntry(Criteria.CriteriaEntry entry,
 				query = queryStringQuery("*" + searchText).field(fieldName).analyzeWildcard(true);
 				break;
 			case EXPRESSION:
-				query = queryStringQuery(searchText).field(fieldName);
+				query = queryStringQuery(value.toString()).field(fieldName);
 				break;
 			case LESS_EQUAL:
 				query = rangeQuery(fieldName).lte(value);