From aa89610d1111fb4bb56920903626f02fa446afc8 Mon Sep 17 00:00:00 2001 From: Teryk Bellahsene Date: Tue, 25 Aug 2015 11:33:45 +0200 Subject: [PATCH] SONAR-6503 SONAR-6500 SONAR-6502 SONAR-6501 Update permission parameter description when project permissions only are allowed --- .../permission/ws/AddGroupToTemplateAction.java | 4 ++-- .../permission/ws/AddUserToTemplateAction.java | 4 ++-- .../org/sonar/server/permission/ws/Parameters.java | 13 ++++++++++++- .../ws/RemoveGroupFromTemplateAction.java | 4 ++-- .../permission/ws/RemoveUserFromTemplateAction.java | 4 ++-- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddGroupToTemplateAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddGroupToTemplateAction.java index ee330decfac..c579546a7c2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddGroupToTemplateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddGroupToTemplateAction.java @@ -40,7 +40,7 @@ import static org.sonar.server.permission.ws.Parameters.PARAM_PERMISSION; import static org.sonar.server.permission.ws.Parameters.PARAM_TEMPLATE_KEY; import static org.sonar.server.permission.ws.Parameters.createGroupIdParameter; import static org.sonar.server.permission.ws.Parameters.createGroupNameParameter; -import static org.sonar.server.permission.ws.Parameters.createPermissionParameter; +import static org.sonar.server.permission.ws.Parameters.createProjectPermissionParameter; import static org.sonar.server.permission.ws.Parameters.createTemplateKeyParameter; public class AddGroupToTemplateAction implements PermissionsWsAction { @@ -66,7 +66,7 @@ public class AddGroupToTemplateAction implements PermissionsWsAction { .setHandler(this); createTemplateKeyParameter(action); - createPermissionParameter(action); + createProjectPermissionParameter(action); createGroupIdParameter(action); createGroupNameParameter(action); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddUserToTemplateAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddUserToTemplateAction.java index 01ae1255d4c..510bbac1f52 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddUserToTemplateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddUserToTemplateAction.java @@ -40,7 +40,7 @@ import static org.sonar.server.permission.PermissionRequestValidator.validatePro import static org.sonar.server.permission.ws.Parameters.PARAM_PERMISSION; import static org.sonar.server.permission.ws.Parameters.PARAM_TEMPLATE_KEY; import static org.sonar.server.permission.ws.Parameters.PARAM_USER_LOGIN; -import static org.sonar.server.permission.ws.Parameters.createPermissionParameter; +import static org.sonar.server.permission.ws.Parameters.createProjectPermissionParameter; import static org.sonar.server.permission.ws.Parameters.createTemplateKeyParameter; import static org.sonar.server.permission.ws.Parameters.createUserLoginParameter; @@ -66,7 +66,7 @@ public class AddUserToTemplateAction implements PermissionsWsAction { .setHandler(this); createTemplateKeyParameter(action); - createPermissionParameter(action); + createProjectPermissionParameter(action); createUserLoginParameter(action); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/Parameters.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/Parameters.java index 79eb9c1333a..e15cd93a079 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/Parameters.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/Parameters.java @@ -21,8 +21,8 @@ package org.sonar.server.permission.ws; import org.sonar.api.server.ws.WebService.NewAction; -import org.sonar.core.permission.ProjectPermissions; import org.sonar.core.permission.GlobalPermissions; +import org.sonar.core.permission.ProjectPermissions; class Parameters { @@ -41,6 +41,11 @@ class Parameters { "", GlobalPermissions.ALL_ON_ONE_LINE, ProjectPermissions.ALL_ON_ONE_LINE); + private static final String PROJECT_PERMISSION_PARAM_DESCRIPTION = String.format("Permission" + + "", + ProjectPermissions.ALL_ON_ONE_LINE); private Parameters() { // static methods only @@ -52,6 +57,12 @@ class Parameters { .setRequired(true); } + static void createProjectPermissionParameter(NewAction action) { + action.createParam(PARAM_PERMISSION) + .setDescription(PROJECT_PERMISSION_PARAM_DESCRIPTION) + .setRequired(true); + } + static void createGroupNameParameter(NewAction action) { action.createParam(PARAM_GROUP_NAME) .setDescription("Group name or 'anyone' (case insensitive)") diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveGroupFromTemplateAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveGroupFromTemplateAction.java index f5f156779f5..79147e7cf33 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveGroupFromTemplateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveGroupFromTemplateAction.java @@ -35,7 +35,7 @@ import static org.sonar.server.permission.ws.Parameters.PARAM_PERMISSION; import static org.sonar.server.permission.ws.Parameters.PARAM_TEMPLATE_KEY; import static org.sonar.server.permission.ws.Parameters.createGroupIdParameter; import static org.sonar.server.permission.ws.Parameters.createGroupNameParameter; -import static org.sonar.server.permission.ws.Parameters.createPermissionParameter; +import static org.sonar.server.permission.ws.Parameters.createProjectPermissionParameter; import static org.sonar.server.permission.ws.Parameters.createTemplateKeyParameter; public class RemoveGroupFromTemplateAction implements PermissionsWsAction { @@ -61,7 +61,7 @@ public class RemoveGroupFromTemplateAction implements PermissionsWsAction { .setHandler(this); createTemplateKeyParameter(action); - createPermissionParameter(action); + createProjectPermissionParameter(action); createGroupIdParameter(action); createGroupNameParameter(action); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveUserFromTemplateAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveUserFromTemplateAction.java index 7b2857e21ef..0c0c9742436 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveUserFromTemplateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveUserFromTemplateAction.java @@ -34,7 +34,7 @@ import static org.sonar.server.permission.PermissionRequestValidator.validatePro import static org.sonar.server.permission.ws.Parameters.PARAM_PERMISSION; import static org.sonar.server.permission.ws.Parameters.PARAM_TEMPLATE_KEY; import static org.sonar.server.permission.ws.Parameters.PARAM_USER_LOGIN; -import static org.sonar.server.permission.ws.Parameters.createPermissionParameter; +import static org.sonar.server.permission.ws.Parameters.createProjectPermissionParameter; import static org.sonar.server.permission.ws.Parameters.createTemplateKeyParameter; import static org.sonar.server.permission.ws.Parameters.createUserLoginParameter; @@ -60,7 +60,7 @@ public class RemoveUserFromTemplateAction implements PermissionsWsAction { .setHandler(this); createTemplateKeyParameter(action); - createPermissionParameter(action); + createProjectPermissionParameter(action); createUserLoginParameter(action); } -- 2.39.5