From 67816d9fd0b6ab86c4102e4b400eede36fe96c44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Chicchiricc=C3=B2?= Date: Mon, 30 Oct 2023 10:53:06 +0100 Subject: [PATCH] Fixing Audit --- .../core/persistence/jpa/dao/ElasticsearchAuditConfDAO.java | 5 +++-- .../core/persistence/jpa/dao/OpenSearchAuditConfDAO.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAuditConfDAO.java b/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAuditConfDAO.java index 7ffb55e78d..60d7cc0e01 100644 --- a/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAuditConfDAO.java +++ b/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAuditConfDAO.java @@ -184,6 +184,7 @@ public List searchEntries( index(ElasticsearchUtils.getAuditIndex(AuthContextUtils.getDomain())). searchType(SearchType.QueryThenFetch). query(getQuery(entityKey, type, category, subcategory, events, result, before, after)). + fields(f -> f.field("message")). from(itemsPerPage * (page <= 0 ? 0 : page - 1)). size(itemsPerPage < 0 ? indexMaxResultWindow : itemsPerPage). sort(sortBuilders(orderBy)). @@ -193,13 +194,13 @@ public List searchEntries( try { esResult = client.search(request, ObjectNode.class).hits().hits(); } catch (Exception e) { - LOG.error("While searching in OpenSearch", e); + LOG.error("While searching in Elasticsearch", e); } return CollectionUtils.isEmpty(esResult) ? List.of() : esResult.stream(). - map(hit -> POJOHelper.convertValue(hit.source().get("message").asText(), AuditEntry.class)). + map(hit -> POJOHelper.convertValue(hit.source().get("message"), AuditEntry.class)). filter(Objects::nonNull).collect(Collectors.toList()); } } diff --git a/ext/opensearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/OpenSearchAuditConfDAO.java b/ext/opensearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/OpenSearchAuditConfDAO.java index 3b8806ac10..45de90b259 100644 --- a/ext/opensearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/OpenSearchAuditConfDAO.java +++ b/ext/opensearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/OpenSearchAuditConfDAO.java @@ -187,6 +187,7 @@ public List searchEntries( index(OpenSearchUtils.getAuditIndex(AuthContextUtils.getDomain())). searchType(SearchType.QueryThenFetch). query(getQuery(entityKey, type, category, subcategory, events, result, before, after)). + fields(f -> f.field("message")). from(itemsPerPage * (page <= 0 ? 0 : page - 1)). size(itemsPerPage < 0 ? indexMaxResultWindow : itemsPerPage). sort(sortBuilders(orderBy)). @@ -202,7 +203,7 @@ public List searchEntries( return CollectionUtils.isEmpty(esResult) ? List.of() : esResult.stream(). - map(hit -> POJOHelper.convertValue(hit.source().get("message").asText(), AuditEntry.class)). + map(hit -> POJOHelper.convertValue(hit.source().get("message"), AuditEntry.class)). filter(Objects::nonNull).collect(Collectors.toList()); } }