From 7c5b10e2d94f3707418495214300f9e9c3bf11a7 Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Thu, 20 Apr 2017 09:05:34 +0200
Subject: [PATCH] Use changelog in users action WS

---
 .../main/java/org/sonar/server/user/ws/CreateAction.java  | 8 +++++---
 .../main/java/org/sonar/server/user/ws/UpdateAction.java  | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java
index 3430d3ea4c7..d0d43c426e7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java
@@ -21,6 +21,7 @@ package org.sonar.server.user.ws;
 
 import java.util.Collections;
 import java.util.List;
+import org.sonar.api.server.ws.Change;
 import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
@@ -65,10 +66,11 @@ public class CreateAction implements UsersWsAction {
     WebService.NewAction action = controller.createAction(ACTION_CREATE)
       .setDescription("Create a user.<br/>" +
         "If a deactivated user account exists with the given login, it will be reactivated.<br/>" +
-        "Requires Administer System permission<br/>" +
-        "Since 6.3, the password is only mandatory when creating local users, and should not be set on non local users<br/>" +
-        "Since 6.3, the 'infos' message is no more returned when a user is reactivated")
+        "Requires Administer System permission")
       .setSince("3.7")
+      .setChangelog(
+        new Change("6.3", "The password is only mandatory when creating local users, and should not be set on non local users"),
+        new Change("6.3", "The 'infos' message is no more returned when a user is reactivated"))
       .setPost(true)
       .setHandler(this);
 
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 24aeb94f08f..b9292bd4f73 100644
--- 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
@@ -23,6 +23,7 @@ import com.google.common.collect.Sets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+import org.sonar.api.server.ws.Change;
 import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
@@ -64,8 +65,9 @@ public class UpdateAction implements UsersWsAction {
   public void define(WebService.NewController controller) {
     WebService.NewAction action = controller.createAction(ACTION_UPDATE)
       .setDescription("Update a user. If a deactivated user account exists with the given login, it will be reactivated. " +
-        "Requires Administer System permission. Since 5.2, a user's password can only be changed using the 'change_password' action.")
+        "Requires Administer System permission")
       .setSince("3.7")
+      .setChangelog(new Change("5.2", "User's password can only be changed using the 'change_password' action."))
       .setPost(true)
       .setHandler(this)
       .setResponseExample(getClass().getResource("update-example.json"));
-- 
2.39.5