Add pagination options to ListBranches REST API

Add limit and skip options to allow pagination. Those options are
supported by other similar REST API (ListProjects, ListGroups).

Change-Id: I2d14c8cc33f00033ef894b550e29e377ac5778b6
This commit is contained in:
Hugo Arès
2014-10-14 14:19:01 -04:00
parent 3133b4b28e
commit 158566267f
3 changed files with 115 additions and 0 deletions

View File

@@ -933,6 +933,54 @@ returned.
[[branch-options]]
==== Branch Options
Limit(n)::
Limit the number of branches to be included in the results.
+
.Request
----
GET /projects/testproject/branches?n=1 HTTP/1.0
----
+
.Response
----
HTTP/1.1 200 OK
Content-Disposition: attachment
Content-Type: application/json;charset=UTF-8
)]}'
[
{
"ref": "HEAD",
"revision": "master",
"can_delete": false
}
]
----
Skip(s)::
Skip the given number of branches from the beginning of the list.
+
.Request
----
GET /projects/testproject/branches?n=1&s=0 HTTP/1.0
----
+
.Response
----
HTTP/1.1 200 OK
Content-Disposition: attachment
Content-Type: application/json;charset=UTF-8
)]}'
[
{
"ref": "HEAD",
"revision": "master",
"can_delete": false
}
]
----
Substring(m)::
Limit the results to those projects that match the specified substring.
+

View File

@@ -119,6 +119,56 @@ public class ListBranchesIT extends AbstractDaemonTest {
devCommit, false)), toBranchInfoList(r));
}
@Test
public void listBranchesUsingPagination() throws Exception {
pushTo("refs/heads/master");
pushTo("refs/heads/someBranch1");
pushTo("refs/heads/someBranch2");
pushTo("refs/heads/someBranch3");
// using only limit
RestResponse r =
adminSession.get("/projects/" + project.get() + "/branches?n=4");
List<BranchInfo> result = toBranchInfoList(r);
assertEquals(4, result.size());
assertEquals("HEAD", result.get(0).ref);
assertEquals("refs/meta/config", result.get(1).ref);
assertEquals("refs/heads/master", result.get(2).ref);
assertEquals("refs/heads/someBranch1", result.get(3).ref);
// limit higher than total number of branches
r = adminSession.get("/projects/" + project.get() + "/branches?n=25");
result = toBranchInfoList(r);
assertEquals(6, result.size());
assertEquals("HEAD", result.get(0).ref);
assertEquals("refs/meta/config", result.get(1).ref);
assertEquals("refs/heads/master", result.get(2).ref);
assertEquals("refs/heads/someBranch1", result.get(3).ref);
assertEquals("refs/heads/someBranch2", result.get(4).ref);
assertEquals("refs/heads/someBranch3", result.get(5).ref);
// using skip only
r = adminSession.get("/projects/" + project.get() + "/branches?s=2");
result = toBranchInfoList(r);
assertEquals(4, result.size());
assertEquals("refs/heads/master", result.get(0).ref);
assertEquals("refs/heads/someBranch1", result.get(1).ref);
assertEquals("refs/heads/someBranch2", result.get(2).ref);
assertEquals("refs/heads/someBranch3", result.get(3).ref);
// skip more branches than the number of available branches
r = adminSession.get("/projects/" + project.get() + "/branches?s=7");
result = toBranchInfoList(r);
assertEquals(0, result.size());
// using skip and limit
r = adminSession.get("/projects/" + project.get() + "/branches?s=2&n=2");
result = toBranchInfoList(r);
assertEquals(2, result.size());
assertEquals("refs/heads/master", result.get(0).ref);
assertEquals("refs/heads/someBranch1", result.get(1).ref);
}
@Test
public void listBranchesUsingFilter() throws Exception {
pushTo("refs/heads/master");

View File

@@ -58,6 +58,12 @@ public class ListBranches implements RestReadView<ProjectResource> {
private final DynamicMap<RestView<BranchResource>> branchViews;
private final WebLinks webLinks;
@Option(name = "--limit", aliases = {"-n"}, metaVar = "CNT", usage = "maximum number of branches to list")
private int limit;
@Option(name = "--start", aliases = {"-s"}, metaVar = "CNT", usage = "number of branches to skip")
private int start;
@Option(name = "--match", aliases = {"-m"}, metaVar = "MATCH", usage = "match branches substring")
private String matchSubstring;
@@ -170,6 +176,17 @@ public class ListBranches implements RestReadView<ProjectResource> {
} else {
filteredBranches = branches;
}
if (!filteredBranches.isEmpty()) {
int end = filteredBranches.size();
if (limit > 0 && start + limit < end) {
end = start + limit;
}
if (start <= end) {
filteredBranches = filteredBranches.subList(start, end);
} else {
filteredBranches = Collections.emptyList();
}
}
return filteredBranches;
}