From d8e2d42e70807608e015381b55d2431db73bc574 Mon Sep 17 00:00:00 2001 From: Teryk Bellahsene Date: Thu, 23 Jul 2015 10:14:08 +0200 Subject: [PATCH] Move GroupDao to sonar-db --- .../java/org/sonar/server/db/DbClient.java | 7 ------- .../platform/platformlevel/PlatformLevel1.java | 2 +- .../server/usergroups/ws/AddUserAction.java | 5 ++++- .../server/usergroups/ws/DeleteAction.java | 2 +- .../server/usergroups/ws/UsersAction.java | 7 ++++++- .../server/issue/IssueServiceMediumTest.java | 2 +- .../org/sonar/server/user/UserUpdaterTest.java | 2 +- .../user/ws/ChangePasswordActionTest.java | 2 +- .../sonar/server/user/ws/CreateActionTest.java | 2 +- .../sonar/server/user/ws/GroupsActionTest.java | 2 +- .../sonar/server/user/ws/SearchActionTest.java | 2 +- .../sonar/server/user/ws/UpdateActionTest.java | 2 +- .../usergroups/ws/AddUserActionTest.java | 2 +- .../server/usergroups/ws/CreateActionTest.java | 2 +- .../server/usergroups/ws/DeleteActionTest.java | 18 +++++++++--------- .../usergroups/ws/RemoveUserActionTest.java | 2 +- .../server/usergroups/ws/SearchActionTest.java | 2 +- .../server/usergroups/ws/UpdateActionTest.java | 2 +- .../server/usergroups/ws/UsersActionTest.java | 2 +- .../src/main/java/org/sonar/db/DbClient.java | 7 +++++++ .../main/java/org/sonar/db/user}/GroupDao.java | 10 ++++------ .../java/org/sonar/db/user}/GroupDaoTest.java | 3 +-- .../org/sonar/db/user}/GroupDaoTest/empty.xml | 0 .../user}/GroupDaoTest/find_by_user_login.xml | 0 .../db/user}/GroupDaoTest/insert-result.xml | 0 .../db/user}/GroupDaoTest/select_by_key.xml | 0 .../db/user}/GroupDaoTest/select_by_query.xml | 0 .../db/user}/GroupDaoTest/update-result.xml | 0 .../org/sonar/db/user}/GroupDaoTest/update.xml | 0 29 files changed, 46 insertions(+), 41 deletions(-) rename {server/sonar-server/src/main/java/org/sonar/server/user/db => sonar-db/src/main/java/org/sonar/db/user}/GroupDao.java (90%) rename {server/sonar-server/src/test/java/org/sonar/server/user/db => sonar-db/src/test/java/org/sonar/db/user}/GroupDaoTest.java (98%) rename {server/sonar-server/src/test/resources/org/sonar/server/user/db => sonar-db/src/test/resources/org/sonar/db/user}/GroupDaoTest/empty.xml (100%) rename {server/sonar-server/src/test/resources/org/sonar/server/user/db => sonar-db/src/test/resources/org/sonar/db/user}/GroupDaoTest/find_by_user_login.xml (100%) rename {server/sonar-server/src/test/resources/org/sonar/server/user/db => sonar-db/src/test/resources/org/sonar/db/user}/GroupDaoTest/insert-result.xml (100%) rename {server/sonar-server/src/test/resources/org/sonar/server/user/db => sonar-db/src/test/resources/org/sonar/db/user}/GroupDaoTest/select_by_key.xml (100%) rename {server/sonar-server/src/test/resources/org/sonar/server/user/db => sonar-db/src/test/resources/org/sonar/db/user}/GroupDaoTest/select_by_query.xml (100%) rename {server/sonar-server/src/test/resources/org/sonar/server/user/db => sonar-db/src/test/resources/org/sonar/db/user}/GroupDaoTest/update-result.xml (100%) rename {server/sonar-server/src/test/resources/org/sonar/server/user/db => sonar-db/src/test/resources/org/sonar/db/user}/GroupDaoTest/update.xml (100%) diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java b/server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java index f52b3906c51..684a0fb426b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java +++ b/server/sonar-server/src/main/java/org/sonar/server/db/DbClient.java @@ -25,7 +25,6 @@ import org.sonar.db.Database; import org.sonar.db.MyBatis; import org.sonar.server.qualityprofile.db.ActiveRuleDao; import org.sonar.server.rule.db.RuleDao; -import org.sonar.server.user.db.GroupDao; import org.sonar.server.user.db.UserDao; /** @@ -35,7 +34,6 @@ import org.sonar.server.user.db.UserDao; public class DbClient extends org.sonar.db.DbClient { private ActiveRuleDao activeRuleDao; - private GroupDao groupDao; private RuleDao ruleDao; private UserDao userDao; @@ -46,7 +44,6 @@ public class DbClient extends org.sonar.db.DbClient { @Override protected void doOnLoad(Map daoByClass) { this.activeRuleDao = (ActiveRuleDao) daoByClass.get(ActiveRuleDao.class); - this.groupDao = (GroupDao) daoByClass.get(GroupDao.class); this.ruleDao = (RuleDao) daoByClass.get(RuleDao.class); this.userDao = (UserDao) daoByClass.get(UserDao.class); } @@ -55,10 +52,6 @@ public class DbClient extends org.sonar.db.DbClient { return activeRuleDao; } - public GroupDao groupDao() { - return groupDao; - } - public RuleDao ruleDao() { return ruleDao; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java index 1553ca676ff..71409b9efa1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel1.java @@ -54,7 +54,7 @@ import org.sonar.server.rule.index.RuleNormalizer; import org.sonar.server.search.EsSearchModule; import org.sonar.server.search.IndexQueue; import org.sonar.server.user.ThreadLocalUserSession; -import org.sonar.server.user.db.GroupDao; +import org.sonar.db.user.GroupDao; import org.sonar.server.user.db.UserDao; public class PlatformLevel1 extends PlatformLevel { diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/AddUserAction.java b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/AddUserAction.java index cf1e59772e5..70fd56dfa1c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/AddUserAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/AddUserAction.java @@ -76,8 +76,11 @@ public class AddUserAction implements UserGroupsWsAction { DbSession dbSession = dbClient.openSession(false); try { - GroupDto group = dbClient.groupDao().selectById(dbSession, groupId); + GroupDto group = dbClient.groupDao().selectNullableById(dbSession, groupId); UserDto user = dbClient.userDao().selectActiveUserByLogin(dbSession, login); + if (group == null) { + throw new NotFoundException(String.format("Could not find a user group with group id '%s'", groupId)); + } if (user == null) { throw new NotFoundException(String.format("Could not find a user with login '%s'", login)); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/DeleteAction.java b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/DeleteAction.java index 1faf779a895..9ae00ab5fe7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/DeleteAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/DeleteAction.java @@ -68,7 +68,7 @@ public class DeleteAction implements UserGroupsWsAction { DbSession dbSession = dbClient.openSession(false); try { - if (dbClient.groupDao().selectById(dbSession, groupId) == null) { + if (dbClient.groupDao().selectNullableById(dbSession, groupId) == null) { throw new NotFoundException(String.format("Could not find a group with id=%d", groupId)); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UsersAction.java b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UsersAction.java index 34176d12cd0..a09f155476d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UsersAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/UsersAction.java @@ -31,10 +31,12 @@ import org.sonar.api.utils.text.JsonWriter; import org.sonar.core.permission.GlobalPermissions; import org.sonar.db.DbSession; import org.sonar.db.MyBatis; +import org.sonar.db.user.GroupDto; import org.sonar.db.user.GroupMembershipQuery; import org.sonar.db.user.UserMembershipDto; import org.sonar.db.user.UserMembershipQuery; import org.sonar.server.db.DbClient; +import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.user.UserSession; public class UsersAction implements UserGroupsWsAction { @@ -93,7 +95,10 @@ public class UsersAction implements UserGroupsWsAction { DbSession dbSession = dbClient.openSession(false); try { - dbClient.groupDao().selectById(dbSession, groupId); + GroupDto group = dbClient.groupDao().selectNullableById(dbSession, groupId); + if (group == null) { + throw new NotFoundException(String.format("Could not find user group with id '%s'", groupId)); + } int total = dbClient.groupMembershipDao().countMembers(dbSession, query); Paging paging = Paging.create(pageSize, page, total); List users = dbClient.groupMembershipDao().selectMembers(dbSession, query, paging.offset(), paging.pageSize()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java index b13e8248c6a..98687e6db7e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java @@ -70,7 +70,7 @@ import org.sonar.server.tester.ServerTester; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.user.NewUser; import org.sonar.server.user.UserUpdater; -import org.sonar.server.user.db.GroupDao; +import org.sonar.db.user.GroupDao; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterTest.java index e6fb69e2062..24d7a6f3e2d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterTest.java @@ -46,7 +46,7 @@ import org.sonar.server.es.EsTester; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.Message; import org.sonar.server.exceptions.ServerException; -import org.sonar.server.user.db.GroupDao; +import org.sonar.db.user.GroupDao; import org.sonar.server.user.db.UserDao; import org.sonar.server.user.index.UserIndexDefinition; import org.sonar.server.user.index.UserIndexer; diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java index 261568bbbdf..b8831db855d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/ChangePasswordActionTest.java @@ -43,7 +43,7 @@ import org.sonar.server.user.NewUser; import org.sonar.server.user.NewUserNotifier; import org.sonar.server.user.SecurityRealmFactory; import org.sonar.server.user.UserUpdater; -import org.sonar.server.user.db.GroupDao; +import org.sonar.db.user.GroupDao; import org.sonar.server.user.db.UserDao; import org.sonar.server.user.index.UserIndex; import org.sonar.server.user.index.UserIndexDefinition; diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java index ebcd12af6a2..ec7db596fc4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java @@ -44,7 +44,7 @@ import org.sonar.server.tester.UserSessionRule; import org.sonar.server.user.NewUserNotifier; import org.sonar.server.user.SecurityRealmFactory; import org.sonar.server.user.UserUpdater; -import org.sonar.server.user.db.GroupDao; +import org.sonar.db.user.GroupDao; import org.sonar.server.user.db.UserDao; import org.sonar.server.user.index.UserDoc; import org.sonar.server.user.index.UserIndex; diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java index 0d9248068cc..5d0c01c2bd1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java @@ -39,7 +39,7 @@ import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.tester.UserSessionRule; -import org.sonar.server.user.db.GroupDao; +import org.sonar.db.user.GroupDao; import org.sonar.server.user.db.UserDao; import org.sonar.server.ws.WsTester; diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java index c0c49ca2f30..ad6fad60cd0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java @@ -44,7 +44,7 @@ import org.sonar.db.user.UserGroupDto; import org.sonar.server.db.DbClient; import org.sonar.server.es.EsTester; import org.sonar.server.tester.UserSessionRule; -import org.sonar.server.user.db.GroupDao; +import org.sonar.db.user.GroupDao; import org.sonar.server.user.db.UserDao; import org.sonar.server.user.index.UserDoc; import org.sonar.server.user.index.UserIndex; diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java index db6f3932faf..2e765fc05cb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java @@ -42,7 +42,7 @@ import org.sonar.server.tester.UserSessionRule; import org.sonar.server.user.NewUserNotifier; import org.sonar.server.user.SecurityRealmFactory; import org.sonar.server.user.UserUpdater; -import org.sonar.server.user.db.GroupDao; +import org.sonar.db.user.GroupDao; import org.sonar.server.user.db.UserDao; import org.sonar.server.user.index.UserIndex; import org.sonar.server.user.index.UserIndexDefinition; diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java index adb1f863a96..fb36a088a89 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java @@ -41,7 +41,7 @@ import org.sonar.db.user.UserGroupDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.tester.UserSessionRule; -import org.sonar.server.user.db.GroupDao; +import org.sonar.db.user.GroupDao; import org.sonar.server.user.db.UserDao; import org.sonar.server.ws.WsTester; import org.sonar.test.DbTests; diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java index 5c422838003..8ee28e049c7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/CreateActionTest.java @@ -37,7 +37,7 @@ import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.ServerException; import org.sonar.server.tester.UserSessionRule; -import org.sonar.server.user.db.GroupDao; +import org.sonar.db.user.GroupDao; import org.sonar.server.ws.WsTester; import org.sonar.test.DbTests; diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java index 786e2d50e89..ad08e6dd95f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java @@ -41,7 +41,7 @@ import org.sonar.db.user.UserGroupDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.tester.UserSessionRule; -import org.sonar.server.user.db.GroupDao; +import org.sonar.db.user.GroupDao; import org.sonar.server.ws.WsTester; import org.sonar.test.DbTests; @@ -56,7 +56,7 @@ public class DeleteActionTest { @Rule public UserSessionRule userSession = UserSessionRule.standalone(); - private WsTester tester; + private WsTester ws; private GroupDao groupDao; @@ -89,7 +89,7 @@ public class DeleteActionTest { defaultGroupId = defaultGroup.getId(); session.commit(); - tester = new WsTester(new UserGroupsWs(new DeleteAction(dbClient, userSession, settings))); + ws = new WsTester(new UserGroupsWs(new DeleteAction(dbClient, userSession, settings))); } @After @@ -103,7 +103,7 @@ public class DeleteActionTest { session.commit(); loginAsAdmin(); - tester.newPostRequest("api/usergroups", "delete") + ws.newPostRequest("api/usergroups", "delete") .setParam("id", group.getId().toString()) .execute().assertNoContent(); } @@ -115,7 +115,7 @@ public class DeleteActionTest { session.commit(); loginAsAdmin(); - tester.newPostRequest("api/usergroups", "delete") + ws.newPostRequest("api/usergroups", "delete") .setParam("id", group.getId().toString()) .execute().assertNoContent(); @@ -129,7 +129,7 @@ public class DeleteActionTest { session.commit(); loginAsAdmin(); - tester.newPostRequest("api/usergroups", "delete") + ws.newPostRequest("api/usergroups", "delete") .setParam("id", group.getId().toString()) .execute().assertNoContent(); @@ -143,7 +143,7 @@ public class DeleteActionTest { session.commit(); loginAsAdmin(); - tester.newPostRequest("api/usergroups", "delete") + ws.newPostRequest("api/usergroups", "delete") .setParam("id", group.getId().toString()) .execute().assertNoContent(); @@ -153,7 +153,7 @@ public class DeleteActionTest { @Test(expected = NotFoundException.class) public void not_found() throws Exception { loginAsAdmin(); - tester.newPostRequest("api/usergroups", "delete") + ws.newPostRequest("api/usergroups", "delete") .setParam("id", "42") .execute(); } @@ -161,7 +161,7 @@ public class DeleteActionTest { @Test(expected = IllegalArgumentException.class) public void cannot_delete_default_group() throws Exception { loginAsAdmin(); - tester.newPostRequest("api/usergroups", "delete") + ws.newPostRequest("api/usergroups", "delete") .setParam("id", defaultGroupId.toString()) .execute(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java index 94e3b208c77..a18dd2fc392 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java @@ -40,7 +40,7 @@ import org.sonar.db.user.UserGroupDto; import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.tester.UserSessionRule; -import org.sonar.server.user.db.GroupDao; +import org.sonar.db.user.GroupDao; import org.sonar.server.user.db.UserDao; import org.sonar.server.ws.WsTester; import org.sonar.test.DbTests; diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java index 1c100744bc5..b54acb862f4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java @@ -35,7 +35,7 @@ import org.sonar.db.user.GroupMembershipDao; import org.sonar.db.user.UserGroupDao; import org.sonar.db.user.UserGroupDto; import org.sonar.server.db.DbClient; -import org.sonar.server.user.db.GroupDao; +import org.sonar.db.user.GroupDao; import org.sonar.server.ws.WsTester; import org.sonar.test.DbTests; diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java index f54ea91549e..e03e5329b52 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java @@ -41,7 +41,7 @@ import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.exceptions.ServerException; import org.sonar.server.tester.UserSessionRule; -import org.sonar.server.user.db.GroupDao; +import org.sonar.db.user.GroupDao; import org.sonar.server.ws.WsTester; import org.sonar.test.DbTests; diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java index f8f12b85e55..e992c2cd9b4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java @@ -40,7 +40,7 @@ import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.tester.UserSessionRule; -import org.sonar.server.user.db.GroupDao; +import org.sonar.db.user.GroupDao; import org.sonar.server.user.db.UserDao; import org.sonar.server.ws.WsTester; import org.sonar.server.ws.WsTester.TestRequest; diff --git a/sonar-db/src/main/java/org/sonar/db/DbClient.java b/sonar-db/src/main/java/org/sonar/db/DbClient.java index fba496c2f90..6ff2e99fdd6 100644 --- a/sonar-db/src/main/java/org/sonar/db/DbClient.java +++ b/sonar-db/src/main/java/org/sonar/db/DbClient.java @@ -60,6 +60,7 @@ import org.sonar.db.qualityprofile.QualityProfileDao; import org.sonar.db.source.FileSourceDao; import org.sonar.db.user.AuthorDao; import org.sonar.db.user.AuthorizationDao; +import org.sonar.db.user.GroupDao; import org.sonar.db.user.GroupMembershipDao; import org.sonar.db.user.RoleDao; import org.sonar.db.user.UserDao; @@ -111,6 +112,7 @@ public class DbClient { private final NotificationQueueDao notificationQueueDao; private final CustomMeasureDao customMeasureDao; private final MetricDao metricDao; + private final GroupDao groupDao; public DbClient(Database database, MyBatis myBatis, Dao... daos) { this.database = database; @@ -162,6 +164,7 @@ public class DbClient { notificationQueueDao = getDao(map, NotificationQueueDao.class); customMeasureDao = getDao(map, CustomMeasureDao.class); metricDao = getDao(map, MetricDao.class); + groupDao = getDao(map, GroupDao.class); doOnLoad(map); } @@ -350,6 +353,10 @@ public class DbClient { return metricDao; } + public GroupDao groupDao() { + return groupDao; + } + protected K getDao(Map map, Class clazz) { return (K) map.get(clazz); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/db/GroupDao.java b/sonar-db/src/main/java/org/sonar/db/user/GroupDao.java similarity index 90% rename from server/sonar-server/src/main/java/org/sonar/server/user/db/GroupDao.java rename to sonar-db/src/main/java/org/sonar/db/user/GroupDao.java index acedc2aa42c..a642b77c6b5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/db/GroupDao.java +++ b/sonar-db/src/main/java/org/sonar/db/user/GroupDao.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.user.db; +package org.sonar.db.user; import java.util.Date; import java.util.List; @@ -29,9 +29,7 @@ import org.apache.ibatis.session.RowBounds; import org.sonar.api.utils.System2; import org.sonar.db.Dao; import org.sonar.db.DbSession; -import org.sonar.db.user.GroupDto; -import org.sonar.db.user.GroupMapper; -import org.sonar.server.exceptions.NotFoundException; +import org.sonar.db.util.RowNotFoundException; public class GroupDao implements Dao { @@ -45,7 +43,7 @@ public class GroupDao implements Dao { public GroupDto selectByKey(DbSession session, String key) { GroupDto group = selectNullableByKey(session, key); if (group == null) { - throw new NotFoundException(String.format("Could not find a group with name '%s'", key)); + throw new RowNotFoundException(String.format("Could not find a group with name '%s'", key)); } return group; } @@ -58,7 +56,7 @@ public class GroupDao implements Dao { public GroupDto selectById(DbSession dbSession, long groupId) { GroupDto group = selectNullableById(dbSession, groupId); if (group == null) { - throw new NotFoundException(String.format("Could not find a group with id '%d'", groupId)); + throw new RowNotFoundException(String.format("Could not find a group with id '%d'", groupId)); } return group; } diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/db/GroupDaoTest.java b/sonar-db/src/test/java/org/sonar/db/user/GroupDaoTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/user/db/GroupDaoTest.java rename to sonar-db/src/test/java/org/sonar/db/user/GroupDaoTest.java index 41657bbf5af..4389dc9a5d6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/db/GroupDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/user/GroupDaoTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.user.db; +package org.sonar.db.user; import org.junit.After; import org.junit.Before; @@ -29,7 +29,6 @@ import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; import org.sonar.db.DbSession; import org.sonar.db.DbTester; -import org.sonar.db.user.GroupDto; import org.sonar.test.DbTests; import static org.assertj.core.api.Assertions.assertThat; diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/db/GroupDaoTest/empty.xml b/sonar-db/src/test/resources/org/sonar/db/user/GroupDaoTest/empty.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/user/db/GroupDaoTest/empty.xml rename to sonar-db/src/test/resources/org/sonar/db/user/GroupDaoTest/empty.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/db/GroupDaoTest/find_by_user_login.xml b/sonar-db/src/test/resources/org/sonar/db/user/GroupDaoTest/find_by_user_login.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/user/db/GroupDaoTest/find_by_user_login.xml rename to sonar-db/src/test/resources/org/sonar/db/user/GroupDaoTest/find_by_user_login.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/db/GroupDaoTest/insert-result.xml b/sonar-db/src/test/resources/org/sonar/db/user/GroupDaoTest/insert-result.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/user/db/GroupDaoTest/insert-result.xml rename to sonar-db/src/test/resources/org/sonar/db/user/GroupDaoTest/insert-result.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/db/GroupDaoTest/select_by_key.xml b/sonar-db/src/test/resources/org/sonar/db/user/GroupDaoTest/select_by_key.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/user/db/GroupDaoTest/select_by_key.xml rename to sonar-db/src/test/resources/org/sonar/db/user/GroupDaoTest/select_by_key.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/db/GroupDaoTest/select_by_query.xml b/sonar-db/src/test/resources/org/sonar/db/user/GroupDaoTest/select_by_query.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/user/db/GroupDaoTest/select_by_query.xml rename to sonar-db/src/test/resources/org/sonar/db/user/GroupDaoTest/select_by_query.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/db/GroupDaoTest/update-result.xml b/sonar-db/src/test/resources/org/sonar/db/user/GroupDaoTest/update-result.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/user/db/GroupDaoTest/update-result.xml rename to sonar-db/src/test/resources/org/sonar/db/user/GroupDaoTest/update-result.xml diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/db/GroupDaoTest/update.xml b/sonar-db/src/test/resources/org/sonar/db/user/GroupDaoTest/update.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/user/db/GroupDaoTest/update.xml rename to sonar-db/src/test/resources/org/sonar/db/user/GroupDaoTest/update.xml -- 2.39.5