(syncope) branch master updated: Fixing Neo4jTaskDAO

[ilgrosso]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 65fc187067 Fixing Neo4jTaskDAO
65fc187067 is described below

commit 65fc187067ccaeb7aaf9a7348f5a7fb8e42856ea
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Fri Jun 12 14:47:10 2026 +0200

    Fixing Neo4jTaskDAO
---
 .../syncope/core/persistence/neo4j/dao/Neo4jTaskDAO.java  | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git 
a/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/dao/Neo4jTaskDAO.java
 
b/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/dao/Neo4jTaskDAO.java
index dcc6f56ed3..408c8e8e0d 100644
--- 
a/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/dao/Neo4jTaskDAO.java
+++ 
b/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/dao/Neo4jTaskDAO.java
@@ -265,12 +265,12 @@ public class Neo4jTaskDAO extends AbstractDAO implements 
TaskDAO {
                 default:
             }
 
-            subStatement.append("n.").append(field).append(' 
').append(clause.getDirection().name()).append(',');
+            subStatement.append("p.").append(field).append(' 
').append(clause.getDirection().name()).append(',');
         });
 
         StringBuilder statement = new StringBuilder(" ORDER BY ");
         if (subStatement.length() == 0) {
-            statement.append("n.id DESC");
+            statement.append("p.id DESC");
         } else {
             subStatement.deleteCharAt(subStatement.length() - 1);
             statement.append(subStatement);
@@ -283,16 +283,15 @@ public class Neo4jTaskDAO extends AbstractDAO implements 
TaskDAO {
     @Override
     public <T extends Task<T>> List<T> findToExec(final TaskType type, final 
Pageable pageable) {
         TaskUtils taskUtils = taskUtilsFactory.getInstance(type);
-        StringBuilder query = new StringBuilder("MATCH (n:" + 
taskUtils.getTaskStorage() + ") WHERE ");
+        StringBuilder query = new StringBuilder("MATCH (p:" + 
taskUtils.getTaskStorage() + ") WHERE ");
 
         if (type == TaskType.NOTIFICATION) {
-            query.append("n.executed = false ");
+            query.append("p.executed = false ");
         } else {
-            query.append("(n)-[:").append(execRelationship(type)).append("]-() 
");
+            query.append("(p)-[:").append(execRelationship(type)).append("]-() 
");
         }
 
-        query.append("RETURN n.id ").
-                append(toOrderByStatement(pageable.getSort().get()));
+        query.append("RETURN p.id 
").append(toOrderByStatement(pageable.getSort().get()));
 
         if (pageable.isPaged()) {
             query.append(" SKIP ").append(pageable.getPageSize() * 
pageable.getPageNumber()).
@@ -300,7 +299,7 @@ public class Neo4jTaskDAO extends AbstractDAO implements 
TaskDAO {
         }
 
         return toList(neo4jClient.query(query.toString()).fetch().all(),
-                "n.id",
+                "p.id",
                 (Class<AbstractTask<?>>) taskUtils.getTaskEntity(),
                 null);
     }