aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorTeryk Bellahsene <teryk.bellahsene@sonarsource.com>2015-08-26 12:16:22 +0200
committerTeryk Bellahsene <teryk.bellahsene@sonarsource.com>2015-08-27 09:52:45 +0200
commite7e08bd112c1dd6628e53ab6c83f895e4c564edf (patch)
treebbbb4217914139dcd5dcfbcf0cbc33bc2a36c7a3 /server
parent771647e32377530d4a659bf286fe509ab93c02be (diff)
downloadsonarqube-e7e08bd112c1dd6628e53ab6c83f895e4c564edf.tar.gz
sonarqube-e7e08bd112c1dd6628e53ab6c83f895e4c564edf.zip
Sanitize PermissionTemplateDao methods
Diffstat (limited to 'server')
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateService.java4
-rw-r--r--server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateServiceTest.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateService.java b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateService.java
index 8ae7d6eaaac..e21f2d41af3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateService.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateService.java
@@ -75,7 +75,7 @@ public class PermissionTemplateService {
@CheckForNull
public PermissionTemplate selectPermissionTemplate(String templateKey) {
checkGlobalAdminUser(userSession);
- PermissionTemplateDto permissionTemplateDto = permissionTemplateDao.selectPermissionTemplate(templateKey);
+ PermissionTemplateDto permissionTemplateDto = permissionTemplateDao.selectByKeyWithUserAndGroupPermissions(templateKey);
return PermissionTemplate.create(permissionTemplateDto);
}
@@ -132,7 +132,7 @@ public class PermissionTemplateService {
public void deletePermissionTemplate(Long templateId) {
checkGlobalAdminUser(userSession);
- permissionTemplateDao.deletePermissionTemplate(templateId);
+ permissionTemplateDao.deleteById(templateId);
}
/**
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateServiceTest.java
index e4ceb1b7180..970a14d42ab 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateServiceTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateServiceTest.java
@@ -151,7 +151,7 @@ public class PermissionTemplateServiceTest {
underTest.deletePermissionTemplate(1L);
- verify(permissionTemplateDao, times(1)).deletePermissionTemplate(1L);
+ verify(permissionTemplateDao, times(1)).deleteById(1L);
}
@Test
@@ -177,7 +177,7 @@ public class PermissionTemplateServiceTest {
.setUsersPermissions(usersPermissions)
.setGroupsByPermission(groupsPermissions);
- when(permissionTemplateDao.selectPermissionTemplate("my template")).thenReturn(permissionTemplateDto);
+ when(permissionTemplateDao.selectByKeyWithUserAndGroupPermissions("my template")).thenReturn(permissionTemplateDto);
PermissionTemplate permissionTemplate = underTest.selectPermissionTemplate("my template");