Deprecate kee accessors in favor of uuid accessors in PermissionTemplateDto

diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/DefaultPermissionTemplates.java b/server/sonar-server/src/main/java/org/sonar/server/permission/DefaultPermissionTemplates.java
index e77d2259837d42fb52e8357f9ef33faac3810810..9caed504711e37bcef9f57a891962593eb75469a 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/DefaultPermissionTemplates.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/permission/DefaultPermissionTemplates.java
@@ -20,10 +20,19 @@
 
 package org.sonar.server.permission;
 
+import java.util.Date;
+import org.sonar.db.permission.PermissionTemplateDto;
+
 import static java.lang.String.format;
 
 public class DefaultPermissionTemplates {
   public static final String DEFAULT_TEMPLATE_PROPERTY = "sonar.permission.template.default";
+  public static final PermissionTemplateDto DEFAULT_TEMPLATE = new PermissionTemplateDto()
+    .setName("Default template")
+    .setUuid("default_template")
+    .setDescription("This permission template will be used as default when no other permission configuration is available")
+    .setCreatedAt(new Date())
+    .setUpdatedAt(new Date());
   private static final String DEFAULT_ROOT_QUALIFIER_TEMPLATE_PATTERN = "sonar.permission.template.%s.default";
 
   private DefaultPermissionTemplates() {

diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoBuilder.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoBuilder.java
index 79e658da4096f2097283d88272679ed9391e66cd..1d7090d32564aa055277f5e1169389836db3fdf5 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoBuilder.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoBuilder.java
@@ -60,7 +60,7 @@ public class PermissionTemplateDtoBuilder {
       .setName(name)
       .setDescription(description)
       .setKeyPattern(projectKeyPattern)
-      .setKee(Uuids.create())
+      .setUuid(Uuids.create())
       .setCreatedAt(new Date(now))
       .setUpdatedAt(new Date(now));
   }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponse.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponse.java
index 28f77ac55635f1bcf3e11b8c62f1822c9dc6ae0f..8d634a922850bb6348a1cd72f4ca640700fb594c 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponse.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/PermissionTemplateDtoToPermissionTemplateResponse.java
@@ -37,7 +37,7 @@ public class PermissionTemplateDtoToPermissionTemplateResponse {
     @Override
     public PermissionTemplate apply(@Nonnull PermissionTemplateDto permissionTemplate) {
       PermissionTemplate.Builder permissionTemplateBuilder = PermissionTemplate.newBuilder()
-        .setId(permissionTemplate.getKee())
+        .setId(permissionTemplate.getUuid())
         .setName(permissionTemplate.getName())
         .setCreatedAt(DateUtils.formatDateTime(permissionTemplate.getCreatedAt()))
         .setUpdatedAt(DateUtils.formatDateTime(permissionTemplate.getUpdatedAt()));

diff --git a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java
index 8da3049818c37aee9b9b05e827bccf508b50cc8f..999483ed888751ed5f62ea4f3a4ab77815d4d1ce 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/startup/RegisterPermissionTemplates.java
@@ -31,6 +31,7 @@ import org.sonar.db.DbSession;
 import org.sonar.db.loadedtemplate.LoadedTemplateDto;
 import org.sonar.db.permission.PermissionTemplateDto;
 import org.sonar.db.user.GroupDto;
+import org.sonar.server.permission.DefaultPermissionTemplates;
 import org.sonar.server.platform.PersistentSettings;
 
 import static org.sonar.server.permission.DefaultPermissionTemplates.DEFAULT_TEMPLATE_PROPERTY;
@@ -58,7 +59,7 @@ public class RegisterPermissionTemplates {
       setDefaultProperty(defaultProjectPermissionTemplateUuid);
     } else if (shouldRegister) {
       insertDefaultTemplate();
-      setDefaultProperty(PermissionTemplateDto.DEFAULT.getKee());
+      setDefaultProperty(DefaultPermissionTemplates.DEFAULT_TEMPLATE.getUuid());
     }
 
     if (shouldRegister) {
@@ -73,14 +74,14 @@ public class RegisterPermissionTemplates {
   }
 
   private boolean shouldRegister() {
-    return dbClient.loadedTemplateDao().countByTypeAndKey(LoadedTemplateDto.PERMISSION_TEMPLATE_TYPE, PermissionTemplateDto.DEFAULT.getKee()) == 0;
+    return dbClient.loadedTemplateDao().countByTypeAndKey(LoadedTemplateDto.PERMISSION_TEMPLATE_TYPE, DefaultPermissionTemplates.DEFAULT_TEMPLATE.getUuid()) == 0;
   }
 
   private void insertDefaultTemplate() {
     DbSession dbSession = dbClient.openSession(false);
     try {
       PermissionTemplateDto defaultPermissionTemplate =
-        dbClient.permissionTemplateDao().insert(dbSession, PermissionTemplateDto.DEFAULT);
+        dbClient.permissionTemplateDao().insert(dbSession, DefaultPermissionTemplates.DEFAULT_TEMPLATE);
       addGroupPermission(defaultPermissionTemplate, UserRole.ADMIN, DefaultGroups.ADMINISTRATORS);
       addGroupPermission(defaultPermissionTemplate, UserRole.ISSUE_ADMIN, DefaultGroups.ADMINISTRATORS);
       addGroupPermission(defaultPermissionTemplate, UserRole.USER, DefaultGroups.ANYONE);
@@ -111,7 +112,7 @@ public class RegisterPermissionTemplates {
   }
 
   private void registerInitialization() {
-    LoadedTemplateDto loadedTemplate = new LoadedTemplateDto(PermissionTemplateDto.DEFAULT.getKee(),
+    LoadedTemplateDto loadedTemplate = new LoadedTemplateDto(DefaultPermissionTemplates.DEFAULT_TEMPLATE.getUuid(),
       LoadedTemplateDto.PERMISSION_TEMPLATE_TYPE);
     dbClient.loadedTemplateDao().insert(loadedTemplate);
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceTest.java
index ead28b575af4bda10c6c305fba32993e82c585c8..05b9b33e1f25eaebef2f0b7380c28c4df09b9ed8 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueBulkChangeServiceTest.java
@@ -142,8 +142,8 @@ public class IssueBulkChangeServiceTest {
 //
 //  @Test
 //  public void should_execute_bulk_change_with_comment_only_on_changed_issues() {
-//    IssueDto issueDto1 = IssueTesting.newDto(RuleTesting.newDto(rule.ruleKey()).setId(50), file, project).setKee("ABCD");
-//    IssueDto issueDto2 = IssueTesting.newDto(RuleTesting.newDto(rule.ruleKey()).setId(50), file, project).setKee("EFGH");
+//    IssueDto issueDto1 = IssueTesting.newDto(RuleTesting.newDto(rule.ruleKey()).setId(50), file, project).setUuid("ABCD");
+//    IssueDto issueDto2 = IssueTesting.newDto(RuleTesting.newDto(rule.ruleKey()).setId(50), file, project).setUuid("EFGH");
 //
 //    org.sonar.server.search.Result<Issue> resultIssues = mock(org.sonar.server.search.Result.class);
 //    when(resultIssues.getHits()).thenReturn(Lists.<Issue>newArrayList(issueDto1.toDefaultIssue(), issueDto2.toDefaultIssue()));

diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionFinderTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionFinderTest.java
index 711aa8a31980039d276965dd4902688236ee052b..a3d6ae9d177402e948e136551535bedfcdf11941 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionFinderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionFinderTest.java
@@ -255,7 +255,7 @@ public class PermissionFinderTest {
 
   @Test
   public void find_users_from_permission_template() {
-    when(permissionTemplateDao.selectByUuid(anyString())).thenReturn(new PermissionTemplateDto().setId(1L).setKee("my_template"));
+    when(permissionTemplateDao.selectByUuid(anyString())).thenReturn(new PermissionTemplateDto().setId(1L).setUuid("my_template"));
 
     when(permissionTemplateDao.selectUsers(any(DbSession.class), any(PermissionQuery.class), anyLong(), anyInt(), anyInt())).thenReturn(
       newArrayList(new UserWithPermissionDto().setName("user1").setPermission("user"))
@@ -282,7 +282,7 @@ public class PermissionFinderTest {
 
   @Test
   public void find_groups_from_permission_template() {
-    when(permissionTemplateDao.selectByUuid(anyString())).thenReturn(new PermissionTemplateDto().setId(1L).setKee("my_template"));
+    when(permissionTemplateDao.selectByUuid(anyString())).thenReturn(new PermissionTemplateDto().setId(1L).setUuid("my_template"));
 
     when(permissionTemplateDao.selectGroups(any(DbSession.class), any(PermissionQuery.class), anyLong())).thenReturn(
       newArrayList(new GroupWithPermissionDto().setName("users").setPermission("user"))

diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java
index 006c55214362d0045be2bce29ae1b643a50fa526..e2d1f670eae8c47a39b35ce62fd3ea39ab1aef44 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java
@@ -99,7 +99,7 @@ public class AddGroupToTemplateActionTest {
 
   @Test
   public void add_group_to_template() {
-    newRequest(GROUP_NAME, permissionTemplate.getKee(), CODEVIEWER);
+    newRequest(GROUP_NAME, permissionTemplate.getUuid(), CODEVIEWER);
 
     assertThat(getGroupNamesInTemplateAndPermission(permissionTemplate.getId(), CODEVIEWER)).containsExactly(GROUP_NAME);
   }
@@ -119,7 +119,7 @@ public class AddGroupToTemplateActionTest {
   @Test
   public void add_with_group_id() {
     ws.newRequest()
-      .setParam(PARAM_TEMPLATE_ID, permissionTemplate.getKee())
+      .setParam(PARAM_TEMPLATE_ID, permissionTemplate.getUuid())
       .setParam(PARAM_PERMISSION, CODEVIEWER)
       .setParam(PARAM_GROUP_ID, String.valueOf(group.getId()))
       .execute();
@@ -129,15 +129,15 @@ public class AddGroupToTemplateActionTest {
 
   @Test
   public void does_not_add_a_group_twice() {
-    newRequest(GROUP_NAME, permissionTemplate.getKee(), ISSUE_ADMIN);
-    newRequest(GROUP_NAME, permissionTemplate.getKee(), ISSUE_ADMIN);
+    newRequest(GROUP_NAME, permissionTemplate.getUuid(), ISSUE_ADMIN);
+    newRequest(GROUP_NAME, permissionTemplate.getUuid(), ISSUE_ADMIN);
 
     assertThat(getGroupNamesInTemplateAndPermission(permissionTemplate.getId(), ISSUE_ADMIN)).containsExactly(GROUP_NAME);
   }
 
   @Test
   public void add_anyone_group_to_template() {
-    newRequest(ANYONE, permissionTemplate.getKee(), CODEVIEWER);
+    newRequest(ANYONE, permissionTemplate.getUuid(), CODEVIEWER);
 
     assertThat(getGroupNamesInTemplateAndPermission(permissionTemplate.getId(), CODEVIEWER)).containsExactly(ANYONE);
   }
@@ -147,14 +147,14 @@ public class AddGroupToTemplateActionTest {
     expectedException.expect(BadRequestException.class);
     expectedException.expectMessage(String.format("It is not possible to add the '%s' permission to the '%s' group.", UserRole.ADMIN, ANYONE));
 
-    newRequest(ANYONE, permissionTemplate.getKee(), ADMIN);
+    newRequest(ANYONE, permissionTemplate.getUuid(), ADMIN);
   }
 
   @Test
   public void fail_if_not_a_project_permission() {
     expectedException.expect(BadRequestException.class);
 
-    newRequest(GROUP_NAME, permissionTemplate.getKee(), GlobalPermissions.PREVIEW_EXECUTION);
+    newRequest(GROUP_NAME, permissionTemplate.getUuid(), GlobalPermissions.PREVIEW_EXECUTION);
   }
 
   @Test
@@ -162,7 +162,7 @@ public class AddGroupToTemplateActionTest {
     expectedException.expect(ForbiddenException.class);
     userSession.setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN);
 
-    newRequest(GROUP_NAME, permissionTemplate.getKee(), CODEVIEWER);
+    newRequest(GROUP_NAME, permissionTemplate.getUuid(), CODEVIEWER);
   }
 
   @Test
@@ -170,21 +170,21 @@ public class AddGroupToTemplateActionTest {
     expectedException.expect(UnauthorizedException.class);
     userSession.anonymous();
 
-    newRequest(GROUP_NAME, permissionTemplate.getKee(), CODEVIEWER);
+    newRequest(GROUP_NAME, permissionTemplate.getUuid(), CODEVIEWER);
   }
 
   @Test
   public void fail_if_group_params_missing() {
     expectedException.expect(BadRequestException.class);
 
-    newRequest(null, permissionTemplate.getKee(), CODEVIEWER);
+    newRequest(null, permissionTemplate.getUuid(), CODEVIEWER);
   }
 
   @Test
   public void fail_if_permission_missing() {
     expectedException.expect(IllegalArgumentException.class);
 
-    newRequest(GROUP_NAME, permissionTemplate.getKee(), null);
+    newRequest(GROUP_NAME, permissionTemplate.getUuid(), null);
   }
 
   @Test
@@ -199,7 +199,7 @@ public class AddGroupToTemplateActionTest {
     expectedException.expect(NotFoundException.class);
     expectedException.expectMessage("Group with name 'unknown-group-name' is not found");
 
-    newRequest("unknown-group-name", permissionTemplate.getKee(), CODEVIEWER);
+    newRequest("unknown-group-name", permissionTemplate.getUuid(), CODEVIEWER);
   }
 
   @Test

diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddUserToTemplateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddUserToTemplateActionTest.java
index 2ab68a4378eac880e1a3bab6dc7f65bc6fa014fd..d6e56cf80639f524c02aef8ea8140b01e7d94465 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddUserToTemplateActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddUserToTemplateActionTest.java
@@ -45,7 +45,6 @@ import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.exceptions.UnauthorizedException;
 import org.sonar.server.permission.ws.PermissionDependenciesFinder;
 import org.sonar.server.permission.ws.WsPermissionParameters;
-import org.sonar.server.permission.ws.template.AddUserToTemplateAction;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.TestRequest;
 import org.sonar.server.ws.WsActionTester;
@@ -95,7 +94,7 @@ public class AddUserToTemplateActionTest {
 
   @Test
   public void add_user_to_template() {
-    newRequest(USER_LOGIN, permissionTemplate.getKee(), CODEVIEWER);
+    newRequest(USER_LOGIN, permissionTemplate.getUuid(), CODEVIEWER);
 
     assertThat(getLoginsInTemplateAndPermission(permissionTemplate.getId(), CODEVIEWER)).containsExactly(USER_LOGIN);
   }
@@ -114,8 +113,8 @@ public class AddUserToTemplateActionTest {
 
   @Test
   public void does_not_add_a_user_twice() {
-    newRequest(USER_LOGIN, permissionTemplate.getKee(), ISSUE_ADMIN);
-    newRequest(USER_LOGIN, permissionTemplate.getKee(), ISSUE_ADMIN);
+    newRequest(USER_LOGIN, permissionTemplate.getUuid(), ISSUE_ADMIN);
+    newRequest(USER_LOGIN, permissionTemplate.getUuid(), ISSUE_ADMIN);
 
     assertThat(getLoginsInTemplateAndPermission(permissionTemplate.getId(), ISSUE_ADMIN)).containsExactly(USER_LOGIN);
   }
@@ -124,7 +123,7 @@ public class AddUserToTemplateActionTest {
   public void fail_if_not_a_project_permission() {
     expectedException.expect(BadRequestException.class);
 
-    newRequest(USER_LOGIN, permissionTemplate.getKee(), GlobalPermissions.PREVIEW_EXECUTION);
+    newRequest(USER_LOGIN, permissionTemplate.getUuid(), GlobalPermissions.PREVIEW_EXECUTION);
   }
 
   @Test
@@ -132,7 +131,7 @@ public class AddUserToTemplateActionTest {
     expectedException.expect(ForbiddenException.class);
     userSession.setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN);
 
-    newRequest(USER_LOGIN, permissionTemplate.getKee(), CODEVIEWER);
+    newRequest(USER_LOGIN, permissionTemplate.getUuid(), CODEVIEWER);
   }
 
   @Test
@@ -140,21 +139,21 @@ public class AddUserToTemplateActionTest {
     expectedException.expect(UnauthorizedException.class);
     userSession.anonymous();
 
-    newRequest(USER_LOGIN, permissionTemplate.getKee(), CODEVIEWER);
+    newRequest(USER_LOGIN, permissionTemplate.getUuid(), CODEVIEWER);
   }
 
   @Test
   public void fail_if_user_missing() {
     expectedException.expect(IllegalArgumentException.class);
 
-    newRequest(null, permissionTemplate.getKee(), CODEVIEWER);
+    newRequest(null, permissionTemplate.getUuid(), CODEVIEWER);
   }
 
   @Test
   public void fail_if_permission_missing() {
     expectedException.expect(IllegalArgumentException.class);
 
-    newRequest(USER_LOGIN, permissionTemplate.getKee(), null);
+    newRequest(USER_LOGIN, permissionTemplate.getUuid(), null);
   }
 
   @Test
@@ -169,7 +168,7 @@ public class AddUserToTemplateActionTest {
     expectedException.expect(NotFoundException.class);
     expectedException.expectMessage("User with login 'unknown-login' is not found");
 
-    newRequest("unknown-login", permissionTemplate.getKee(), CODEVIEWER);
+    newRequest("unknown-login", permissionTemplate.getUuid(), CODEVIEWER);
   }
 
   @Test

diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/CreateTemplateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/CreateTemplateActionTest.java
index 991600c8f54cab4397819f73c6265dc8d761166a..37493845cb6a1e7b85364c9d200dfb95cb953891 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/CreateTemplateActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/CreateTemplateActionTest.java
@@ -83,7 +83,7 @@ public class CreateTemplateActionTest {
     assertThat(finance.getName()).isEqualTo("Finance");
     assertThat(finance.getDescription()).isEqualTo("Permissions for financially related projects");
     assertThat(finance.getKeyPattern()).isEqualTo(".*\\.finance\\..*");
-    assertThat(finance.getKee()).isNotEmpty();
+    assertThat(finance.getUuid()).isNotEmpty();
     assertThat(finance.getCreatedAt().getTime()).isEqualTo(1440512328743L);
     assertThat(finance.getUpdatedAt().getTime()).isEqualTo(1440512328743L);
   }
@@ -96,7 +96,7 @@ public class CreateTemplateActionTest {
     assertThat(finance.getName()).isEqualTo("Finance");
     assertThat(finance.getDescription()).isNullOrEmpty();
     assertThat(finance.getKeyPattern()).isNullOrEmpty();
-    assertThat(finance.getKee()).isNotEmpty();
+    assertThat(finance.getUuid()).isNotEmpty();
     assertThat(finance.getCreatedAt().getTime()).isEqualTo(1440512328743L);
     assertThat(finance.getUpdatedAt().getTime()).isEqualTo(1440512328743L);
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/DeleteTemplateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/DeleteTemplateActionTest.java
index 8515de5e20ff2f20fa9c82e308af3564c12b93b8..38c4a0b63519ef0a4333685febde3ad4f16aa025 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/DeleteTemplateActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/DeleteTemplateActionTest.java
@@ -44,7 +44,6 @@ import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.exceptions.UnauthorizedException;
 import org.sonar.server.permission.ws.DeleteTemplateAction;
 import org.sonar.server.permission.ws.PermissionDependenciesFinder;
-import org.sonar.server.permission.ws.template.DefaultPermissionTemplateFinder;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.TestRequest;
 import org.sonar.server.ws.TestResponse;
@@ -87,9 +86,9 @@ public class DeleteTemplateActionTest {
     PermissionDependenciesFinder finder = new PermissionDependenciesFinder(dbClient, new ComponentFinder(dbClient));
     ws = new WsActionTester(new DeleteTemplateAction(dbClient, userSession, finder, defaultTemplatePermissionFinder));
 
-    permissionTemplate = insertTemplateAndAssociatedPermissions(newPermissionTemplateDto().setKee(TEMPLATE_UUID));
+    permissionTemplate = insertTemplateAndAssociatedPermissions(newPermissionTemplateDto().setUuid(TEMPLATE_UUID));
     PermissionTemplateDto permissionTemplateInDatabase = dbClient.permissionTemplateDao().selectByUuidWithUserAndGroupPermissions(dbSession, TEMPLATE_UUID);
-    assertThat(permissionTemplateInDatabase.getKee()).isEqualTo(TEMPLATE_UUID);
+    assertThat(permissionTemplateInDatabase.getUuid()).isEqualTo(TEMPLATE_UUID);
     assertThat(permissionTemplateInDatabase.getGroupsPermissions()).isNotEmpty();
     assertThat(permissionTemplateInDatabase.getUsersPermissions()).isNotEmpty();
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateActionTest.java
index e372afa7f9f5facdd1738f85d786de8df5128c40..dceee632face9a8415cdcfcef1b9881a02d55deb 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateActionTest.java
@@ -101,7 +101,7 @@ public class RemoveGroupFromTemplateActionTest {
     assertThat(getGroupNamesInTemplateAndPermission(permissionTemplate.getId(), PERMISSION)).containsExactly(GROUP_NAME);
     commit();
 
-    newRequest(GROUP_NAME, permissionTemplate.getKee(), PERMISSION);
+    newRequest(GROUP_NAME, permissionTemplate.getUuid(), PERMISSION);
 
     assertThat(getGroupNamesInTemplateAndPermission(permissionTemplate.getId(), PERMISSION)).isEmpty();
   }
@@ -127,7 +127,7 @@ public class RemoveGroupFromTemplateActionTest {
     commit();
 
     ws.newRequest()
-      .setParam(PARAM_TEMPLATE_ID, permissionTemplate.getKee())
+      .setParam(PARAM_TEMPLATE_ID, permissionTemplate.getUuid())
       .setParam(PARAM_PERMISSION, PERMISSION)
       .setParam(PARAM_GROUP_ID, String.valueOf(group.getId()))
       .execute();
@@ -137,8 +137,8 @@ public class RemoveGroupFromTemplateActionTest {
 
   @Test
   public void remove_group_twice_without_error() {
-    newRequest(GROUP_NAME, permissionTemplate.getKee(), PERMISSION);
-    newRequest(GROUP_NAME, permissionTemplate.getKee(), PERMISSION);
+    newRequest(GROUP_NAME, permissionTemplate.getUuid(), PERMISSION);
+    newRequest(GROUP_NAME, permissionTemplate.getUuid(), PERMISSION);
 
     assertThat(getGroupNamesInTemplateAndPermission(permissionTemplate.getId(), PERMISSION)).isEmpty();
   }
@@ -148,7 +148,7 @@ public class RemoveGroupFromTemplateActionTest {
     addGroupToPermissionTemplate(permissionTemplate.getId(), null, PERMISSION);
     commit();
 
-    newRequest(ANYONE, permissionTemplate.getKee(), PERMISSION);
+    newRequest(ANYONE, permissionTemplate.getUuid(), PERMISSION);
 
     assertThat(getGroupNamesInTemplateAndPermission(permissionTemplate.getId(), PERMISSION)).containsExactly(GROUP_NAME);
   }
@@ -157,7 +157,7 @@ public class RemoveGroupFromTemplateActionTest {
   public void fail_if_not_a_project_permission() {
     expectedException.expect(BadRequestException.class);
 
-    newRequest(GROUP_NAME, permissionTemplate.getKee(), GlobalPermissions.PREVIEW_EXECUTION);
+    newRequest(GROUP_NAME, permissionTemplate.getUuid(), GlobalPermissions.PREVIEW_EXECUTION);
   }
 
   @Test
@@ -165,7 +165,7 @@ public class RemoveGroupFromTemplateActionTest {
     expectedException.expect(ForbiddenException.class);
     userSession.setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN);
 
-    newRequest(GROUP_NAME, permissionTemplate.getKee(), PERMISSION);
+    newRequest(GROUP_NAME, permissionTemplate.getUuid(), PERMISSION);
   }
 
   @Test
@@ -173,21 +173,21 @@ public class RemoveGroupFromTemplateActionTest {
     expectedException.expect(UnauthorizedException.class);
     userSession.anonymous();
 
-    newRequest(GROUP_NAME, permissionTemplate.getKee(), PERMISSION);
+    newRequest(GROUP_NAME, permissionTemplate.getUuid(), PERMISSION);
   }
 
   @Test
   public void fail_if_group_params_missing() {
     expectedException.expect(BadRequestException.class);
 
-    newRequest(null, permissionTemplate.getKee(), PERMISSION);
+    newRequest(null, permissionTemplate.getUuid(), PERMISSION);
   }
 
   @Test
   public void fail_if_permission_missing() {
     expectedException.expect(IllegalArgumentException.class);
 
-    newRequest(GROUP_NAME, permissionTemplate.getKee(), null);
+    newRequest(GROUP_NAME, permissionTemplate.getUuid(), null);
   }
 
   @Test
@@ -202,7 +202,7 @@ public class RemoveGroupFromTemplateActionTest {
     expectedException.expect(NotFoundException.class);
     expectedException.expectMessage("Group with name 'unknown-group-name' is not found");
 
-    newRequest("unknown-group-name", permissionTemplate.getKee(), PERMISSION);
+    newRequest("unknown-group-name", permissionTemplate.getUuid(), PERMISSION);
   }
 
   @Test

diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateActionTest.java
index 588e651dc846c16f036a1731e8daf6e917c19c45..4883e655d1a5b626c369f70e01a55f59480152d0 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateActionTest.java
@@ -45,7 +45,6 @@ import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.exceptions.UnauthorizedException;
 import org.sonar.server.permission.ws.PermissionDependenciesFinder;
 import org.sonar.server.permission.ws.WsPermissionParameters;
-import org.sonar.server.permission.ws.template.RemoveUserFromTemplateAction;
 import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.TestRequest;
 import org.sonar.server.ws.WsActionTester;
@@ -97,7 +96,7 @@ public class RemoveUserFromTemplateActionTest {
 
   @Test
   public void remove_user_from_template() {
-    newRequest(USER_LOGIN, permissionTemplate.getKee(), DEFAULT_PERMISSION);
+    newRequest(USER_LOGIN, permissionTemplate.getUuid(), DEFAULT_PERMISSION);
 
     assertThat(getLoginsInTemplateAndPermission(permissionTemplate.getId(), DEFAULT_PERMISSION)).isEmpty();
   }
@@ -116,8 +115,8 @@ public class RemoveUserFromTemplateActionTest {
 
   @Test
   public void remove_user_from_template_twice_without_failing() {
-    newRequest(USER_LOGIN, permissionTemplate.getKee(), DEFAULT_PERMISSION);
-    newRequest(USER_LOGIN, permissionTemplate.getKee(), DEFAULT_PERMISSION);
+    newRequest(USER_LOGIN, permissionTemplate.getUuid(), DEFAULT_PERMISSION);
+    newRequest(USER_LOGIN, permissionTemplate.getUuid(), DEFAULT_PERMISSION);
 
     assertThat(getLoginsInTemplateAndPermission(permissionTemplate.getId(), DEFAULT_PERMISSION)).isEmpty();
   }
@@ -127,7 +126,7 @@ public class RemoveUserFromTemplateActionTest {
     addUserToTemplate(user, permissionTemplate, ISSUE_ADMIN);
     commit();
 
-    newRequest(USER_LOGIN, permissionTemplate.getKee(), DEFAULT_PERMISSION);
+    newRequest(USER_LOGIN, permissionTemplate.getUuid(), DEFAULT_PERMISSION);
 
     assertThat(getLoginsInTemplateAndPermission(permissionTemplate.getId(), DEFAULT_PERMISSION)).isEmpty();
     assertThat(getLoginsInTemplateAndPermission(permissionTemplate.getId(), ISSUE_ADMIN)).containsExactly(user.getLogin());
@@ -139,7 +138,7 @@ public class RemoveUserFromTemplateActionTest {
     addUserToTemplate(newUser, permissionTemplate, DEFAULT_PERMISSION);
     commit();
 
-    newRequest(USER_LOGIN, permissionTemplate.getKee(), DEFAULT_PERMISSION);
+    newRequest(USER_LOGIN, permissionTemplate.getUuid(), DEFAULT_PERMISSION);
 
     assertThat(getLoginsInTemplateAndPermission(permissionTemplate.getId(), DEFAULT_PERMISSION)).containsExactly("new-login");
   }
@@ -148,7 +147,7 @@ public class RemoveUserFromTemplateActionTest {
   public void fail_if_not_a_project_permission() {
     expectedException.expect(BadRequestException.class);
 
-    newRequest(USER_LOGIN, permissionTemplate.getKee(), GlobalPermissions.PREVIEW_EXECUTION);
+    newRequest(USER_LOGIN, permissionTemplate.getUuid(), GlobalPermissions.PREVIEW_EXECUTION);
   }
 
   @Test
@@ -156,7 +155,7 @@ public class RemoveUserFromTemplateActionTest {
     expectedException.expect(ForbiddenException.class);
     userSession.setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN);
 
-    newRequest(USER_LOGIN, permissionTemplate.getKee(), DEFAULT_PERMISSION);
+    newRequest(USER_LOGIN, permissionTemplate.getUuid(), DEFAULT_PERMISSION);
   }
 
   @Test
@@ -164,21 +163,21 @@ public class RemoveUserFromTemplateActionTest {
     expectedException.expect(UnauthorizedException.class);
     userSession.anonymous();
 
-    newRequest(USER_LOGIN, permissionTemplate.getKee(), DEFAULT_PERMISSION);
+    newRequest(USER_LOGIN, permissionTemplate.getUuid(), DEFAULT_PERMISSION);
   }
 
   @Test
   public void fail_if_user_missing() {
     expectedException.expect(IllegalArgumentException.class);
 
-    newRequest(null, permissionTemplate.getKee(), DEFAULT_PERMISSION);
+    newRequest(null, permissionTemplate.getUuid(), DEFAULT_PERMISSION);
   }
 
   @Test
   public void fail_if_permission_missing() {
     expectedException.expect(IllegalArgumentException.class);
 
-    newRequest(USER_LOGIN, permissionTemplate.getKee(), null);
+    newRequest(USER_LOGIN, permissionTemplate.getUuid(), null);
   }
 
   @Test
@@ -193,7 +192,7 @@ public class RemoveUserFromTemplateActionTest {
     expectedException.expect(NotFoundException.class);
     expectedException.expectMessage("User with login 'unknown-login' is not found");
 
-    newRequest("unknown-login", permissionTemplate.getKee(), DEFAULT_PERMISSION);
+    newRequest("unknown-login", permissionTemplate.getUuid(), DEFAULT_PERMISSION);
   }
 
   @Test

diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/UpdateTemplateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/UpdateTemplateActionTest.java
index 515fa91123d1f03bba715c3ce7b94abd969776a9..0246c5a9eecf82173bd441d09e63aff1655a3cd9 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/UpdateTemplateActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/UpdateTemplateActionTest.java
@@ -92,7 +92,7 @@ public class UpdateTemplateActionTest {
 
   @Test
   public void update_all_permission_template_fields() {
-    TestResponse result = newRequest(templateDto.getKee(), "Finance", "Permissions for financially related projects", ".*\\.finance\\..*");
+    TestResponse result = newRequest(templateDto.getUuid(), "Finance", "Permissions for financially related projects", ".*\\.finance\\..*");
 
     assertJson(result.getInput())
       .ignoreFields("id")
@@ -101,16 +101,16 @@ public class UpdateTemplateActionTest {
     assertThat(finance.getName()).isEqualTo("Finance");
     assertThat(finance.getDescription()).isEqualTo("Permissions for financially related projects");
     assertThat(finance.getKeyPattern()).isEqualTo(".*\\.finance\\..*");
-    assertThat(finance.getKee()).isEqualTo(templateDto.getKee());
+    assertThat(finance.getUuid()).isEqualTo(templateDto.getUuid());
     assertThat(finance.getCreatedAt()).isEqualTo(templateDto.getCreatedAt());
     assertThat(finance.getUpdatedAt().getTime()).isEqualTo(1440512328743L);
   }
 
   @Test
   public void update_with_the_same_values() {
-    newRequest(templateDto.getKee(), templateDto.getName(), templateDto.getDescription(), templateDto.getKeyPattern());
+    newRequest(templateDto.getUuid(), templateDto.getName(), templateDto.getDescription(), templateDto.getKeyPattern());
 
-    PermissionTemplateDto updatedTemplate = dbClient.permissionTemplateDao().selectByUuid(dbSession, templateDto.getKee());
+    PermissionTemplateDto updatedTemplate = dbClient.permissionTemplateDao().selectByUuid(dbSession, templateDto.getUuid());
     assertThat(updatedTemplate.getName()).isEqualTo(templateDto.getName());
     assertThat(updatedTemplate.getDescription()).isEqualTo(templateDto.getDescription());
     assertThat(updatedTemplate.getKeyPattern()).isEqualTo(templateDto.getKeyPattern());
@@ -118,7 +118,7 @@ public class UpdateTemplateActionTest {
 
   @Test
   public void update_name_only() {
-    newRequest(templateDto.getKee(), "Finance", null, null);
+    newRequest(templateDto.getUuid(), "Finance", null, null);
 
     PermissionTemplateDto finance = dbClient.permissionTemplateDao().selectByName(dbSession, "Finance");
     assertThat(finance.getName()).isEqualTo("Finance");
@@ -141,12 +141,12 @@ public class UpdateTemplateActionTest {
 
     insertTemplate(newPermissionTemplateDto()
       .setName("My Template")
-      .setKee("my-key")
+      .setUuid("my-key")
       .setCreatedAt(new Date(12345789L))
       .setUpdatedAt(new Date(12345789L)));
     commit();
 
-    newRequest(templateDto.getKee(), "My Template", null, null);
+    newRequest(templateDto.getUuid(), "My Template", null, null);
   }
 
   @Test
@@ -161,7 +161,7 @@ public class UpdateTemplateActionTest {
     expectedException.expect(BadRequestException.class);
     expectedException.expectMessage("The template name must not be blank");
 
-    newRequest(templateDto.getKee(), "", null, null);
+    newRequest(templateDto.getUuid(), "", null, null);
   }
 
   @Test
@@ -169,7 +169,7 @@ public class UpdateTemplateActionTest {
     expectedException.expect(BadRequestException.class);
     expectedException.expectMessage("The template name must not be blank");
 
-    newRequest(templateDto.getKee(), "  \r\n", null, null);
+    newRequest(templateDto.getUuid(), "  \r\n", null, null);
   }
 
   @Test
@@ -177,7 +177,7 @@ public class UpdateTemplateActionTest {
     expectedException.expect(BadRequestException.class);
     expectedException.expectMessage("The 'projectKeyPattern' parameter must be a valid Java regular expression. '[azerty' was passed");
 
-    newRequest(templateDto.getKee(), "Finance", null, "[azerty");
+    newRequest(templateDto.getUuid(), "Finance", null, "[azerty");
   }
 
   @Test
@@ -187,7 +187,7 @@ public class UpdateTemplateActionTest {
     insertTemplate(newPermissionTemplateDto().setName("finance"));
     commit();
 
-    newRequest(templateDto.getKee(), "Finance", null, null);
+    newRequest(templateDto.getUuid(), "Finance", null, null);
   }
 
   @Test
@@ -195,7 +195,7 @@ public class UpdateTemplateActionTest {
     expectedException.expect(UnauthorizedException.class);
     userSession.anonymous();
 
-    newRequest(templateDto.getKee(), "Finance", null, null);
+    newRequest(templateDto.getUuid(), "Finance", null, null);
   }
 
   @Test
@@ -203,7 +203,7 @@ public class UpdateTemplateActionTest {
     expectedException.expect(ForbiddenException.class);
     userSession.setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN);
 
-    newRequest(templateDto.getKee(), "Finance", null, null);
+    newRequest(templateDto.getUuid(), "Finance", null, null);
   }
 
   private PermissionTemplateDto insertTemplate(PermissionTemplateDto template) {

diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java
index 3165bce1f097d2e84d9476303a4aee1b8351e728..e6a8254952b8651f1c1bf6122384459e7a14d45e 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterPermissionTemplatesTest.java
@@ -36,6 +36,7 @@ import org.sonar.db.permission.PermissionTemplateDto;
 import org.sonar.db.user.GroupDao;
 import org.sonar.db.user.GroupDto;
 import org.sonar.db.user.UserDao;
+import org.sonar.server.permission.DefaultPermissionTemplates;
 import org.sonar.server.platform.PersistentSettings;
 
 import static org.mockito.Matchers.any;
@@ -76,13 +77,13 @@ public class RegisterPermissionTemplatesTest {
 
   @Test
   public void should_insert_and_register_default_permission_template() {
-    LoadedTemplateDto expectedTemplate = new LoadedTemplateDto().setKey(PermissionTemplateDto.DEFAULT.getKee())
+    LoadedTemplateDto expectedTemplate = new LoadedTemplateDto().setKey(DefaultPermissionTemplates.DEFAULT_TEMPLATE.getUuid())
       .setType(LoadedTemplateDto.PERMISSION_TEMPLATE_TYPE);
-    PermissionTemplateDto permissionTemplate = PermissionTemplateDto.DEFAULT.setId(1L);
+    PermissionTemplateDto permissionTemplate = DefaultPermissionTemplates.DEFAULT_TEMPLATE.setId(1L);
 
-    when(loadedTemplateDao.countByTypeAndKey(LoadedTemplateDto.PERMISSION_TEMPLATE_TYPE, PermissionTemplateDto.DEFAULT.getKee()))
+    when(loadedTemplateDao.countByTypeAndKey(LoadedTemplateDto.PERMISSION_TEMPLATE_TYPE, DefaultPermissionTemplates.DEFAULT_TEMPLATE.getUuid()))
       .thenReturn(0);
-    when(permissionTemplateDao.insert(any(DbSession.class), eq(PermissionTemplateDto.DEFAULT)))
+    when(permissionTemplateDao.insert(any(DbSession.class), eq(DefaultPermissionTemplates.DEFAULT_TEMPLATE)))
       .thenReturn(permissionTemplate);
     when(groupDao.selectByName(any(DbSession.class), eq(DefaultGroups.ADMINISTRATORS))).thenReturn(new GroupDto().setId(1L));
     when(groupDao.selectByName(any(DbSession.class), eq(DefaultGroups.USERS))).thenReturn(new GroupDto().setId(2L));
@@ -91,18 +92,18 @@ public class RegisterPermissionTemplatesTest {
     initializer.start();
 
     verify(loadedTemplateDao).insert(argThat(Matches.template(expectedTemplate)));
-    verify(permissionTemplateDao).insert(any(DbSession.class), eq(PermissionTemplateDto.DEFAULT));
+    verify(permissionTemplateDao).insert(any(DbSession.class), eq(DefaultPermissionTemplates.DEFAULT_TEMPLATE));
     verify(permissionTemplateDao).insertGroupPermission(1L, 1L, UserRole.ADMIN);
     verify(permissionTemplateDao).insertGroupPermission(1L, 1L, UserRole.ISSUE_ADMIN);
     verify(permissionTemplateDao).insertGroupPermission(1L, null, UserRole.USER);
     verify(permissionTemplateDao).insertGroupPermission(1L, null, UserRole.CODEVIEWER);
     verifyNoMoreInteractions(permissionTemplateDao);
-    verify(settings).saveProperty(DEFAULT_TEMPLATE_PROPERTY, PermissionTemplateDto.DEFAULT.getKee());
+    verify(settings).saveProperty(DEFAULT_TEMPLATE_PROPERTY, DefaultPermissionTemplates.DEFAULT_TEMPLATE.getUuid());
   }
 
   @Test
   public void should_skip_insertion_and_registration() {
-    when(loadedTemplateDao.countByTypeAndKey(LoadedTemplateDto.PERMISSION_TEMPLATE_TYPE, PermissionTemplateDto.DEFAULT.getKee()))
+    when(loadedTemplateDao.countByTypeAndKey(LoadedTemplateDto.PERMISSION_TEMPLATE_TYPE, DefaultPermissionTemplates.DEFAULT_TEMPLATE.getUuid()))
       .thenReturn(1);
 
     RegisterPermissionTemplates initializer = new RegisterPermissionTemplates(dbClient, settings);
@@ -116,7 +117,7 @@ public class RegisterPermissionTemplatesTest {
   public void should_reference_TRK_template_as_default_when_present() {
     when(settings.getString(defaultRootQualifierTemplateProperty(Qualifiers.PROJECT))).thenReturn("my_projects_template");
 
-    LoadedTemplateDto expectedTemplate = new LoadedTemplateDto().setKey(PermissionTemplateDto.DEFAULT.getKee())
+    LoadedTemplateDto expectedTemplate = new LoadedTemplateDto().setKey(DefaultPermissionTemplates.DEFAULT_TEMPLATE.getUuid())
       .setType(LoadedTemplateDto.PERMISSION_TEMPLATE_TYPE);
 
     RegisterPermissionTemplates initializer = new RegisterPermissionTemplates(dbClient, settings);

diff --git a/sonar-db/src/main/java/org/sonar/db/permission/PermissionRepository.java b/sonar-db/src/main/java/org/sonar/db/permission/PermissionRepository.java
index 0c7bfacd2375f8a18b63f39f7a76b83da915bf11..9986a04ce8178b1d4c3500171f6370d5a3858706 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/permission/PermissionRepository.java
+++ b/sonar-db/src/main/java/org/sonar/db/permission/PermissionRepository.java
@@ -176,7 +176,7 @@ public class PermissionRepository {
     }
     checkAtMostOneMatchForComponentKey(componentKey, matchingTemplates);
     if (matchingTemplates.size() == 1) {
-      return matchingTemplates.get(0).getKee();
+      return matchingTemplates.get(0).getUuid();
     }
     String qualifierTemplateKey = settings.getString("sonar.permission.template." + qualifier + ".default");
     if (!StringUtils.isBlank(qualifierTemplateKey)) {

diff --git a/sonar-db/src/main/java/org/sonar/db/permission/PermissionTemplateDao.java b/sonar-db/src/main/java/org/sonar/db/permission/PermissionTemplateDao.java
index f01ebe0566510950902d7bf69d7c4ca997de0854..1df1e9be5a21f0d1123908fdda03105a1af6df2f 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/permission/PermissionTemplateDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/permission/PermissionTemplateDao.java
@@ -384,7 +384,7 @@ public class PermissionTemplateDao implements Dao {
     if (permissionTemplateDto == null) {
       throw new IllegalArgumentException("Could not retrieve permission template with uuid " + templateUuid);
     }
-    PermissionTemplateDto templateWithPermissions = selectByUuidWithUserAndGroupPermissions(session, permissionTemplateDto.getKee());
+    PermissionTemplateDto templateWithPermissions = selectByUuidWithUserAndGroupPermissions(session, permissionTemplateDto.getUuid());
     if (templateWithPermissions == null) {
       throw new IllegalArgumentException("Could not retrieve permissions for template with uuid " + templateUuid);
     }

diff --git a/sonar-db/src/main/java/org/sonar/db/permission/PermissionTemplateDto.java b/sonar-db/src/main/java/org/sonar/db/permission/PermissionTemplateDto.java
index e79376bd24ce371fb9ded7b4781dea23135f0b1b..1fc13fb8bd2288526fab5e431b03629602159e34 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/permission/PermissionTemplateDto.java
+++ b/sonar-db/src/main/java/org/sonar/db/permission/PermissionTemplateDto.java
@@ -27,16 +27,9 @@ import javax.annotation.Nullable;
 
 public class PermissionTemplateDto {
 
-  public static final PermissionTemplateDto DEFAULT = new PermissionTemplateDto()
-    .setName("Default template")
-    .setKee("default_template")
-    .setDescription("This permission template will be used as default when no other permission configuration is available")
-    .setCreatedAt(new Date())
-    .setUpdatedAt(new Date());
-
   private Long id;
   private String name;
-  private String kee;
+  private String uuid;
   private String description;
   private String keyPattern;
   private List<PermissionTemplateUserDto> usersPermissions;
@@ -62,27 +55,35 @@ public class PermissionTemplateDto {
     return this;
   }
 
+  /**
+   * @deprecated since 5.2 use {@link #getUuid()}
+   */
+  @Deprecated
   public String getKee() {
-    return kee;
+    return uuid;
   }
 
   /**
-   * @since 5.2 the kee column is a proper uuid. Before that it was build on the name + timestamp
+   * @deprecated since 5.2 use {@link #setUuid(String)}
    */
-  public String getUuid() {
-    return kee;
-  }
-
+  @Deprecated
   public PermissionTemplateDto setKee(String kee) {
-    this.kee = kee;
+    this.uuid = kee;
     return this;
   }
 
+  /**
+   * @since 5.2 the kee column is a proper uuid. Before that it was build on the name + timestamp
+   */
+  public String getUuid() {
+    return uuid;
+  }
+
   /**
    * @since 5.2 the kee column is a proper uuid. Before it was build on the name + timestamp
    */
   public PermissionTemplateDto setUuid(String uuid) {
-    this.kee = uuid;
+    this.uuid = uuid;
     return this;
   }
 

diff --git a/sonar-db/src/test/java/org/sonar/db/permission/PermissionTemplateDaoTest.java b/sonar-db/src/test/java/org/sonar/db/permission/PermissionTemplateDaoTest.java
index be7ccfcc78b96270d308f3848668c3eb319ceac2..bdfeb62d8dd35b98ba693c0905dc1c1efb1932a8 100644 (file)
--- a/sonar-db/src/test/java/org/sonar/db/permission/PermissionTemplateDaoTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/permission/PermissionTemplateDaoTest.java
@@ -37,14 +37,12 @@ import org.sonar.api.utils.System2;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.DbTester;
-import org.sonar.db.MyBatis;
 import org.sonar.db.user.GroupDto;
 import org.sonar.db.user.UserDto;
 import org.sonar.test.DbTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.sonar.api.web.UserRole.ADMIN;
 import static org.sonar.api.web.UserRole.CODEVIEWER;
@@ -86,27 +84,6 @@ public class PermissionTemplateDaoTest {
     db.assertDbUnitTable(getClass(), "createPermissionTemplate-result.xml", "permission_templates", "id", "name", "description");
   }
 
-  @Test
-  public void should_skip_key_normalization_on_default_template() {
-    db.truncateTables();
-
-    PermissionTemplateMapper mapper = mock(PermissionTemplateMapper.class);
-
-    DbSession session = mock(DbSession.class);
-    when(session.getMapper(PermissionTemplateMapper.class)).thenReturn(mapper);
-
-    MyBatis myBatis = mock(MyBatis.class);
-    when(myBatis.openSession(false)).thenReturn(session);
-
-    underTest = new PermissionTemplateDao(myBatis, system);
-    PermissionTemplateDto permissionTemplate = underTest.insert(session, PermissionTemplateDto.DEFAULT);
-
-    verify(mapper).insert(permissionTemplate);
-    verify(session).commit();
-
-    assertThat(permissionTemplate.getKee()).isEqualTo(PermissionTemplateDto.DEFAULT.getKee());
-  }
-
   @Test
   public void should_select_permission_template() {
     db.prepareDbUnit(getClass(), "selectPermissionTemplate.xml");
@@ -115,7 +92,7 @@ public class PermissionTemplateDaoTest {
 
     assertThat(permissionTemplate).isNotNull();
     assertThat(permissionTemplate.getName()).isEqualTo("my template");
-    assertThat(permissionTemplate.getKee()).isEqualTo("my_template_20130102_030405");
+    assertThat(permissionTemplate.getUuid()).isEqualTo("my_template_20130102_030405");
     assertThat(permissionTemplate.getDescription()).isEqualTo("my description");
     assertThat(permissionTemplate.getUsersPermissions()).hasSize(3);
     assertThat(permissionTemplate.getUsersPermissions()).extracting("userId").containsOnly(1L, 2L, 1L);
@@ -150,7 +127,7 @@ public class PermissionTemplateDaoTest {
     assertThat(permissionTemplate).isNotNull();
     assertThat(permissionTemplate.getId()).isEqualTo(1L);
     assertThat(permissionTemplate.getName()).isEqualTo("my template");
-    assertThat(permissionTemplate.getKee()).isEqualTo("my_template_20130102_030405");
+    assertThat(permissionTemplate.getUuid()).isEqualTo("my_template_20130102_030405");
     assertThat(permissionTemplate.getDescription()).isEqualTo("my description");
   }
 
@@ -255,8 +232,8 @@ public class PermissionTemplateDaoTest {
   public void should_retrieve_permission_template() {
     db.truncateTables();
 
-    PermissionTemplateDto permissionTemplateDto = new PermissionTemplateDto().setName("Test template").setKee("test_template");
-    PermissionTemplateDto templateWithPermissions = new PermissionTemplateDto().setKee("test_template");
+    PermissionTemplateDto permissionTemplateDto = new PermissionTemplateDto().setName("Test template").setUuid("test_template");
+    PermissionTemplateDto templateWithPermissions = new PermissionTemplateDto().setUuid("test_template");
     underTest = mock(PermissionTemplateDao.class);
     when(underTest.selectByUuid(db.getSession(), "test_template")).thenReturn(permissionTemplateDto);
     when(underTest.selectByUuidWithUserAndGroupPermissions(db.getSession(), "test_template")).thenReturn(templateWithPermissions);

diff --git a/sonar-db/src/test/java/org/sonar/db/permission/PermissionTemplateTesting.java b/sonar-db/src/test/java/org/sonar/db/permission/PermissionTemplateTesting.java
index c8f35799c4c6a0e4f4ac8fff6a7abf07ed6257ff..fa9a0f66074ea43621b10a39ad64f3eba49b74a6 100644 (file)
--- a/sonar-db/src/test/java/org/sonar/db/permission/PermissionTemplateTesting.java
+++ b/sonar-db/src/test/java/org/sonar/db/permission/PermissionTemplateTesting.java
@@ -31,7 +31,7 @@ public class PermissionTemplateTesting {
     return new PermissionTemplateDto()
       .setName(randomAlphanumeric(60))
       .setDescription(randomAscii(500))
-      .setKee(Uuids.create())
+      .setUuid(Uuids.create())
       .setCreatedAt(new Date())
       .setUpdatedAt(new Date());
   }