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 2018/07/27 07:40:20 UTC
[1/3] syncope git commit: [SYNCOPE-1346] Ensure PropagationTask is
not already in the JPA context before creating new one
Repository: syncope
Updated Branches:
refs/heads/2_0_X 267215785 -> b0d75aedf
refs/heads/2_1_X cfb7b31da -> 110e4bae2
refs/heads/master 0895017a2 -> ae0588462
[SYNCOPE-1346] Ensure PropagationTask is not already in the JPA context before creating new one
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/110e4bae
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/110e4bae
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/110e4bae
Branch: refs/heads/2_1_X
Commit: 110e4bae2831ee1d93891885c84ff5ded74576fc
Parents: cfb7b31
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Jul 27 09:39:43 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jul 27 09:39:43 2018 +0200
----------------------------------------------------------------------
.../apache/syncope/core/logic/TaskLogic.java | 2 +-
.../AbstractPropagationTaskExecutor.java | 23 ++++++++++++--------
2 files changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/110e4bae/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
index 2da812e..526fb63 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
@@ -228,7 +228,7 @@ public class TaskLogic extends AbstractExecutableLogic<TaskTO> {
ExecTO result = null;
switch (taskUtil.getType()) {
case PROPAGATION:
- TaskExec propExec = taskExecutor.execute((PropagationTaskTO) binder.getTaskTO(task, taskUtil, false));
+ TaskExec propExec = taskExecutor.execute(binder.<PropagationTaskTO>getTaskTO(task, taskUtil, false));
result = binder.getExecTO(propExec);
break;
http://git-wip-us.apache.org/repos/asf/syncope/blob/110e4bae/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
index b55eacc..4d7f00d 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
@@ -350,15 +350,20 @@ public abstract class AbstractPropagationTaskExecutor implements PropagationTask
}
protected TaskExec execute(final PropagationTaskTO taskTO, final PropagationReporter reporter) {
- PropagationTask task = entityFactory.newEntity(PropagationTask.class);
- task.setResource(resourceDAO.find(taskTO.getResource()));
- task.setObjectClassName(taskTO.getObjectClassName());
- task.setAnyTypeKind(taskTO.getAnyTypeKind());
- task.setAnyType(taskTO.getAnyType());
- task.setEntityKey(taskTO.getEntityKey());
- task.setOperation(taskTO.getOperation());
- task.setConnObjectKey(taskTO.getConnObjectKey());
- task.setOldConnObjectKey(taskTO.getOldConnObjectKey());
+ PropagationTask task;
+ if (taskTO.getKey() == null) {
+ task = entityFactory.newEntity(PropagationTask.class);
+ task.setResource(resourceDAO.find(taskTO.getResource()));
+ task.setObjectClassName(taskTO.getObjectClassName());
+ task.setAnyTypeKind(taskTO.getAnyTypeKind());
+ task.setAnyType(taskTO.getAnyType());
+ task.setEntityKey(taskTO.getEntityKey());
+ task.setOperation(taskTO.getOperation());
+ task.setConnObjectKey(taskTO.getConnObjectKey());
+ task.setOldConnObjectKey(taskTO.getOldConnObjectKey());
+ } else {
+ task = taskDAO.find(taskTO.getKey());
+ }
Set<Attribute> attributes = new HashSet<>();
if (StringUtils.isNotBlank(taskTO.getAttributes())) {
attributes.addAll(Arrays.asList(POJOHelper.deserialize(taskTO.getAttributes(), Attribute[].class)));
[3/3] syncope git commit: [SYNCOPE-1346] Ensure PropagationTask is
not already in the JPA context before creating new one
Posted by il...@apache.org.
[SYNCOPE-1346] Ensure PropagationTask is not already in the JPA context before creating new one
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b0d75aed
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b0d75aed
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b0d75aed
Branch: refs/heads/2_0_X
Commit: b0d75aedfb1e1fe5fa42aa3408a269fa4302739e
Parents: 2672157
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Jul 27 09:39:43 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jul 27 09:40:06 2018 +0200
----------------------------------------------------------------------
.../apache/syncope/core/logic/TaskLogic.java | 2 +-
.../AbstractPropagationTaskExecutor.java | 23 ++++++++++++--------
2 files changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/b0d75aed/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
index ce1b9cc..6d2edbf 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
@@ -234,7 +234,7 @@ public class TaskLogic extends AbstractExecutableLogic<TaskTO> {
ExecTO result = null;
switch (taskUtil.getType()) {
case PROPAGATION:
- TaskExec propExec = taskExecutor.execute((PropagationTaskTO) binder.getTaskTO(task, taskUtil, false));
+ TaskExec propExec = taskExecutor.execute(binder.<PropagationTaskTO>getTaskTO(task, taskUtil, false));
result = binder.getExecTO(propExec);
break;
http://git-wip-us.apache.org/repos/asf/syncope/blob/b0d75aed/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
index 3c45321..178b19d 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
@@ -366,15 +366,20 @@ public abstract class AbstractPropagationTaskExecutor implements PropagationTask
}
protected TaskExec execute(final PropagationTaskTO taskTO, final PropagationReporter reporter) {
- PropagationTask task = entityFactory.newEntity(PropagationTask.class);
- task.setResource(resourceDAO.find(taskTO.getResource()));
- task.setObjectClassName(taskTO.getObjectClassName());
- task.setAnyTypeKind(taskTO.getAnyTypeKind());
- task.setAnyType(taskTO.getAnyType());
- task.setEntityKey(taskTO.getEntityKey());
- task.setOperation(taskTO.getOperation());
- task.setConnObjectKey(taskTO.getConnObjectKey());
- task.setOldConnObjectKey(taskTO.getOldConnObjectKey());
+ PropagationTask task;
+ if (taskTO.getKey() == null) {
+ task = entityFactory.newEntity(PropagationTask.class);
+ task.setResource(resourceDAO.find(taskTO.getResource()));
+ task.setObjectClassName(taskTO.getObjectClassName());
+ task.setAnyTypeKind(taskTO.getAnyTypeKind());
+ task.setAnyType(taskTO.getAnyType());
+ task.setEntityKey(taskTO.getEntityKey());
+ task.setOperation(taskTO.getOperation());
+ task.setConnObjectKey(taskTO.getConnObjectKey());
+ task.setOldConnObjectKey(taskTO.getOldConnObjectKey());
+ } else {
+ task = taskDAO.find(taskTO.getKey());
+ }
Set<Attribute> attributes = new HashSet<>();
if (StringUtils.isNotBlank(taskTO.getAttributes())) {
attributes.addAll(Arrays.asList(POJOHelper.deserialize(taskTO.getAttributes(), Attribute[].class)));
[2/3] syncope git commit: [SYNCOPE-1346] Ensure PropagationTask is
not already in the JPA context before creating new one
Posted by il...@apache.org.
[SYNCOPE-1346] Ensure PropagationTask is not already in the JPA context before creating new one
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ae058846
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ae058846
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ae058846
Branch: refs/heads/master
Commit: ae058846238567128f1ff4969e5f8709750c35ae
Parents: 0895017
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Jul 27 09:39:43 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jul 27 09:39:55 2018 +0200
----------------------------------------------------------------------
.../apache/syncope/core/logic/TaskLogic.java | 2 +-
.../AbstractPropagationTaskExecutor.java | 23 ++++++++++++--------
2 files changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/ae058846/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
index 2da812e..526fb63 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
@@ -228,7 +228,7 @@ public class TaskLogic extends AbstractExecutableLogic<TaskTO> {
ExecTO result = null;
switch (taskUtil.getType()) {
case PROPAGATION:
- TaskExec propExec = taskExecutor.execute((PropagationTaskTO) binder.getTaskTO(task, taskUtil, false));
+ TaskExec propExec = taskExecutor.execute(binder.<PropagationTaskTO>getTaskTO(task, taskUtil, false));
result = binder.getExecTO(propExec);
break;
http://git-wip-us.apache.org/repos/asf/syncope/blob/ae058846/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
index b55eacc..4d7f00d 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
@@ -350,15 +350,20 @@ public abstract class AbstractPropagationTaskExecutor implements PropagationTask
}
protected TaskExec execute(final PropagationTaskTO taskTO, final PropagationReporter reporter) {
- PropagationTask task = entityFactory.newEntity(PropagationTask.class);
- task.setResource(resourceDAO.find(taskTO.getResource()));
- task.setObjectClassName(taskTO.getObjectClassName());
- task.setAnyTypeKind(taskTO.getAnyTypeKind());
- task.setAnyType(taskTO.getAnyType());
- task.setEntityKey(taskTO.getEntityKey());
- task.setOperation(taskTO.getOperation());
- task.setConnObjectKey(taskTO.getConnObjectKey());
- task.setOldConnObjectKey(taskTO.getOldConnObjectKey());
+ PropagationTask task;
+ if (taskTO.getKey() == null) {
+ task = entityFactory.newEntity(PropagationTask.class);
+ task.setResource(resourceDAO.find(taskTO.getResource()));
+ task.setObjectClassName(taskTO.getObjectClassName());
+ task.setAnyTypeKind(taskTO.getAnyTypeKind());
+ task.setAnyType(taskTO.getAnyType());
+ task.setEntityKey(taskTO.getEntityKey());
+ task.setOperation(taskTO.getOperation());
+ task.setConnObjectKey(taskTO.getConnObjectKey());
+ task.setOldConnObjectKey(taskTO.getOldConnObjectKey());
+ } else {
+ task = taskDAO.find(taskTO.getKey());
+ }
Set<Attribute> attributes = new HashSet<>();
if (StringUtils.isNotBlank(taskTO.getAttributes())) {
attributes.addAll(Arrays.asList(POJOHelper.deserialize(taskTO.getAttributes(), Attribute[].class)));