From: Julien Lancelot Date: Wed, 15 Mar 2017 09:49:59 +0000 (+0100) Subject: SONAR-8895 Explicitly set version on organization parameter X-Git-Tag: 6.4-RC1~722 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=528fd26cbdcefec2242b28b77011278574c7cc03;p=sonarqube.git SONAR-8895 Explicitly set version on organization parameter --- 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 ea3e4ca6885..12325dd6900 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 @@ -73,7 +73,7 @@ public class AddGroupAction implements PermissionsWsAction { .setHandler(this); createPermissionParameter(action); - createOrganizationParameter(action); + createOrganizationParameter(action).setSince("6.2"); createGroupNameParameter(action); createGroupIdParameter(action); createProjectParameters(action); 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 c765245d1c3..43b2537233a 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 @@ -81,7 +81,9 @@ public class AddUserAction implements PermissionsWsAction { createPermissionParameter(action); createUserLoginParameter(action); createProjectParameters(action); - createOrganizationParameter(action).setDescription("Key of organization, cannot be used at the same time with %s and %s", PARAM_PROJECT_ID, PARAM_PROJECT_KEY); + createOrganizationParameter(action) + .setSince("6.2") + .setDescription("Key of organization, cannot be used at the same time with %s and %s", PARAM_PROJECT_ID, PARAM_PROJECT_KEY); } @Override 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 77f576ce6d0..b3779d65cc6 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 @@ -86,7 +86,7 @@ public class GroupsAction implements PermissionsWsAction { .setResponseExample(Resources.getResource(getClass(), "groups-example.json")) .setHandler(this); - createOrganizationParameter(action); + createOrganizationParameter(action).setSince("6.2"); createPermissionParameter(action).setRequired(false); createProjectParameters(action); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsParametersBuilder.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsParametersBuilder.java index 1280df79588..ebc2956e146 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsParametersBuilder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/PermissionsWsParametersBuilder.java @@ -82,7 +82,6 @@ public class PermissionsWsParametersBuilder { return action.createParam(PARAM_ORGANIZATION) .setDescription("Key of organization, used when group name is set") .setExampleValue("my-org") - .setSince("6.2") .setInternal(true); } 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 338f53b8e20..05704ff90eb 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 @@ -73,7 +73,7 @@ public class RemoveGroupAction implements PermissionsWsAction { .setHandler(this); createPermissionParameter(action); - createOrganizationParameter(action); + createOrganizationParameter(action).setSince("6.2"); createGroupNameParameter(action); createGroupIdParameter(action); createProjectParameters(action); 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 864dc92dd7b..65a46dbc5eb 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 @@ -76,7 +76,7 @@ public class RemoveUserAction implements PermissionsWsAction { createPermissionParameter(action); createUserLoginParameter(action); createProjectParameters(action); - createOrganizationParameter(action); + createOrganizationParameter(action).setSince("6.2"); } @Override diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchGlobalPermissionsAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchGlobalPermissionsAction.java index 00abbf8fb23..85f964b3d7a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchGlobalPermissionsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/SearchGlobalPermissionsAction.java @@ -66,7 +66,7 @@ public class SearchGlobalPermissionsAction implements PermissionsWsAction { .setSince("5.2") .setHandler(this); - createOrganizationParameter(action); + createOrganizationParameter(action).setSince("6.2"); } @Override 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 57f136db6fa..2027d8c645e 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 @@ -91,7 +91,7 @@ public class UsersAction implements PermissionsWsAction { "When this parameter is not set, only users having at least one permission are returned.", SEARCH_QUERY_MIN_LENGTH) .setExampleValue("eri"); - createOrganizationParameter(action); + createOrganizationParameter(action).setSince("6.2"); createPermissionParameter(action).setRequired(false); createProjectParameters(action); } 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 b4f6b89d95b..8354a36eaf5 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 @@ -95,7 +95,7 @@ public class CreateTemplateAction implements PermissionsWsAction { createTemplateProjectKeyPatternParameter(action); createTemplateDescriptionParameter(action); - createOrganizationParameter(action); + createOrganizationParameter(action).setSince("6.2"); } @Override diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesAction.java b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesAction.java index dda4b4da19b..f1159aeade5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/permission/ws/template/SearchTemplatesAction.java @@ -118,7 +118,7 @@ public class SearchTemplatesAction implements PermissionsWsAction { .addSearchQuery("defau", "permission template names") .setHandler(this); - createOrganizationParameter(action); + createOrganizationParameter(action).setSince("6.2"); } @Override