diff options
author | Teryk Bellahsene <teryk.bellahsene@sonarsource.com> | 2015-10-05 17:55:21 +0200 |
---|---|---|
committer | Teryk Bellahsene <teryk.bellahsene@sonarsource.com> | 2015-10-06 08:10:12 +0200 |
commit | 266d66ca1c06150d058f48910990d7891f66f6c4 (patch) | |
tree | a0fa32f7ca7bfdd019e661ac2d105434492905d8 /server | |
parent | 538324eece870b20ae18f0d9072fa286b774c843 (diff) | |
download | sonarqube-266d66ca1c06150d058f48910990d7891f66f6c4.tar.gz sonarqube-266d66ca1c06150d058f48910990d7891f66f6c4.zip |
Rename WsPermissionParameters to PermissionsWsParameters
Diffstat (limited to 'server')
44 files changed, 158 insertions, 158 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java index 503c99724cf..ef3d0c9dc9b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/SearchAction.java @@ -45,7 +45,7 @@ import static com.google.common.collect.Ordering.natural; import static java.lang.String.format; import static org.sonar.server.component.ResourceTypeFunctions.RESOURCE_TYPE_TO_QUALIFIER; import static org.sonar.server.component.ws.WsComponentsParameters.PARAM_QUALIFIERS; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_QUALIFIER; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_QUALIFIER; import static org.sonar.server.ws.WsUtils.checkRequest; import static org.sonar.server.ws.WsUtils.writeProtobuf; diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddGroupAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddGroupAction.java index 4ac3370b230..a2a8c4c747b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddGroupAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddGroupAction.java @@ -29,10 +29,10 @@ import org.sonar.server.permission.PermissionChange; import org.sonar.server.permission.PermissionUpdater; import org.sonar.server.permission.ws.PermissionRequest.Builder; -import static org.sonar.server.permission.ws.WsPermissionParameters.createGroupIdParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createGroupNameParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createPermissionParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createProjectParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createGroupIdParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createGroupNameParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createPermissionParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createProjectParameter; public class AddGroupAction implements PermissionsWsAction { diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddUserAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddUserAction.java index b98d9cbf43a..5528f880326 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddUserAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/AddUserAction.java @@ -29,9 +29,9 @@ import org.sonar.server.permission.PermissionChange; import org.sonar.server.permission.PermissionUpdater; import org.sonar.server.permission.ws.PermissionRequest.Builder; -import static org.sonar.server.permission.ws.WsPermissionParameters.createPermissionParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createProjectParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createUserLoginParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createPermissionParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createProjectParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createUserLoginParameter; public class AddUserAction implements PermissionsWsAction { diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/DeleteTemplateAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/DeleteTemplateAction.java index 4813560a92c..58bcca990e1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/DeleteTemplateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/DeleteTemplateAction.java @@ -31,7 +31,7 @@ import org.sonar.server.permission.ws.template.DefaultPermissionTemplateFinder; import org.sonar.server.user.UserSession; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdminUser; -import static org.sonar.server.permission.ws.WsPermissionParameters.createTemplateParameters; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createTemplateParameters; import static org.sonar.server.permission.ws.WsTemplateRef.fromRequest; import static org.sonar.server.ws.WsUtils.checkRequest; diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/GroupsAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/GroupsAction.java index 532ab5f5314..041d215e551 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/GroupsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/GroupsAction.java @@ -43,8 +43,8 @@ import org.sonarqube.ws.WsPermissions.WsGroupsResponse; import static com.google.common.base.Objects.firstNonNull; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkProjectAdminUserByComponentDto; import static org.sonar.server.permission.ws.PermissionQueryParser.fromSelectionModeToMembership; -import static org.sonar.server.permission.ws.WsPermissionParameters.createPermissionParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createProjectParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createPermissionParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createProjectParameter; import static org.sonar.server.ws.WsUtils.writeProtobuf; public class GroupsAction implements PermissionsWsAction { diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequest.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequest.java index 7c1d914d8d4..352e0e606b5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequest.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequest.java @@ -31,8 +31,8 @@ import static org.sonar.api.server.ws.WebService.Param.SELECTED; import static org.sonar.api.server.ws.WebService.Param.TEXT_QUERY; import static org.sonar.server.permission.ws.PermissionRequestValidator.validateGlobalPermission; import static org.sonar.server.permission.ws.PermissionRequestValidator.validateProjectPermission; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PERMISSION; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_USER_LOGIN; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PERMISSION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_USER_LOGIN; class PermissionRequest { private final String permission; diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequestValidator.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequestValidator.java index 1c3423b1f08..adac2aa7e3b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequestValidator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionRequestValidator.java @@ -32,9 +32,9 @@ import static com.google.common.base.Strings.isNullOrEmpty; import static java.lang.String.format; import static org.apache.commons.lang.StringUtils.isBlank; import static org.sonar.api.security.DefaultGroups.isAnyone; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PERMISSION; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_QUALIFIER; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PATTERN; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PERMISSION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_QUALIFIER; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PATTERN; import static org.sonar.server.ws.WsUtils.checkRequest; public class PermissionRequestValidator { diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/WsPermissionParameters.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsParameters.java index c9d9f4b2111..7c0b865dca6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/WsPermissionParameters.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsParameters.java @@ -27,7 +27,7 @@ import org.sonar.core.util.Uuids; import static java.lang.String.format; -public class WsPermissionParameters { +public class PermissionsWsParameters { public static final String PARAM_PERMISSION = "permission"; public static final String PARAM_GROUP_NAME = "groupName"; @@ -58,7 +58,7 @@ public class WsPermissionParameters { "</ul>", ProjectPermissions.ALL_ON_ONE_LINE); - private WsPermissionParameters() { + private PermissionsWsParameters() { // static methods only } diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveGroupAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveGroupAction.java index 2a1da412fb3..91c3e2637d1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveGroupAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveGroupAction.java @@ -29,10 +29,10 @@ import org.sonar.server.permission.PermissionChange; import org.sonar.server.permission.PermissionUpdater; import org.sonar.server.permission.ws.PermissionRequest.Builder; -import static org.sonar.server.permission.ws.WsPermissionParameters.createGroupIdParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createGroupNameParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createPermissionParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createProjectParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createGroupIdParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createGroupNameParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createPermissionParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createProjectParameter; public class RemoveGroupAction implements PermissionsWsAction { diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveUserAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveUserAction.java index 0dfaaa174a5..85b1d8b79d6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveUserAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/RemoveUserAction.java @@ -29,9 +29,9 @@ import org.sonar.server.permission.PermissionChange; import org.sonar.server.permission.PermissionUpdater; import org.sonar.server.permission.ws.PermissionRequest.Builder; -import static org.sonar.server.permission.ws.WsPermissionParameters.createPermissionParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createProjectParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createUserLoginParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createPermissionParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createProjectParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createUserLoginParameter; public class RemoveUserAction implements PermissionsWsAction { diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsAction.java index bf72a44f0b5..aa6f842ea56 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchProjectPermissionsAction.java @@ -39,7 +39,7 @@ import org.sonarqube.ws.WsPermissions.WsSearchProjectPermissionsResponse.Project import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdminUser; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkProjectAdminUserByComponentKey; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkProjectAdminUserByComponentUuid; -import static org.sonar.server.permission.ws.WsPermissionParameters.createProjectParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createProjectParameter; import static org.sonar.server.ws.WsUtils.writeProtobuf; public class SearchProjectPermissionsAction implements PermissionsWsAction { diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/TemplateGroupsAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/TemplateGroupsAction.java index 1901b93e886..fee0309378a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/TemplateGroupsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/TemplateGroupsAction.java @@ -38,9 +38,9 @@ import org.sonarqube.ws.WsPermissions.WsGroupsResponse; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdminUser; import static org.sonar.server.permission.ws.PermissionQueryParser.fromSelectionModeToMembership; import static org.sonar.server.permission.ws.PermissionRequestValidator.validateProjectPermission; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PERMISSION; -import static org.sonar.server.permission.ws.WsPermissionParameters.createProjectPermissionParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createTemplateParameters; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PERMISSION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createProjectPermissionParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createTemplateParameters; import static org.sonar.server.ws.WsUtils.writeProtobuf; public class TemplateGroupsAction implements PermissionsWsAction { diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/TemplateUsersAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/TemplateUsersAction.java index bb10c0686a7..936482b9976 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/TemplateUsersAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/TemplateUsersAction.java @@ -39,9 +39,9 @@ import static java.lang.String.format; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdminUser; import static org.sonar.server.permission.ws.PermissionQueryParser.fromSelectionModeToMembership; import static org.sonar.server.permission.ws.PermissionRequestValidator.validateProjectPermission; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PERMISSION; -import static org.sonar.server.permission.ws.WsPermissionParameters.createProjectPermissionParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createTemplateParameters; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PERMISSION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createProjectPermissionParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createTemplateParameters; import static org.sonar.server.ws.WsUtils.writeProtobuf; public class TemplateUsersAction implements PermissionsWsAction { diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/UsersAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/UsersAction.java index 0ed4161e4f4..1de9929e0ea 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/UsersAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/UsersAction.java @@ -44,8 +44,8 @@ import static com.google.common.base.Strings.nullToEmpty; import static org.sonar.api.utils.Paging.forPageIndex; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkProjectAdminUserByComponentDto; import static org.sonar.server.permission.ws.PermissionQueryParser.fromSelectionModeToMembership; -import static org.sonar.server.permission.ws.WsPermissionParameters.createPermissionParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createProjectParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createPermissionParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createProjectParameter; import static org.sonar.server.ws.WsUtils.writeProtobuf; public class UsersAction implements PermissionsWsAction { diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/WsProjectRef.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/WsProjectRef.java index 9e1f6989edc..97f44766dd9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/WsProjectRef.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/WsProjectRef.java @@ -24,8 +24,8 @@ import com.google.common.base.Optional; import javax.annotation.CheckForNull; import org.sonar.api.server.ws.Request; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PROJECT_ID; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PROJECT_KEY; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PROJECT_ID; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PROJECT_KEY; import static org.sonar.server.ws.WsUtils.checkRequest; /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/WsTemplateRef.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/WsTemplateRef.java index dab5c88b098..6fa2b2c7f55 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/WsTemplateRef.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/WsTemplateRef.java @@ -24,8 +24,8 @@ import javax.annotation.CheckForNull; import javax.annotation.Nullable; import org.sonar.api.server.ws.Request; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_TEMPLATE_UUID; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_TEMPLATE_NAME; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_TEMPLATE_UUID; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_TEMPLATE_NAME; import static org.sonar.server.ws.WsUtils.checkRequest; /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddGroupToTemplateAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddGroupToTemplateAction.java index 7d40a1a5698..4aa2269fd75 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddGroupToTemplateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddGroupToTemplateAction.java @@ -40,11 +40,11 @@ import static org.sonar.db.user.GroupMembershipQuery.IN; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdminUser; import static org.sonar.server.permission.ws.PermissionRequestValidator.validateNotAnyoneAndAdminPermission; import static org.sonar.server.permission.ws.PermissionRequestValidator.validateProjectPermission; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PERMISSION; -import static org.sonar.server.permission.ws.WsPermissionParameters.createGroupIdParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createGroupNameParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createProjectPermissionParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createTemplateParameters; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PERMISSION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createGroupIdParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createGroupNameParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createProjectPermissionParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createTemplateParameters; public class AddGroupToTemplateAction implements PermissionsWsAction { private final DbClient dbClient; diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddUserToTemplateAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddUserToTemplateAction.java index c8658d3f088..0d1d8924966 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddUserToTemplateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/AddUserToTemplateAction.java @@ -39,11 +39,11 @@ import org.sonar.server.user.UserSession; import static com.google.common.collect.FluentIterable.from; import static org.sonar.db.user.GroupMembershipQuery.IN; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdminUser; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PERMISSION; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_USER_LOGIN; -import static org.sonar.server.permission.ws.WsPermissionParameters.createProjectPermissionParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createTemplateParameters; -import static org.sonar.server.permission.ws.WsPermissionParameters.createUserLoginParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PERMISSION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_USER_LOGIN; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createProjectPermissionParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createTemplateParameters; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createUserLoginParameter; import static org.sonar.server.permission.ws.PermissionRequestValidator.validateProjectPermission; public class AddUserToTemplateAction implements PermissionsWsAction { diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/ApplyTemplateAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/ApplyTemplateAction.java index 11111c34762..8a10f4b17d9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/ApplyTemplateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/ApplyTemplateAction.java @@ -35,8 +35,8 @@ import org.sonar.server.permission.ws.WsProjectRef; import org.sonar.server.permission.ws.WsTemplateRef; import static java.util.Collections.singletonList; -import static org.sonar.server.permission.ws.WsPermissionParameters.createProjectParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createTemplateParameters; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createProjectParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createTemplateParameters; public class ApplyTemplateAction implements PermissionsWsAction { private final DbClient dbClient; diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/CreateTemplateAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/CreateTemplateAction.java index 2e949840264..38eb3127239 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/CreateTemplateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/CreateTemplateAction.java @@ -34,11 +34,11 @@ import org.sonarqube.ws.WsPermissions.WsCreatePermissionTemplateResponse; import static java.lang.String.format; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdminUser; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_DESCRIPTION; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_NAME; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PATTERN; -import static org.sonar.server.permission.ws.WsPermissionParameters.createTemplateDescriptionParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createTemplateProjectKeyPatternParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_DESCRIPTION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_NAME; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PATTERN; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createTemplateDescriptionParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createTemplateProjectKeyPatternParameter; import static org.sonar.server.permission.ws.PermissionRequestValidator.MSG_TEMPLATE_WITH_SAME_NAME; import static org.sonar.server.permission.ws.PermissionRequestValidator.validateProjectPattern; import static org.sonar.server.permission.ws.PermissionRequestValidator.validateTemplateNameFormat; diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateAction.java index 06c76a2b975..766bd03f2e7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveGroupFromTemplateAction.java @@ -34,11 +34,11 @@ import org.sonar.server.permission.ws.WsTemplateRef; import org.sonar.server.user.UserSession; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdminUser; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PERMISSION; -import static org.sonar.server.permission.ws.WsPermissionParameters.createGroupIdParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createGroupNameParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createProjectPermissionParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createTemplateParameters; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PERMISSION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createGroupIdParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createGroupNameParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createProjectPermissionParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createTemplateParameters; import static org.sonar.server.permission.ws.PermissionRequestValidator.validateProjectPermission; public class RemoveGroupFromTemplateAction implements PermissionsWsAction { diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateAction.java index a8147e40d7b..c793545c9a2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateAction.java @@ -33,11 +33,11 @@ import org.sonar.server.permission.ws.WsTemplateRef; import org.sonar.server.user.UserSession; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdminUser; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PERMISSION; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_USER_LOGIN; -import static org.sonar.server.permission.ws.WsPermissionParameters.createProjectPermissionParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createTemplateParameters; -import static org.sonar.server.permission.ws.WsPermissionParameters.createUserLoginParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PERMISSION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_USER_LOGIN; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createProjectPermissionParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createTemplateParameters; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createUserLoginParameter; import static org.sonar.server.permission.ws.PermissionRequestValidator.validateProjectPermission; public class RemoveUserFromTemplateAction implements PermissionsWsAction { diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SetDefaultTemplateAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SetDefaultTemplateAction.java index a8c8e7b664b..82ca38f7153 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SetDefaultTemplateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SetDefaultTemplateAction.java @@ -41,8 +41,8 @@ import static com.google.common.collect.Ordering.natural; import static java.lang.String.format; import static org.sonar.server.permission.DefaultPermissionTemplates.defaultRootQualifierTemplateProperty; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdminUser; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_QUALIFIER; -import static org.sonar.server.permission.ws.WsPermissionParameters.createTemplateParameters; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_QUALIFIER; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createTemplateParameters; import static org.sonar.server.permission.ws.PermissionRequestValidator.validateQualifier; import static org.sonar.server.component.ResourceTypeFunctions.RESOURCE_TYPE_TO_QUALIFIER; diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/UpdateTemplateAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/UpdateTemplateAction.java index 8eaf61cb37a..5522eae7289 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/UpdateTemplateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/UpdateTemplateAction.java @@ -39,13 +39,13 @@ import org.sonarqube.ws.WsPermissions.WsUpdatePermissionTemplateResponse; import static com.google.common.base.Objects.firstNonNull; import static java.lang.String.format; import static org.sonar.server.permission.PermissionPrivilegeChecker.checkGlobalAdminUser; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_ID; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_DESCRIPTION; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_NAME; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PATTERN; -import static org.sonar.server.permission.ws.WsPermissionParameters.createIdParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createTemplateDescriptionParameter; -import static org.sonar.server.permission.ws.WsPermissionParameters.createTemplateProjectKeyPatternParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_ID; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_DESCRIPTION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_NAME; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PATTERN; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createIdParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createTemplateDescriptionParameter; +import static org.sonar.server.permission.ws.PermissionsWsParameters.createTemplateProjectKeyPatternParameter; import static org.sonar.server.permission.ws.PermissionRequestValidator.MSG_TEMPLATE_WITH_SAME_NAME; import static org.sonar.server.permission.ws.PermissionRequestValidator.validateProjectPattern; import static org.sonar.server.permission.ws.PermissionRequestValidator.validateTemplateNameFormat; diff --git a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/WsGroupRef.java b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/WsGroupRef.java index b7c7bf48aa5..4eed536b0ee 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/WsGroupRef.java +++ b/server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/WsGroupRef.java @@ -23,7 +23,7 @@ package org.sonar.server.usergroups.ws; import javax.annotation.CheckForNull; import javax.annotation.Nullable; import org.sonar.api.server.ws.Request; -import org.sonar.server.permission.ws.WsPermissionParameters; +import org.sonar.server.permission.ws.PermissionsWsParameters; import static org.sonar.server.ws.WsUtils.checkRequest; @@ -43,8 +43,8 @@ public class WsGroupRef { } public static WsGroupRef fromPermissionRequest(Request wsRequest) { - Long id = wsRequest.paramAsLong(WsPermissionParameters.PARAM_GROUP_ID); - String name = wsRequest.param(WsPermissionParameters.PARAM_GROUP_NAME); + Long id = wsRequest.paramAsLong(PermissionsWsParameters.PARAM_GROUP_ID); + String name = wsRequest.param(PermissionsWsParameters.PARAM_GROUP_NAME); return new WsGroupRef(id, name); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java index 787fab250e7..9bc4b51fc4f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java @@ -54,11 +54,11 @@ import static org.sonar.db.component.ComponentTesting.newProjectDto; import static org.sonar.db.component.ComponentTesting.newView; import static org.sonar.server.permission.ws.AddGroupAction.ACTION; import static org.sonar.server.permission.ws.PermissionsWs.ENDPOINT; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_GROUP_ID; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_GROUP_NAME; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PERMISSION; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PROJECT_ID; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PROJECT_KEY; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_GROUP_ID; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_GROUP_NAME; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PERMISSION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PROJECT_ID; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PROJECT_KEY; @Category(DbTests.class) public class AddGroupActionTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java index 4281848a89c..08136ea912d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java @@ -54,10 +54,10 @@ import static org.sonar.db.component.ComponentTesting.newProjectDto; import static org.sonar.db.component.ComponentTesting.newView; import static org.sonar.server.permission.ws.AddUserAction.ACTION; import static org.sonar.server.permission.ws.PermissionsWs.ENDPOINT; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PERMISSION; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PROJECT_ID; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PROJECT_KEY; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_USER_LOGIN; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PERMISSION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PROJECT_ID; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PROJECT_KEY; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_USER_LOGIN; @Category(DbTests.class) public class AddUserActionTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java index 8b7ed74c2a1..ade5d7a6a9a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java @@ -58,9 +58,9 @@ import static org.sonar.core.permission.GlobalPermissions.SCAN_EXECUTION; import static org.sonar.core.permission.GlobalPermissions.SYSTEM_ADMIN; import static org.sonar.db.component.ComponentTesting.newProjectDto; import static org.sonar.db.component.ComponentTesting.newView; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PERMISSION; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PROJECT_KEY; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PROJECT_ID; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PERMISSION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PROJECT_KEY; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PROJECT_ID; import static org.sonar.test.JsonAssert.assertJson; @Category(DbTests.class) diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionsWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionsWsTest.java index bedfb26e07b..f8e8932e28c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionsWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/PermissionsWsTest.java @@ -84,7 +84,7 @@ public class PermissionsWsTest { assertThat(action.isPost()).isFalse(); assertThat(action.isInternal()).isTrue(); assertThat(action.since()).isEqualTo("5.2"); - assertThat(action.param(WsPermissionParameters.PARAM_PERMISSION).isRequired()).isTrue(); + assertThat(action.param(PermissionsWsParameters.PARAM_PERMISSION).isRequired()).isTrue(); } @Test @@ -95,7 +95,7 @@ public class PermissionsWsTest { assertThat(action.isPost()).isFalse(); assertThat(action.isInternal()).isTrue(); assertThat(action.since()).isEqualTo("5.2"); - assertThat(action.param(WsPermissionParameters.PARAM_PERMISSION).isRequired()).isTrue(); + assertThat(action.param(PermissionsWsParameters.PARAM_PERMISSION).isRequired()).isTrue(); } private WebService.Controller controller() { diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java index 2b4f3323eed..e06c769e9f0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java @@ -53,11 +53,11 @@ import static org.sonar.core.permission.GlobalPermissions.SYSTEM_ADMIN; import static org.sonar.db.component.ComponentTesting.newFileDto; import static org.sonar.db.component.ComponentTesting.newProjectDto; import static org.sonar.db.component.ComponentTesting.newView; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_GROUP_ID; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_GROUP_NAME; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PERMISSION; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PROJECT_KEY; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PROJECT_ID; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_GROUP_ID; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_GROUP_NAME; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PERMISSION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PROJECT_KEY; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PROJECT_ID; import static org.sonar.server.permission.ws.RemoveGroupAction.ACTION; @Category(DbTests.class) diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveUserActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveUserActionTest.java index eb29e8bb8a7..f15d13d37c7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveUserActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveUserActionTest.java @@ -52,10 +52,10 @@ import static org.sonar.core.permission.GlobalPermissions.SYSTEM_ADMIN; import static org.sonar.db.component.ComponentTesting.newFileDto; import static org.sonar.db.component.ComponentTesting.newProjectDto; import static org.sonar.db.component.ComponentTesting.newView; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PERMISSION; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PROJECT_KEY; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PROJECT_ID; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_USER_LOGIN; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PERMISSION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PROJECT_KEY; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PROJECT_ID; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_USER_LOGIN; import static org.sonar.server.permission.ws.PermissionsWs.ENDPOINT; import static org.sonar.server.permission.ws.RemoveUserAction.ACTION; diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java index 3e88bffa8a9..03bd47c57e5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchProjectPermissionsActionTest.java @@ -61,7 +61,7 @@ import static org.sonar.db.component.ComponentTesting.newProjectDto; import static org.sonar.db.component.ComponentTesting.newView; import static org.sonar.db.user.GroupTesting.newGroupDto; import static org.sonar.db.user.UserTesting.newUserDto; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PROJECT_ID; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PROJECT_ID; import static org.sonar.test.JsonAssert.assertJson; public class SearchProjectPermissionsActionTest { diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/TemplateGroupsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/TemplateGroupsActionTest.java index f05da6003ab..5e3fa737221 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/TemplateGroupsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/TemplateGroupsActionTest.java @@ -61,9 +61,9 @@ import static org.sonar.core.permission.GlobalPermissions.SYSTEM_ADMIN; import static org.sonar.db.permission.PermissionTemplateTesting.newPermissionTemplateDto; import static org.sonar.db.permission.PermissionTemplateTesting.newPermissionTemplateGroupDto; import static org.sonar.db.user.GroupTesting.newGroupDto; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PERMISSION; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_TEMPLATE_NAME; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_TEMPLATE_UUID; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PERMISSION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_TEMPLATE_NAME; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_TEMPLATE_UUID; import static org.sonar.test.JsonAssert.assertJson; @Category(DbTests.class) diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/TemplateUsersActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/TemplateUsersActionTest.java index 6c10b5d6174..a4d63b2b97f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/TemplateUsersActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/TemplateUsersActionTest.java @@ -122,7 +122,7 @@ public class TemplateUsersActionTest { @Test public void search_for_users_by_template_name() throws IOException { InputStream responseStream = newRequest(UserRole.USER, null) - .setParam(WsPermissionParameters.PARAM_TEMPLATE_NAME, template1.getName()) + .setParam(PermissionsWsParameters.PARAM_TEMPLATE_NAME, template1.getName()) .setMediaType(PROTOBUF) .execute().getInputStream(); @@ -134,7 +134,7 @@ public class TemplateUsersActionTest { @Test public void search_using_text_query() throws IOException { InputStream responseStream = newRequest(UserRole.USER, null) - .setParam(WsPermissionParameters.PARAM_TEMPLATE_NAME, template1.getName()) + .setParam(PermissionsWsParameters.PARAM_TEMPLATE_NAME, template1.getName()) .setParam(WebService.Param.TEXT_QUERY, "ame-1") .setMediaType(PROTOBUF) .execute().getInputStream(); @@ -147,7 +147,7 @@ public class TemplateUsersActionTest { @Test public void search_using_selected() throws IOException { InputStream responseStream = newRequest(UserRole.USER, null) - .setParam(WsPermissionParameters.PARAM_TEMPLATE_NAME, template1.getName()) + .setParam(PermissionsWsParameters.PARAM_TEMPLATE_NAME, template1.getName()) .setParam(WebService.Param.SELECTED, "all") .setMediaType(PROTOBUF) .execute().getInputStream(); @@ -161,7 +161,7 @@ public class TemplateUsersActionTest { @Test public void search_with_pagination() throws IOException { InputStream responseStream = newRequest(UserRole.USER, null) - .setParam(WsPermissionParameters.PARAM_TEMPLATE_NAME, template1.getName()) + .setParam(PermissionsWsParameters.PARAM_TEMPLATE_NAME, template1.getName()) .setParam(WebService.Param.SELECTED, "all") .setParam(WebService.Param.PAGE, "2") .setParam(WebService.Param.PAGE_SIZE, "1") @@ -194,7 +194,7 @@ public class TemplateUsersActionTest { expectedException.expect(BadRequestException.class); newRequest(UserRole.USER, template1.getUuid()) - .setParam(WsPermissionParameters.PARAM_TEMPLATE_NAME, template1.getName()) + .setParam(PermissionsWsParameters.PARAM_TEMPLATE_NAME, template1.getName()) .execute(); } @@ -236,9 +236,9 @@ public class TemplateUsersActionTest { private TestRequest newRequest(String permission, @Nullable String templateUuid) { TestRequest request = ws.newRequest(); - request.setParam(WsPermissionParameters.PARAM_PERMISSION, permission); + request.setParam(PermissionsWsParameters.PARAM_PERMISSION, permission); if (templateUuid != null) { - request.setParam(WsPermissionParameters.PARAM_TEMPLATE_UUID, templateUuid); + request.setParam(PermissionsWsParameters.PARAM_TEMPLATE_UUID, templateUuid); } return request; diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/UsersActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/UsersActionTest.java index 397a495ca35..b7c41b06173 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/UsersActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/UsersActionTest.java @@ -53,9 +53,9 @@ import static org.sonar.core.permission.GlobalPermissions.SCAN_EXECUTION; import static org.sonar.core.permission.GlobalPermissions.SYSTEM_ADMIN; import static org.sonar.db.component.ComponentTesting.newProjectDto; import static org.sonar.db.user.UserTesting.newUserDto; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PERMISSION; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PROJECT_ID; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PROJECT_KEY; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PERMISSION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PROJECT_ID; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PROJECT_KEY; import static org.sonar.test.JsonAssert.assertJson; @Category(DbTests.class) 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 8c9516723aa..d2667d6a788 100644 --- 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 @@ -47,7 +47,7 @@ import org.sonar.server.exceptions.ForbiddenException; 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.PermissionsWsParameters; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.usergroups.ws.UserGroupFinder; import org.sonar.server.ws.TestRequest; @@ -63,11 +63,11 @@ import static org.sonar.api.web.UserRole.ISSUE_ADMIN; import static org.sonar.db.permission.PermissionTemplateTesting.newPermissionTemplateDto; import static org.sonar.db.user.GroupMembershipQuery.IN; import static org.sonar.db.user.GroupTesting.newGroupDto; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_GROUP_ID; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_GROUP_NAME; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PERMISSION; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_TEMPLATE_UUID; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_TEMPLATE_NAME; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_GROUP_ID; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_GROUP_NAME; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PERMISSION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_TEMPLATE_UUID; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_TEMPLATE_NAME; @Category(DbTests.class) public class AddGroupToTemplateActionTest { @@ -217,13 +217,13 @@ public class AddGroupToTemplateActionTest { private void newRequest(@Nullable String groupName, @Nullable String templateKey, @Nullable String permission) { TestRequest request = ws.newRequest(); if (groupName != null) { - request.setParam(WsPermissionParameters.PARAM_GROUP_NAME, groupName); + request.setParam(PermissionsWsParameters.PARAM_GROUP_NAME, groupName); } if (templateKey != null) { request.setParam(PARAM_TEMPLATE_UUID, templateKey); } if (permission != null) { - request.setParam(WsPermissionParameters.PARAM_PERMISSION, permission); + request.setParam(PermissionsWsParameters.PARAM_PERMISSION, permission); } request.execute(); 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 e42476b4c2a..1391b998193 100644 --- 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 @@ -46,7 +46,7 @@ import org.sonar.server.exceptions.ForbiddenException; 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.PermissionsWsParameters; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.usergroups.ws.UserGroupFinder; import org.sonar.server.ws.TestRequest; @@ -60,9 +60,9 @@ import static org.sonar.api.web.UserRole.ISSUE_ADMIN; import static org.sonar.db.permission.PermissionTemplateTesting.newPermissionTemplateDto; import static org.sonar.db.user.GroupMembershipQuery.IN; import static org.sonar.db.user.UserTesting.newUserDto; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PERMISSION; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_TEMPLATE_NAME; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_USER_LOGIN; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PERMISSION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_TEMPLATE_NAME; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_USER_LOGIN; @Category(DbTests.class) public class AddUserToTemplateActionTest { @@ -189,10 +189,10 @@ public class AddUserToTemplateActionTest { request.setParam(PARAM_USER_LOGIN, userLogin); } if (templateKey != null) { - request.setParam(WsPermissionParameters.PARAM_TEMPLATE_UUID, templateKey); + request.setParam(PermissionsWsParameters.PARAM_TEMPLATE_UUID, templateKey); } if (permission != null) { - request.setParam(WsPermissionParameters.PARAM_PERMISSION, permission); + request.setParam(PermissionsWsParameters.PARAM_PERMISSION, permission); } request.execute(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/ApplyTemplateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/ApplyTemplateActionTest.java index ec227d9ec14..eb4ceead794 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/ApplyTemplateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/ApplyTemplateActionTest.java @@ -72,10 +72,10 @@ import static org.sonar.db.permission.PermissionTemplateTesting.newPermissionTem import static org.sonar.db.user.GroupMembershipQuery.IN; import static org.sonar.db.user.GroupTesting.newGroupDto; import static org.sonar.db.user.UserTesting.newUserDto; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PROJECT_ID; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PROJECT_KEY; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_TEMPLATE_UUID; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_TEMPLATE_NAME; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PROJECT_ID; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PROJECT_KEY; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_TEMPLATE_UUID; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_TEMPLATE_NAME; @Category(DbTests.class) public class ApplyTemplateActionTest { 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 37493845cb6..4789e934557 100644 --- 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 @@ -43,9 +43,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.sonar.db.permission.PermissionTemplateTesting.newPermissionTemplateDto; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_DESCRIPTION; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_NAME; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PATTERN; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_DESCRIPTION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_NAME; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PATTERN; import static org.sonar.test.JsonAssert.assertJson; public class CreateTemplateActionTest { 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 6021d9a6649..83f56144c54 100644 --- 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 @@ -57,8 +57,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.mockito.internal.util.collections.Sets.newSet; import static org.sonar.db.permission.PermissionTemplateTesting.newPermissionTemplateDto; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_TEMPLATE_UUID; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_TEMPLATE_NAME; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_TEMPLATE_UUID; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_TEMPLATE_NAME; public class DeleteTemplateActionTest { 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 8ba57d49b72..37a89b0457e 100644 --- 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 @@ -46,7 +46,7 @@ import org.sonar.server.exceptions.ForbiddenException; 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.PermissionsWsParameters; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.usergroups.ws.UserGroupFinder; import org.sonar.server.ws.TestRequest; @@ -60,11 +60,11 @@ import static org.sonar.api.web.UserRole.CODEVIEWER; import static org.sonar.db.permission.PermissionTemplateTesting.newPermissionTemplateDto; import static org.sonar.db.user.GroupMembershipQuery.IN; import static org.sonar.db.user.GroupTesting.newGroupDto; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_GROUP_ID; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_GROUP_NAME; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PERMISSION; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_TEMPLATE_NAME; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_TEMPLATE_UUID; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_GROUP_ID; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_GROUP_NAME; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PERMISSION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_TEMPLATE_NAME; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_TEMPLATE_UUID; @Category(DbTests.class) public class RemoveGroupFromTemplateActionTest { @@ -220,13 +220,13 @@ public class RemoveGroupFromTemplateActionTest { private void newRequest(@Nullable String groupName, @Nullable String templateKey, @Nullable String permission) { TestRequest request = ws.newRequest(); if (groupName != null) { - request.setParam(WsPermissionParameters.PARAM_GROUP_NAME, groupName); + request.setParam(PermissionsWsParameters.PARAM_GROUP_NAME, groupName); } if (templateKey != null) { request.setParam(PARAM_TEMPLATE_UUID, templateKey); } if (permission != null) { - request.setParam(WsPermissionParameters.PARAM_PERMISSION, permission); + request.setParam(PermissionsWsParameters.PARAM_PERMISSION, permission); } request.execute(); 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 b50d28d0a2e..538db311444 100644 --- 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 @@ -46,7 +46,7 @@ import org.sonar.server.exceptions.ForbiddenException; 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.PermissionsWsParameters; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.usergroups.ws.UserGroupFinder; import org.sonar.server.ws.TestRequest; @@ -60,9 +60,9 @@ import static org.sonar.api.web.UserRole.ISSUE_ADMIN; import static org.sonar.db.permission.PermissionTemplateTesting.newPermissionTemplateDto; import static org.sonar.db.user.GroupMembershipQuery.IN; import static org.sonar.db.user.UserTesting.newUserDto; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PERMISSION; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_TEMPLATE_NAME; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_USER_LOGIN; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PERMISSION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_TEMPLATE_NAME; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_USER_LOGIN; @Category(DbTests.class) public class RemoveUserFromTemplateActionTest { @@ -213,10 +213,10 @@ public class RemoveUserFromTemplateActionTest { request.setParam(PARAM_USER_LOGIN, userLogin); } if (templateKey != null) { - request.setParam(WsPermissionParameters.PARAM_TEMPLATE_UUID, templateKey); + request.setParam(PermissionsWsParameters.PARAM_TEMPLATE_UUID, templateKey); } if (permission != null) { - request.setParam(WsPermissionParameters.PARAM_PERMISSION, permission); + request.setParam(PermissionsWsParameters.PARAM_PERMISSION, permission); } request.execute(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SetDefaultTemplateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SetDefaultTemplateActionTest.java index 6c40baada03..7925bc707c7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SetDefaultTemplateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/SetDefaultTemplateActionTest.java @@ -62,9 +62,9 @@ import static org.sonar.api.resources.Qualifiers.PROJECT; import static org.sonar.api.resources.Qualifiers.VIEW; import static org.sonar.server.permission.DefaultPermissionTemplates.DEFAULT_TEMPLATE_PROPERTY; import static org.sonar.server.permission.DefaultPermissionTemplates.defaultRootQualifierTemplateProperty; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_QUALIFIER; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_TEMPLATE_UUID; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_TEMPLATE_NAME; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_QUALIFIER; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_TEMPLATE_UUID; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_TEMPLATE_NAME; @Category(DbTests.class) public class SetDefaultTemplateActionTest { 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 1193571351c..8aa7f028c36 100644 --- 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 @@ -51,10 +51,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.sonar.db.permission.PermissionTemplateTesting.newPermissionTemplateDto; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_DESCRIPTION; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_ID; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_NAME; -import static org.sonar.server.permission.ws.WsPermissionParameters.PARAM_PATTERN; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_DESCRIPTION; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_ID; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_NAME; +import static org.sonar.server.permission.ws.PermissionsWsParameters.PARAM_PATTERN; import static org.sonar.test.JsonAssert.assertJson; public class UpdateTemplateActionTest { |