commit a45974f42672d96c2d80f6540253ae8c403dc873
author Marco Miller <marco.miller@ericsson.com> Tue Mar 10 10:48:49 2020 -0400
committer Marco Miller <marco.miller@ericsson.com> Tue Mar 10 10:49:50 2020 -0400
tree 2dd32005ae6f534e774a30348d89e7fe16f210f9
parent 3290bfada33aaa88c590db07b248fcdeff54d323
parent e5bf1cac6aea3bae62ff3acb4fd1bdeb57964a37

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Bump Bazel version to 2.2.0

Change-Id: I45c01845de31ba0c831e7b7ecbde85dea70a4f8c

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 48e25a1..ec50441 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "96f691ebbf4ef1c46b798e871ed5acd9d844651c",
+    commit = "300de940c226c4ef7f0ce4baa90e278ae0fa840c",
     #local_path = "/home/<user>/projects/bazlets",
 )
 

src/main/java/com/googlesource/gerrit/plugins/readonly/ReadOnlyEndpoint.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/readonly/ReadOnlyEndpoint.java b/src/main/java/com/googlesource/gerrit/plugins/readonly/ReadOnlyEndpoint.java
index 2482cab..6a4b916 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/readonly/ReadOnlyEndpoint.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/readonly/ReadOnlyEndpoint.java
@@ -40,8 +40,8 @@
     }
 
     @Override
-    public String apply(ConfigResource resource) {
-      return state.isReadOnly() ? "on" : "off";
+    public Response<String> apply(ConfigResource resource) {
+      return Response.ok(state.isReadOnly() ? "on" : "off");
     }
   }
 

src/test/java/com/googlesource/gerrit/plugins/readonly/AbstractReadOnlyTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/readonly/AbstractReadOnlyTest.java b/src/test/java/com/googlesource/gerrit/plugins/readonly/AbstractReadOnlyTest.java
index e24137f..ce8d081 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/readonly/AbstractReadOnlyTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/readonly/AbstractReadOnlyTest.java
@@ -15,6 +15,7 @@
 package com.googlesource.gerrit.plugins.readonly;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.gerrit.testing.GerritJUnit.assertThrows;
 import static org.apache.http.HttpStatus.SC_SERVICE_UNAVAILABLE;
 
 import com.google.gerrit.acceptance.GitUtil;
@@ -146,12 +147,9 @@
     setReadOnly(true);
 
     // Push should fail
-    try {
-      pushTo("refs/for/master");
-      fail("expected TransportException");
-    } catch (TransportException e) {
-      assertThat(e).hasMessageThat().contains("READ ONLY");
-    }
+    TransportException thrown =
+        assertThrows(TransportException.class, () -> pushTo("refs/for/master"));
+    assertThat(thrown).hasMessageThat().contains("READ ONLY");
 
     // Disable read-only
     setReadOnly(false);