Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade google-java-format to 1.7

Change-Id: Ia7383822ef59fb60bb5559956a065ae46b2e4f4a
This commit is contained in:
David Pursehouse
2019-03-14 09:01:59 +09:00
149 changed files with 225 additions and 604 deletions

View File

@@ -85,12 +85,7 @@ public class ListChildProjects implements RestReadView<ProjectResource> {
private List<ProjectInfo> directChildProjects(Project.NameKey parent)
throws OrmException, RestApiException {
PermissionBackend.WithUser currentUser = permissionBackend.currentUser();
return queryProvider
.get()
.withQuery("parent:" + parent.get())
.withLimit(limit)
.apply()
.stream()
return queryProvider.get().withQuery("parent:" + parent.get()).withLimit(limit).apply().stream()
.filter(
p ->
currentUser