commit a0a92c4d120bd0da250cb5e23db07778d5f6dd41
author Edwin Kempin <ekempin@google.com> Fri Aug 02 15:40:40 2019 +0200
committer Edwin Kempin <ekempin@google.com> Fri Aug 02 15:40:40 2019 +0200
tree bc18a570694ffd7808d5bebbd35b4ddd3dd9f791
parent de65ef860af5bb89bff48f824af6c36a3567a050

Adapt to changed REST interfaces in Gerrit core

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I4f78bca939d89d8e46bc083e624a009189eb96e6

src/main/java/com/googlesource/gerrit/plugins/simplesubmitrules/config/ConfigServlet.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/simplesubmitrules/config/ConfigServlet.java b/src/main/java/com/googlesource/gerrit/plugins/simplesubmitrules/config/ConfigServlet.java
index 3db1d0f..560b2c6 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/simplesubmitrules/config/ConfigServlet.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/simplesubmitrules/config/ConfigServlet.java
@@ -16,6 +16,7 @@
 
 import com.google.gerrit.extensions.restapi.AuthException;
 import com.google.gerrit.extensions.restapi.BadRequestException;
+import com.google.gerrit.extensions.restapi.Response;
 import com.google.gerrit.extensions.restapi.RestModifyView;
 import com.google.gerrit.extensions.restapi.RestReadView;
 import com.google.gerrit.reviewdb.client.Project;
@@ -59,17 +60,18 @@
   }
 
   @Override
-  public Object apply(ProjectResource resource) throws AuthException, PermissionBackendException {
+  public Response<SubmitConfig> apply(ProjectResource resource)
+      throws AuthException, PermissionBackendException {
     permissionBackend
         .user(resource.getUser())
         .project(resource.getNameKey())
         .check(ProjectPermission.READ_CONFIG);
 
-    return configTranslator.convertFrom(resource.getProjectState());
+    return Response.ok(configTranslator.convertFrom(resource.getProjectState()));
   }
 
   @Override
-  public Object apply(ProjectResource resource, SubmitConfig inConfig)
+  public Response<SubmitConfig> apply(ProjectResource resource, SubmitConfig inConfig)
       throws PermissionBackendException, AuthException, BadRequestException, ConfigInvalidException,
           IOException {
     Project.NameKey projectName = resource.getNameKey();
@@ -86,6 +88,6 @@
       projectCache.evict(projectName);
     }
 
-    return configTranslator.convertFrom(projectCache.checkedGet(projectName));
+    return Response.ok(configTranslator.convertFrom(projectCache.checkedGet(projectName)));
   }
 }