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 ea3e4ca688555d42651f23c122f22e4b6efe4ff6..12325dd690015cc7d533773afcf01caab4839933 100644 (file)
--- 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 c765245d1c34b8c03a7ec71abf8aa8d3b67e41a6..43b2537233a458c2aa158e6af2244a819919ddf6 100644 (file)
--- 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 77f576ce6d0303911a1500c083ed70bba3b5df39..b3779d65cc66196ddc4650950f13818a2a4d6a4a 100644 (file)
--- 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 1280df7958884e3edeb28dfd683c687850bcf09a..ebc2956e14607f7b53501132eaa09aef28aed10b 100644 (file)
--- 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 338f53b8e2076d60d2b92dc20b61c51ac47aa44e..05704ff90eb953ecc571eacf517b52d445218f38 100644 (file)
--- 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 864dc92dd7baceac6486920d703270c08829b2a4..65a46dbc5eb84244ce4703ac2d4ba15e48317259 100644 (file)
--- 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 00abbf8fb23a367944b28de71edca3ed12e3311d..85f964b3d7a4db14e71ed0200dbe87f1a032c07d 100644 (file)
--- 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 57f136db6fa36c5727e535b8ed5a567db9b04d98..2027d8c645e1697b450cc1af42d3efa33311505a 100644 (file)
--- 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 b4f6b89d95b0f9b453098477cdb0d013ef77c1bd..8354a36eaf5b479840b1cae6a8c94c0fb8994fbc 100644 (file)
--- 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 dda4b4da19b0cf87769f1222bc7fc865632cf8a5..f1159aeade578d9bf17d4fe36e24047efec4cb59 100644 (file)
--- 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