diff options
author | Julien Lancelot <julien.lancelot@gmail.com> | 2013-06-05 13:04:15 +0200 |
---|---|---|
committer | Julien Lancelot <julien.lancelot@gmail.com> | 2013-06-05 13:04:15 +0200 |
commit | 65c729ebd24a5f1dc7e076b866aadf701556e9d2 (patch) | |
tree | ec169e2099b01c056fecfb550f1233a70cde9076 /sonar-server | |
parent | 78145182be251fc055da7a95a338bba231156e10 (diff) | |
download | sonarqube-65c729ebd24a5f1dc7e076b866aadf701556e9d2.tar.gz sonarqube-65c729ebd24a5f1dc7e076b866aadf701556e9d2.zip |
SONAR-3755 Fix issue on SQL to retrieve root project
Diffstat (limited to 'sonar-server')
-rw-r--r-- | sonar-server/src/main/java/org/sonar/server/issue/IssueService.java | 4 | ||||
-rw-r--r-- | sonar-server/src/test/java/org/sonar/server/issue/IssueServiceTest.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java b/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java index f6a9e846b0a..14ade9f87e4 100644 --- a/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java +++ b/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java @@ -203,14 +203,14 @@ public class IssueService implements ServerComponent { // must be logged throw new IllegalStateException("User is not logged in"); } - if (!authorizationDao.isAuthorizedComponentId(findProject(issue.componentKey()).getId(), userSession.userId(), requiredRole)) { + if (!authorizationDao.isAuthorizedComponentId(findRootProject(issue.componentKey()).getId(), userSession.userId(), requiredRole)) { // TODO throw unauthorized throw new IllegalStateException("User does not have the required role"); } } @VisibleForTesting - ResourceDto findProject(String componentKey) { + ResourceDto findRootProject(String componentKey) { ResourceDto resourceDto = resourceDao.getRootProjectByComponentKey(componentKey); if (resourceDto == null) { // TODO throw 404 diff --git a/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceTest.java b/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceTest.java index 584c217ad06..bfeec5cbfc1 100644 --- a/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceTest.java +++ b/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceTest.java @@ -411,14 +411,14 @@ public class IssueServiceTest { public void should_find_project() { ResourceDto project = new ResourceDto().setKey("org.sonar.Sample").setId(1l); when(resourceDao.getRootProjectByComponentKey(anyString())).thenReturn(project); - assertThat(issueService.findProject("org.sonar.Sample")).isEqualTo(project); + assertThat(issueService.findRootProject("org.sonar.Sample")).isEqualTo(project); } @Test public void should_fail_to_find_project() { when(resourceDao.getRootProjectByComponentKey(anyString())).thenReturn(null); try { - issueService.findProject("org.sonar.Sample"); + issueService.findRootProject("org.sonar.Sample"); fail(); } catch (Exception e) { assertThat(e).isInstanceOf(IllegalArgumentException.class).hasMessage("Component 'org.sonar.Sample' does not exists."); |