Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Upgrade bazlets to latest stable-3.0 to build with 3.0.11 API Remove the commented-out snapshot plugin api lines Change-Id: Ia9ee0a9b16ee699bca498131f2e9168e81c207fe
diff --git a/WORKSPACE b/WORKSPACE index 8870d08..dc4e5d6 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -3,7 +3,7 @@ load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "7a9ae377b519934c87184cc05845663ed708b69c", + commit = "bd8db0cf3057397bcf7287c28cc93886e663989b", #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")); } }