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
The following commit(s) were added to refs/heads/4_1_X by this push:
new 2629a1a08b Fixing Neo4j with workaround from
https://github.com/spring-projects/spring-data-commons/issues/3500
2629a1a08b is described below
commit 2629a1a08b203f4736528bd7af162cbffc85224e
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Tue Jun 23 14:03:15 2026 +0200
Fixing Neo4j with workaround from
https://github.com/spring-projects/spring-data-commons/issues/3500
---
core/persistence-neo4j/pom.xml | 6 ------
.../core/persistence/neo4j/entity/task/Neo4jLiveSyncTask.java | 6 +++---
.../syncope/core/persistence/neo4j/entity/task/Neo4jMacroTask.java | 6 +++---
.../core/persistence/neo4j/entity/task/Neo4jNotificationTask.java | 6 +++---
.../core/persistence/neo4j/entity/task/Neo4jPropagationTask.java | 6 +++---
.../syncope/core/persistence/neo4j/entity/task/Neo4jPullTask.java | 6 +++---
.../syncope/core/persistence/neo4j/entity/task/Neo4jPushTask.java | 6 +++---
.../syncope/core/persistence/neo4j/entity/task/Neo4jSchedTask.java | 6 +++---
fit/core-reference/pom.xml | 6 ------
9 files changed, 21 insertions(+), 33 deletions(-)
diff --git a/core/persistence-neo4j/pom.xml b/core/persistence-neo4j/pom.xml
index dc744c25c2..08817349c2 100644
--- a/core/persistence-neo4j/pom.xml
+++ b/core/persistence-neo4j/pom.xml
@@ -43,12 +43,6 @@ 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/entity/task/Neo4jLiveSyncTask.java
b/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jLiveSyncTask.java
index ede651fea6..097ce4f286 100644
---
a/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jLiveSyncTask.java
+++
b/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jLiveSyncTask.java
@@ -74,7 +74,7 @@ public class Neo4jLiveSyncTask extends
Neo4jInboundTask<LiveSyncTask> implements
private List<Neo4jAnyTemplateLiveSyncTask> templates = new ArrayList<>();
@Relationship(type = LIVE_SYNC_TASK_EXEC_REL, direction =
Relationship.Direction.INCOMING)
- private List<Neo4jLiveSyncTaskExec> executions = new ArrayList<>();
+ private List<Neo4jLiveSyncTaskExec> liveSyncTaskExecs = new ArrayList<>();
@Override
public int getDelaySecondsAcrossInvocations() {
@@ -130,7 +130,7 @@ public class Neo4jLiveSyncTask extends
Neo4jInboundTask<LiveSyncTask> implements
@Override
protected boolean doAdd(final TaskExec<SchedTask> exec) {
- return executions.add((Neo4jLiveSyncTaskExec) exec);
+ return liveSyncTaskExecs.add((Neo4jLiveSyncTaskExec) exec);
}
@Override
@@ -140,7 +140,7 @@ public class Neo4jLiveSyncTask extends
Neo4jInboundTask<LiveSyncTask> implements
@Override
protected List<? extends AbstractTaskExec<SchedTask>> executions() {
- return executions;
+ return liveSyncTaskExecs;
}
@PostLoad
diff --git
a/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jMacroTask.java
b/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jMacroTask.java
index ecd4799dad..7c1174705d 100644
---
a/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jMacroTask.java
+++
b/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jMacroTask.java
@@ -86,7 +86,7 @@ public class Neo4jMacroTask extends Neo4jSchedTask implements
MacroTask {
private Neo4jImplementation macroActions;
@Relationship(type = MACRO_TASK_EXEC_REL, direction =
Relationship.Direction.INCOMING)
- private List<Neo4jMacroTaskExec> executions = new ArrayList<>();
+ private List<Neo4jMacroTaskExec> macroTaskExecs = new ArrayList<>();
@Override
public Realm getRealm() {
@@ -121,7 +121,7 @@ public class Neo4jMacroTask extends Neo4jSchedTask
implements MacroTask {
@Override
protected boolean doAdd(final TaskExec<SchedTask> exec) {
- return executions.add((Neo4jMacroTaskExec) exec);
+ return macroTaskExecs.add((Neo4jMacroTaskExec) exec);
}
@Override
@@ -131,7 +131,7 @@ public class Neo4jMacroTask extends Neo4jSchedTask
implements MacroTask {
@Override
protected List<? extends AbstractTaskExec<SchedTask>> executions() {
- return executions;
+ return macroTaskExecs;
}
@Override
diff --git
a/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jNotificationTask.java
b/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jNotificationTask.java
index 59a95fb197..228272b97d 100644
---
a/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jNotificationTask.java
+++
b/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jNotificationTask.java
@@ -62,7 +62,7 @@ public class Neo4jNotificationTask extends
AbstractTask<NotificationTask> implem
private Set<String> recipientsSet = new HashSet<>();
@Relationship(type = NOTIFICATION_TASK_EXEC_REL, direction =
Relationship.Direction.INCOMING)
- private List<Neo4jNotificationTaskExec> executions = new ArrayList<>();
+ private List<Neo4jNotificationTaskExec> notificationTaskExecs = new
ArrayList<>();
@NotNull
private String sender;
@@ -180,7 +180,7 @@ public class Neo4jNotificationTask extends
AbstractTask<NotificationTask> implem
@Override
protected boolean doAdd(final TaskExec<NotificationTask> exec) {
- return executions.add((Neo4jNotificationTaskExec) exec);
+ return notificationTaskExecs.add((Neo4jNotificationTaskExec) exec);
}
@Override
@@ -190,7 +190,7 @@ public class Neo4jNotificationTask extends
AbstractTask<NotificationTask> implem
@Override
protected List<? extends AbstractTaskExec<NotificationTask>> executions() {
- return executions;
+ return notificationTaskExecs;
}
protected void json2list(final boolean clearFirst) {
diff --git
a/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jPropagationTask.java
b/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jPropagationTask.java
index 134dc1cb61..870773a1ba 100644
---
a/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jPropagationTask.java
+++
b/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jPropagationTask.java
@@ -83,7 +83,7 @@ public class Neo4jPropagationTask extends
AbstractTask<PropagationTask> implemen
private Neo4jExternalResource resource;
@Relationship(type = PROPAGATION_TASK_EXEC_REL, direction =
Relationship.Direction.INCOMING)
- private List<Neo4jPropagationTaskExec> executions = new ArrayList<>();
+ private List<Neo4jPropagationTaskExec> propagationTaskExecs = new
ArrayList<>();
@Override
public String getConnObjectKey() {
@@ -188,7 +188,7 @@ public class Neo4jPropagationTask extends
AbstractTask<PropagationTask> implemen
@Override
protected boolean doAdd(final TaskExec<PropagationTask> exec) {
- return executions.add((Neo4jPropagationTaskExec) exec);
+ return propagationTaskExecs.add((Neo4jPropagationTaskExec) exec);
}
@Override
@@ -198,6 +198,6 @@ public class Neo4jPropagationTask extends
AbstractTask<PropagationTask> implemen
@Override
protected List<? extends AbstractTaskExec<PropagationTask>> executions() {
- return executions;
+ return propagationTaskExecs;
}
}
diff --git
a/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jPullTask.java
b/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jPullTask.java
index 4cf1b17b71..7f716bba61 100644
---
a/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jPullTask.java
+++
b/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jPullTask.java
@@ -73,7 +73,7 @@ public class Neo4jPullTask extends Neo4jInboundTask<PullTask>
implements PullTas
private List<Neo4jAnyTemplatePullTask> templates = new ArrayList<>();
@Relationship(type = PULL_TASK_EXEC_REL, direction =
Relationship.Direction.INCOMING)
- private List<Neo4jPullTaskExec> executions = new ArrayList<>();
+ private List<Neo4jPullTaskExec> pullTaskExecs = new ArrayList<>();
@Override
public PullMode getPullMode() {
@@ -129,7 +129,7 @@ public class Neo4jPullTask extends
Neo4jInboundTask<PullTask> implements PullTas
@Override
protected boolean doAdd(final TaskExec<SchedTask> exec) {
- return executions.add((Neo4jPullTaskExec) exec);
+ return pullTaskExecs.add((Neo4jPullTaskExec) exec);
}
@Override
@@ -139,7 +139,7 @@ public class Neo4jPullTask extends
Neo4jInboundTask<PullTask> implements PullTas
@Override
protected List<? extends AbstractTaskExec<SchedTask>> executions() {
- return executions;
+ return pullTaskExecs;
}
@PostLoad
diff --git
a/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jPushTask.java
b/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jPushTask.java
index 2436774403..6df9941890 100644
---
a/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jPushTask.java
+++
b/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jPushTask.java
@@ -76,7 +76,7 @@ public class Neo4jPushTask extends
Neo4jProvisioningTask<PushTask> implements Pu
actions, Neo4jImplementationRelationship.builder());
@Relationship(type = PUSH_TASK_EXEC_REL, direction =
Relationship.Direction.INCOMING)
- private List<Neo4jPushTaskExec> executions = new ArrayList<>();
+ private List<Neo4jPushTaskExec> pushTaskExecs = new ArrayList<>();
@Override
public Neo4jRealm getSourceRealm() {
@@ -113,7 +113,7 @@ public class Neo4jPushTask extends
Neo4jProvisioningTask<PushTask> implements Pu
@Override
protected boolean doAdd(final TaskExec<SchedTask> exec) {
- return executions.add((Neo4jPushTaskExec) exec);
+ return pushTaskExecs.add((Neo4jPushTaskExec) exec);
}
@Override
@@ -123,7 +123,7 @@ public class Neo4jPushTask extends
Neo4jProvisioningTask<PushTask> implements Pu
@Override
protected List<? extends AbstractTaskExec<SchedTask>> executions() {
- return executions;
+ return pushTaskExecs;
}
protected void json2map(final boolean clearFirst) {
diff --git
a/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jSchedTask.java
b/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jSchedTask.java
index 87bd2e9ced..2b0366965d 100644
---
a/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jSchedTask.java
+++
b/core/persistence-neo4j/src/main/java/org/apache/syncope/core/persistence/neo4j/entity/task/Neo4jSchedTask.java
@@ -58,7 +58,7 @@ public class Neo4jSchedTask extends AbstractTask<SchedTask>
implements SchedTask
private Boolean active = true;
@Relationship(type = SCHED_TASK_EXEC_REL, direction =
Relationship.Direction.INCOMING)
- private List<Neo4jSchedTaskExec> executions = new ArrayList<>();
+ private List<Neo4jSchedTaskExec> schedTaskExecs = new ArrayList<>();
@Override
public Implementation getJobDelegate() {
@@ -114,7 +114,7 @@ public class Neo4jSchedTask extends AbstractTask<SchedTask>
implements SchedTask
@Override
protected boolean doAdd(final TaskExec<SchedTask> exec) {
- return executions.add((Neo4jSchedTaskExec) exec);
+ return schedTaskExecs.add((Neo4jSchedTaskExec) exec);
}
@Override
@@ -124,6 +124,6 @@ public class Neo4jSchedTask extends AbstractTask<SchedTask>
implements SchedTask
@Override
protected List<? extends AbstractTaskExec<SchedTask>> executions() {
- return executions;
+ return schedTaskExecs;
}
}
diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml
index 9129014a11..d2d91adc55 100644
--- a/fit/core-reference/pom.xml
+++ b/fit/core-reference/pom.xml
@@ -1111,12 +1111,6 @@ 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>
