[syncope] branch 2_1_X updated: Fixing Elasticsearch multi match query for Audit searches

[ilgrosso]

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

ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/2_1_X by this push:
     new 31c11cdc1a Fixing Elasticsearch multi match query for Audit searches
31c11cdc1a is described below

commit 31c11cdc1aa000d677fcab05ea073ace7bbb2d96
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Thu Mar 30 11:51:09 2023 +0200

    Fixing Elasticsearch multi match query for Audit searches
---
 .../syncope/core/persistence/jpa/dao/ElasticsearchLoggerDAO.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchLoggerDAO.java
 
b/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchLoggerDAO.java
index 2e100d446f..fbb0d646ee 100644
--- 
a/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchLoggerDAO.java
+++ 
b/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchLoggerDAO.java
@@ -40,6 +40,7 @@ import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.core.CountRequest;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.DisMaxQueryBuilder;
+import org.elasticsearch.index.query.MultiMatchQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.SearchHit;
@@ -72,7 +73,8 @@ public class ElasticsearchLoggerDAO extends JPALoggerDAO {
 
         if (entityKey != null) {
             queryBuilders.add(QueryBuilders.multiMatchQuery(
-                    entityKey, "message.before", "message.inputs", 
"message.output", "message.throwable"));
+                    entityKey, "message.before", "message.inputs", 
"message.output", "message.throwable").
+                    type(MultiMatchQueryBuilder.Type.PHRASE));
         }
 
         if (type != null) {