Merge branch 'stable-3.0'
* stable-3.0:
Switch required bazel version to 0.29.1
Change-Id: Ibe21dbb8dfcfce84d62bbac36779d1e633637042
diff --git a/WORKSPACE b/WORKSPACE
index 8042d6c..6410cf8 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,24 +3,24 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "0ca51936ca46049cddd34e971a595d3baafe731b",
+ commit = "7744d119c623494f7c7ec621e20cd66ea5bc04f6",
#local_path = "/home/<user>/projects/bazlets",
)
# Release Plugin API
-load(
- "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
- "gerrit_api",
-)
-
-# Snapshot Plugin API
#load(
-# "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-# "gerrit_api_maven_local",
+# "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
+# "gerrit_api",
#)
+# Snapshot Plugin API
+load(
+ "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
+ "gerrit_api_maven_local",
+)
+
# Load release Plugin API
-gerrit_api()
+#gerrit_api()
# Load snapshot Plugin API
-#gerrit_api_maven_local()
+gerrit_api_maven_local()
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..a9e1c36 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 apply(ConfigResource resource) {
+ return Response.ok(state.isReadOnly() ? "on" : "off");
}
}
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);
