Merge branch 'stable-3.0' into stable-3.1
* stable-3.0:
Bump Bazel version to 3.7.0
Upgrade bazlets to latest stable-3.0 to build with 3.0.13 API
Change-Id: I0f8d910be774d17ad774b97351b902e5adb40d92
diff --git a/WORKSPACE b/WORKSPACE
index 57d9901..c684ab0 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "a010a539824bd467059f414412a47b80101352d7",
+ commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
#local_path = "/home/<user>/projects/bazlets",
)
diff --git a/src/main/java/com/googlesource/gerrit/plugins/changemessage/rest/GetChangeInfo.java b/src/main/java/com/googlesource/gerrit/plugins/changemessage/rest/GetChangeInfo.java
index d7694d9..8cfed27 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/changemessage/rest/GetChangeInfo.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/changemessage/rest/GetChangeInfo.java
@@ -15,6 +15,7 @@
package com.googlesource.gerrit.plugins.changemessage.rest;
import com.google.gerrit.extensions.annotations.PluginName;
+import com.google.gerrit.extensions.restapi.Response;
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.server.change.ChangeResource;
import com.google.gerrit.server.config.PluginConfig;
@@ -33,9 +34,9 @@
}
@Override
- public String apply(ChangeResource rsrc) throws NoSuchProjectException {
+ public Response apply(ChangeResource rsrc) throws NoSuchProjectException {
PluginConfig cfg =
cfgFactory.getFromProjectConfigWithInheritance(rsrc.getProject(), pluginName);
- return cfg.getString("changeInfo");
+ return Response.ok(cfg.getString("changeInfo"));
}
}
