This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch 4_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 9c4d8609fdd140ff0eaa7bbf07dd22b0a752a011 Author: Francesco Chicchiriccò <[email protected]> AuthorDate: Fri Jun 12 13:33:13 2026 +0200 Fixing Neo4j --- core/persistence-neo4j/pom.xml | 6 ++++++ .../syncope/core/persistence/neo4j/PersistenceContext.java | 3 ++- .../syncope/core/persistence/neo4j/dao/Neo4jTaskDAO.java | 12 ++++++------ fit/core-reference/pom.xml | 6 ++++++ 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/core/persistence-neo4j/pom.xml b/core/persistence-neo4j/pom.xml index 08817349c2..dc744c25c2 100644 --- a/core/persistence-neo4j/pom.xml +++ b/core/persistence-neo4j/pom.xml @@ -43,6 +43,12 @@ under the License. <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-neo4j</artifactId> </dependency> + <!-- keep until https://github.com/spring-projects/spring-data-commons/issues/3500 --> + <dependency> + <groupId>org.springframework.data</groupId> + <artifactId>spring-data-commons</artifactId> + <version>3.5.11</version> + </dependency> <dependency> <groupId>org.apache.syncope.core</groupId> diff --git a/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/PersistenceContext.java b/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/PersistenceContext.java index f260a5aa15..4f95ba6705 100644 --- a/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/PersistenceContext.java +++ b/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/PersistenceContext.java @@ -244,7 +244,8 @@ public class PersistenceContext { @ConditionalOnMissingBean @Bean public org.neo4j.cypherdsl.core.renderer.Configuration cypherDslConfiguration() { - return org.neo4j.cypherdsl.core.renderer.Configuration.newConfig().withDialect(Dialect.NEO4J_5).build(); + return org.neo4j.cypherdsl.core.renderer.Configuration.newConfig(). + withDialect(Dialect.NEO4J_5_DEFAULT_CYPHER).build(); } @ConditionalOnMissingBean 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 75576dd5c5..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 @@ -270,7 +270,7 @@ public class Neo4jTaskDAO extends AbstractDAO implements TaskDAO { 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,15 +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()). @@ -299,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); } diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml index d2d91adc55..9129014a11 100644 --- a/fit/core-reference/pom.xml +++ b/fit/core-reference/pom.xml @@ -1111,6 +1111,12 @@ under the License. <artifactId>syncope-core-persistence-neo4j</artifactId> <version>${project.version}</version> </dependency> + <!-- keep until https://github.com/spring-projects/spring-data-commons/issues/3500 --> + <dependency> + <groupId>org.springframework.data</groupId> + <artifactId>spring-data-commons</artifactId> + <version>3.5.11</version> + </dependency> </dependencies> <build>
