SONAR-7129 WS api/components/tree

2 files changed, 20 insertions, 1 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/WebService.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/WebService.java
index 0fe59142154..6dd6c57898a 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/WebService.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/WebService.java
@@ -411,8 +411,23 @@ public interface WebService extends Definable<WebService.Context> {
      * Add predefined parameters related to sorting of results.
      */
     public <V> NewAction addSortParams(Collection<V> possibleValues, @Nullable V defaultValue, boolean defaultAscending) {
+      genericAddSortParam(possibleValues, defaultValue, defaultAscending, "Sort field");
+
+      return this;
+    }
+
+    /**
+     * Add predefined parameters related to sorting of results. Comma-separated list
+     */
+    public <V> NewAction addMultiSortsParams(Collection<V> possibleValues, @Nullable V defaultValue, boolean defaultAscending) {
+      genericAddSortParam(possibleValues, defaultValue, defaultAscending, "Comma-separated list of sort fields");
+
+      return this;
+    }
+
+    public <V> NewAction genericAddSortParam(Collection<V> possibleValues, @Nullable V defaultValue, boolean defaultAscending, String description) {
       createParam(Param.SORT)
-        .setDescription("Sort field")
+        .setDescription(description)
         .setDeprecatedKey("sort")
         .setDefaultValue(defaultValue)
         .setPossibleValues(possibleValues);
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/Paging.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/Paging.java
index d9439514a3c..f9b49c528c3 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/Paging.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/Paging.java
@@ -82,6 +82,10 @@ public class Paging {
     return (pageIndex - 1) * pageSize;
   }
 
+  public static int offset(int pageIndex, int pageSize) {
+    return (pageIndex - 1) * pageSize;
+  }
+
   /**
    * Number of pages. It is greater than or equal 0.
    */