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/01/08 10:49:11 UTC
[2/3] syncope git commit: [SYNCOPE-623] Minor cleanup
[SYNCOPE-623] Minor cleanup
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a8f98d25
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a8f98d25
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a8f98d25
Branch: refs/heads/master
Commit: a8f98d25bbe42c14de763703768dd0d8cf4895dd
Parents: 7ee3051
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Jan 8 10:48:42 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Jan 8 10:48:42 2015 +0100
----------------------------------------------------------------------
.../org/apache/syncope/common/to/RouteTO.java | 15 ++-
.../DefaultRoleProvisioningManager.java | 30 +++---
.../DefaultUserProvisioningManager.java | 102 +++++++------------
.../core/provisioning/ProvisioningManager.java | 12 +--
.../provisioning/RoleProvisioningManager.java | 34 ++++---
.../provisioning/UserProvisioningManager.java | 52 +++++-----
.../camel/CamelRoleProvisioningManager.java | 2 +-
.../camel/CamelUserProvisioningManager.java | 2 +-
.../core/sync/impl/RoleSyncResultHandler.java | 2 +-
.../core/sync/impl/UserSyncResultHandler.java | 2 +-
10 files changed, 113 insertions(+), 140 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/a8f98d25/common/src/main/java/org/apache/syncope/common/to/RouteTO.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/syncope/common/to/RouteTO.java b/common/src/main/java/org/apache/syncope/common/to/RouteTO.java
index d9fe833..709297e 100644
--- a/common/src/main/java/org/apache/syncope/common/to/RouteTO.java
+++ b/common/src/main/java/org/apache/syncope/common/to/RouteTO.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.syncope.common.to;
import javax.xml.bind.annotation.XmlRootElement;
@@ -25,15 +24,15 @@ import org.apache.syncope.common.AbstractBaseBean;
@XmlRootElement(name = "route")
@XmlType
-public class RouteTO extends AbstractBaseBean{
-
+public class RouteTO extends AbstractBaseBean {
+
private Long id;
private String name;
private String routeContent;
-
- public void setId(Long id){
+
+ public void setId(Long id) {
this.id = id;
}
@@ -41,7 +40,7 @@ public class RouteTO extends AbstractBaseBean{
return id;
}
- public void setName(String name) {
+ public void setName(final String name) {
this.name = name;
}
@@ -53,8 +52,8 @@ public class RouteTO extends AbstractBaseBean{
return routeContent;
}
- public void setRouteContent(String routeContent) {
+ public void setRouteContent(final String routeContent) {
this.routeContent = routeContent;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/a8f98d25/core/src/main/java/org/apache/syncope/core/provisioning/DefaultRoleProvisioningManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/DefaultRoleProvisioningManager.java b/core/src/main/java/org/apache/syncope/core/provisioning/DefaultRoleProvisioningManager.java
index 5986b8e..cee88d5 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/DefaultRoleProvisioningManager.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/DefaultRoleProvisioningManager.java
@@ -67,13 +67,12 @@ public class DefaultRoleProvisioningManager implements RoleProvisioningManager {
protected RoleDataBinder binder;
@Override
- public Map.Entry<Long, List<PropagationStatus>> create(RoleTO subject) {
+ public Map.Entry<Long, List<PropagationStatus>> create(final RoleTO subject) {
return create(subject, Collections.<String>emptySet());
}
@Override
- public Map.Entry<Long, List<PropagationStatus>> create(RoleTO subject, Set<String> excludedResources) {
-
+ public Map.Entry<Long, List<PropagationStatus>> create(final RoleTO subject, final Set<String> excludedResources) {
WorkflowResult<Long> created = rwfAdapter.create(subject);
EntitlementUtil.extendAuthContext(created.getResult());
@@ -97,8 +96,8 @@ public class DefaultRoleProvisioningManager implements RoleProvisioningManager {
}
@Override
- public Map.Entry<Long, List<PropagationStatus>> createInSync(RoleTO roleTO, Map<Long, String> roleOwnerMap,
- Set<String> excludedResources) throws PropagationException {
+ public Map.Entry<Long, List<PropagationStatus>> create(
+ final RoleTO roleTO, final Map<Long, String> roleOwnerMap, final Set<String> excludedResources) {
WorkflowResult<Long> created = rwfAdapter.create((RoleTO) roleTO);
AttributeTO roleOwner = roleTO.getAttrMap().get(StringUtils.EMPTY);
@@ -108,24 +107,22 @@ public class DefaultRoleProvisioningManager implements RoleProvisioningManager {
EntitlementUtil.extendAuthContext(created.getResult());
- List<PropagationTask> tasks = propagationManager.getRoleCreateTaskIds(created,
- roleTO.getVirAttrs(), excludedResources);
+ List<PropagationTask> tasks = propagationManager.getRoleCreateTaskIds(
+ created, roleTO.getVirAttrs(), excludedResources);
taskExecutor.execute(tasks);
- Map.Entry<Long, List<PropagationStatus>> result = new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(
- created.getResult(), null);
- return result;
+ return new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(created.getResult(), null);
}
@Override
- public Map.Entry<Long, List<PropagationStatus>> update(RoleMod subjectMod) {
-
+ public Map.Entry<Long, List<PropagationStatus>> update(final RoleMod subjectMod) {
return update(subjectMod, Collections.<String>emptySet());
}
@Override
- public Map.Entry<Long, List<PropagationStatus>> update(RoleMod subjectMod, Set<String> excludedResources) {
+ public Map.Entry<Long, List<PropagationStatus>> update(
+ final RoleMod subjectMod, final Set<String> excludedResources) {
WorkflowResult<Long> updated = rwfAdapter.update(subjectMod);
@@ -146,8 +143,7 @@ public class DefaultRoleProvisioningManager implements RoleProvisioningManager {
}
@Override
- public List<PropagationStatus> delete(Long subjectId) {
-
+ public List<PropagationStatus> delete(final Long subjectId) {
final List<SyncopeRole> toBeDeprovisioned = new ArrayList<SyncopeRole>();
final SyncopeRole syncopeRole = roleDAO.find(subjectId);
@@ -193,7 +189,7 @@ public class DefaultRoleProvisioningManager implements RoleProvisioningManager {
}
@Override
- public Long unlink(RoleMod subjectMod) {
+ public Long unlink(final RoleMod subjectMod) {
WorkflowResult<Long> updated = rwfAdapter.update(subjectMod);
return updated.getResult();
}
@@ -219,7 +215,7 @@ public class DefaultRoleProvisioningManager implements RoleProvisioningManager {
}
@Override
- public Long link(RoleMod subjectMod) {
+ public Long link(final RoleMod subjectMod) {
return rwfAdapter.update(subjectMod).getResult();
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/a8f98d25/core/src/main/java/org/apache/syncope/core/provisioning/DefaultUserProvisioningManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/DefaultUserProvisioningManager.java b/core/src/main/java/org/apache/syncope/core/provisioning/DefaultUserProvisioningManager.java
index ff0544f..f6549a4 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/DefaultUserProvisioningManager.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/DefaultUserProvisioningManager.java
@@ -72,38 +72,17 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
}
public Map.Entry<Long, List<PropagationStatus>> create(final UserTO userTO, boolean storePassword) {
- /* WorkflowResult<Map.Entry<Long, Boolean>> created;
- * try {
- * created = uwfAdapter.create(userTO,storePassword);
- * } catch (RuntimeException e) {
- * throw e;
- * }
- *
- * List<PropagationTask> tasks = propagationManager.getUserCreateTaskIds(
- * created, userTO.getPassword(), userTO.getVirAttrs(), userTO.getMemberships());
- *
- * PropagationReporter propagationReporter = ApplicationContextProvider.getApplicationContext().
- * getBean(PropagationReporter.class);
- * try {
- * taskExecutor.execute(tasks, propagationReporter);
- * } catch (PropagationException e) {
- * LOG.error("Error propagation primary resource", e);
- * propagationReporter.onPrimaryResourceFailure(tasks);
- * }
- *
- * Map.Entry<Long, List<PropagationStatus>> result = new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(
- * created.getResult().getKey(), propagationReporter.getStatuses());
- * return result; */
return create(userTO, storePassword, false, null, Collections.<String>emptySet());
}
@Override
- public Map.Entry<Long, List<PropagationStatus>> create(UserTO userTO, boolean storePassword,
- boolean disablePwdPolicyCheck, Boolean enabled, Set<String> excludedResources) {
+ public Map.Entry<Long, List<PropagationStatus>> create(final UserTO userTO, final boolean storePassword,
+ final boolean disablePwdPolicyCheck, final Boolean enabled, final Set<String> excludedResources) {
+
WorkflowResult<Map.Entry<Long, Boolean>> created;
try {
created = uwfAdapter.create(userTO, disablePwdPolicyCheck, enabled, storePassword);
- } catch (RuntimeException e) {
+ } catch (PropagationException e) {
throw e;
}
@@ -129,11 +108,11 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
}
@Override
- public Map.Entry<Long, List<PropagationStatus>> update(UserMod userMod, boolean removeMemberships) {
+ public Map.Entry<Long, List<PropagationStatus>> update(final UserMod userMod, final boolean removeMemberships) {
WorkflowResult<Map.Entry<UserMod, Boolean>> updated;
try {
updated = uwfAdapter.update(userMod);
- } catch (RuntimeException e) {
+ } catch (PropagationException e) {
throw e;
}
@@ -180,12 +159,11 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
@Override
public List<PropagationStatus> delete(final Long userId) {
-
return delete(userId, Collections.<String>emptySet());
}
@Override
- public List<PropagationStatus> delete(Long subjectId, Set<String> excludedResources) {
+ public List<PropagationStatus> delete(final Long subjectId, final Set<String> excludedResources) {
List<PropagationTask> tasks = propagationManager.getUserDeleteTaskIds(subjectId, excludedResources);
PropagationReporter propagationReporter = ApplicationContextProvider.getApplicationContext().
@@ -199,7 +177,7 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
try {
uwfAdapter.delete(subjectId);
- } catch (RuntimeException e) {
+ } catch (PropagationException e) {
throw e;
}
@@ -207,18 +185,18 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
}
@Override
- public Long unlink(UserMod userMod) {
+ public Long unlink(final UserMod userMod) {
WorkflowResult<Map.Entry<UserMod, Boolean>> updated = uwfAdapter.update(userMod);
return updated.getResult().getKey().getId();
}
@Override
- public Long link(UserMod subjectMod) {
+ public Long link(final UserMod subjectMod) {
return uwfAdapter.update(subjectMod).getResult().getKey().getId();
}
@Override
- public Map.Entry<Long, List<PropagationStatus>> activate(SyncopeUser user, StatusMod statusMod) {
+ public Map.Entry<Long, List<PropagationStatus>> activate(final SyncopeUser user, final StatusMod statusMod) {
WorkflowResult<Long> updated;
if (statusMod.isOnSyncope()) {
updated = uwfAdapter.activate(user.getId(), statusMod.getToken());
@@ -231,7 +209,7 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
}
@Override
- public Map.Entry<Long, List<PropagationStatus>> reactivate(SyncopeUser user, StatusMod statusMod) {
+ public Map.Entry<Long, List<PropagationStatus>> reactivate(final SyncopeUser user, final StatusMod statusMod) {
WorkflowResult<Long> updated;
if (statusMod.isOnSyncope()) {
updated = uwfAdapter.reactivate(user.getId());
@@ -244,7 +222,7 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
}
@Override
- public Map.Entry<Long, List<PropagationStatus>> suspend(SyncopeUser user, StatusMod statusMod) {
+ public Map.Entry<Long, List<PropagationStatus>> suspend(final SyncopeUser user, final StatusMod statusMod) {
WorkflowResult<Long> updated;
if (statusMod.isOnSyncope()) {
updated = uwfAdapter.suspend(user.getId());
@@ -256,8 +234,7 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
return new AbstractMap.SimpleEntry<Long, List<PropagationStatus>>(updated.getResult(), statuses);
}
- public List<PropagationStatus> propagateStatus(SyncopeUser user, StatusMod statusMod) {
-
+ protected List<PropagationStatus> propagateStatus(final SyncopeUser user, final StatusMod statusMod) {
Set<String> resourcesToBeExcluded = new HashSet<String>(user.getResourceNames());
resourcesToBeExcluded.removeAll(statusMod.getResourceNames());
@@ -277,8 +254,25 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
}
@Override
- public List<PropagationStatus> deprovision(Long userId, Collection<String> resources) {
+ public void innerSuspend(final SyncopeUser user, final boolean propagate) {
+ final WorkflowResult<Long> updated = uwfAdapter.suspend(user);
+
+ // propagate suspension if and only if it is required by policy
+ if (propagate) {
+ UserMod userMod = new UserMod();
+ userMod.setId(updated.getResult());
+
+ final List<PropagationTask> tasks = propagationManager.getUserUpdateTaskIds(
+ new WorkflowResult<Map.Entry<UserMod, Boolean>>(
+ new AbstractMap.SimpleEntry<UserMod, Boolean>(userMod, Boolean.FALSE),
+ updated.getPropByRes(), updated.getPerformedTasks()));
+
+ taskExecutor.execute(tasks);
+ }
+ }
+ @Override
+ public List<PropagationStatus> deprovision(final Long userId, final Collection<String> resources) {
final SyncopeUser user = binder.getUserFromId(userId);
final Set<String> noPropResourceName = user.getResourceNames();
@@ -299,8 +293,8 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
}
@Override
- public Map.Entry<Long, List<PropagationStatus>> updateInSync(final UserMod userMod, final Long id,
- final SyncResult result, Boolean enabled, Set<String> excludedResources) {
+ public Map.Entry<Long, List<PropagationStatus>> update(final UserMod userMod, final Long id,
+ final SyncResult result, final Boolean enabled, final Set<String> excludedResources) {
WorkflowResult<Map.Entry<UserMod, Boolean>> updated;
try {
@@ -340,8 +334,8 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
PropagationReporter propagationReporter = ApplicationContextProvider.getApplicationContext().
getBean(PropagationReporter.class);
- List<PropagationTask> tasks = propagationManager.getUserUpdateTaskIds(updated, updated.getResult().getKey().
- getPassword() != null, excludedResources);
+ List<PropagationTask> tasks = propagationManager.getUserUpdateTaskIds(
+ updated, updated.getResult().getKey().getPassword() != null, excludedResources);
try {
taskExecutor.execute(tasks, propagationReporter);
@@ -356,32 +350,12 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
}
@Override
- public void innerSuspend(SyncopeUser user, boolean suspend) {
-
- final WorkflowResult<Long> updated = uwfAdapter.suspend(user);
-
- // propagate suspension if and only if it is required by policy
- if (suspend) {
- UserMod userMod = new UserMod();
- userMod.setId(updated.getResult());
-
- final List<PropagationTask> tasks = propagationManager.getUserUpdateTaskIds(
- new WorkflowResult<Map.Entry<UserMod, Boolean>>(
- new AbstractMap.SimpleEntry<UserMod, Boolean>(userMod, Boolean.FALSE),
- updated.getPropByRes(), updated.getPerformedTasks()));
-
- taskExecutor.execute(tasks);
- }
- }
-
- @Override
- public void requestPasswordReset(Long id) {
+ public void requestPasswordReset(final Long id) {
uwfAdapter.requestPasswordReset(id);
}
@Override
- public void confirmPasswordReset(SyncopeUser user, String token, String password) {
-
+ public void confirmPasswordReset(final SyncopeUser user, final String token, final String password) {
uwfAdapter.confirmPasswordReset(user.getId(), token, password);
List<PropagationTask> tasks = propagationManager.getUserUpdateTaskIds(user, null, null);
http://git-wip-us.apache.org/repos/asf/syncope/blob/a8f98d25/core/src/main/java/org/apache/syncope/core/provisioning/ProvisioningManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/ProvisioningManager.java b/core/src/main/java/org/apache/syncope/core/provisioning/ProvisioningManager.java
index 65f7f7d..7546ca3 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/ProvisioningManager.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/ProvisioningManager.java
@@ -27,16 +27,16 @@ import org.apache.syncope.common.to.PropagationStatus;
public interface ProvisioningManager<T extends AbstractAttributableTO, M extends AbstractAttributableMod> {
- public Map.Entry<Long, List<PropagationStatus>> create(T subject);
+ Map.Entry<Long, List<PropagationStatus>> create(T subject);
- public Map.Entry<Long, List<PropagationStatus>> update(M subjectMod);
+ Map.Entry<Long, List<PropagationStatus>> update(M subjectMod);
- public List<PropagationStatus> delete(Long subjectId);
+ List<PropagationStatus> delete(Long subjectId);
- public Long unlink(M subjectMod);
+ Long unlink(M subjectMod);
- public Long link(M subjectMod);
+ Long link(M subjectMod);
- public List<PropagationStatus> deprovision(Long user, Collection<String> resources);
+ List<PropagationStatus> deprovision(Long user, Collection<String> resources);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/a8f98d25/core/src/main/java/org/apache/syncope/core/provisioning/RoleProvisioningManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/RoleProvisioningManager.java b/core/src/main/java/org/apache/syncope/core/provisioning/RoleProvisioningManager.java
index 53029ac..df58543 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/RoleProvisioningManager.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/RoleProvisioningManager.java
@@ -1,17 +1,20 @@
/*
- * Copyright 2013 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.syncope.core.provisioning;
@@ -21,15 +24,14 @@ import java.util.Set;
import org.apache.syncope.common.to.RoleTO;
import org.apache.syncope.common.mod.RoleMod;
import org.apache.syncope.common.to.PropagationStatus;
-import org.apache.syncope.core.propagation.PropagationException;
public interface RoleProvisioningManager extends ProvisioningManager<RoleTO, RoleMod> {
- public Map.Entry<Long, List<PropagationStatus>> create(final RoleTO roleTO, Set<String> excludedResources);
+ Map.Entry<Long, List<PropagationStatus>> create(RoleTO roleTO, Set<String> excludedResources);
- public Map.Entry<Long, List<PropagationStatus>> createInSync(final RoleTO roleTO, Map<Long, String> roleOwnerMap,
- Set<String> excludedResources) throws PropagationException;
+ Map.Entry<Long, List<PropagationStatus>> create(
+ RoleTO roleTO, Map<Long, String> roleOwnerMap, Set<String> excludedResources);
- public Map.Entry<Long, List<PropagationStatus>> update(RoleMod subjectMod, Set<String> excludedResources);
+ Map.Entry<Long, List<PropagationStatus>> update(RoleMod subjectMod, Set<String> excludedResources);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/a8f98d25/core/src/main/java/org/apache/syncope/core/provisioning/UserProvisioningManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/UserProvisioningManager.java b/core/src/main/java/org/apache/syncope/core/provisioning/UserProvisioningManager.java
index c5b70a8..57d8aec 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/UserProvisioningManager.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/UserProvisioningManager.java
@@ -1,17 +1,20 @@
/*
- * Copyright 2013 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.syncope.core.provisioning;
@@ -19,7 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.syncope.common.mod.StatusMod;
-import org.apache.syncope.core.workflow.WorkflowResult;
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.common.mod.UserMod;
import org.apache.syncope.common.to.PropagationStatus;
@@ -28,28 +30,28 @@ import org.apache.syncope.core.sync.SyncResult;
public interface UserProvisioningManager extends ProvisioningManager<UserTO, UserMod> {
- public Map.Entry<Long, List<PropagationStatus>> activate(SyncopeUser user, StatusMod statusMod);
+ Map.Entry<Long, List<PropagationStatus>> activate(SyncopeUser user, StatusMod statusMod);
- public Map.Entry<Long, List<PropagationStatus>> reactivate(SyncopeUser user, StatusMod statusMod);
+ Map.Entry<Long, List<PropagationStatus>> reactivate(SyncopeUser user, StatusMod statusMod);
- public Map.Entry<Long, List<PropagationStatus>> suspend(SyncopeUser user, StatusMod statusMod);
+ Map.Entry<Long, List<PropagationStatus>> suspend(SyncopeUser user, StatusMod statusMod);
- public Map.Entry<Long, List<PropagationStatus>> create(final UserTO userTO, final boolean storePassword);
+ void innerSuspend(SyncopeUser user, boolean propagate);
- public Map.Entry<Long, List<PropagationStatus>> create(final UserTO userTO, final boolean storePassword,
- boolean disablePwdPolicyCheck, Boolean enabled, Set<String> excludedResources);
+ Map.Entry<Long, List<PropagationStatus>> create(UserTO userTO, boolean storePassword);
- public Map.Entry<Long, List<PropagationStatus>> update(final UserMod userMod, final boolean removeMemberships);
+ Map.Entry<Long, List<PropagationStatus>> create(UserTO userTO, boolean storePassword,
+ boolean disablePwdPolicyCheck, Boolean enabled, Set<String> excludedResources);
- public Map.Entry<Long, List<PropagationStatus>> updateInSync(final UserMod userMod, final Long id,
- final SyncResult result, Boolean enabled, Set<String> excludedResources);
+ Map.Entry<Long, List<PropagationStatus>> update(UserMod userMod, boolean removeMemberships);
- public List<PropagationStatus> delete(Long subjectId, Set<String> excludedResources);
+ Map.Entry<Long, List<PropagationStatus>> update(UserMod userMod, Long id,
+ SyncResult result, Boolean enabled, Set<String> excludedResources);
- public void innerSuspend(SyncopeUser user, boolean suspend);
+ List<PropagationStatus> delete(Long subjectKey, Set<String> excludedResources);
- public void requestPasswordReset(final Long id);
+ void requestPasswordReset(Long id);
- public void confirmPasswordReset(SyncopeUser user, final String token, final String password);
+ void confirmPasswordReset(SyncopeUser user, String token, String password);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/a8f98d25/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelRoleProvisioningManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelRoleProvisioningManager.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelRoleProvisioningManager.java
index 96f5227..6e75771 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelRoleProvisioningManager.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelRoleProvisioningManager.java
@@ -168,7 +168,7 @@ public class CamelRoleProvisioningManager implements RoleProvisioningManager {
@Override
@SuppressWarnings("unchecked")
- public Map.Entry<Long, List<PropagationStatus>> createInSync(RoleTO roleTO, Map<Long, String> roleOwnerMap,
+ public Map.Entry<Long, List<PropagationStatus>> create(RoleTO roleTO, Map<Long, String> roleOwnerMap,
Set<String> excludedResources) throws PropagationException {
String uri = "direct:createRoleSyncPort";
http://git-wip-us.apache.org/repos/asf/syncope/blob/a8f98d25/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java
index c65f8eb..9ad7396 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/CamelUserProvisioningManager.java
@@ -396,7 +396,7 @@ public class CamelUserProvisioningManager implements UserProvisioningManager {
@Override
@SuppressWarnings("unchecked")
- public Map.Entry<Long, List<PropagationStatus>> updateInSync(UserMod userMod, Long id, SyncResult result,
+ public Map.Entry<Long, List<PropagationStatus>> update(UserMod userMod, Long id, SyncResult result,
Boolean enabled, Set<String> excludedResources) {
String uri = "direct:updateSyncPort";
http://git-wip-us.apache.org/repos/asf/syncope/blob/a8f98d25/core/src/main/java/org/apache/syncope/core/sync/impl/RoleSyncResultHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/sync/impl/RoleSyncResultHandler.java b/core/src/main/java/org/apache/syncope/core/sync/impl/RoleSyncResultHandler.java
index 4e83e66..9ac8056 100644
--- a/core/src/main/java/org/apache/syncope/core/sync/impl/RoleSyncResultHandler.java
+++ b/core/src/main/java/org/apache/syncope/core/sync/impl/RoleSyncResultHandler.java
@@ -86,7 +86,7 @@ public class RoleSyncResultHandler extends AbstractSubjectSyncResultHandler {
RoleTO roleTO = RoleTO.class.cast(subjectTO);
- Map.Entry<Long, List<PropagationStatus>> created = roleProvisioningManager.createInSync(roleTO, roleOwnerMap,
+ Map.Entry<Long, List<PropagationStatus>> created = roleProvisioningManager.create(roleTO, roleOwnerMap,
Collections.singleton(profile.getSyncTask().getResource().getName()));
roleTO = roleDataBinder.getRoleTO(created.getKey());
http://git-wip-us.apache.org/repos/asf/syncope/blob/a8f98d25/core/src/main/java/org/apache/syncope/core/sync/impl/UserSyncResultHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/sync/impl/UserSyncResultHandler.java b/core/src/main/java/org/apache/syncope/core/sync/impl/UserSyncResultHandler.java
index 6802726..d539fe5 100644
--- a/core/src/main/java/org/apache/syncope/core/sync/impl/UserSyncResultHandler.java
+++ b/core/src/main/java/org/apache/syncope/core/sync/impl/UserSyncResultHandler.java
@@ -164,7 +164,7 @@ public class UserSyncResultHandler extends AbstractSubjectSyncResultHandler {
*
* taskExecutor.execute(tasks); */
- Map.Entry<Long, List<PropagationStatus>> updated = userProvisioningManager.updateInSync(userMod, before.getId(),
+ Map.Entry<Long, List<PropagationStatus>> updated = userProvisioningManager.update(userMod, before.getId(),
result, enabled, Collections.singleton(profile.getSyncTask().getResource().getName()));
return userDataBinder.getUserTO(updated.getKey());