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 2015/09/21 16:51:04 UTC
[13/22] syncope git commit: Refactoring to reduce ProvisioningManager
methods and move as much as possible into AbstractPushResultHandler /
bstractSyncResultHandler from respective children
Refactoring to reduce ProvisioningManager methods and move as much as possible into AbstractPushResultHandler / bstractSyncResultHandler from respective children
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3d017e2c
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3d017e2c
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3d017e2c
Branch: refs/heads/SYNCOPE-156
Commit: 3d017e2c3ecaee95f5ef964464d1169ac06bb88c
Parents: 9f73fa4
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Sep 18 16:35:35 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Sep 18 16:35:35 2015 +0200
----------------------------------------------------------------------
.../core/provisioning/api/VirAttrHandler.java | 22 +-
.../api/propagation/PropagationManager.java | 176 +++++----------
.../DefaultAnyObjectProvisioningManager.java | 77 ++++---
.../java/DefaultGroupProvisioningManager.java | 113 ++++++----
.../java/DefaultUserProvisioningManager.java | 34 ++-
.../provisioning/java/VirAttrHandlerImpl.java | 104 ++++-----
.../java/data/AbstractAnyDataBinder.java | 2 +-
.../propagation/PropagationManagerImpl.java | 223 +++++++------------
.../java/sync/AbstractPushResultHandler.java | 118 ++++++++--
.../java/sync/AbstractSyncResultHandler.java | 86 +++++--
.../java/sync/AbstractSyncopeResultHandler.java | 9 +
.../sync/AnyObjectPushResultHandlerImpl.java | 126 ++---------
.../sync/AnyObjectSyncResultHandlerImpl.java | 78 +++----
.../java/sync/GroupPushResultHandlerImpl.java | 124 ++---------
.../java/sync/GroupSyncResultHandlerImpl.java | 76 +++----
.../java/sync/UserPushResultHandlerImpl.java | 114 ++--------
.../java/sync/UserSyncResultHandlerImpl.java | 80 ++++---
.../processor/AnyObjectCreateProcessor.java | 11 +-
.../processor/AnyObjectDeleteProcessor.java | 22 +-
.../AnyObjectDeprovisionProcessor.java | 20 +-
.../processor/AnyObjectProvisionProcessor.java | 17 +-
.../processor/AnyObjectUpdateProcessor.java | 21 +-
.../processor/GroupCreateInSyncProcessor.java | 30 ++-
.../camel/processor/GroupCreateProcessor.java | 11 +-
.../camel/processor/GroupDeleteProcessor.java | 53 ++---
.../processor/GroupDeprovisionProcessor.java | 20 +-
.../processor/GroupProvisionProcessor.java | 17 +-
.../camel/processor/GroupUpdateProcessor.java | 21 +-
.../camel/processor/UserCreateProcessor.java | 3 +-
.../camel/processor/UserDeleteProcessor.java | 20 +-
.../processor/UserDeprovisionProcessor.java | 19 +-
.../UserStatusPropagationProcessor.java | 13 +-
.../camel/processor/UserUpdateProcessor.java | 2 +-
.../main/resources/all/provisioning.properties | 2 +-
34 files changed, 852 insertions(+), 1012 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/VirAttrHandler.java
----------------------------------------------------------------------
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/VirAttrHandler.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/VirAttrHandler.java
index 54d8fe0..95e751e 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/VirAttrHandler.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/VirAttrHandler.java
@@ -19,7 +19,6 @@
package org.apache.syncope.core.provisioning.api;
import java.util.Collection;
-import java.util.Set;
import org.apache.syncope.common.lib.patch.AttrPatch;
import org.apache.syncope.common.lib.to.AttrTO;
import org.apache.syncope.common.lib.types.AnyTypeKind;
@@ -31,25 +30,32 @@ import org.apache.syncope.core.persistence.api.entity.resource.ExternalResource;
public interface VirAttrHandler {
- PropagationByResource fillVirtual(Any any, Set<AttrPatch> vAttrs);
-
/**
- * Add virtual attributes and specify values to be propagated.
+ * Create and add virtual attributes to any.
*
- * @param any any.
+ * @param any any
* @param vAttrs virtual attributes to be added.
*/
- void fillVirtual(Any any, Collection<AttrTO> vAttrs);
+ void createVirtual(Any any, Collection<AttrTO> vAttrs);
+
+ /**
+ * Update virtual attributes to any.
+ *
+ * @param any
+ * @param vAttrs virtual attributes to be updated.
+ * @return operations to be performed on external resources for virtual attributes changes
+ */
+ PropagationByResource updateVirtual(Any any, Collection<AttrPatch> vAttrs);
/**
- * SYNCOPE-459: build virtual attribute changes in case no other changes were made.
+ * Update virtual attributes to any identified by the given {@code key}.
*
* @param key any key
* @param anyTypeKind type kind
* @param vAttrs virtual attributes to be updated.
* @return operations to be performed on external resources for virtual attributes changes
*/
- PropagationByResource fillVirtual(Long key, AnyTypeKind anyTypeKind, Set<AttrPatch> vAttrs);
+ PropagationByResource updateVirtual(Long key, AnyTypeKind anyTypeKind, Collection<AttrPatch> vAttrs);
VirSchema getVirSchema(String virSchemaName);
http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationManager.java
----------------------------------------------------------------------
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationManager.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationManager.java
index 0d0c7f4..ef9baf2 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationManager.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationManager.java
@@ -20,179 +20,109 @@ package org.apache.syncope.core.provisioning.api.propagation;
import java.util.Collection;
import java.util.List;
-import java.util.Set;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.syncope.common.lib.patch.AttrPatch;
import org.apache.syncope.common.lib.patch.UserPatch;
import org.apache.syncope.common.lib.to.AttrTO;
+import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.common.lib.types.PropagationByResource;
-import org.apache.syncope.core.persistence.api.entity.Any;
import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
import org.apache.syncope.core.provisioning.api.WorkflowResult;
public interface PropagationManager {
/**
- * Create the group on every associated resource.
+ * Create the any object tasks for every associated resource, unless in {@code noPropResourceNames}.
*
- * @param wfResult group to be propagated (and info associated), as per result from workflow
- * @param vAttrs virtual attributes to be set
- * @param noPropResourceNames external resources performing not to be considered for propagation
- * @return list of propagation tasks
- */
- List<PropagationTask> getGroupCreateTasks(
- WorkflowResult<Long> wfResult, Collection<AttrTO> vAttrs, Collection<String> noPropResourceNames);
-
- /**
- * Create the group on every associated resource.
- *
- * @param key group id
- * @param vAttrs virtual attributes to be set
+ * @param kind any object type kind
+ * @param key any object key
* @param propByRes operation to be performed per resource
+ * @param vAttrs virtual attributes to be set
* @param noPropResourceNames external resources performing not to be considered for propagation
* @return list of propagation tasks
*/
- List<PropagationTask> getGroupCreateTasks(Long key, Collection<AttrTO> vAttrs, PropagationByResource propByRes,
+ List<PropagationTask> getCreateTasks(
+ AnyTypeKind kind,
+ Long key,
+ PropagationByResource propByRes,
+ Collection<AttrTO> vAttrs,
Collection<String> noPropResourceNames);
/**
- * Performs update on each resource associated to the group.
- *
- * @param wfResult group to be propagated (and info associated), as per result from workflow
- * @param vAttrs virtual attributes patches
- * @param noPropResourceNames external resource names not to be considered for propagation
- * @return list of propagation tasks
- */
- List<PropagationTask> getGroupUpdateTasks(
- WorkflowResult<Long> wfResult, Set<AttrPatch> vAttrs, Set<String> noPropResourceNames);
-
- /**
- * Perform delete on each resource associated to the group. It is possible to ask for a mandatory provisioning for
- * some resources specifying a set of resource names. Exceptions won't be ignored and the process will be stopped if
- * the creation fails onto a mandatory resource.
- *
- * @param groupKey to be deleted
- * @return list of propagation tasks
- */
- List<PropagationTask> getGroupDeleteTasks(Long groupKey);
-
- /**
- * Perform delete on each resource associated to the group. It is possible to ask for a mandatory provisioning for
- * some resources specifying a set of resource names. Exceptions won't be ignored and the process will be stopped if
- * the creation fails onto a mandatory resource.
+ * Create the user tasks for every associated resource, unless in {@code noPropResourceNames}.
*
- * @param groupKey to be deleted
- * @param noPropResourceName name of external resource not to be considered for propagation
- * @return list of propagation tasks
- */
- List<PropagationTask> getGroupDeleteTasks(Long groupKey, String noPropResourceName);
-
- /**
- * Perform delete on each resource associated to the group. It is possible to ask for a mandatory provisioning for
- * some resources specifying a set of resource names. Exceptions won't be ignored and the process will be stopped if
- * the creation fails onto a mandatory resource.
- *
- * @param groupKey to be deleted
- * @param noPropResourceNames name of external resources not to be considered for propagation
- * @return list of propagation tasks
- */
- List<PropagationTask> getGroupDeleteTasks(Long groupKey, Collection<String> noPropResourceNames);
-
- /**
- * Perform delete on each resource associated to the group. It is possible to ask for a mandatory provisioning for
- * some resources specifying a set of resource names. Exceptions won't be ignored and the process will be stopped if
- * the creation fails onto a mandatory resource.
- *
- * @param groupKey to be deleted
- * @param resourceNames resource from which group is to be deleted
- * @param noPropResourceNames name of external resources not to be considered for propagation
- * @return list of propagation tasks
- */
- List<PropagationTask> getGroupDeleteTasks(
- Long groupKey, Set<String> resourceNames, Collection<String> noPropResourceNames);
-
- List<PropagationTask> getAnyObjectCreateTasks(
- WorkflowResult<Long> wfResult, Collection<AttrTO> vAttrs, Collection<String> noPropResourceNames);
-
- List<PropagationTask> getAnyObjectCreateTasks(Long anyObjectKey, Collection<AttrTO> vAttrs,
- PropagationByResource propByRes, Collection<String> noPropResourceNames);
-
- List<PropagationTask> getAnyObjectUpdateTasks(
- WorkflowResult<Long> wfResult, Set<AttrPatch> vAttrs, Set<String> noPropResourceNames);
-
- List<PropagationTask> getAnyObjectDeleteTasks(Long anyObjectKey);
-
- List<PropagationTask> getAnyObjectDeleteTasks(Long anyObjectKey, String noPropResourceName);
-
- List<PropagationTask> getAnyObjectDeleteTasks(Long anyObjectKey, Collection<String> noPropResourceNames);
-
- List<PropagationTask> getAnyObjectDeleteTasks(
- Long groupKey, Set<String> resourceNames, Collection<String> noPropResourceNames);
-
- /**
- * Create the user on every associated resource.
- *
- * @param key to be propagated
+ * @param key user key
+ * @param password to be set
* @param enable whether user must be enabled or not
* @param propByRes operation to be performed per resource
- * @param password to be set
* @param vAttrs virtual attributes to be set
* @param noPropResourceNames external resources not to be considered for propagation
* @return list of propagation tasks
*/
- List<PropagationTask> getUserCreateTasks(Long key, Boolean enable,
- PropagationByResource propByRes, String password, Collection<AttrTO> vAttrs,
+ List<PropagationTask> getUserCreateTasks(
+ Long key,
+ String password,
+ Boolean enable,
+ PropagationByResource propByRes,
+ Collection<AttrTO> vAttrs,
Collection<String> noPropResourceNames);
/**
- * Performs update on each resource associated to the user excluding the specified into 'resourceNames' parameter.
+ * Create the update tasks for the any object on each resource associated, unless in {@code noPropResourceNames}.
*
- * @param key to be propagated
- * @param enable whether user must be enabled or not
+ * @param kind any object type kind
+ * @param key any object key
+ * @param changePwd whether password should be included for propagation attributes or not
+ * @param enable whether any object should be enabled or not, may be null to leave unchanged
+ * @param propByRes operation to be performed per resource
+ * @param vAttrs virtual attributes patches
* @param noPropResourceNames external resource names not to be considered for propagation
* @return list of propagation tasks
*/
- List<PropagationTask> getUserUpdateTasks(Long key, Boolean enable, Collection<String> noPropResourceNames);
+ List<PropagationTask> getUpdateTasks(
+ AnyTypeKind kind,
+ Long key,
+ boolean changePwd,
+ Boolean enable,
+ PropagationByResource propByRes,
+ Collection<AttrPatch> vAttrs,
+ Collection<String> noPropResourceNames);
/**
- * Performs update on each resource associated to the user.
+ * Create the update tasks for the user on each resource associated, unless in {@code noPropResourceNames}.
*
* @param wfResult user to be propagated (and info associated), as per result from workflow
* @param changePwd whether password should be included for propagation attributes or not
* @param noPropResourceNames external resources not to be considered for propagation
* @return list of propagation tasks
*/
- List<PropagationTask> getUserUpdateTasks(WorkflowResult<Pair<UserPatch, Boolean>> wfResult,
- boolean changePwd, Collection<String> noPropResourceNames);
-
- List<PropagationTask> getUserUpdateTasks(WorkflowResult<Pair<UserPatch, Boolean>> wfResult);
-
- List<PropagationTask> getUpdateTasks(Any<?, ?, ?> any, String password, boolean changePwd,
- Boolean enable, Set<AttrPatch> vAttrs,
- PropagationByResource propByRes, Collection<String> noPropResourceNames);
+ List<PropagationTask> getUserUpdateTasks(
+ WorkflowResult<Pair<UserPatch, Boolean>> wfResult,
+ boolean changePwd,
+ Collection<String> noPropResourceNames);
/**
- * Perform delete on each resource associated to the user. It is possible to ask for a mandatory provisioning for
- * some resources specifying a set of resource names. Exceptions won't be ignored and the process will be stopped if
- * the creation fails onto a mandatory resource.
+ * Create the update tasks for the user on each resource associated; propagate password update only to requested
+ * resources.
*
- * @param userKey to be deleted
- * @param noPropResourceNames name of external resources not to be considered for propagation
+ * @param wfResult user to be propagated (and info associated), as per result from workflow
* @return list of propagation tasks
*/
- List<PropagationTask> getUserDeleteTasks(Long userKey, Collection<String> noPropResourceNames);
+ List<PropagationTask> getUserUpdateTasks(WorkflowResult<Pair<UserPatch, Boolean>> wfResult);
/**
- * Perform delete on each resource associated to the user. It is possible to ask for a mandatory provisioning for
- * some resources specifying a set of resource names. Exceptions won't be ignored and the process will be stopped if
- * the creation fails onto a mandatory resource.
+ * Create the delete tasks for the any object from each resource associated, unless in {@code noPropResourceNames}.
*
- * @param userKey to be deleted
- * @param resourceNames resources
- * @param noPropResourceNames name of external resources not to be considered for propagation
+ * @param kind any object type kind
+ * @param key any object key
+ * @param propByRes operation to be performed per resource
+ * @param noPropResourceNames external resource names not to be considered for propagation
* @return list of propagation tasks
*/
- List<PropagationTask> getUserDeleteTasks(
- Long userKey, Set<String> resourceNames, Collection<String> noPropResourceNames);
+ List<PropagationTask> getDeleteTasks(
+ AnyTypeKind kind,
+ Long key,
+ PropagationByResource propByRes,
+ Collection<String> noPropResourceNames);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultAnyObjectProvisioningManager.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultAnyObjectProvisioningManager.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultAnyObjectProvisioningManager.java
index ed8d260..bc1dbc2 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultAnyObjectProvisioningManager.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultAnyObjectProvisioningManager.java
@@ -18,10 +18,8 @@
*/
package org.apache.syncope.core.provisioning.java;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.apache.commons.collections4.CollectionUtils;
@@ -42,7 +40,6 @@ import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
import org.apache.syncope.core.provisioning.api.propagation.PropagationReporter;
import org.apache.syncope.core.provisioning.api.propagation.PropagationTaskExecutor;
import org.apache.syncope.core.misc.spring.ApplicationContextProvider;
-import org.apache.syncope.core.persistence.api.entity.anyobject.AnyObject;
import org.apache.syncope.core.provisioning.api.VirAttrHandler;
import org.apache.syncope.core.workflow.api.AnyObjectWorkflowAdapter;
import org.slf4j.Logger;
@@ -79,8 +76,12 @@ public class DefaultAnyObjectProvisioningManager implements AnyObjectProvisionin
WorkflowResult<Long> created = awfAdapter.create(anyObjectTO);
- List<PropagationTask> tasks = propagationManager.getAnyObjectCreateTasks(
- created, anyObjectTO.getVirAttrs(), excludedResources);
+ List<PropagationTask> tasks = propagationManager.getCreateTasks(
+ AnyTypeKind.ANY_OBJECT,
+ created.getResult(),
+ created.getPropByRes(),
+ anyObjectTO.getVirAttrs(),
+ excludedResources);
PropagationReporter propagationReporter =
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
try {
@@ -104,16 +105,29 @@ public class DefaultAnyObjectProvisioningManager implements AnyObjectProvisionin
WorkflowResult<Long> updated = awfAdapter.update(anyObjectPatch);
- List<PropagationTask> tasks = propagationManager.getAnyObjectUpdateTasks(
- updated, anyObjectPatch.getVirAttrs(), excludedResources);
+ List<PropagationTask> tasks = propagationManager.getUpdateTasks(
+ AnyTypeKind.ANY_OBJECT,
+ updated.getResult(),
+ false,
+ null,
+ updated.getPropByRes(),
+ anyObjectPatch.getVirAttrs(),
+ excludedResources);
if (tasks.isEmpty()) {
// SYNCOPE-459: take care of user virtual attributes ...
- PropagationByResource propByResVirAttr = virtAttrHandler.fillVirtual(
+ PropagationByResource propByResVirAttr = virtAttrHandler.updateVirtual(
updated.getResult(),
AnyTypeKind.ANY_OBJECT,
anyObjectPatch.getVirAttrs());
tasks.addAll(!propByResVirAttr.isEmpty()
- ? propagationManager.getAnyObjectUpdateTasks(updated, null, null)
+ ? propagationManager.getUpdateTasks(
+ AnyTypeKind.ANY_OBJECT,
+ updated.getResult(),
+ false,
+ null,
+ updated.getPropByRes(),
+ anyObjectPatch.getVirAttrs(),
+ null)
: Collections.<PropagationTask>emptyList());
}
@@ -136,15 +150,13 @@ public class DefaultAnyObjectProvisioningManager implements AnyObjectProvisionin
@Override
public List<PropagationStatus> delete(final Long key, final Set<String> excludedResources) {
- List<PropagationTask> tasks = new ArrayList<>();
-
- AnyObject anyObject = anyObjectDAO.authFind(key);
- if (anyObject != null) {
- tasks.addAll(propagationManager.getAnyObjectDeleteTasks(anyObject.getKey()));
- }
-
- PropagationReporter propagationReporter = ApplicationContextProvider.getBeanFactory().
- getBean(PropagationReporter.class);
+ List<PropagationTask> tasks = propagationManager.getDeleteTasks(
+ AnyTypeKind.ANY_OBJECT,
+ key,
+ null,
+ excludedResources);
+ PropagationReporter propagationReporter =
+ ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
try {
taskExecutor.execute(tasks, propagationReporter);
} catch (PropagationException e) {
@@ -170,13 +182,16 @@ public class DefaultAnyObjectProvisioningManager implements AnyObjectProvisionin
@Override
public List<PropagationStatus> provision(final Long key, final Collection<String> resources) {
PropagationByResource propByRes = new PropagationByResource();
- for (String resource : resources) {
- propByRes.add(ResourceOperation.UPDATE, resource);
- }
-
- WorkflowResult<Long> wfResult = new WorkflowResult<>(key, propByRes, "update");
-
- List<PropagationTask> tasks = propagationManager.getAnyObjectUpdateTasks(wfResult, null, null);
+ propByRes.addAll(ResourceOperation.UPDATE, resources);
+
+ List<PropagationTask> tasks = propagationManager.getUpdateTasks(
+ AnyTypeKind.ANY_OBJECT,
+ key,
+ false,
+ null,
+ propByRes,
+ null,
+ null);
PropagationReporter propagationReporter =
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
try {
@@ -190,12 +205,14 @@ public class DefaultAnyObjectProvisioningManager implements AnyObjectProvisionin
@Override
public List<PropagationStatus> deprovision(final Long key, final Collection<String> resources) {
- AnyObject anyObject = anyObjectDAO.authFind(key);
-
- Collection<String> noPropResourceName = CollectionUtils.removeAll(anyObject.getResourceNames(), resources);
+ PropagationByResource propByRes = new PropagationByResource();
+ propByRes.addAll(ResourceOperation.DELETE, resources);
- List<PropagationTask> tasks = propagationManager.getAnyObjectDeleteTasks(
- key, new HashSet<>(resources), noPropResourceName);
+ List<PropagationTask> tasks = propagationManager.getDeleteTasks(
+ AnyTypeKind.ANY_OBJECT,
+ key,
+ propByRes,
+ CollectionUtils.removeAll(anyObjectDAO.findAllResourceNames(anyObjectDAO.authFind(key)), resources));
PropagationReporter propagationReporter =
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
try {
http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultGroupProvisioningManager.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultGroupProvisioningManager.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultGroupProvisioningManager.java
index 6785ba0..b933488 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultGroupProvisioningManager.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultGroupProvisioningManager.java
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Set;
import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger;
@@ -40,7 +39,6 @@ import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.common.lib.types.PropagationByResource;
import org.apache.syncope.common.lib.types.ResourceOperation;
import org.apache.syncope.core.persistence.api.dao.GroupDAO;
-import org.apache.syncope.core.persistence.api.entity.group.Group;
import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
import org.apache.syncope.core.provisioning.api.GroupProvisioningManager;
import org.apache.syncope.core.provisioning.api.WorkflowResult;
@@ -80,8 +78,12 @@ public class DefaultGroupProvisioningManager implements GroupProvisioningManager
public Pair<Long, List<PropagationStatus>> create(final GroupTO groupTO, final Set<String> excludedResources) {
WorkflowResult<Long> created = gwfAdapter.create(groupTO);
- List<PropagationTask> tasks = propagationManager.getGroupCreateTasks(
- created, groupTO.getVirAttrs(), excludedResources);
+ List<PropagationTask> tasks = propagationManager.getCreateTasks(
+ AnyTypeKind.GROUP,
+ created.getResult(),
+ created.getPropByRes(),
+ groupTO.getVirAttrs(),
+ excludedResources);
PropagationReporter propagationReporter =
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
try {
@@ -106,8 +108,12 @@ public class DefaultGroupProvisioningManager implements GroupProvisioningManager
groupOwnerMap.put(created.getResult(), groupOwner.getValues().iterator().next());
}
- List<PropagationTask> tasks = propagationManager.getGroupCreateTasks(
- created, groupTO.getVirAttrs(), excludedResources);
+ List<PropagationTask> tasks = propagationManager.getCreateTasks(
+ AnyTypeKind.GROUP,
+ created.getResult(),
+ created.getPropByRes(),
+ groupTO.getVirAttrs(),
+ excludedResources);
PropagationReporter propagationReporter =
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
try {
@@ -131,16 +137,29 @@ public class DefaultGroupProvisioningManager implements GroupProvisioningManager
WorkflowResult<Long> updated = gwfAdapter.update(groupPatch);
- List<PropagationTask> tasks = propagationManager.getGroupUpdateTasks(
- updated, groupPatch.getVirAttrs(), excludedResources);
+ List<PropagationTask> tasks = propagationManager.getUpdateTasks(
+ AnyTypeKind.GROUP,
+ updated.getResult(),
+ false,
+ null,
+ updated.getPropByRes(),
+ groupPatch.getVirAttrs(),
+ excludedResources);
if (tasks.isEmpty()) {
// SYNCOPE-459: take care of user virtual attributes ...
- PropagationByResource propByResVirAttr = virtAttrHandler.fillVirtual(
+ PropagationByResource propByResVirAttr = virtAttrHandler.updateVirtual(
updated.getResult(),
AnyTypeKind.GROUP,
groupPatch.getVirAttrs());
tasks.addAll(!propByResVirAttr.isEmpty()
- ? propagationManager.getGroupUpdateTasks(updated, null, null)
+ ? propagationManager.getUpdateTasks(
+ AnyTypeKind.GROUP,
+ updated.getResult(),
+ false,
+ null,
+ updated.getPropByRes(),
+ groupPatch.getVirAttrs(),
+ excludedResources)
: Collections.<PropagationTask>emptyList());
}
@@ -165,31 +184,36 @@ public class DefaultGroupProvisioningManager implements GroupProvisioningManager
public List<PropagationStatus> delete(final Long key, final Set<String> excludedResources) {
List<PropagationTask> tasks = new ArrayList<>();
- Group group = groupDAO.authFind(key);
- if (group != null) {
- // Generate propagation tasks for deleting users from group resources, if they are on those resources only
- // because of the reason being deleted (see SYNCOPE-357)
- for (Map.Entry<Long, PropagationByResource> entry
- : groupDAO.findUsersWithTransitiveResources(group.getKey()).entrySet()) {
-
- WorkflowResult<Long> wfResult =
- new WorkflowResult<>(entry.getKey(), entry.getValue(), Collections.<String>emptySet());
- tasks.addAll(propagationManager.getUserDeleteTasks(wfResult.getResult(), excludedResources));
- }
- for (Map.Entry<Long, PropagationByResource> entry
- : groupDAO.findAnyObjectsWithTransitiveResources(group.getKey()).entrySet()) {
-
- WorkflowResult<Long> wfResult =
- new WorkflowResult<>(entry.getKey(), entry.getValue(), Collections.<String>emptySet());
- tasks.addAll(propagationManager.getAnyObjectDeleteTasks(wfResult.getResult(), excludedResources));
- }
-
- // Generate propagation tasks for deleting this group from resources
- tasks.addAll(propagationManager.getGroupDeleteTasks(group.getKey()));
+ // Generate propagation tasks for deleting users and any objects from group resources,
+ // if they are on those resources only because of the reason being deleted (see SYNCOPE-357)
+ for (Map.Entry<Long, PropagationByResource> entry
+ : groupDAO.findUsersWithTransitiveResources(key).entrySet()) {
+
+ tasks.addAll(propagationManager.getDeleteTasks(
+ AnyTypeKind.USER,
+ entry.getKey(),
+ entry.getValue(),
+ excludedResources));
+ }
+ for (Map.Entry<Long, PropagationByResource> entry
+ : groupDAO.findAnyObjectsWithTransitiveResources(key).entrySet()) {
+
+ tasks.addAll(propagationManager.getDeleteTasks(
+ AnyTypeKind.ANY_OBJECT,
+ entry.getKey(),
+ entry.getValue(),
+ excludedResources));
}
- PropagationReporter propagationReporter = ApplicationContextProvider.getBeanFactory().
- getBean(PropagationReporter.class);
+ // Generate propagation tasks for deleting this group from resources
+ tasks.addAll(propagationManager.getDeleteTasks(
+ AnyTypeKind.GROUP,
+ key,
+ null,
+ null));
+
+ PropagationReporter propagationReporter =
+ ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
try {
taskExecutor.execute(tasks, propagationReporter);
} catch (PropagationException e) {
@@ -213,9 +237,14 @@ public class DefaultGroupProvisioningManager implements GroupProvisioningManager
PropagationByResource propByRes = new PropagationByResource();
propByRes.addAll(ResourceOperation.UPDATE, resources);
- WorkflowResult<Long> wfResult = new WorkflowResult<>(key, propByRes, "update");
-
- List<PropagationTask> tasks = propagationManager.getGroupUpdateTasks(wfResult, null, null);
+ List<PropagationTask> tasks = propagationManager.getUpdateTasks(
+ AnyTypeKind.GROUP,
+ key,
+ false,
+ null,
+ propByRes,
+ null,
+ null);
PropagationReporter propagationReporter =
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
try {
@@ -229,12 +258,14 @@ public class DefaultGroupProvisioningManager implements GroupProvisioningManager
@Override
public List<PropagationStatus> deprovision(final Long key, final Collection<String> resources) {
- Group group = groupDAO.authFind(key);
-
- Collection<String> noPropResourceName = CollectionUtils.removeAll(group.getResourceNames(), resources);
+ PropagationByResource propByRes = new PropagationByResource();
+ propByRes.addAll(ResourceOperation.DELETE, resources);
- List<PropagationTask> tasks = propagationManager.getGroupDeleteTasks(
- key, new HashSet<>(resources), noPropResourceName);
+ List<PropagationTask> tasks = propagationManager.getDeleteTasks(
+ AnyTypeKind.GROUP,
+ key,
+ propByRes,
+ CollectionUtils.removeAll(groupDAO.authFind(key).getResourceNames(), resources));
PropagationReporter propagationReporter =
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
try {
http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultUserProvisioningManager.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultUserProvisioningManager.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultUserProvisioningManager.java
index 2fd5005..4a302f2 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultUserProvisioningManager.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultUserProvisioningManager.java
@@ -98,9 +98,9 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
List<PropagationTask> tasks = propagationManager.getUserCreateTasks(
created.getResult().getKey(),
+ userTO.getPassword(),
created.getResult().getValue(),
created.getPropByRes(),
- userTO.getPassword(),
userTO.getVirAttrs(),
excludedResources);
PropagationReporter propagationReporter =
@@ -122,7 +122,7 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
List<PropagationTask> tasks = propagationManager.getUserUpdateTasks(updated);
if (tasks.isEmpty()) {
// SYNCOPE-459: take care of user virtual attributes ...
- PropagationByResource propByResVirAttr = virtAttrHandler.fillVirtual(
+ PropagationByResource propByResVirAttr = virtAttrHandler.updateVirtual(
updated.getResult().getKey().getKey(),
AnyTypeKind.USER,
userPatch.getVirAttrs());
@@ -209,13 +209,19 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
@Override
public List<PropagationStatus> delete(final Long key, final Set<String> excludedResources) {
+ PropagationByResource propByRes = new PropagationByResource();
+ propByRes.set(ResourceOperation.DELETE, userDAO.findAllResourceNames(userDAO.authFind(key)));
+
// Note here that we can only notify about "delete", not any other
// task defined in workflow process definition: this because this
// information could only be available after uwfAdapter.delete(), which
// will also effectively remove user from db, thus making virtually
// impossible by NotificationManager to fetch required user information
- List<PropagationTask> tasks = propagationManager.getUserDeleteTasks(key, excludedResources);
-
+ List<PropagationTask> tasks = propagationManager.getDeleteTasks(
+ AnyTypeKind.USER,
+ key,
+ propByRes,
+ excludedResources);
PropagationReporter propagationReporter =
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
try {
@@ -276,8 +282,14 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
Collection<String> noPropResourceNames = CollectionUtils.removeAll(
userDAO.findAllResourceNames(userDAO.find(statusPatch.getKey())), statusPatch.getResources());
- List<PropagationTask> tasks = propagationManager.getUserUpdateTasks(
- statusPatch.getKey(), statusPatch.getType() != StatusPatchType.SUSPEND, noPropResourceNames);
+ List<PropagationTask> tasks = propagationManager.getUpdateTasks(
+ AnyTypeKind.USER,
+ statusPatch.getKey(),
+ false,
+ statusPatch.getType() != StatusPatchType.SUSPEND,
+ null,
+ null,
+ noPropResourceNames);
PropagationReporter propReporter =
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
try {
@@ -352,12 +364,14 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
@Override
public List<PropagationStatus> deprovision(final Long key, final Collection<String> resources) {
- User user = userDAO.authFind(key);
+ PropagationByResource propByRes = new PropagationByResource();
+ propByRes.set(ResourceOperation.DELETE, resources);
- List<PropagationTask> tasks = propagationManager.getUserDeleteTasks(
+ List<PropagationTask> tasks = propagationManager.getDeleteTasks(
+ AnyTypeKind.USER,
key,
- new HashSet<>(resources),
- CollectionUtils.removeAll(userDAO.findAllResourceNames(user), resources));
+ propByRes,
+ CollectionUtils.removeAll(userDAO.findAllResourceNames(userDAO.authFind(key)), resources));
PropagationReporter propagationReporter =
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
try {
http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/VirAttrHandlerImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/VirAttrHandlerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/VirAttrHandlerImpl.java
index adeb8c7..3907700 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/VirAttrHandlerImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/VirAttrHandlerImpl.java
@@ -144,7 +144,55 @@ public class VirAttrHandlerImpl implements VirAttrHandler {
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
- public PropagationByResource fillVirtual(final Any any, final Set<AttrPatch> vAttrs) {
+ public void createVirtual(final Any any, final Collection<AttrTO> vAttrs) {
+ AnyUtils anyUtils = anyUtilsFactory.getInstance(any);
+
+ for (AttrTO attrTO : vAttrs) {
+ VirAttr virAttr = any.getVirAttr(attrTO.getSchema());
+ if (virAttr == null) {
+ VirSchema virSchema = getVirSchema(attrTO.getSchema());
+ if (virSchema != null) {
+ virAttr = anyUtils.newVirAttr();
+ virAttr.setSchema(virSchema);
+ if (virAttr.getSchema() == null) {
+ LOG.debug("Ignoring {} because no valid schema was found", attrTO);
+ } else {
+ virAttr.setOwner(any);
+ any.add(virAttr);
+ virAttr.getValues().clear();
+ virAttr.getValues().addAll(attrTO.getValues());
+ }
+ }
+ } else {
+ virAttr.getValues().clear();
+ virAttr.getValues().addAll(attrTO.getValues());
+ }
+ }
+ }
+
+ private Any<?, ?, ?> find(final Long key, final AnyTypeKind anyTypeKind) {
+ Any<?, ?, ?> result;
+
+ switch (anyTypeKind) {
+ case USER:
+ result = userDAO.authFind(key);
+ break;
+
+ case GROUP:
+ result = groupDAO.authFind(key);
+ break;
+
+ case ANY_OBJECT:
+ default:
+ result = anyObjectDAO.authFind(key);
+ }
+
+ return result;
+ }
+
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ @Override
+ public PropagationByResource updateVirtual(final Any any, final Collection<AttrPatch> vAttrs) {
AnyUtils anyUtils = anyUtilsFactory.getInstance(any);
PropagationByResource propByRes = new PropagationByResource();
@@ -209,60 +257,12 @@ public class VirAttrHandlerImpl implements VirAttrHandler {
return propByRes;
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
- @Override
- public void fillVirtual(final Any any, final Collection<AttrTO> vAttrs) {
- AnyUtils anyUtils = anyUtilsFactory.getInstance(any);
-
- for (AttrTO attrTO : vAttrs) {
- VirAttr virAttr = any.getVirAttr(attrTO.getSchema());
- if (virAttr == null) {
- VirSchema virSchema = getVirSchema(attrTO.getSchema());
- if (virSchema != null) {
- virAttr = anyUtils.newVirAttr();
- virAttr.setSchema(virSchema);
- if (virAttr.getSchema() == null) {
- LOG.debug("Ignoring {} because no valid schema was found", attrTO);
- } else {
- virAttr.setOwner(any);
- any.add(virAttr);
- virAttr.getValues().clear();
- virAttr.getValues().addAll(attrTO.getValues());
- }
- }
- } else {
- virAttr.getValues().clear();
- virAttr.getValues().addAll(attrTO.getValues());
- }
- }
- }
-
- private Any<?, ?, ?> find(final Long key, final AnyTypeKind anyTypeKind) {
- Any<?, ?, ?> result;
-
- switch (anyTypeKind) {
- case USER:
- result = userDAO.authFind(key);
- break;
-
- case GROUP:
- result = groupDAO.authFind(key);
- break;
-
- case ANY_OBJECT:
- default:
- result = anyObjectDAO.authFind(key);
- }
-
- return result;
- }
-
@Transactional
@Override
- public PropagationByResource fillVirtual(
- final Long key, final AnyTypeKind anyTypeKind, final Set<AttrPatch> vAttrs) {
+ public PropagationByResource updateVirtual(
+ final Long key, final AnyTypeKind anyTypeKind, final Collection<AttrPatch> vAttrs) {
- return fillVirtual(find(key, anyTypeKind), vAttrs);
+ return updateVirtual(find(key, anyTypeKind), vAttrs);
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AbstractAnyDataBinder.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AbstractAnyDataBinder.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AbstractAnyDataBinder.java
index 30852f4..2568f45 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AbstractAnyDataBinder.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AbstractAnyDataBinder.java
@@ -591,7 +591,7 @@ abstract class AbstractAnyDataBinder {
scce.addException(requiredValuesMissing);
}
- virAttrHander.fillVirtual(any, anyTO.getVirAttrs());
+ virAttrHander.createVirtual(any, anyTO.getVirAttrs());
// 4. realm & resources
Realm realm = realmDAO.find(anyTO.getRealm());
http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PropagationManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PropagationManagerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PropagationManagerImpl.java
index cd2db88..d656bac 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PropagationManagerImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PropagationManagerImpl.java
@@ -33,6 +33,7 @@ import org.apache.syncope.common.lib.patch.AttrPatch;
import org.apache.syncope.common.lib.patch.StringPatchItem;
import org.apache.syncope.common.lib.patch.UserPatch;
import org.apache.syncope.common.lib.to.AttrTO;
+import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.common.lib.types.MappingPurpose;
import org.apache.syncope.common.lib.types.PropagationByResource;
import org.apache.syncope.common.lib.types.ResourceOperation;
@@ -41,7 +42,6 @@ import org.apache.syncope.core.persistence.api.dao.GroupDAO;
import org.apache.syncope.core.persistence.api.dao.UserDAO;
import org.apache.syncope.core.persistence.api.entity.EntityFactory;
import org.apache.syncope.core.persistence.api.entity.VirAttr;
-import org.apache.syncope.core.persistence.api.entity.group.Group;
import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
import org.apache.syncope.core.persistence.api.entity.user.User;
import org.apache.syncope.core.provisioning.api.WorkflowResult;
@@ -50,9 +50,9 @@ import org.apache.syncope.core.provisioning.api.propagation.PropagationTaskExecu
import org.apache.syncope.core.misc.ConnObjectUtils;
import org.apache.syncope.core.misc.MappingUtils;
import org.apache.syncope.core.misc.jexl.JexlUtils;
+import org.apache.syncope.core.persistence.api.dao.AnyDAO;
import org.apache.syncope.core.persistence.api.dao.AnyObjectDAO;
import org.apache.syncope.core.persistence.api.entity.Any;
-import org.apache.syncope.core.persistence.api.entity.anyobject.AnyObject;
import org.apache.syncope.core.persistence.api.entity.resource.ExternalResource;
import org.apache.syncope.core.persistence.api.entity.resource.MappingItem;
import org.apache.syncope.core.persistence.api.entity.resource.Provision;
@@ -106,72 +106,62 @@ public class PropagationManagerImpl implements PropagationManager {
@Autowired
protected VirAttrHandler virAttrHandler;
- @Override
- public List<PropagationTask> getAnyObjectCreateTasks(
- final WorkflowResult<Long> wfResult,
- final Collection<AttrTO> vAttrs,
- final Collection<String> noPropResourceNames) {
+ protected Any<?, ?, ?> find(final AnyTypeKind kind, final Long key) {
+ AnyDAO<? extends Any<?, ?, ?>> dao;
+ switch (kind) {
+ case ANY_OBJECT:
+ dao = anyObjectDAO;
+ break;
- return getAnyObjectCreateTasks(wfResult.getResult(), vAttrs, wfResult.getPropByRes(), noPropResourceNames);
- }
-
- @Override
- public List<PropagationTask> getAnyObjectCreateTasks(
- final Long key,
- final Collection<AttrTO> vAttrs,
- final PropagationByResource propByRes,
- final Collection<String> noPropResourceNames) {
+ case GROUP:
+ dao = groupDAO;
+ break;
- AnyObject anyObject = anyObjectDAO.authFind(key);
- if (vAttrs != null && !vAttrs.isEmpty()) {
- virAttrHandler.fillVirtual(anyObject, vAttrs);
+ case USER:
+ default:
+ dao = userDAO;
}
- return getCreateTaskIds(anyObject, null, null, propByRes, noPropResourceNames);
+ return dao.authFind(key);
}
@Override
- public List<PropagationTask> getUserCreateTasks(
+ public List<PropagationTask> getCreateTasks(
+ final AnyTypeKind kind,
final Long key,
- final Boolean enable,
final PropagationByResource propByRes,
- final String password,
final Collection<AttrTO> vAttrs,
final Collection<String> noPropResourceNames) {
- User user = userDAO.authFind(key);
+ Any<?, ?, ?> any = find(kind, key);
if (vAttrs != null && !vAttrs.isEmpty()) {
- virAttrHandler.fillVirtual(user, vAttrs);
+ virAttrHandler.createVirtual(any, vAttrs);
}
- return getCreateTaskIds(user, password, enable, propByRes, noPropResourceNames);
- }
- @Override
- public List<PropagationTask> getGroupCreateTasks(
- final WorkflowResult<Long> wfResult,
- final Collection<AttrTO> vAttrs,
- final Collection<String> noPropResourceNames) {
-
- return getGroupCreateTasks(wfResult.getResult(), vAttrs, wfResult.getPropByRes(), noPropResourceNames);
+ return getCreateTasks(any, null, null, propByRes, noPropResourceNames);
}
@Override
- public List<PropagationTask> getGroupCreateTasks(
+ public List<PropagationTask> getUserCreateTasks(
final Long key,
- final Collection<AttrTO> vAttrs,
+ final String password,
+ final Boolean enable,
final PropagationByResource propByRes,
+ final Collection<AttrTO> vAttrs,
final Collection<String> noPropResourceNames) {
- Group group = groupDAO.authFind(key);
+ User user = userDAO.authFind(key);
if (vAttrs != null && !vAttrs.isEmpty()) {
- virAttrHandler.fillVirtual(group, vAttrs);
+ virAttrHandler.createVirtual(user, vAttrs);
}
- return getCreateTaskIds(group, null, null, propByRes, noPropResourceNames);
+ return getCreateTasks(user, password, enable, propByRes, noPropResourceNames);
}
- protected List<PropagationTask> getCreateTaskIds(final Any<?, ?, ?> any,
- final String password, final Boolean enable,
+ protected List<PropagationTask> getCreateTasks(
+ final Any<?, ?, ?> any,
+ final String password,
+ final Boolean enable,
final PropagationByResource propByRes,
final Collection<String> noPropResourceNames) {
@@ -187,43 +177,33 @@ public class PropagationManagerImpl implements PropagationManager {
}
@Override
- public List<PropagationTask> getAnyObjectUpdateTasks(
- final WorkflowResult<Long> wfResult,
- final Set<AttrPatch> vAttrs,
- final Set<String> noPropResourceNames) {
-
- AnyObject anyObject = anyObjectDAO.authFind(wfResult.getResult());
- return getUpdateTasks(anyObject, null, false, null,
- vAttrs, wfResult.getPropByRes(), noPropResourceNames);
- }
-
- @Override
- public List<PropagationTask> getUserUpdateTasks(final Long key, final Boolean enable,
+ public List<PropagationTask> getUpdateTasks(
+ final AnyTypeKind kind,
+ final Long key,
+ final boolean changePwd,
+ final Boolean enable,
+ final PropagationByResource propByRes,
+ final Collection<AttrPatch> vAttrs,
final Collection<String> noPropResourceNames) {
- return getUpdateTasks(
- userDAO.find(key), // user to be updated on external resources
- null, // no password
- false,
- enable, // status to be propagated
- Collections.<AttrPatch>emptySet(), // no virtual attributes to be managed
- null, // no propagation by resources
- noPropResourceNames);
+ return getUpdateTasks(find(kind, key), null, changePwd, enable, propByRes, vAttrs, noPropResourceNames);
}
@Override
- public List<PropagationTask> getUserUpdateTasks(final WorkflowResult<Pair<UserPatch, Boolean>> wfResult,
- final boolean changePwd, final Collection<String> noPropResourceNames) {
+ public List<PropagationTask> getUserUpdateTasks(
+ final WorkflowResult<Pair<UserPatch, Boolean>> wfResult,
+ final boolean changePwd,
+ final Collection<String> noPropResourceNames) {
- User user = userDAO.authFind(wfResult.getResult().getKey().getKey());
- return getUpdateTasks(user,
+ return getUpdateTasks(
+ userDAO.authFind(wfResult.getResult().getKey().getKey()),
wfResult.getResult().getKey().getPassword() == null
? null
: wfResult.getResult().getKey().getPassword().getValue(),
changePwd,
wfResult.getResult().getValue(),
- wfResult.getResult().getKey().getVirAttrs(),
wfResult.getPropByRes(),
+ wfResult.getResult().getKey().getVirAttrs(),
noPropResourceNames);
}
@@ -274,24 +254,18 @@ public class PropagationManagerImpl implements PropagationManager {
return tasks;
}
- @Override
- public List<PropagationTask> getGroupUpdateTasks(final WorkflowResult<Long> wfResult,
- final Set<AttrPatch> vAttrs, final Set<String> noPropResourceNames) {
-
- Group group = groupDAO.authFind(wfResult.getResult());
- return getUpdateTasks(group, null, false, null,
- vAttrs, wfResult.getPropByRes(), noPropResourceNames);
- }
-
- @Override
- public List<PropagationTask> getUpdateTasks(final Any<?, ?, ?> any,
- final String password, final boolean changePwd, final Boolean enable, final Set<AttrPatch> vAttrs,
- final PropagationByResource propByRes, final Collection<String> noPropResourceNames) {
+ protected List<PropagationTask> getUpdateTasks(
+ final Any<?, ?, ?> any,
+ final String password,
+ final boolean changePwd,
+ final Boolean enable,
+ final PropagationByResource propByRes,
+ final Collection<AttrPatch> vAttrs,
+ final Collection<String> noPropResourceNames) {
- PropagationByResource localPropByRes = virAttrHandler.fillVirtual(
- any, vAttrs == null
- ? Collections.<AttrPatch>emptySet()
- : vAttrs);
+ PropagationByResource localPropByRes = virAttrHandler.updateVirtual(
+ any,
+ vAttrs == null ? Collections.<AttrPatch>emptySet() : vAttrs);
if (propByRes == null || propByRes.isEmpty()) {
localPropByRes.addAll(ResourceOperation.UPDATE, any.getResourceNames());
@@ -315,81 +289,34 @@ public class PropagationManagerImpl implements PropagationManager {
}
@Override
- public List<PropagationTask> getAnyObjectDeleteTasks(final Long anyObjectKey) {
- return getAnyObjectDeleteTasks(anyObjectKey, Collections.<String>emptySet());
- }
-
- @Override
- public List<PropagationTask> getAnyObjectDeleteTasks(final Long anyObjectKey, final String noPropResourceName) {
- return getAnyObjectDeleteTasks(anyObjectKey, Collections.<String>singleton(noPropResourceName));
- }
-
- @Override
- public List<PropagationTask> getAnyObjectDeleteTasks(
- final Long anyObjectKey, final Collection<String> noPropResourceNames) {
-
- AnyObject anyObject = anyObjectDAO.authFind(anyObjectKey);
- return getDeleteTaskIds(anyObject, anyObject.getResourceNames(), noPropResourceNames);
- }
-
- @Override
- public List<PropagationTask> getAnyObjectDeleteTasks(
- final Long groupKey, final Set<String> resourceNames, final Collection<String> noPropResourceNames) {
-
- AnyObject anyObject = anyObjectDAO.authFind(groupKey);
- return getDeleteTaskIds(anyObject, resourceNames, noPropResourceNames);
- }
-
- @Override
- public List<PropagationTask> getUserDeleteTasks(final Long userKey, final Collection<String> noPropResourceNames) {
- User user = userDAO.authFind(userKey);
- return getDeleteTaskIds(user, userDAO.findAllResourceNames(user), noPropResourceNames);
- }
-
- @Override
- public List<PropagationTask> getUserDeleteTasks(
- final Long userKey, final Set<String> resourceNames, final Collection<String> noPropResourceNames) {
-
- User user = userDAO.authFind(userKey);
- return getDeleteTaskIds(user, resourceNames, noPropResourceNames);
- }
-
- @Override
- public List<PropagationTask> getGroupDeleteTasks(final Long groupKey) {
- return getGroupDeleteTasks(groupKey, Collections.<String>emptySet());
- }
+ public List<PropagationTask> getDeleteTasks(
+ final AnyTypeKind kind,
+ final Long key,
+ final PropagationByResource propByRes,
+ final Collection<String> noPropResourceNames) {
- @Override
- public List<PropagationTask> getGroupDeleteTasks(final Long groupKey, final String noPropResourceName) {
- return getGroupDeleteTasks(groupKey, Collections.<String>singleton(noPropResourceName));
- }
+ Any<?, ?, ?> any = find(kind, key);
- @Override
- public List<PropagationTask> getGroupDeleteTasks(
- final Long groupKey, final Collection<String> noPropResourceNames) {
+ PropagationByResource localPropByRes = new PropagationByResource();
- Group group = groupDAO.authFind(groupKey);
- return getDeleteTaskIds(group, group.getResourceNames(), noPropResourceNames);
- }
+ if (propByRes == null || propByRes.isEmpty()) {
+ localPropByRes.addAll(ResourceOperation.DELETE, any.getResourceNames());
+ } else {
+ localPropByRes.merge(propByRes);
+ }
- @Override
- public List<PropagationTask> getGroupDeleteTasks(
- final Long groupKey, final Set<String> resourceNames, final Collection<String> noPropResourceNames) {
+ if (noPropResourceNames != null) {
+ localPropByRes.removeAll(noPropResourceNames);
+ }
- Group group = groupDAO.authFind(groupKey);
- return getDeleteTaskIds(group, resourceNames, noPropResourceNames);
+ return getDeleteTasks(any, localPropByRes, noPropResourceNames);
}
- protected List<PropagationTask> getDeleteTaskIds(
+ protected List<PropagationTask> getDeleteTasks(
final Any<?, ?, ?> any,
- final Collection<String> resourceNames,
+ final PropagationByResource propByRes,
final Collection<String> noPropResourceNames) {
- PropagationByResource propByRes = new PropagationByResource();
- propByRes.set(ResourceOperation.DELETE, resourceNames);
- if (noPropResourceNames != null && !noPropResourceNames.isEmpty()) {
- propByRes.get(ResourceOperation.DELETE).removeAll(noPropResourceNames);
- }
return createTasks(any, null, false, null, false, true, propByRes);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AbstractPushResultHandler.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AbstractPushResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AbstractPushResultHandler.java
index 6c7f39e..8aa37d3 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AbstractPushResultHandler.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AbstractPushResultHandler.java
@@ -20,11 +20,15 @@ package org.apache.syncope.core.provisioning.java.sync;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.syncope.common.lib.patch.AnyPatch;
import org.apache.syncope.common.lib.patch.AttrPatch;
+import org.apache.syncope.common.lib.patch.StringPatchItem;
+import org.apache.syncope.common.lib.to.AnyTO;
import org.apache.syncope.common.lib.to.AttrTO;
import org.apache.syncope.common.lib.types.AuditElements;
import org.apache.syncope.common.lib.types.AuditElements.Result;
@@ -47,10 +51,12 @@ import org.apache.syncope.core.persistence.api.entity.group.Group;
import org.apache.syncope.core.persistence.api.entity.resource.Mapping;
import org.apache.syncope.core.persistence.api.entity.resource.MappingItem;
import org.apache.syncope.core.persistence.api.entity.resource.Provision;
+import org.apache.syncope.core.provisioning.api.TimeoutException;
import org.apache.syncope.core.provisioning.api.sync.IgnoreProvisionException;
import org.apache.syncope.core.provisioning.api.sync.SyncopePushResultHandler;
import org.identityconnectors.framework.common.objects.ConnectorObject;
import org.identityconnectors.framework.common.objects.ObjectClass;
+import org.identityconnectors.framework.common.objects.Uid;
import org.quartz.JobExecutionException;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@@ -60,19 +66,87 @@ public abstract class AbstractPushResultHandler extends AbstractSyncopeResultHan
protected abstract String getName(Any<?, ?, ?> any);
- protected abstract Any<?, ?, ?> getAny(long key);
+ protected void deprovision(final Any<?, ?, ?> any) {
+ AnyTO before = getAnyTO(any.getKey());
- protected abstract Any<?, ?, ?> deprovision(Any<?, ?, ?> sbj);
+ List<String> noPropResources = new ArrayList<>(before.getResources());
+ noPropResources.remove(profile.getTask().getResource().getKey());
- protected abstract Any<?, ?, ?> provision(Any<?, ?, ?> sbj, Boolean enabled);
+ taskExecutor.execute(propagationManager.getDeleteTasks(
+ any.getType().getKind(),
+ any.getKey(),
+ null,
+ noPropResources));
+ }
- protected abstract Any<?, ?, ?> link(Any<?, ?, ?> sbj, Boolean unlink);
+ protected void provision(final Any<?, ?, ?> any, final Boolean enabled) {
+ AnyTO before = getAnyTO(any.getKey());
- protected abstract Any<?, ?, ?> unassign(Any<?, ?, ?> sbj);
+ List<String> noPropResources = new ArrayList<>(before.getResources());
+ noPropResources.remove(profile.getTask().getResource().getKey());
- protected abstract Any<?, ?, ?> assign(Any<?, ?, ?> sbj, Boolean enabled);
+ PropagationByResource propByRes = new PropagationByResource();
+ propByRes.add(ResourceOperation.CREATE, profile.getTask().getResource().getKey());
+
+ taskExecutor.execute(propagationManager.getCreateTasks(
+ any.getType().getKind(),
+ any.getKey(),
+ propByRes,
+ before.getVirAttrs(),
+ noPropResources));
+ }
- protected abstract ConnectorObject getRemoteObject(String connObjectKey, ObjectClass objectClass);
+ @SuppressWarnings("unchecked")
+ protected void link(final Any<?, ?, ?> any, final Boolean unlink) {
+ AnyPatch patch = newPatch(any.getKey());
+ patch.getResources().add(new StringPatchItem.Builder().
+ operation(unlink ? PatchOperation.DELETE : PatchOperation.ADD_REPLACE).
+ value(profile.getTask().getResource().getKey()).build());
+
+ update(patch);
+ }
+
+ @SuppressWarnings("unchecked")
+ protected void unassign(final Any<?, ?, ?> any) {
+ AnyPatch patch = newPatch(any.getKey());
+ patch.getResources().add(new StringPatchItem.Builder().
+ operation(PatchOperation.DELETE).
+ value(profile.getTask().getResource().getKey()).build());
+
+ update(patch);
+
+ deprovision(any);
+ }
+
+ protected void assign(final Any<?, ?, ?> any, final Boolean enabled) {
+ AnyPatch patch = newPatch(any.getKey());
+ patch.getResources().add(new StringPatchItem.Builder().
+ operation(PatchOperation.ADD_REPLACE).
+ value(profile.getTask().getResource().getKey()).build());
+
+ update(patch);
+
+ provision(any, enabled);
+ }
+
+ protected ConnectorObject getRemoteObject(final String connObjectKey, final ObjectClass objectClass) {
+ ConnectorObject obj = null;
+ try {
+ Uid uid = new Uid(connObjectKey);
+
+ obj = profile.getConnector().getObject(
+ objectClass,
+ uid,
+ profile.getConnector().getOperationOptions(Collections.<MappingItem>emptySet()));
+ } catch (TimeoutException toe) {
+ LOG.debug("Request timeout", toe);
+ throw toe;
+ } catch (RuntimeException ignore) {
+ LOG.debug("While resolving {}", connObjectKey, ignore);
+ }
+
+ return obj;
+ }
@Transactional(propagation = Propagation.REQUIRES_NEW)
@Override
@@ -328,11 +402,11 @@ public abstract class AbstractPushResultHandler extends AbstractSyncopeResultHan
}
}
- protected Any<?, ?, ?> update(final Any<?, ?, ?> sbj, final Boolean enabled) {
+ protected Any<?, ?, ?> update(final Any<?, ?, ?> any, final Boolean enabled) {
Set<AttrPatch> vattrs = new HashSet<>();
// Search for all mapped vattrs
- Mapping mapping = profile.getTask().getResource().getProvision(sbj.getType()).getMapping();
+ Mapping mapping = profile.getTask().getResource().getProvision(any.getType()).getMapping();
for (MappingItem mappingItem : mapping.getItems()) {
if (mappingItem.getIntMappingType() == IntMappingType.UserVirtualSchema) {
vattrs.add(new AttrPatch.Builder().
@@ -345,7 +419,7 @@ public abstract class AbstractPushResultHandler extends AbstractSyncopeResultHan
// Search for all user's vattrs and:
// 1. add mapped vattrs not owned by the user to the set of vattrs to be removed
// 2. add all vattrs owned by the user to the set of vattrs to be update
- for (VirAttr<?> vattr : sbj.getVirAttrs()) {
+ for (VirAttr<?> vattr : any.getVirAttrs()) {
vattrs.add(new AttrPatch.Builder().
operation(PatchOperation.ADD_REPLACE).
attrTO(new AttrTO.Builder().
@@ -357,15 +431,15 @@ public abstract class AbstractPushResultHandler extends AbstractSyncopeResultHan
boolean changepwd;
Collection<String> resourceNames;
- if (sbj instanceof User) {
+ if (any instanceof User) {
changepwd = true;
- resourceNames = userDAO.findAllResourceNames((User) sbj);
- } else if (sbj instanceof AnyObject) {
- changepwd = true;
- resourceNames = anyObjectDAO.findAllResourceNames((AnyObject) sbj);
+ resourceNames = userDAO.findAllResourceNames((User) any);
+ } else if (any instanceof AnyObject) {
+ changepwd = false;
+ resourceNames = anyObjectDAO.findAllResourceNames((AnyObject) any);
} else {
changepwd = false;
- resourceNames = ((Group) sbj).getResourceNames();
+ resourceNames = ((Group) any).getResourceNames();
}
List<String> noPropResources = new ArrayList<>(resourceNames);
@@ -375,8 +449,14 @@ public abstract class AbstractPushResultHandler extends AbstractSyncopeResultHan
propByRes.add(ResourceOperation.CREATE, profile.getTask().getResource().getKey());
taskExecutor.execute(propagationManager.getUpdateTasks(
- sbj, null, changepwd, enabled, vattrs, propByRes, noPropResources));
-
- return getAny(sbj.getKey());
+ any.getType().getKind(),
+ any.getKey(),
+ changepwd,
+ null,
+ propByRes,
+ vattrs,
+ noPropResources));
+
+ return getAny(any.getKey());
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AbstractSyncResultHandler.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AbstractSyncResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AbstractSyncResultHandler.java
index 34ead69..30d2879 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AbstractSyncResultHandler.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AbstractSyncResultHandler.java
@@ -23,10 +23,14 @@ import java.util.Collections;
import java.util.List;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.syncope.common.lib.patch.AnyPatch;
+import org.apache.syncope.common.lib.patch.StringPatchItem;
import org.apache.syncope.common.lib.to.AnyTO;
+import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.common.lib.types.AuditElements;
import org.apache.syncope.common.lib.types.AuditElements.Result;
import org.apache.syncope.common.lib.types.MatchingRule;
+import org.apache.syncope.common.lib.types.PatchOperation;
+import org.apache.syncope.common.lib.types.PropagationByResource;
import org.apache.syncope.common.lib.types.ResourceOperation;
import org.apache.syncope.common.lib.types.UnmatchingRule;
import org.apache.syncope.core.persistence.api.dao.NotFoundException;
@@ -36,6 +40,7 @@ import org.apache.syncope.core.provisioning.api.sync.SyncActions;
import org.apache.syncope.core.misc.security.DelegatedAdministrationException;
import org.apache.syncope.core.persistence.api.entity.AnyUtils;
import org.apache.syncope.core.persistence.api.entity.resource.Provision;
+import org.apache.syncope.core.provisioning.api.ProvisioningManager;
import org.apache.syncope.core.provisioning.api.sync.IgnoreProvisionException;
import org.apache.syncope.core.provisioning.api.sync.ProvisioningResult;
import org.apache.syncope.core.provisioning.api.sync.SyncopeSyncResultHandler;
@@ -54,15 +59,56 @@ public abstract class AbstractSyncResultHandler extends AbstractSyncopeResultHan
protected abstract String getName(AnyTO anyTO);
+ protected abstract ProvisioningManager<?, ?> getProvisioningManager();
+
protected abstract AnyTO doCreate(AnyTO anyTO, SyncDelta delta, ProvisioningResult result);
- protected abstract AnyTO doLink(AnyTO before, ProvisioningResult result, boolean unlink);
+ protected AnyTO doLink(final AnyTO before, final boolean unlink) {
+ AnyPatch patch = newPatch(before.getKey());
+ patch.setKey(before.getKey());
+ patch.getResources().add(new StringPatchItem.Builder().
+ operation(unlink ? PatchOperation.DELETE : PatchOperation.ADD_REPLACE).
+ value(profile.getTask().getResource().getKey()).build());
+
+ return getAnyTO(update(patch).getResult());
+ }
protected abstract AnyTO doUpdate(AnyTO before, AnyPatch anyPatch, SyncDelta delta, ProvisioningResult result);
- protected abstract void doDeprovision(Long key, boolean unlink);
+ protected void doDeprovision(final AnyTypeKind kind, final Long key, final boolean unlink) {
+ PropagationByResource propByRes = new PropagationByResource();
+ propByRes.add(ResourceOperation.DELETE, profile.getTask().getResource().getKey());
+ taskExecutor.execute(propagationManager.getDeleteTasks(
+ kind,
+ key,
+ propByRes,
+ null));
+
+ if (unlink) {
+ AnyPatch anyObjectPatch = newPatch(key);
+ anyObjectPatch.getResources().add(new StringPatchItem.Builder().
+ operation(PatchOperation.DELETE).
+ value(profile.getTask().getResource().getKey()).build());
+ }
+ }
- protected abstract void doDelete(Long key);
+ protected void doDelete(final AnyTypeKind kind, final Long key) {
+ PropagationByResource propByRes = new PropagationByResource();
+ propByRes.add(ResourceOperation.DELETE, profile.getTask().getResource().getKey());
+ try {
+ taskExecutor.execute(propagationManager.getDeleteTasks(
+ kind,
+ key,
+ propByRes,
+ null));
+ } catch (Exception e) {
+ // A propagation failure doesn't imply a synchronization failure.
+ // The propagation exception status will be reported into the propagation task execution.
+ LOG.error("Could not propagate anyObject " + key, e);
+ }
+
+ getProvisioningManager().delete(key);
+ }
@Override
public boolean handle(final SyncDelta delta) {
@@ -313,8 +359,8 @@ public abstract class AbstractSyncResultHandler extends AbstractSyncopeResultHan
final List<ProvisioningResult> updResults = new ArrayList<>();
- for (Long id : anys) {
- LOG.debug("About to unassign resource {}", id);
+ for (Long key : anys) {
+ LOG.debug("About to unassign resource {}", key);
Object output;
Result resultStatus;
@@ -323,13 +369,13 @@ public abstract class AbstractSyncResultHandler extends AbstractSyncopeResultHan
result.setOperation(ResourceOperation.DELETE);
result.setAnyType(provision.getAnyType().getKey());
result.setStatus(ProvisioningResult.Status.SUCCESS);
- result.setKey(id);
+ result.setKey(key);
- AnyTO before = getAnyTO(id);
+ AnyTO before = getAnyTO(key);
if (before == null) {
result.setStatus(ProvisioningResult.Status.FAILURE);
- result.setMessage(String.format("Any '%s(%d)' not found", provision.getAnyType().getKey(), id));
+ result.setMessage(String.format("Any '%s(%d)' not found", provision.getAnyType().getKey(), key));
}
if (!profile.isDryRun()) {
@@ -350,15 +396,15 @@ public abstract class AbstractSyncResultHandler extends AbstractSyncopeResultHan
}
}
- doDeprovision(id, unlink);
- output = getAnyTO(id);
+ doDeprovision(provision.getAnyType().getKind(), key, unlink);
+ output = getAnyTO(key);
for (SyncActions action : profile.getActions()) {
action.after(this.getProfile(), delta, AnyTO.class.cast(output), result);
}
resultStatus = Result.SUCCESS;
- LOG.debug("{} {} successfully updated", provision.getAnyType().getKey(), id);
+ LOG.debug("{} {} successfully updated", provision.getAnyType().getKey(), key);
} catch (IgnoreProvisionException e) {
throw e;
} catch (PropagationException e) {
@@ -448,7 +494,7 @@ public abstract class AbstractSyncResultHandler extends AbstractSyncopeResultHan
}
}
- output = doLink(before, result, unlink);
+ output = doLink(before, unlink);
for (SyncActions action : profile.getActions()) {
action.after(this.getProfile(), delta, AnyTO.class.cast(output), result);
@@ -507,16 +553,16 @@ public abstract class AbstractSyncResultHandler extends AbstractSyncopeResultHan
List<ProvisioningResult> delResults = new ArrayList<>();
SyncDelta workingDelta = delta;
- for (Long id : anys) {
+ for (Long key : anys) {
Object output;
Result resultStatus = Result.FAILURE;
ProvisioningResult result = new ProvisioningResult();
try {
- AnyTO before = getAnyTO(id);
+ AnyTO before = getAnyTO(key);
- result.setKey(id);
+ result.setKey(key);
result.setName(getName(before));
result.setOperation(ResourceOperation.DELETE);
result.setAnyType(provision.getAnyType().getKey());
@@ -528,7 +574,7 @@ public abstract class AbstractSyncResultHandler extends AbstractSyncopeResultHan
}
try {
- doDelete(id);
+ doDelete(provision.getAnyType().getKind(), key);
output = null;
resultStatus = Result.SUCCESS;
@@ -540,7 +586,7 @@ public abstract class AbstractSyncResultHandler extends AbstractSyncopeResultHan
} catch (Exception e) {
result.setStatus(ProvisioningResult.Status.FAILURE);
result.setMessage(ExceptionUtils.getRootCauseMessage(e));
- LOG.error("Could not delete {} {}", provision.getAnyType().getKey(), id, e);
+ LOG.error("Could not delete {} {}", provision.getAnyType().getKey(), key, e);
output = e;
for (SyncActions action : profile.getActions()) {
@@ -553,11 +599,11 @@ public abstract class AbstractSyncResultHandler extends AbstractSyncopeResultHan
delResults.add(result);
} catch (NotFoundException e) {
- LOG.error("Could not find {} {}", provision.getAnyType().getKey(), id, e);
+ LOG.error("Could not find {} {}", provision.getAnyType().getKey(), key, e);
} catch (DelegatedAdministrationException e) {
- LOG.error("Not allowed to read {} {}", provision.getAnyType().getKey(), id, e);
+ LOG.error("Not allowed to read {} {}", provision.getAnyType().getKey(), key, e);
} catch (Exception e) {
- LOG.error("Could not delete {} {}", provision.getAnyType().getKey(), id, e);
+ LOG.error("Could not delete {} {}", provision.getAnyType().getKey(), key, e);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AbstractSyncopeResultHandler.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AbstractSyncopeResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AbstractSyncopeResultHandler.java
index 49a38d3..2527d5f 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AbstractSyncopeResultHandler.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AbstractSyncopeResultHandler.java
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.core.provisioning.java.sync;
+import org.apache.syncope.common.lib.patch.AnyPatch;
import org.apache.syncope.common.lib.to.AnyTO;
import org.apache.syncope.core.persistence.api.dao.GroupDAO;
import org.apache.syncope.core.persistence.api.dao.UserDAO;
@@ -33,9 +34,11 @@ import org.apache.syncope.core.provisioning.api.sync.SyncopeResultHandler;
import org.apache.syncope.core.misc.AuditManager;
import org.apache.syncope.core.misc.ConnObjectUtils;
import org.apache.syncope.core.persistence.api.dao.AnyObjectDAO;
+import org.apache.syncope.core.persistence.api.entity.Any;
import org.apache.syncope.core.persistence.api.entity.AnyUtils;
import org.apache.syncope.core.persistence.api.entity.AnyUtilsFactory;
import org.apache.syncope.core.provisioning.api.AnyObjectProvisioningManager;
+import org.apache.syncope.core.provisioning.api.WorkflowResult;
import org.apache.syncope.core.provisioning.api.data.AnyObjectDataBinder;
import org.apache.syncope.core.provisioning.api.notification.NotificationManager;
import org.apache.syncope.core.provisioning.api.sync.ProvisioningActions;
@@ -134,6 +137,12 @@ public abstract class AbstractSyncopeResultHandler<T extends ProvisioningTask, A
protected abstract AnyTO getAnyTO(long key);
+ protected abstract Any<?, ?, ?> getAny(long key);
+
+ protected abstract AnyPatch newPatch(final long key);
+
+ protected abstract WorkflowResult<Long> update(AnyPatch patch);
+
@Override
public void setProfile(final ProvisioningProfile<T, A> profile) {
this.profile = profile;