diff options
| author | Teryk Bellahsene <teryk.bellahsene@sonarsource.com> | 2015-08-27 14:37:15 +0200 |
|---|---|---|
| committer | Teryk Bellahsene <teryk.bellahsene@sonarsource.com> | 2015-08-27 16:52:33 +0200 |
| commit | 4d08ae84be368871885db709b830399d5f5c4715 (patch) | |
| tree | 4311194e0a34af6c297f1558d05deb7aa27a16d0 /server | |
| parent | a6fc7f98841dd0bbf85b25e25ef641b2630fe265 (diff) | |
| download | sonarqube-4d08ae84be368871885db709b830399d5f5c4715.tar.gz sonarqube-4d08ae84be368871885db709b830399d5f5c4715.zip | |
SONAR-6496 SONAR-6497 Rename template key by template id and projectPattern by projectKeyPattern
Diffstat (limited to 'server')
5 files changed, 8 insertions, 8 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionTemplateDtoToPermissionTemplateResponse.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionTemplateDtoToPermissionTemplateResponse.java index 443f3ea8d94..34bf52a9267 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionTemplateDtoToPermissionTemplateResponse.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionTemplateDtoToPermissionTemplateResponse.java @@ -37,7 +37,7 @@ class PermissionTemplateDtoToPermissionTemplateResponse { @Override public PermissionTemplate apply(@Nonnull PermissionTemplateDto permissionTemplate) { PermissionTemplate.Builder permissionTemplateBuilder = PermissionTemplate.newBuilder() - .setKey(permissionTemplate.getKee()) + .setId(permissionTemplate.getKee()) .setName(permissionTemplate.getName()) .setCreatedAt(DateUtils.formatDateTime(permissionTemplate.getCreatedAt())) .setUpdatedAt(DateUtils.formatDateTime(permissionTemplate.getUpdatedAt())); @@ -45,7 +45,7 @@ class PermissionTemplateDtoToPermissionTemplateResponse { permissionTemplateBuilder.setDescription(permissionTemplate.getDescription()); } if (permissionTemplate.getKeyPattern() != null) { - permissionTemplateBuilder.setProjectPattern(permissionTemplate.getKeyPattern()); + permissionTemplateBuilder.setProjectKeyPattern(permissionTemplate.getKeyPattern()); } return permissionTemplateBuilder.build(); } diff --git a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/create_template-example.json b/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/create_template-example.json index 922c0ea3049..d27d52f9003 100644 --- a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/create_template-example.json +++ b/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/create_template-example.json @@ -1,9 +1,9 @@ { "permissionTemplate": { - "key": "af8cb8cc-1e78-4c4e-8c00-ee8e814009a5", + "id": "af8cb8cc-1e78-4c4e-8c00-ee8e814009a5", "name": "Finance", "description": "Permissions for financial related projects", - "projectPattern": ".*\\.finance\\..*", + "projectKeyPattern": ".*\\.finance\\..*", "createdAt": "2015-08-25T16:18:48+0200", "updatedAt": "2015-08-25T16:18:48+0200" } diff --git a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/update_template-example.json b/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/update_template-example.json index 922c0ea3049..d27d52f9003 100644 --- a/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/update_template-example.json +++ b/server/sonar-server/src/main/resources/org/sonar/server/permission/ws/update_template-example.json @@ -1,9 +1,9 @@ { "permissionTemplate": { - "key": "af8cb8cc-1e78-4c4e-8c00-ee8e814009a5", + "id": "af8cb8cc-1e78-4c4e-8c00-ee8e814009a5", "name": "Finance", "description": "Permissions for financial related projects", - "projectPattern": ".*\\.finance\\..*", + "projectKeyPattern": ".*\\.finance\\..*", "createdAt": "2015-08-25T16:18:48+0200", "updatedAt": "2015-08-25T16:18:48+0200" } diff --git a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/CreateTemplateActionTest/create_template.json b/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/CreateTemplateActionTest/create_template.json index 47e35540fde..0d4c7137db8 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/CreateTemplateActionTest/create_template.json +++ b/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/CreateTemplateActionTest/create_template.json @@ -2,7 +2,7 @@ "permissionTemplate": { "name": "Finance", "description": "Permissions for financially related projects", - "projectPattern": ".*\\.finance\\..*", + "projectKeyPattern": ".*\\.finance\\..*", "createdAt": "2015-08-25T16:18:48+0200", "updatedAt": "2015-08-25T16:18:48+0200" } diff --git a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/UpdateTemplateActionTest/update_template.json b/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/UpdateTemplateActionTest/update_template.json index 2010e558892..1d0f4eb39cc 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/UpdateTemplateActionTest/update_template.json +++ b/server/sonar-server/src/test/resources/org/sonar/server/permission/ws/UpdateTemplateActionTest/update_template.json @@ -2,7 +2,7 @@ "permissionTemplate": { "name": "Finance", "description": "Permissions for financially related projects", - "projectPattern": ".*\\.finance\\..*", + "projectKeyPattern": ".*\\.finance\\..*", "createdAt": "2001-09-09T03:46:40+0200", "updatedAt": "2015-08-25T16:18:48+0200" } |