diff --git a/Documentation/rest-api-config.txt b/Documentation/rest-api-config.txt index 16b76b7710..fd35a29d1c 100644 --- a/Documentation/rest-api-config.txt +++ b/Documentation/rest-api-config.txt @@ -218,10 +218,8 @@ project-ref combination). )]}' { - "result": { - "message": "user Kristen Burns \u003cKristen.Burns@gerritcodereview.com\u003e (1000098) cannot see ref refs/heads/secret/master in project medium", - "status": 403 - } + "message": "user Kristen Burns \u003cKristen.Burns@gerritcodereview.com\u003e (1000098) cannot see ref refs/heads/secret/master in project medium", + "status": 403 } ---- diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/CheckAccessIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/CheckAccessIT.java index cda5347db6..e7b5cc05df 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/CheckAccessIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/CheckAccessIT.java @@ -118,19 +118,19 @@ public class CheckAccessIT extends AbstractDaemonTest { } int want = entry.getValue(); - if (want != info.result.status) { - fail(String.format("check.access(%s) = %d, want %d", in, info.result.status, want)); + if (want != info.status) { + fail(String.format("check.access(%s) = %d, want %d", in, info.status, want)); } switch (want) { case 403: - assertThat(info.result.message).contains("cannot see"); + assertThat(info.message).contains("cannot see"); break; case 404: - assertThat(info.result.message).contains("does not exist"); + assertThat(info.message).contains("does not exist"); break; case 200: - assertThat(info.result.message).isNull(); + assertThat(info.message).isNull(); break; default: fail(String.format("unknown code %d", want)); diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/AccessCheckInfo.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/AccessCheckInfo.java index 4ff517219b..fab2ec4416 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/AccessCheckInfo.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/AccessCheckInfo.java @@ -15,13 +15,9 @@ package com.google.gerrit.extensions.api.config; public class AccessCheckInfo { - public static class Result { - public String message; + public String message; + // HTTP status code + public int status; - // HTTP status code. - public int status; - } - - public Result result; // for future extension, we may add inputs / results for bulk checks. } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/CheckAccess.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/CheckAccess.java index a80d29875a..84db266392 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/CheckAccess.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/CheckAccess.java @@ -16,7 +16,6 @@ package com.google.gerrit.server.config; import com.google.common.base.Strings; import com.google.gerrit.extensions.api.config.AccessCheckInfo; -import com.google.gerrit.extensions.api.config.AccessCheckInfo.Result; import com.google.gerrit.extensions.api.config.AccessCheckInput; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.BadRequestException; @@ -87,12 +86,11 @@ public class CheckAccess implements RestModifyView