Support accept headers for http about page (#345)

* Combine json page with html page based on accept header * Support old path too
qzind · Aug 14, 2018 · c210938 · c210938
1 parent 8f2e617
commit c210938
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 47 deletions.
diff --git a/src/qz/ws/HttpAboutServlet.java b/src/qz/ws/HttpAboutServlet.java
@@ -8,20 +8,31 @@
 import org.slf4j.LoggerFactory;
 import qz.common.AboutInfo;
 
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Iterator;
 
 /**
  * HTTP JSON endpoint for serving QZ Tray information
  */
 public class HttpAboutServlet extends DefaultServlet {
+
     private static final Logger log = LoggerFactory.getLogger(PrintSocketServer.class);
 
+    private static final int JSON_INDENT = 2;
+
+
     @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) {
+        if ("application/json".equals(request.getHeader("Accept")) || "/json".equals(request.getServletPath())) {
+            generateJsonResponse(request, response);
+        } else {
+            generateHtmlResponse(request, response);
+        }
+    }
+
+    private void generateHtmlResponse(HttpServletRequest request, HttpServletResponse response) {
         StringBuilder display = new StringBuilder();
 
         display.append("<html><body>")
@@ -51,6 +62,20 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
         }
     }
 
+    private void generateJsonResponse(HttpServletRequest request, HttpServletResponse response) {
+        JSONObject aboutData = AboutInfo.gatherAbout(request.getServerName());
+
+        try {
+            response.setStatus(HttpServletResponse.SC_OK);
+            response.setContentType("application/json");
+            response.getOutputStream().write(aboutData.toString(JSON_INDENT).getBytes(StandardCharsets.UTF_8));
+        }
+        catch(Exception e) {
+            response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+            log.warn("Exception occurred writing JSONObject {}", aboutData);
+        }
+    }
+
     private StringBuilder generateFromKeys(JSONObject obj, boolean printTitle) throws JSONException {
         StringBuilder rows = new StringBuilder();
 

diff --git a/src/qz/ws/JsonAboutServlet.java b/src/qz/ws/JsonAboutServlet.java
diff --git a/src/qz/ws/PrintSocketServer.java b/src/qz/ws/PrintSocketServer.java
@@ -168,12 +168,7 @@ public Object createWebSocket(ServletUpgradeRequest req, ServletUpgradeResponse
                 ServletHolder httpServlet = new ServletHolder(new HttpAboutServlet());
                 httpServlet.setInitParameter("resourceBase","/");
                 context.addServlet(httpServlet, "/");
-
-                // Handle JSON data page
-                ServletHolder jsonServlet = new ServletHolder(new JsonAboutServlet());
-                jsonServlet.setInitParameter("resourceBase","/json/");
-                context.addServlet(jsonServlet, "/json");
-                context.addServlet(jsonServlet, "/json/");
+                context.addServlet(httpServlet, "/json");
 
                 server.setHandler(context);
                 server.setStopAtShutdown(true);