From 44ceaa9fe6ca6dd776b658b9d0b4f2e9f61a6e3f Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Thu, 11 Jun 2015 11:08:11 -0400 Subject: [PATCH] RestApiServlet: Support Rest{Read,Modify}View on the same class Change-Id: Ib339c92f1b066c2a25947f1b3cd651f3b194e259 --- .../com/google/gerrit/httpd/restapi/RestApiServlet.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java index 0045649fc8..b69dbbf182 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java @@ -317,15 +317,16 @@ public class RestApiServlet extends HttpServlet { return; } - if (viewData.view instanceof RestModifyView) { + if (viewData.view instanceof RestReadView + && "GET".equals(req.getMethod())) { + result = ((RestReadView) viewData.view).apply(rsrc); + } else if (viewData.view instanceof RestModifyView) { @SuppressWarnings("unchecked") RestModifyView m = (RestModifyView) viewData.view; inputRequestBody = parseRequest(req, inputType(m)); result = m.apply(rsrc, inputRequestBody); - } else if (viewData.view instanceof RestReadView) { - result = ((RestReadView) viewData.view).apply(rsrc); } else { throw new ResourceNotFoundException(); }