Moving helper methods used in single places away from RestResource.

graylog2-server/src/main/java/org/graylog2/rest/resources/system/MessagesResource.java

@@ -77,4 +77,8 @@ public Map<String, Object> all(@ApiParam(name = "page", value = "Page", required
                 "messages", messages,
                 "total", systemMessageService.totalCount());
     }
+
+    private int page(int page) {
+        return Math.max(0, page - 1);
+    }
 }

graylog2-shared/src/main/java/org/graylog2/shared/rest/resources/RestResource.java

@@ -83,10 +83,6 @@ public ObjectWriter modify(EndpointConfigBase<?> endpoint, MultivaluedMap<String
         }
     }
 
-    protected int page(int page) {
-        return Math.max(0, page - 1);
-    }
-
     protected Subject getSubject() {
         if (securityContext == null) {
             LOG.error("Cannot retrieve current subject, SecurityContext isn't set.");
@@ -123,40 +119,6 @@ protected void checkPermission(String permission, String instanceId) {
         }
     }
 
-    protected Map<String, Long> bytesToValueMap(long bytes) {
-        final Size size = Size.bytes(bytes);
-        return ImmutableMap.of(
-                "bytes", size.toBytes(),
-                "kilobytes", size.toKilobytes(),
-                "megabytes", size.toMegabytes());
-    }
-
-    protected String guessContentType(final String filename) {
-        // A really dumb but for us good enough approach. We only need this for a very few static files we control.
-
-        if (filename.endsWith(".png")) {
-            return "image/png";
-        }
-
-        if (filename.endsWith(".gif")) {
-            return "image/gif";
-        }
-
-        if (filename.endsWith(".css")) {
-            return "text/css";
-        }
-
-        if (filename.endsWith(".js")) {
-            return "application/javascript";
-        }
-
-        if (filename.endsWith(".html")) {
-            return MediaType.TEXT_HTML;
-        }
-
-        return MediaType.TEXT_PLAIN;
-    }
-
     protected void restrictToMaster() {
         if (!serverStatus.hasCapability(ServerStatus.Capability.MASTER)) {
             LOG.warn("Rejected request that is only allowed against master nodes. Returning HTTP 403.");

graylog2-shared/src/main/java/org/graylog2/shared/rest/resources/documentation/DocumentationBrowserResource.java

@@ -24,6 +24,7 @@
 import javax.ws.rs.NotFoundException;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import java.io.IOException;
 import java.net.URL;
@@ -65,4 +66,30 @@ public Response asset(@PathParam("route") String route) {
             throw new NotFoundException();
         }
     }
+
+    private String guessContentType(final String filename) {
+        // A really dumb but for us good enough approach. We only need this for a very few static files we control.
+
+        if (filename.endsWith(".png")) {
+            return "image/png";
+        }
+
+        if (filename.endsWith(".gif")) {
+            return "image/gif";
+        }
+
+        if (filename.endsWith(".css")) {
+            return "text/css";
+        }
+
+        if (filename.endsWith(".js")) {
+            return "application/javascript";
+        }
+
+        if (filename.endsWith(".html")) {
+            return MediaType.TEXT_HTML;
+        }
+
+        return MediaType.TEXT_PLAIN;
+    }
 }

graylog2-shared/src/main/java/org/graylog2/shared/rest/resources/system/SystemResource.java

@@ -18,6 +18,8 @@
 
 import com.codahale.metrics.annotation.Timed;
 import com.codahale.metrics.jvm.ThreadDump;
+import com.github.joschi.jadconfig.util.Size;
+import com.google.common.collect.ImmutableMap;
 import com.wordnik.swagger.annotations.Api;
 import com.wordnik.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
@@ -36,6 +38,7 @@
 import java.io.ByteArrayOutputStream;
 import java.lang.management.ManagementFactory;
 import java.nio.charset.StandardCharsets;
+import java.util.Map;
 
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
 import static javax.ws.rs.core.MediaType.TEXT_PLAIN;
@@ -110,4 +113,12 @@ public String threaddump() {
         threadDump.dump(output);
         return new String(output.toByteArray(), StandardCharsets.UTF_8);
     }
+
+    private Map<String, Long> bytesToValueMap(long bytes) {
+        final Size size = Size.bytes(bytes);
+        return ImmutableMap.of(
+                "bytes", size.toBytes(),
+                "kilobytes", size.toKilobytes(),
+                "megabytes", size.toMegabytes());
+    }
 }