diff options
Diffstat (limited to 'sonar-db/src/main/java/org')
4 files changed, 0 insertions, 34 deletions
diff --git a/sonar-db/src/main/java/org/sonar/db/user/GroupDao.java b/sonar-db/src/main/java/org/sonar/db/user/GroupDao.java index be74102e5c9..a046383ecb1 100644 --- a/sonar-db/src/main/java/org/sonar/db/user/GroupDao.java +++ b/sonar-db/src/main/java/org/sonar/db/user/GroupDao.java @@ -115,17 +115,6 @@ public class GroupDao implements Dao { return mapper(dbSession).selectByOrganizationUuid(organizationUuid); } - /** - * Ensures all users of the specified group have its root flag set or unset depending on whether each of them have the - * 'admin' permission in the default organization or not. - */ - public void updateRootFlagOfUsersInGroupFromPermissions(DbSession dbSession, long groupId, String defaultOrganizationUuid) { - long now = system.now(); - GroupMapper mapper = mapper(dbSession); - mapper.updateRootUsersOfGroup(groupId, defaultOrganizationUuid, now); - mapper.updateNonRootUsersOfGroup(groupId, defaultOrganizationUuid, now); - } - private static GroupMapper mapper(DbSession session) { return session.getMapper(GroupMapper.class); } diff --git a/sonar-db/src/main/java/org/sonar/db/user/GroupMapper.java b/sonar-db/src/main/java/org/sonar/db/user/GroupMapper.java index eeb2ab8e9b0..f6a7164b5b8 100644 --- a/sonar-db/src/main/java/org/sonar/db/user/GroupMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/user/GroupMapper.java @@ -58,13 +58,5 @@ public interface GroupMapper { List<GroupDto> selectByOrganizationUuid(@Param("organizationUuid") String organizationUuid); - int updateRootUsersOfGroup(@Param("groupId") long groupId, - @Param("defaultOrganizationUuid") String defaultOrganizationUuid, - @Param("now") long now); - - int updateNonRootUsersOfGroup(@Param("groupId") long groupId, - @Param("defaultOrganizationUuid") String defaultOrganizationUuid, - @Param("now") long now); - List<GroupDto> selectByIds(@Param("ids") List<Long> ids); } diff --git a/sonar-db/src/main/java/org/sonar/db/user/UserDao.java b/sonar-db/src/main/java/org/sonar/db/user/UserDao.java index 19c5cde9b28..0a87ffddae5 100644 --- a/sonar-db/src/main/java/org/sonar/db/user/UserDao.java +++ b/sonar-db/src/main/java/org/sonar/db/user/UserDao.java @@ -194,17 +194,6 @@ public class UserDao implements Dao { return mapper(dbSession).countByEmail(email.toLowerCase(Locale.ENGLISH)) > 0; } - /** - * Ensures the specified user has its root flag set or unset depending on whether the user has the 'admin' permission - * in the default organization or not. - */ - public void updateRootFlagFromPermissions(DbSession dbSession, long userId, String defaultOrganizationUuid) { - long now = system2.now(); - UserMapper mapper = mapper(dbSession); - mapper.updateRootUser(userId, defaultOrganizationUuid, now); - mapper.updateNonRootUser(userId, defaultOrganizationUuid, now); - } - protected UserMapper mapper(DbSession session) { return session.getMapper(UserMapper.class); } diff --git a/sonar-db/src/main/java/org/sonar/db/user/UserMapper.java b/sonar-db/src/main/java/org/sonar/db/user/UserMapper.java index 799d73f2414..b7cf25be54e 100644 --- a/sonar-db/src/main/java/org/sonar/db/user/UserMapper.java +++ b/sonar-db/src/main/java/org/sonar/db/user/UserMapper.java @@ -74,8 +74,4 @@ public interface UserMapper { void deactivateUser(@Param("id") long userId, @Param("now") long now); - int updateRootUser(@Param("userId") long userId, @Param("defaultOrganizationUuid") String defaultOrganizationUuid, @Param("now") long now); - - int updateNonRootUser(@Param("userId") long userId, @Param("defaultOrganizationUuid") String defaultOrganizationUuid, @Param("now") long now); - } |