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/06/15 16:06:45 UTC
syncope git commit: Cleanup
Repository: syncope
Updated Branches:
refs/heads/2_0_X 168e59d3c -> 812e8430d
Cleanup
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/812e8430
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/812e8430
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/812e8430
Branch: refs/heads/2_0_X
Commit: 812e8430d59d8134521d510e07d9a5764ca7fdf0
Parents: 168e59d
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Jun 15 18:06:38 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jun 15 18:06:38 2018 +0200
----------------------------------------------------------------------
.../core/persistence/api/entity/AnyUtils.java | 3 ++
.../persistence/jpa/entity/JPAAnyUtils.java | 35 ++++++++++++++++++++
.../pushpull/AbstractPullResultHandler.java | 4 +--
.../pushpull/AbstractPushResultHandler.java | 31 ++++++-----------
.../pushpull/AbstractSyncopeResultHandler.java | 17 ----------
.../DefaultAnyObjectPullResultHandler.java | 18 ----------
.../DefaultAnyObjectPushResultHandler.java | 17 ----------
.../pushpull/DefaultGroupPullResultHandler.java | 18 ----------
.../pushpull/DefaultGroupPushResultHandler.java | 17 ----------
.../pushpull/DefaultUserPullResultHandler.java | 18 ----------
.../pushpull/DefaultUserPushResultHandler.java | 17 ----------
11 files changed, 51 insertions(+), 144 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/812e8430/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/AnyUtils.java
----------------------------------------------------------------------
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/AnyUtils.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/AnyUtils.java
index 12063a5..4e535a2 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/AnyUtils.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/AnyUtils.java
@@ -19,6 +19,7 @@
package org.apache.syncope.core.persistence.api.entity;
import java.util.Set;
+import org.apache.syncope.common.lib.patch.AnyPatch;
import org.apache.syncope.common.lib.to.AnyTO;
import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.core.persistence.api.dao.AnyDAO;
@@ -48,6 +49,8 @@ public interface AnyUtils {
<T extends AnyTO> T newAnyTO();
+ <P extends AnyPatch> P newAnyPatch(String key);
+
<A extends Any<?>> AnyDAO<A> dao();
Set<ExternalResource> getAllResources(Any<?> any);
http://git-wip-us.apache.org/repos/asf/syncope/blob/812e8430/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAAnyUtils.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAAnyUtils.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAAnyUtils.java
index fea7228..ac26db8 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAAnyUtils.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/JPAAnyUtils.java
@@ -26,6 +26,10 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.commons.lang3.ClassUtils;
+import org.apache.syncope.common.lib.patch.AnyObjectPatch;
+import org.apache.syncope.common.lib.patch.AnyPatch;
+import org.apache.syncope.common.lib.patch.GroupPatch;
+import org.apache.syncope.common.lib.patch.UserPatch;
import org.apache.syncope.common.lib.to.AnyObjectTO;
import org.apache.syncope.common.lib.to.AnyTO;
import org.apache.syncope.common.lib.to.GroupTO;
@@ -56,12 +60,16 @@ import org.apache.syncope.core.persistence.jpa.entity.user.JPAUPlainAttr;
import org.apache.syncope.core.persistence.jpa.entity.user.JPAUPlainAttrUniqueValue;
import org.apache.syncope.core.persistence.jpa.entity.user.JPAUPlainAttrValue;
import org.apache.syncope.core.persistence.jpa.entity.user.JPAUser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@SuppressWarnings({ "unchecked", "rawtypes" })
public class JPAAnyUtils implements AnyUtils {
+ private static final Logger LOG = LoggerFactory.getLogger(AnyUtils.class);
+
private static final Set<String> USER_FIELD_NAMES = new HashSet<>();
private static final Set<String> GROUP_FIELD_NAMES = new HashSet<>();
@@ -337,6 +345,33 @@ public class JPAAnyUtils implements AnyUtils {
}
@Override
+ public <P extends AnyPatch> P newAnyPatch(final String key) {
+ P result = null;
+
+ switch (anyTypeKind) {
+ case USER:
+ result = (P) new UserPatch();
+ break;
+
+ case GROUP:
+ result = (P) new GroupPatch();
+ break;
+
+ case ANY_OBJECT:
+ result = (P) new AnyObjectPatch();
+ break;
+
+ default:
+ }
+
+ if (result != null) {
+ result.setKey(key);
+ }
+
+ return result;
+ }
+
+ @Override
public <A extends Any<?>> AnyDAO<A> dao() {
AnyDAO<A> result = null;
http://git-wip-us.apache.org/repos/asf/syncope/blob/812e8430/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
index da6f011..448ac2e 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
@@ -461,7 +461,7 @@ public abstract class AbstractPullResultHandler extends AbstractSyncopeResultHan
AnyPatch anyPatch = null;
if (unlink) {
- anyPatch = newPatch(key);
+ anyPatch = getAnyUtils().newAnyPatch(key);
anyPatch.getResources().add(new StringPatchItem.Builder().
operation(PatchOperation.DELETE).
value(profile.getTask().getResource().getKey()).build());
@@ -564,7 +564,7 @@ public abstract class AbstractPullResultHandler extends AbstractSyncopeResultHan
}
}
- AnyPatch anyPatch = newPatch(before.getKey());
+ AnyPatch anyPatch = getAnyUtils().newAnyPatch(before.getKey());
anyPatch.getResources().add(new StringPatchItem.Builder().
operation(unlink ? PatchOperation.DELETE : PatchOperation.ADD_REPLACE).
value(profile.getTask().getResource().getKey()).build());
http://git-wip-us.apache.org/repos/asf/syncope/blob/812e8430/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java
index 54f6986..05c723d 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java
@@ -19,11 +19,11 @@
package org.apache.syncope.core.provisioning.java.pushpull;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.IterableUtils;
import org.apache.commons.collections4.Predicate;
import org.apache.commons.lang3.exception.ExceptionUtils;
@@ -44,7 +44,6 @@ import org.apache.syncope.core.provisioning.api.pushpull.ProvisioningReport;
import org.apache.syncope.core.provisioning.api.pushpull.PushActions;
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.anyobject.AnyObject;
import org.apache.syncope.core.persistence.api.entity.resource.Item;
import org.apache.syncope.core.persistence.api.entity.resource.MappingItem;
import org.apache.syncope.core.persistence.api.entity.resource.Provision;
@@ -56,6 +55,7 @@ import org.apache.syncope.core.provisioning.api.notification.NotificationManager
import org.apache.syncope.core.provisioning.api.propagation.PropagationReporter;
import org.apache.syncope.core.provisioning.api.pushpull.IgnoreProvisionException;
import org.apache.syncope.core.provisioning.api.pushpull.SyncopePushResultHandler;
+import org.apache.syncope.core.provisioning.api.utils.EntityUtils;
import org.apache.syncope.core.provisioning.java.job.AfterHandlingJob;
import org.apache.syncope.core.provisioning.java.utils.MappingUtils;
import org.identityconnectors.framework.common.objects.AttributeBuilder;
@@ -98,24 +98,15 @@ public abstract class AbstractPushResultHandler extends AbstractSyncopeResultHan
}
protected void update(final Any<?> any, final ProvisioningReport result) {
- boolean changepwd;
- Collection<String> resourceKeys;
- if (any instanceof User) {
- changepwd = true;
- resourceKeys = userDAO.findAllResourceKeys(any.getKey());
- } else if (any instanceof AnyObject) {
- changepwd = false;
- resourceKeys = anyObjectDAO.findAllResourceKeys(any.getKey());
- } else {
- changepwd = false;
- resourceKeys = groupDAO.findAllResourceKeys(any.getKey());
- }
+ boolean changepwd = any instanceof User;
+ List<String> ownedResources = CollectionUtils.collect(
+ getAnyUtils().getAllResources(any), EntityUtils.keyTransformer(), new ArrayList<String>());
- List<String> noPropResources = new ArrayList<>(resourceKeys);
+ List<String> noPropResources = new ArrayList<>(ownedResources);
noPropResources.remove(profile.getTask().getResource().getKey());
PropagationByResource propByRes = new PropagationByResource();
- propByRes.add(ResourceOperation.CREATE, profile.getTask().getResource().getKey());
+ propByRes.add(ResourceOperation.UPDATE, profile.getTask().getResource().getKey());
PropagationReporter reporter = taskExecutor.execute(propagationManager.getUpdateTasks(
any.getType().getKind(),
@@ -164,7 +155,7 @@ public abstract class AbstractPushResultHandler extends AbstractSyncopeResultHan
}
protected void link(final Any<?> any, final boolean unlink, final ProvisioningReport result) {
- AnyPatch patch = newPatch(any.getKey());
+ AnyPatch patch = getAnyUtils().newAnyPatch(any.getKey());
patch.getResources().add(new StringPatchItem.Builder().
operation(unlink ? PatchOperation.DELETE : PatchOperation.ADD_REPLACE).
value(profile.getTask().getResource().getKey()).build());
@@ -175,7 +166,7 @@ public abstract class AbstractPushResultHandler extends AbstractSyncopeResultHan
}
protected void unassign(final Any<?> any, final ProvisioningReport result) {
- AnyPatch patch = newPatch(any.getKey());
+ AnyPatch patch = getAnyUtils().newAnyPatch(any.getKey());
patch.getResources().add(new StringPatchItem.Builder().
operation(PatchOperation.DELETE).
value(profile.getTask().getResource().getKey()).build());
@@ -186,7 +177,7 @@ public abstract class AbstractPushResultHandler extends AbstractSyncopeResultHan
}
protected void assign(final Any<?> any, final Boolean enabled, final ProvisioningReport result) {
- AnyPatch patch = newPatch(any.getKey());
+ AnyPatch patch = getAnyUtils().newAnyPatch(any.getKey());
patch.getResources().add(new StringPatchItem.Builder().
operation(PatchOperation.ADD_REPLACE).
value(profile.getTask().getResource().getKey()).build());
@@ -223,7 +214,7 @@ public abstract class AbstractPushResultHandler extends AbstractSyncopeResultHan
public boolean handle(final String anyKey) {
Any<?> any = null;
try {
- any = getAny(anyKey);
+ any = getAnyUtils().dao().authFind(anyKey);
doHandle(any);
return true;
} catch (IgnoreProvisionException e) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/812e8430/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractSyncopeResultHandler.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractSyncopeResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractSyncopeResultHandler.java
index 53c4258..4e0b229 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractSyncopeResultHandler.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractSyncopeResultHandler.java
@@ -20,8 +20,6 @@ package org.apache.syncope.core.provisioning.java.pushpull;
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;
import org.apache.syncope.core.persistence.api.entity.task.ProvisioningTask;
import org.apache.syncope.core.provisioning.api.data.GroupDataBinder;
import org.apache.syncope.core.provisioning.api.data.UserDataBinder;
@@ -29,8 +27,6 @@ import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
import org.apache.syncope.core.provisioning.api.propagation.PropagationTaskExecutor;
import org.apache.syncope.core.provisioning.api.pushpull.ProvisioningProfile;
import org.apache.syncope.core.provisioning.api.pushpull.SyncopeResultHandler;
-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.WorkflowResult;
@@ -48,15 +44,6 @@ public abstract class AbstractSyncopeResultHandler<T extends ProvisioningTask, A
protected static final Logger LOG = LoggerFactory.getLogger(SyncopeResultHandler.class);
- @Autowired
- protected AnyObjectDAO anyObjectDAO;
-
- @Autowired
- protected UserDAO userDAO;
-
- @Autowired
- protected GroupDAO groupDAO;
-
/**
* Propagation manager.
*/
@@ -105,10 +92,6 @@ public abstract class AbstractSyncopeResultHandler<T extends ProvisioningTask, A
protected abstract AnyTO getAnyTO(String key);
- protected abstract Any<?> getAny(String key);
-
- protected abstract AnyPatch newPatch(String key);
-
protected abstract WorkflowResult<? extends AnyPatch> update(AnyPatch patch);
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/812e8430/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultAnyObjectPullResultHandler.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultAnyObjectPullResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultAnyObjectPullResultHandler.java
index 8d71a2d..bb6e61e 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultAnyObjectPullResultHandler.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultAnyObjectPullResultHandler.java
@@ -28,7 +28,6 @@ import org.apache.syncope.common.lib.to.AnyTO;
import org.apache.syncope.common.lib.to.PropagationStatus;
import org.apache.syncope.common.lib.to.AnyObjectTO;
import org.apache.syncope.common.lib.types.AnyTypeKind;
-import org.apache.syncope.core.persistence.api.entity.Any;
import org.apache.syncope.core.persistence.api.entity.AnyUtils;
import org.apache.syncope.core.provisioning.api.AnyObjectProvisioningManager;
import org.apache.syncope.core.provisioning.api.ProvisioningManager;
@@ -59,28 +58,11 @@ public class DefaultAnyObjectPullResultHandler extends AbstractPullResultHandler
}
@Override
- protected Any<?> getAny(final String key) {
- try {
- return anyObjectDAO.authFind(key);
- } catch (Exception e) {
- LOG.warn("Error retrieving anyObject {}", key, e);
- return null;
- }
- }
-
- @Override
protected AnyTO getAnyTO(final String key) {
return anyObjectDataBinder.getAnyObjectTO(key);
}
@Override
- protected AnyPatch newPatch(final String key) {
- AnyObjectPatch patch = new AnyObjectPatch();
- patch.setKey(key);
- return patch;
- }
-
- @Override
protected WorkflowResult<? extends AnyPatch> update(final AnyPatch patch) {
return awfAdapter.update((AnyObjectPatch) patch);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/812e8430/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultAnyObjectPushResultHandler.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultAnyObjectPushResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultAnyObjectPushResultHandler.java
index 3c401ae..0769d9a 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultAnyObjectPushResultHandler.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultAnyObjectPushResultHandler.java
@@ -41,28 +41,11 @@ public class DefaultAnyObjectPushResultHandler extends AbstractPushResultHandler
}
@Override
- protected Any<?> getAny(final String key) {
- try {
- return anyObjectDAO.authFind(key);
- } catch (Exception e) {
- LOG.warn("Error retrieving anyObject {}", key, e);
- return null;
- }
- }
-
- @Override
protected AnyTO getAnyTO(final String key) {
return anyObjectDataBinder.getAnyObjectTO(key);
}
@Override
- protected AnyPatch newPatch(final String key) {
- AnyObjectPatch patch = new AnyObjectPatch();
- patch.setKey(key);
- return patch;
- }
-
- @Override
protected WorkflowResult<? extends AnyObjectPatch> update(final AnyPatch patch) {
return awfAdapter.update((AnyObjectPatch) patch);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/812e8430/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultGroupPullResultHandler.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultGroupPullResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultGroupPullResultHandler.java
index 451659b..e377123 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultGroupPullResultHandler.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultGroupPullResultHandler.java
@@ -31,7 +31,6 @@ import org.apache.syncope.common.lib.to.PropagationStatus;
import org.apache.syncope.common.lib.to.GroupTO;
import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.common.lib.types.PatchOperation;
-import org.apache.syncope.core.persistence.api.entity.Any;
import org.apache.syncope.core.persistence.api.entity.AnyUtils;
import org.apache.syncope.core.provisioning.api.GroupProvisioningManager;
import org.apache.syncope.core.provisioning.api.ProvisioningManager;
@@ -69,28 +68,11 @@ public class DefaultGroupPullResultHandler extends AbstractPullResultHandler imp
}
@Override
- protected Any<?> getAny(final String key) {
- try {
- return groupDAO.authFind(key);
- } catch (Exception e) {
- LOG.warn("Error retrieving group {}", key, e);
- return null;
- }
- }
-
- @Override
protected AnyTO getAnyTO(final String key) {
return groupDataBinder.getGroupTO(key);
}
@Override
- protected AnyPatch newPatch(final String key) {
- GroupPatch patch = new GroupPatch();
- patch.setKey(key);
- return patch;
- }
-
- @Override
protected WorkflowResult<? extends AnyPatch> update(final AnyPatch patch) {
return gwfAdapter.update((GroupPatch) patch);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/812e8430/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultGroupPushResultHandler.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultGroupPushResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultGroupPushResultHandler.java
index 993f747..02849f0 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultGroupPushResultHandler.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultGroupPushResultHandler.java
@@ -41,28 +41,11 @@ public class DefaultGroupPushResultHandler extends AbstractPushResultHandler imp
}
@Override
- protected Any<?> getAny(final String key) {
- try {
- return groupDAO.authFind(key);
- } catch (Exception e) {
- LOG.warn("Error retrieving group {}", key, e);
- return null;
- }
- }
-
- @Override
protected AnyTO getAnyTO(final String key) {
return groupDataBinder.getGroupTO(key);
}
@Override
- protected AnyPatch newPatch(final String key) {
- GroupPatch patch = new GroupPatch();
- patch.setKey(key);
- return patch;
- }
-
- @Override
protected WorkflowResult<? extends AnyPatch> update(final AnyPatch patch) {
return gwfAdapter.update((GroupPatch) patch);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/812e8430/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPullResultHandler.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPullResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPullResultHandler.java
index 83a5401..e600c93 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPullResultHandler.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPullResultHandler.java
@@ -28,7 +28,6 @@ import org.apache.syncope.common.lib.to.AnyTO;
import org.apache.syncope.common.lib.to.PropagationStatus;
import org.apache.syncope.common.lib.to.UserTO;
import org.apache.syncope.common.lib.types.AnyTypeKind;
-import org.apache.syncope.core.persistence.api.entity.Any;
import org.apache.syncope.core.persistence.api.entity.AnyUtils;
import org.apache.syncope.core.provisioning.api.ProvisioningManager;
import org.apache.syncope.core.provisioning.api.UserProvisioningManager;
@@ -59,28 +58,11 @@ public class DefaultUserPullResultHandler extends AbstractPullResultHandler impl
}
@Override
- protected Any<?> getAny(final String key) {
- try {
- return userDAO.authFind(key);
- } catch (Exception e) {
- LOG.warn("Error retrieving user {}", key, e);
- return null;
- }
- }
-
- @Override
protected AnyTO getAnyTO(final String key) {
return userDataBinder.getUserTO(key);
}
@Override
- protected AnyPatch newPatch(final String key) {
- UserPatch patch = new UserPatch();
- patch.setKey(key);
- return patch;
- }
-
- @Override
protected WorkflowResult<? extends AnyPatch> update(final AnyPatch patch) {
WorkflowResult<Pair<UserPatch, Boolean>> update = uwfAdapter.update((UserPatch) patch);
return new WorkflowResult<>(update.getResult().getLeft(), update.getPropByRes(), update.getPerformedTasks());
http://git-wip-us.apache.org/repos/asf/syncope/blob/812e8430/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPushResultHandler.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPushResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPushResultHandler.java
index 70f3a00..1952170 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPushResultHandler.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPushResultHandler.java
@@ -69,28 +69,11 @@ public class DefaultUserPushResultHandler extends AbstractPushResultHandler impl
}
@Override
- protected Any<?> getAny(final String key) {
- try {
- return userDAO.authFind(key);
- } catch (Exception e) {
- LOG.warn("Error retrieving user {}", key, e);
- return null;
- }
- }
-
- @Override
protected AnyTO getAnyTO(final String key) {
return userDataBinder.getUserTO(key);
}
@Override
- protected AnyPatch newPatch(final String key) {
- UserPatch patch = new UserPatch();
- patch.setKey(key);
- return patch;
- }
-
- @Override
protected WorkflowResult<? extends AnyPatch> update(final AnyPatch patch) {
WorkflowResult<Pair<UserPatch, Boolean>> update = uwfAdapter.update((UserPatch) patch);
return new WorkflowResult<>(update.getResult().getLeft(), update.getPropByRes(), update.getPerformedTasks());