Support posting form without charset parameter

kevinsawicki · kevinsawicki · commit da53d092f392 · 2012-12-09T14:32:21.000-08:00
Specifying a null or empty charset will not add the
charset to the Content-Type header of the request but
will encoding the parameters using UTF-8
diff --git a/lib/src/main/java/com/github/kevinsawicki/http/HttpRequest.java b/lib/src/main/java/com/github/kevinsawicki/http/HttpRequest.java
@@ -2801,13 +2801,14 @@ public HttpRequest form(final Object name, final Object value)
    * @return this request
    * @throws HttpRequestException
    */
-  public HttpRequest form(final Object name, final Object value,
-      final String charset) throws HttpRequestException {
+  public HttpRequest form(final Object name, final Object value, String charset)
+      throws HttpRequestException {
     final boolean first = !form;
     if (first) {
       contentType(CONTENT_TYPE_FORM, charset);
       form = true;
     }
+    charset = getValidCharset(charset);
     try {
       openOutput();
       if (!first)
diff --git a/lib/src/test/java/com/github/kevinsawicki/http/HttpRequestTest.java b/lib/src/test/java/com/github/kevinsawicki/http/HttpRequestTest.java
@@ -729,11 +729,13 @@ public void handle(Request request, HttpServletResponse response) {
   @Test
   public void postForm() throws Exception {
     final AtomicReference<String> body = new AtomicReference<String>();
+    final AtomicReference<String> contentType = new AtomicReference<String>();
     handler = new RequestHandler() {
 
       @Override
       public void handle(Request request, HttpServletResponse response) {
         body.set(new String(read()));
+        contentType.set(request.getContentType());
         response.setStatus(HTTP_OK);
       }
     };
@@ -743,6 +745,35 @@ public void handle(Request request, HttpServletResponse response) {
     int code = post(url).form(data).form("zip", "12345").code();
     assertEquals(HTTP_OK, code);
     assertEquals("name=user&number=100&zip=12345", body.get());
+    assertEquals("application/x-www-form-urlencoded; charset=UTF-8",
+        contentType.get());
+  }
+
+  /**
+   * Make a post of form data
+   *
+   * @throws Exception
+   */
+  @Test
+  public void postFormWithNoCharset() throws Exception {
+    final AtomicReference<String> body = new AtomicReference<String>();
+    final AtomicReference<String> contentType = new AtomicReference<String>();
+    handler = new RequestHandler() {
+
+      @Override
+      public void handle(Request request, HttpServletResponse response) {
+        body.set(new String(read()));
+        contentType.set(request.getContentType());
+        response.setStatus(HTTP_OK);
+      }
+    };
+    Map<String, String> data = new LinkedHashMap<String, String>();
+    data.put("name", "user");
+    data.put("number", "100");
+    int code = post(url).form(data, null).form("zip", "12345").code();
+    assertEquals(HTTP_OK, code);
+    assertEquals("name=user&number=100&zip=12345", body.get());
+    assertEquals("application/x-www-form-urlencoded", contentType.get());
   }
 
   /**
