commit 5b4f3a16292845529e2ce8fa3d65cbeebb51b071
author Edwin Kempin <ekempin@google.com> Thu Sep 26 06:22:40 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 26 06:22:40 2019 +0000
tree 3b698a506a4c7b3f4d1b21e17ce5432b89f9d2e9
parent 3c66d189cd352cfd932ca9cf08fb894e79223de1
parent de0ff0847ac46f17a64018b65b5d4bc860afaf51

Merge "RestApiServlet: Introduce constant for HTTP 429 code"

java/com/google/gerrit/httpd/restapi/RestApiServlet.java

diff --git a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
index 407a4bc..7af7f45 100644
--- a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
+++ b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
@@ -210,6 +210,7 @@
   public static final String XD_AUTHORIZATION = "access_token";
   public static final String XD_CONTENT_TYPE = "$ct";
   public static final String XD_METHOD = "$m";
+  public static final int SC_TOO_MANY_REQUESTS = 429;
 
   private static final int HEAP_EST_SIZE = 10 * 8 * 1024; // Presize 10 blocks.
   private static final String PLAIN_TEXT = "text/plain";
@@ -651,7 +652,13 @@
         }
       } catch (QuotaException e) {
         responseBytes =
-            replyError(req, res, status = 429, messageOr(e, "Quota limit reached"), e.caching(), e);
+            replyError(
+                req,
+                res,
+                status = SC_TOO_MANY_REQUESTS,
+                messageOr(e, "Quota limit reached"),
+                e.caching(),
+                e);
       } catch (Exception e) {
         status = SC_INTERNAL_SERVER_ERROR;
         responseBytes = handleException(e, req, res);

javatests/com/google/gerrit/acceptance/server/quota/RestApiQuotaIT.java

diff --git a/javatests/com/google/gerrit/acceptance/server/quota/RestApiQuotaIT.java b/javatests/com/google/gerrit/acceptance/server/quota/RestApiQuotaIT.java
index f7ecf54..917d597 100644
--- a/javatests/com/google/gerrit/acceptance/server/quota/RestApiQuotaIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/quota/RestApiQuotaIT.java
@@ -14,6 +14,7 @@
 
 package com.google.gerrit.acceptance.server.quota;
 
+import static com.google.gerrit.httpd.restapi.RestApiServlet.SC_TOO_MANY_REQUESTS;
 import static org.mockito.Mockito.clearInvocations;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -119,7 +120,7 @@
   public void outOfQuotaReturnsError() throws Exception {
     when(quotaBackendWithUser.requestToken("/restapi/config/version:GET"))
         .thenReturn(singletonAggregation(QuotaResponse.error("no quota")));
-    adminRestSession.get("/config/server/version").assertStatus(429);
+    adminRestSession.get("/config/server/version").assertStatus(SC_TOO_MANY_REQUESTS);
     verify(quotaBackendWithUser).requestToken("/restapi/config/version:GET");
   }