You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2026/06/12 11:34:05 UTC

(syncope) 05/05: Fixing Neo4j

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

commit 6df746dafe7aa09487cd66d2bdf7ba36a913c8a0
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Fri Jun 12 13:33:13 2026 +0200

    Fixing Neo4j
---
 core/persistence-neo4j/pom.xml                                      | 6 ++++++
 .../apache/syncope/core/persistence/neo4j/PersistenceContext.java   | 3 ++-
 .../org/apache/syncope/core/persistence/neo4j/dao/Neo4jTaskDAO.java | 2 +-
 fit/core-reference/pom.xml                                          | 6 ++++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/core/persistence-neo4j/pom.xml b/core/persistence-neo4j/pom.xml
index 9860f16f7f..dd4815e8ff 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>4.0.5</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 a2351fdd23..fe40fb6ebb 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
@@ -248,7 +248,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 9cad80cc17..dcc6f56ed3 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,7 +265,7 @@ public class Neo4jTaskDAO extends AbstractDAO implements TaskDAO {
                 default:
             }
 
-            subStatement.append("p.").append(field).append(' ').append(clause.getDirection().name()).append(',');
+            subStatement.append("n.").append(field).append(' ').append(clause.getDirection().name()).append(',');
         });
 
         StringBuilder statement = new StringBuilder(" ORDER BY ");
diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml
index 5bd2a58e18..111cf6e587 100644
--- a/fit/core-reference/pom.xml
+++ b/fit/core-reference/pom.xml
@@ -1115,6 +1115,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>4.0.5</version>
+        </dependency>
       </dependencies>
 
       <build>