Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: ListQuotas: Refactor apply method's throws list Upgrade bazlets to latest stable-2.15 Upgrade bazlets to latest stable-2.14 Change-Id: I5fd5675532c7eb146b2ad01d3c88415f5ec48562
diff --git a/.bazelversion b/.bazelversion new file mode 100644 index 0000000..09d1d01 --- /dev/null +++ b/.bazelversion
@@ -0,0 +1,2 @@ +0.29.0 +
diff --git a/src/main/java/com/googlesource/gerrit/plugins/quota/ListQuotas.java b/src/main/java/com/googlesource/gerrit/plugins/quota/ListQuotas.java index d683de9..37d1db4 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/quota/ListQuotas.java +++ b/src/main/java/com/googlesource/gerrit/plugins/quota/ListQuotas.java
@@ -15,17 +15,17 @@ package com.googlesource.gerrit.plugins.quota; import com.google.common.collect.Maps; -import com.google.gerrit.extensions.restapi.AuthException; -import com.google.gerrit.extensions.restapi.BadRequestException; -import com.google.gerrit.extensions.restapi.ResourceConflictException; +import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.config.ConfigResource; import com.google.gerrit.server.restapi.project.ListProjects; +import com.google.gerrit.server.permissions.PermissionBackendException; import com.google.inject.Inject; import com.google.inject.Provider; import com.googlesource.gerrit.plugins.quota.GetQuota.QuotaInfo; import java.util.Map; +import java.util.concurrent.ExecutionException; import org.kohsuke.args4j.Option; public class ListQuotas implements RestReadView<ConfigResource> { @@ -51,7 +51,7 @@ @Override public Map<String, QuotaInfo> apply(ConfigResource resource) - throws AuthException, BadRequestException, ResourceConflictException, Exception { + throws RestApiException, ExecutionException, PermissionBackendException { Map<String, QuotaInfo> result = Maps.newTreeMap(); ListProjects lister = listProjects.get(); lister.setMatchPrefix(matchPrefix);