Fix the response content type of JSON/P

Author: [email protected]

src/main/java/com/google/visualization/datasource/ResponseWriter.java

@@ -40,7 +40,6 @@ public class ResponseWriter {
    */
   private ResponseWriter() {}
 
-
   /**
    * Sets the specified responseMessage on the given <code>HttpServletResponse</code>.
    * This method assumes the <code>StatusType</code> is 'OK'.
@@ -56,17 +55,24 @@ public static void setServletResponse(String responseMessage,
     OutputType type = dataSourceParameters.getOutputType();
     switch (type) {
       case CSV:
-        setServletResponseCSV(responseMessage, dataSourceParameters, res);
+        setServletResponseCSV(dataSourceParameters, res);
+        writeServletResponse(responseMessage, res);
         break;
       case TSV_EXCEL:
-        setServletResponseTSVExcel(responseMessage, dataSourceParameters, res);
+        setServletResponseTSVExcel(dataSourceParameters, res);
+        writeServletResponse(responseMessage, res, "UTF-16LE", UTF_16LE_BOM);
         break;
       case HTML:
-        setServletResponseHTML(responseMessage, res);
+        setServletResponseHTML(res);
+        writeServletResponse(responseMessage, res);
         break;
       case JSONP:
+        setServletResponseJSONP(res);
+        writeServletResponse(responseMessage, res);
+        break;
       case JSON:
-        setServletResponseJSON(responseMessage, res);
+        setServletResponseJSON(res);
+        writeServletResponse(responseMessage, res);
         break;
       default:
         // This should never happen.
@@ -85,8 +91,8 @@ public static void setServletResponse(String responseMessage,
    *
    * @throws IOException In case of a I/O error.
    */
-  private static void setServletResponseCSV(String responseMessage,
-      DataSourceParameters dataSourceParameters, HttpServletResponse res) throws IOException {
+  static void setServletResponseCSV(DataSourceParameters dataSourceParameters,
+      HttpServletResponse res) {
     res.setContentType("text/csv; charset=UTF-8");
     String outFileName = dataSourceParameters.getOutFileName();
 
@@ -95,8 +101,7 @@ private static void setServletResponseCSV(String responseMessage,
       outFileName = outFileName + ".csv";
     }
 
-    res.setHeader("content-disposition", "attachment; filename=" + outFileName);
-    writeServletResponse(responseMessage, res);
+    res.setHeader("Content-Disposition", "attachment; filename=" + outFileName);
   }
 
   /**
@@ -109,12 +114,11 @@ private static void setServletResponseCSV(String responseMessage,
    *
    * @throws IOException In case of a I/O error.
    */
-  private static void setServletResponseTSVExcel(String responseMessage,
-      DataSourceParameters dsParams, HttpServletResponse res) throws IOException {
+  static void setServletResponseTSVExcel(DataSourceParameters dsParams,
+      HttpServletResponse res) {
     res.setContentType("text/csv; charset=UTF-16LE");
     String outFileName = dsParams.getOutFileName();
     res.setHeader("Content-Disposition", "attachment; filename=" + outFileName);
-    writeServletResponse(responseMessage, res, "UTF-16LE", UTF_16LE_BOM);
   }
 
   /**
@@ -126,10 +130,21 @@ private static void setServletResponseTSVExcel(String responseMessage,
    *
    * @throws IOException In case of a I/O error.
    */
-  private static void setServletResponseHTML(String responseMessage, HttpServletResponse res)
-      throws IOException {
+  static void setServletResponseHTML(HttpServletResponse res) {
     res.setContentType("text/html; charset=UTF-8");
-    writeServletResponse(responseMessage, res);
+  }
+  
+  /**
+   * Sets the HTTP servlet response for a JSONP output type.
+   * This method assumes the <code>StatusType</code> is 'OK'.
+   *
+   * @param responseMessage The response char sequence.
+   * @param res The HTTP response.
+   *
+   * @throws IOException In case of a I/O error.
+   */
+  static void setServletResponseJSONP(HttpServletResponse res) {
+    res.setContentType("text/javascript; charset=UTF-8");
   }
 
   /**
@@ -141,10 +156,8 @@ private static void setServletResponseHTML(String responseMessage, HttpServletRe
    *
    * @throws IOException In case of a I/O error.
    */
-  private static void setServletResponseJSON(String responseMessage, HttpServletResponse res)
-      throws IOException {
-    res.setContentType("text/plain; charset=UTF-8");
-    writeServletResponse(responseMessage, res);
+  static void setServletResponseJSON(HttpServletResponse res) {
+    res.setContentType("application/json; charset=UTF-8");
   }
 
   /**

src/test/java/com/google/visualization/datasource/ResponseWriterTest.java

@@ -29,9 +29,18 @@
 import com.google.visualization.datasource.datatable.value.ValueType;
 import com.google.visualization.datasource.render.JsonRenderer;
 
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
 import junit.framework.TestCase;
 
-import java.util.List;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
 
 
 /**
@@ -151,4 +160,73 @@ public void testGenerateJsonResponseError() throws DataSourceException {
         "babylon(" + expected + ");",
         JsonRenderer.renderJsonResponse(dsParamsJsonP, responseStatus, data).toString());
   }
+  
+  public void testCSVResponse() throws DataSourceException {
+    final String csvContentType = "text/csv; charset=UTF-8";
+    final String csvheaderName = "Content-Disposition";
+    final String csvheaderValue = "attachment; filename=testFile.csv";
+    
+    DataSourceParameters dsParamsCSV = 
+      new DataSourceParameters("outFileName:testFile;out:csv");
+    
+    HttpServletResponse mockHttpServletResponse = createMock(HttpServletResponse.class);
+    mockHttpServletResponse.setContentType(eq(csvContentType));
+    mockHttpServletResponse.setHeader(eq(csvheaderName), eq(csvheaderValue));
+    expectLastCall();
+    
+    replay(mockHttpServletResponse);   
+    ResponseWriter.setServletResponseCSV(dsParamsCSV, mockHttpServletResponse);
+    verify(mockHttpServletResponse);
+  }
+  
+  public void testTSVExcelResponse() throws DataSourceException {
+    final String tsvExcelContentType = "text/csv; charset=UTF-16LE";
+    final String headerName = "Content-Disposition";
+    final String headerValue = "attachment; filename=testFile.xls";
+    
+    DataSourceParameters dsParamsTsvExcel = 
+      new DataSourceParameters("outFileName:testFile.xls;out:tsv_excel");
+    
+    HttpServletResponse mockHttpServletResponse = createMock(HttpServletResponse.class);
+    mockHttpServletResponse.setContentType(eq(tsvExcelContentType));
+    mockHttpServletResponse.setHeader(eq(headerName), eq(headerValue));
+    expectLastCall();
+    
+    replay(mockHttpServletResponse);   
+    ResponseWriter.setServletResponseTSVExcel(dsParamsTsvExcel, mockHttpServletResponse);
+    verify(mockHttpServletResponse);
+  }
+  
+  public void testHTMLResponseContentType() {
+    final String HtmlContentType = "text/html; charset=UTF-8";
+    HttpServletResponse mockHttpServletResponse = createMock(HttpServletResponse.class);
+    mockHttpServletResponse.setContentType(eq(HtmlContentType));
+    expectLastCall();
+    
+    replay(mockHttpServletResponse);   
+    ResponseWriter.setServletResponseHTML(mockHttpServletResponse);
+    verify(mockHttpServletResponse);
+  }
+  
+  public void testJsonResponseContentType() {
+    final String jsonContentType = "application/json; charset=UTF-8";
+    HttpServletResponse mockHttpServletResponse = createMock(HttpServletResponse.class);
+    mockHttpServletResponse.setContentType(eq(jsonContentType));
+    expectLastCall();
+    
+    replay(mockHttpServletResponse);   
+    ResponseWriter.setServletResponseJSON(mockHttpServletResponse);
+    verify(mockHttpServletResponse);
+  }
+  
+  public void testJsonpResponseContentType() {
+    final String jsonpContentType = "text/javascript; charset=UTF-8";
+    HttpServletResponse mockHttpServletResponse = createMock(HttpServletResponse.class);
+    mockHttpServletResponse.setContentType(eq(jsonpContentType));
+    expectLastCall();
+    
+    replay(mockHttpServletResponse);   
+    ResponseWriter.setServletResponseJSONP(mockHttpServletResponse);
+    verify(mockHttpServletResponse);
+  }
 }