opendev/gerrit
Code Issues Proposed changes

GetMergeList: Also allow caching of responses for non-merges

Browse Source 
Change-Id: I66527dd14f0ce53015b6548c86eb8634cf3942ac
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2016-09-16 10:45:24 +02:00
parent c6ea7bb81c
commit bf5381df7d
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gerrit-server/src/main/java/com/google/gerrit/server/change/GetMergeList.java
View File

@@ -77,7 +77,7 @@ public class GetMergeList implements RestReadView<RevisionResource> {
}
if (commit.getParentCount() < 2) {
return Response.<List<CommitInfo>> ok(ImmutableList.<CommitInfo> of());
return createResponse(rsrc, ImmutableList.<CommitInfo> of());
}
List<RevCommit> commits =
@@ -87,12 +87,16 @@ public class GetMergeList implements RestReadView<RevisionResource> {
for (RevCommit c : commits) {
result.add(changeJson.toCommit(rsrc.getControl(), rw, c, addLinks, true));
}
Response<List<CommitInfo>> r = Response.ok(result);
if (rsrc.isCacheable()) {
r.caching(CacheControl.PRIVATE(7, TimeUnit.DAYS));
}
return r;
return createResponse(rsrc, result);
}
}
private static Response<List<CommitInfo>> createResponse(
RevisionResource rsrc, List<CommitInfo> result) {
Response<List<CommitInfo>> r = Response.ok(result);
if (rsrc.isCacheable()) {
r.caching(CacheControl.PRIVATE(7, TimeUnit.DAYS));
}
return r;
}
}