commit bf52565fe763251d2f32849cf235f19a1e1b7cb7
author Marco Miller <marco.miller@ericsson.com> Fri Sep 13 13:57:09 2019 -0400
committer Marco Miller <marco.miller@ericsson.com> Fri Sep 13 13:57:09 2019 -0400
tree eea93c5c88ecd3420d4b6018237736140fea7a51
parent 3019bd9856064b6bb94048c9bf905dd21072a3a9
parent f4b3febf57d6bbe8efae1cc6b477fd85b44c3a89

Merge branch 'stable-3.0'

* stable-3.0:
  Upgrade bazlets to latest stable-3.0
  Upgrade bazlets to latest stable-2.16
  Upgrade bazlets to latest stable-2.15
  Bump required bazel version to 1.0.0rc2
  Upgrade bazlets to latest stable-2.14
  Upgrade bazlets to latest stable-2.15
  Upgrade bazlets to latest stable-2.14

Change-Id: Ic070017d05ce620e03799ddac8d1a05ee3a86050

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 264eb83..43bbcb9 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,24 +3,24 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "0ca51936ca46049cddd34e971a595d3baafe731b",
+    commit = "1ddb1d6c71b77972a89aa0a717f6250ef256d166",
     #local_path = "/home/<user>/projects/bazlets",
 )
 
 # Snapshot Plugin API
-#load(
-#    "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-#    "gerrit_api_maven_local",
-#)
-
-# Load snapshot Plugin API
-#gerrit_api_maven_local()
-
-# Release Plugin API
 load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
-    "gerrit_api",
+    "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
+    "gerrit_api_maven_local",
 )
 
+# Load snapshot Plugin API
+gerrit_api_maven_local()
+
+# Release Plugin API
+#load(
+#    "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
+#    "gerrit_api",
+#)
+
 # Load release Plugin API
-gerrit_api()
+#gerrit_api()

src/main/java/com/googlesource/gerrit/plugins/changemessage/rest/GetChangeInfo.java

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"));
   }
 }