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 2022/04/12 10:10:56 UTC
[syncope] branch 2_1_X updated: White noise: align with master
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 499ec8ec62 White noise: align with master
499ec8ec62 is described below
commit 499ec8ec62569149596ec44a83439e100df68b25
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon Apr 11 14:55:21 2022 +0200
White noise: align with master
---
.../core/persistence/jpa/dao/JPAAnyObjectDAO.java | 3 +-
.../core/persistence/jpa/dao/JPAUserDAO.java | 3 +-
.../java/DefaultAnyObjectProvisioningManager.java | 9 +---
.../provisioning/java/data/UserDataBinderImpl.java | 59 +++++++++-------------
.../workflow/api/AnyObjectWorkflowAdapter.java | 6 +--
5 files changed, 34 insertions(+), 46 deletions(-)
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnyObjectDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnyObjectDAO.java
index 579be3e4a8..aa76215e8f 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnyObjectDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnyObjectDAO.java
@@ -43,6 +43,7 @@ import org.apache.syncope.core.persistence.api.dao.UserDAO;
import org.apache.syncope.core.persistence.api.entity.Any;
import org.apache.syncope.core.persistence.api.entity.AnyType;
import org.apache.syncope.core.persistence.api.entity.AnyUtils;
+import org.apache.syncope.core.persistence.api.entity.Membership;
import org.apache.syncope.core.persistence.api.entity.Realm;
import org.apache.syncope.core.persistence.api.entity.Relationship;
import org.apache.syncope.core.persistence.api.entity.anyobject.AMembership;
@@ -307,7 +308,7 @@ public class JPAAnyObjectDAO extends AbstractAnyDAO<AnyObject> implements AnyObj
public Collection<Group> findAllGroups(final AnyObject anyObject) {
Set<Group> result = new HashSet<>();
result.addAll(anyObject.getMemberships().stream().
- map(membership -> membership.getRightEnd()).collect(Collectors.toSet()));
+ map(Membership::getRightEnd).collect(Collectors.toSet()));
result.addAll(findDynGroups(anyObject.getKey()));
return result;
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAUserDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAUserDAO.java
index d8169f17b2..dd0592af6d 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAUserDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAUserDAO.java
@@ -53,6 +53,7 @@ import org.apache.syncope.core.persistence.api.entity.AnyUtils;
import org.apache.syncope.core.persistence.api.entity.Delegation;
import org.apache.syncope.core.persistence.api.entity.Entity;
import org.apache.syncope.core.persistence.api.entity.Implementation;
+import org.apache.syncope.core.persistence.api.entity.Membership;
import org.apache.syncope.core.persistence.api.entity.Privilege;
import org.apache.syncope.core.persistence.api.entity.Realm;
import org.apache.syncope.core.persistence.api.entity.Role;
@@ -553,7 +554,7 @@ public class JPAUserDAO extends AbstractAnyDAO<User> implements UserDAO {
public Collection<Group> findAllGroups(final User user) {
Set<Group> result = new HashSet<>();
result.addAll(user.getMemberships().stream().
- map(membership -> membership.getRightEnd()).collect(Collectors.toSet()));
+ map(Membership::getRightEnd).collect(Collectors.toSet()));
result.addAll(findDynGroups(user.getKey()));
return result;
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 171fc88ffe..2069d19a98 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
@@ -37,7 +37,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.provisioning.api.VirAttrHandler;
-import org.apache.syncope.core.provisioning.api.propagation.PropagationException;
import org.apache.syncope.core.provisioning.api.propagation.PropagationTaskInfo;
import org.apache.syncope.core.workflow.api.AnyObjectWorkflowAdapter;
import org.springframework.beans.factory.annotation.Autowired;
@@ -132,7 +131,7 @@ public class DefaultAnyObjectProvisioningManager implements AnyObjectProvisionin
// task defined in workflow process definition: this because this
// information could only be available after awfAdapter.delete(), which
// will also effectively remove user from db, thus making virtually
- // impossible by NotificationManager to fetch required user information
+ // impossible by NotificationManager to fetch required any object information
List<PropagationTaskInfo> taskInfos = propagationManager.getDeleteTasks(
AnyTypeKind.ANY_OBJECT,
key,
@@ -141,11 +140,7 @@ public class DefaultAnyObjectProvisioningManager implements AnyObjectProvisionin
excludedResources);
PropagationReporter propagationReporter = taskExecutor.execute(taskInfos, nullPriorityAsync);
- try {
- awfAdapter.delete(key);
- } catch (PropagationException e) {
- throw e;
- }
+ awfAdapter.delete(key);
return propagationReporter.getStatuses();
}
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
index 606254e894..c9e4ca4e99 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
@@ -61,7 +61,6 @@ import org.apache.syncope.core.persistence.api.dao.DelegationDAO;
import org.apache.syncope.core.persistence.api.dao.RoleDAO;
import org.apache.syncope.core.persistence.api.entity.AccessToken;
import org.apache.syncope.core.persistence.api.entity.AnyUtils;
-import org.apache.syncope.core.persistence.api.entity.Delegation;
import org.apache.syncope.core.persistence.api.entity.PlainSchema;
import org.apache.syncope.core.persistence.api.entity.Privilege;
import org.apache.syncope.core.persistence.api.entity.Realm;
@@ -242,23 +241,6 @@ public class UserDataBinderImpl extends AbstractAnyDataBinder implements UserDat
}
}
- private LinkedAccountTO getLinkedAccountTO(final LinkedAccount account, final boolean returnPasswordValue) {
- LinkedAccountTO accountTO = new LinkedAccountTO.Builder(
- account.getKey(), account.getResource().getKey(), account.getConnObjectKeyValue()).
- username(account.getUsername()).
- password(returnPasswordValue ? account.getPassword() : null).
- suspended(BooleanUtils.isTrue(account.isSuspended())).
- build();
-
- account.getPlainAttrs().forEach(plainAttr -> accountTO.getPlainAttrs().add(new AttrTO.Builder().
- schema(plainAttr.getSchema().getKey()).values(plainAttr.getValuesAsStrings()).build()));
-
- accountTO.getPrivileges().addAll(account.getPrivileges().stream().
- map(Privilege::getKey).collect(Collectors.toList()));
-
- return accountTO;
- }
-
@Override
public void create(final User user, final UserTO userTO, final boolean storePassword) {
SyncopeClientCompositeException scce = SyncopeClientException.buildComposite();
@@ -712,6 +694,23 @@ public class UserDataBinderImpl extends AbstractAnyDataBinder implements UserDat
return Pair.of(propByRes, propByLinkedAccount);
}
+ private LinkedAccountTO getLinkedAccountTO(final LinkedAccount account, final boolean returnPasswordValue) {
+ LinkedAccountTO accountTO = new LinkedAccountTO.Builder(
+ account.getKey(), account.getResource().getKey(), account.getConnObjectKeyValue()).
+ username(account.getUsername()).
+ password(returnPasswordValue ? account.getPassword() : null).
+ suspended(BooleanUtils.isTrue(account.isSuspended())).
+ build();
+
+ account.getPlainAttrs().forEach(plainAttr -> accountTO.getPlainAttrs().add(new AttrTO.Builder().
+ schema(plainAttr.getSchema().getKey()).values(plainAttr.getValuesAsStrings()).build()));
+
+ accountTO.getPrivileges().addAll(account.getPrivileges().stream().
+ map(Privilege::getKey).collect(Collectors.toList()));
+
+ return accountTO;
+ }
+
@Transactional(readOnly = true)
@Override
public LinkedAccountTO getLinkedAccountTO(final LinkedAccount account) {
@@ -777,29 +776,21 @@ public class UserDataBinderImpl extends AbstractAnyDataBinder implements UserDat
collect(Collectors.toList()));
// memberships
- userTO.getMemberships().addAll(
- user.getMemberships().stream().map(membership -> getMembershipTO(
- user.getPlainAttrs(membership),
+ userTO.getMemberships().addAll(user.getMemberships().stream().
+ map(membership -> getMembershipTO(user.getPlainAttrs(membership),
derAttrHandler.getValues(user, membership),
virAttrHandler.getValues(user, membership),
membership)).collect(Collectors.toList()));
// dynamic memberships
- userTO.getDynMemberships().addAll(
- userDAO.findDynGroups(user.getKey()).stream().map(group -> new MembershipTO.Builder().
- group(group.getKey(), group.getName()).
- build()).collect(Collectors.toList()));
+ userTO.getDynMemberships().addAll(userDAO.findDynGroups(user.getKey()).stream().
+ map(group -> new MembershipTO.Builder().group(group.getKey(), group.getName()).build()).
+ collect(Collectors.toList()));
// linked accounts
- userTO.getLinkedAccounts().addAll(
- user.getLinkedAccounts().stream().map(a -> getLinkedAccountTO(a, returnPasswordValue))
- .collect(Collectors.toList()));
-
- // delegations
- userTO.getDelegatingDelegations().addAll(
- delegationDAO.findByDelegating(user).stream().map(Delegation::getKey).collect(Collectors.toList()));
- userTO.getDelegatedDelegations().addAll(
- delegationDAO.findByDelegated(user).stream().map(Delegation::getKey).collect(Collectors.toList()));
+ userTO.getLinkedAccounts().addAll(user.getLinkedAccounts().stream().
+ map(account -> getLinkedAccountTO(account, returnPasswordValue)).
+ collect(Collectors.toList()));
}
return userTO;
diff --git a/core/workflow-api/src/main/java/org/apache/syncope/core/workflow/api/AnyObjectWorkflowAdapter.java b/core/workflow-api/src/main/java/org/apache/syncope/core/workflow/api/AnyObjectWorkflowAdapter.java
index 1f7daca747..553a59d560 100644
--- a/core/workflow-api/src/main/java/org/apache/syncope/core/workflow/api/AnyObjectWorkflowAdapter.java
+++ b/core/workflow-api/src/main/java/org/apache/syncope/core/workflow/api/AnyObjectWorkflowAdapter.java
@@ -28,7 +28,7 @@ import org.apache.syncope.common.lib.to.AnyObjectTO;
public interface AnyObjectWorkflowAdapter extends WorkflowAdapter {
/**
- * Create a anyObject.
+ * Create an anyObject.
*
* @param anyObjectTO anyObject to be created and whether to propagate it as active
* @return anyObject just created
@@ -36,7 +36,7 @@ public interface AnyObjectWorkflowAdapter extends WorkflowAdapter {
WorkflowResult<String> create(AnyObjectTO anyObjectTO);
/**
- * Update a anyObject.
+ * Update an anyObject.
*
* @param anyObjectPatch modification set to be performed
* @return anyObject just updated and propagations to be performed
@@ -44,7 +44,7 @@ public interface AnyObjectWorkflowAdapter extends WorkflowAdapter {
WorkflowResult<AnyObjectPatch> update(AnyObjectPatch anyObjectPatch);
/**
- * Delete a anyObject.
+ * Delete an anyObject.
*
* @param anyObjectKey anyObject to be deleted
*/