From 7a4aebf9f450583c8c63efa8b8ca6c202ce3cc05 Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Sat, 14 Sep 2019 19:00:54 +0200 Subject: [PATCH] DATAES-651 - Fix regression from escaping query parameters. Original PR: #321 --- .../data/elasticsearch/core/CriteriaQueryProcessor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/core/CriteriaQueryProcessor.java b/src/main/java/org/springframework/data/elasticsearch/core/CriteriaQueryProcessor.java index ab01d127a..f11de8802 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/CriteriaQueryProcessor.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/CriteriaQueryProcessor.java @@ -26,9 +26,9 @@ import java.util.List; 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 @@ class CriteriaQueryProcessor { 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 @@ class CriteriaQueryProcessor { 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);