[unomi] branch UNOMI-225-ES7 updated: UNOMI-225 ElasticSearch 7 support Model changes: - fix issue with full text search not working

[shuber]

This is an automated email from the ASF dual-hosted git repository.

shuber pushed a commit to branch UNOMI-225-ES7
in repository https://gitbox.apache.org/repos/asf/unomi.git


The following commit(s) were added to refs/heads/UNOMI-225-ES7 by this push:
     new 3cf4527  UNOMI-225 ElasticSearch 7 support Model changes: - fix issue 
with full text search not working
3cf4527 is described below

commit 3cf45277ed50315ffe72018969b9c92a602e4018
Author: Serge Huber <shu...@apache.org>
AuthorDate: Thu Nov 21 20:02:54 2019 +0100

    UNOMI-225 ElasticSearch 7 support
    Model changes:
    - fix issue with full text search not working
    
    Signed-off-by: Serge Huber <shu...@apache.org>
---
 .../elasticsearch/ElasticSearchPersistenceServiceImpl.java          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
 
b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
index a4d468b..23bb970 100644
--- 
a/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
+++ 
b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
@@ -1221,7 +1221,7 @@ public class ElasticSearchPersistenceServiceImpl 
implements PersistenceService,
 
     @Override
     public <T extends Item> PartialList<T> queryFullText(final String 
fulltext, final Condition query, String sortBy, final Class<T> clazz, final int 
offset, final int size) {
-        return 
query(QueryBuilders.boolQuery().must(QueryBuilders.queryStringQuery(fulltext).defaultField("_all")).must(conditionESQueryBuilderDispatcher.getQueryBuilder(query)),
 sortBy, clazz, offset, size, null, null);
+        return 
query(QueryBuilders.boolQuery().must(QueryBuilders.queryStringQuery(fulltext)).must(conditionESQueryBuilderDispatcher.getQueryBuilder(query)),
 sortBy, clazz, offset, size, null, null);
     }
 
     @Override
@@ -1241,12 +1241,12 @@ public class ElasticSearchPersistenceServiceImpl 
implements PersistenceService,
 
     @Override
     public <T extends Item> PartialList<T> queryFullText(String fieldName, 
String fieldValue, String fulltext, String sortBy, Class<T> clazz, int offset, 
int size) {
-        return 
query(QueryBuilders.boolQuery().must(QueryBuilders.queryStringQuery(fulltext).defaultField("_all")).must(termQuery(fieldName,
 fieldValue)), sortBy, clazz, offset, size, getRouting(fieldName, new 
String[]{fieldValue}, clazz), null);
+        return 
query(QueryBuilders.boolQuery().must(QueryBuilders.queryStringQuery(fulltext)).must(termQuery(fieldName,
 fieldValue)), sortBy, clazz, offset, size, getRouting(fieldName, new 
String[]{fieldValue}, clazz), null);
     }
 
     @Override
     public <T extends Item> PartialList<T> queryFullText(String fulltext, 
String sortBy, Class<T> clazz, int offset, int size) {
-        return 
query(QueryBuilders.queryStringQuery(fulltext).defaultField("_all"), sortBy, 
clazz, offset, size, getRouting("_all", new String[]{fulltext}, clazz), null);
+        return query(QueryBuilders.queryStringQuery(fulltext), sortBy, clazz, 
offset, size, null, null);
     }
 
     @Override