eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-22 21:55:39 +00:00
Code Activity

bug5230: Variable renaming.

Browse Source
This commit is contained in:
Dennis Aulenbacher
2021-03-10 11:07:55 +01:00
parent d353a0495a
commit 4340be1a16
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sse.security.interface/src/com/sap/sse/security/interfaces/UserStore.java
-2
View File
@@ -112,8 +112,6 @@ public interface UserStore extends BasicUserStore {
*/
UserGroup ensureServerGroupExists() throws UserGroupManagementException;
void removeAllQualifiedRolesForUser(User user);
RoleDefinition getRoleDefinitionByPrototype(RolePrototype rolePrototype);
void deleteUserGroup(UserGroup userGroup) throws UserGroupManagementException;
java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/UserStoreImpl.java
+11 -12
View File
@@ -1460,22 +1460,21 @@ public class UserStoreImpl implements UserStore {
});
}
@Override
public void removeAllQualifiedRolesForUser(User user) {
private void removeAllQualifiedRolesForUser(User user) {
LockUtil.executeWithWriteLock(usersLock, () -> {
for (User checkUser : users.values()) {
Set<Role> rolesToRemoveOrAdjust = new HashSet<>();
Set<Role> rolesToRemove = new HashSet<>();
for (Role role : checkUser.getRoles()) {
if (Util.equalsWithNull(role.getQualifiedForUser(), user)) {
rolesToRemoveOrAdjust.add(role);
rolesToRemove.add(role);
}
}
for (Role removeOrAdjust : rolesToRemoveOrAdjust) {
for (Role roleToRremove : rolesToRemove) {
try {
removeRoleFromUser(checkUser.getName(), removeOrAdjust);
removeRoleFromUser(checkUser.getName(), roleToRremove);
} catch (UserManagementException e) {
logger.log(Level.WARNING,
"Could not properly update qualified roles on user delete " + removeOrAdjust);
"Could not properly update qualified roles on user delete " + roleToRremove);
}
}
}
@@ -1485,18 +1484,18 @@ public class UserStoreImpl implements UserStore {
private void removeAllQualifiedRolesForUserGroup(UserGroup userGroup) {
assert usersLock.isWriteLockedByCurrentThread();
for (User checkUser : users.values()) {
Set<Role> rolesToRemoveOrAdjust = new HashSet<>();
Set<Role> rolesToRemove = new HashSet<>();
for (Role role : checkUser.getRoles()) {
if (Util.equalsWithNull(role.getQualifiedForTenant(), userGroup)) {
rolesToRemoveOrAdjust.add(role);
rolesToRemove.add(role);
}
}
for (Role removeOrAdjust : rolesToRemoveOrAdjust) {
for (Role roleToRemove : rolesToRemove) {
try {
removeRoleFromUser(checkUser.getName(), removeOrAdjust);
removeRoleFromUser(checkUser.getName(), roleToRemove);
} catch (UserManagementException e) {
logger.log(Level.WARNING,
"Could not properly update qualified roles on userGroup delete " + removeOrAdjust);
"Could not properly update qualified roles on userGroup delete " + roleToRemove);
}
}
}