commit e2b566c658db452f77e445c715a2f23a238b11b6
author Edwin Kempin <edwin.kempin@sap.com> Fri Nov 21 16:22:49 2014 +0100
committer Edwin Kempin <edwin.kempin@gmail.com> Wed Nov 26 09:42:53 2014 +0000
tree cab669121b43d43d6c8aea33529a2aa097817684
parent 9f39e64ca9fef75fb37b9031cec15b59473e1a03

Refactor XDocServlet: Move formatter retrieval into helper method

Change-Id: Ie6683f32d475a746fa670f5d1b791501f427cf82
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>

src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocServlet.java

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 0bf2747..fcdc08f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocServlet.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocServlet.java
@@ -120,15 +120,9 @@
       }
 
       MimeType mimeType = fileTypeRegistry.getMimeType(key.file, null);
-      FormatterProvider formatter;
-      if (req.getParameter("raw") != null) {
-        formatter = formatters.getRawFormatter();
-      } else {
-        formatter = formatters.get(state, key.file);
-        if (formatter == null && !isSafeImage(mimeType)) {
-          Resource.NOT_FOUND.send(req, res);
-          return;
-        }
+      FormatterProvider formatter = getFormatter(req, key);
+      if (formatter == null && !isSafeImage(mimeType)) {
+        throw new ResourceNotFoundException();
       }
 
       ProjectControl projectControl = projectControlFactory.validateFor(key.project);
@@ -263,6 +257,15 @@
     return state;
   }
 
+  private FormatterProvider getFormatter(HttpServletRequest req, ResourceKey key)
+      throws ResourceNotFoundException {
+    if (req.getParameter("raw") != null) {
+      return formatters.getRawFormatter();
+    } else {
+      return formatters.get(getProject(key), key.file);
+    }
+  }
+
   private boolean isSafeImage(MimeType mimeType) {
     return isImage(mimeType) && fileTypeRegistry.isSafeInline(mimeType);
   }