Refactor XDocServlet: Move project check into helper method Change-Id: I0600b5aa3ea2459e3a57277ede2a3b6e17b1459e Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
diff --git a/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocServlet.java b/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocServlet.java index 40ce348..0bf2747 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocServlet.java +++ b/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocServlet.java
@@ -111,12 +111,9 @@ validateRequestMethod(req); ResourceKey key = ResourceKey.fromPath(req.getPathInfo()); - ProjectState state = projectCache.get(key.project); - if (state == null) { - Resource.NOT_FOUND.send(req, res); - return; - } + ProjectState state = getProject(key); XDocProjectConfig cfg = cfgFactory.create(state); + if (key.file == null) { res.sendRedirect(getRedirectUrl(req, key, cfg)); return; @@ -257,6 +254,15 @@ } } + private ProjectState getProject(ResourceKey key) + throws ResourceNotFoundException { + ProjectState state = projectCache.get(key.project); + if (state == null) { + throw new ResourceNotFoundException(); + } + return state; + } + private boolean isSafeImage(MimeType mimeType) { return isImage(mimeType) && fileTypeRegistry.isSafeInline(mimeType); }