From 4340be1a16312c8c05e05ccff3698d0f13167dcd Mon Sep 17 00:00:00 2001
From: Dennis Aulenbacher <dennis.aulenbacher@trivadis.com>
Date: Wed, 10 Mar 2021 11:07:55 +0100
Subject: [PATCH] bug5230: Variable renaming.

---
 .../sse/security/interfaces/UserStore.java    |  2 --
 .../userstore/mongodb/UserStoreImpl.java      | 23 +++++++++----------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/java/com.sap.sse.security.interface/src/com/sap/sse/security/interfaces/UserStore.java b/java/com.sap.sse.security.interface/src/com/sap/sse/security/interfaces/UserStore.java
index bfbc4779106..1ad496d59e6 100644
--- a/java/com.sap.sse.security.interface/src/com/sap/sse/security/interfaces/UserStore.java
+++ b/java/com.sap.sse.security.interface/src/com/sap/sse/security/interfaces/UserStore.java
@@ -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;
diff --git a/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/UserStoreImpl.java b/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/UserStoreImpl.java
index 632ffb245f1..d27542ff004 100644
--- a/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/UserStoreImpl.java
+++ b/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/UserStoreImpl.java
@@ -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);
                 }
             }
         }