SONAR-8968 Fix example files name in user WS

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java
index 6f05d7a64070802aba380042592a44333b1a8aff..beff5005b2ed92ac194121688616eb3d1e3d9071 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java
@@ -69,7 +69,7 @@ public class DeactivateAction implements UsersWsAction {
       .setDescription("Deactivate a user. Requires Administer System permission")
       .setSince("3.7")
       .setPost(true)
-      .setResponseExample(getClass().getResource("example-deactivate.json"))
+      .setResponseExample(getClass().getResource("deactivate-example.json"))
       .setHandler(this);
 
     action.createParam("login")

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/GroupsAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/GroupsAction.java
index 9bfd6f41d24259ba3d6a2a9530b9ceaa6a3a9379..87a58a806caa0a74b44ec42356114a8a8e567bf4 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/GroupsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/GroupsAction.java
@@ -60,7 +60,7 @@ public class GroupsAction implements UsersWsAction {
     NewAction action = context.createAction("groups")
       .setDescription("Lists the groups a user belongs to. Requires Administer System permission.")
       .setHandler(this)
-      .setResponseExample(getClass().getResource("example-groups.json"))
+      .setResponseExample(getClass().getResource("groups-example.json"))
       .setSince("5.2");
 
     action.createParam(PARAM_LOGIN)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UpdateAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/UpdateAction.java
index 3a544a862cef4a4a5d56c2bcc32a335e17951e91..24aeb94f08fe5cfc0a408a5e810eb3f93b6e4676 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UpdateAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/UpdateAction.java
@@ -68,7 +68,7 @@ public class UpdateAction implements UsersWsAction {
       .setSince("3.7")
       .setPost(true)
       .setHandler(this)
-      .setResponseExample(getClass().getResource("example-update.json"));
+      .setResponseExample(getClass().getResource("update-example.json"));
 
     action.createParam(PARAM_LOGIN)
       .setDescription("User login")

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/deactivate-example.json b/server/sonar-server/src/main/resources/org/sonar/server/user/ws/deactivate-example.json
new file mode 100644 (file)
index 0000000..e45bb20
--- /dev/null
+++ b/server/sonar-server/src/main/resources/org/sonar/server/user/ws/deactivate-example.json
@@ -0,0 +1,10 @@
+{
+  "user": {
+    "login": "ada.lovelace",
+    "name": "Ada Lovelace",
+    "active": false,
+    "local": true,
+    "groups": [],
+    "scmAccounts": []
+  }
+}

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/example-deactivate.json b/server/sonar-server/src/main/resources/org/sonar/server/user/ws/example-deactivate.json
deleted file mode 100644 (file)
index e45bb20..0000000
--- a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/example-deactivate.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "user": {
-    "login": "ada.lovelace",
-    "name": "Ada Lovelace",
-    "active": false,
-    "local": true,
-    "groups": [],
-    "scmAccounts": []
-  }
-}

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/example-groups.json b/server/sonar-server/src/main/resources/org/sonar/server/user/ws/example-groups.json
deleted file mode 100644 (file)
index 52a39b5..0000000
--- a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/example-groups.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "p": 1,
-  "ps": 25,
-  "total": 2,
-  "groups": [
-    {"id": "2", "name": "sonar-admins", "description": "Sonar Admins", "selected": false},
-    {"id": "1", "name": "sonar-users", "description": "Sonar Users", "selected": true}
-  ]
-}

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/example-update.json b/server/sonar-server/src/main/resources/org/sonar/server/user/ws/example-update.json
deleted file mode 100644 (file)
index b4bdfda..0000000
--- a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/example-update.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "user": {
-    "login": "ada.lovelace",
-    "name": "Ada Lovelace",
-    "email": "ada.lovelace@noteg.com",
-    "scmAccounts": ["ada.lovelace"],
-    "active": true,
-    "local": true
-  }
-}

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/groups-example.json b/server/sonar-server/src/main/resources/org/sonar/server/user/ws/groups-example.json
new file mode 100644 (file)
index 0000000..52a39b5
--- /dev/null
+++ b/server/sonar-server/src/main/resources/org/sonar/server/user/ws/groups-example.json
@@ -0,0 +1,9 @@
+{
+  "p": 1,
+  "ps": 25,
+  "total": 2,
+  "groups": [
+    {"id": "2", "name": "sonar-admins", "description": "Sonar Admins", "selected": false},
+    {"id": "1", "name": "sonar-users", "description": "Sonar Users", "selected": true}
+  ]
+}

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/update-example.json b/server/sonar-server/src/main/resources/org/sonar/server/user/ws/update-example.json
new file mode 100644 (file)
index 0000000..b4bdfda
--- /dev/null
+++ b/server/sonar-server/src/main/resources/org/sonar/server/user/ws/update-example.json
@@ -0,0 +1,10 @@
+{
+  "user": {
+    "login": "ada.lovelace",
+    "name": "Ada Lovelace",
+    "email": "ada.lovelace@noteg.com",
+    "scmAccounts": ["ada.lovelace"],
+    "active": true,
+    "local": true
+  }
+}