Fixing Audit

apache · Oct 30, 2023 · 67816d9 · 67816d9
1 parent b739782
commit 67816d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.../src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAuditConfDAO.java b/.../src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAuditConfDAO.java
@@ -184,6 +184,7 @@ public List<AuditEntry> 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<AuditEntry> 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/...jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/OpenSearchAuditConfDAO.java b/...jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/OpenSearchAuditConfDAO.java
@@ -187,6 +187,7 @@ public List<AuditEntry> 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<AuditEntry> 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());
     }
 }