added CloudAPI#setDefaultContentType(String)

jberkel · jberkel · commit bbee76a01cca · 2011-06-30T14:33:40.000+02:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -5,6 +5,8 @@
   * Added Request#withFile(String, byte[]), Request#withFile(String, ByteBuffer)
   * Added Request#withEntity(HttpEntity) and Request#withContent(String, String)
   * Added PutResource example
+  * Added setting to change the default content type for requests
+    (CloudAPI#setDefaultContentType(String))
 
 ## 1.0.0 2011-05-19
 
diff --git a/src/main/java/com/soundcloud/api/ApiWrapper.java b/src/main/java/com/soundcloud/api/ApiWrapper.java
@@ -72,6 +72,7 @@
  */
 public class ApiWrapper implements CloudAPI, Serializable {
     private static final long serialVersionUID = 3662083416905771921L;
+    public static final String DEFAULT_CONTENT_TYPE = "application/json";
 
     /** The current environment */
     public final Env env;
@@ -85,6 +86,9 @@ public class ApiWrapper implements CloudAPI, Serializable {
     /** debug request details to stderr */
     public boolean debugRequests;
 
+
+    private String mDefaultContentType;
+
     /**
      * Constructs a new ApiWrapper instance.
      *
@@ -420,6 +424,15 @@ public void toFile(File f) throws IOException {
         oos.close();
     }
 
+
+    public String getDefaultContentType() {
+        return (mDefaultContentType == null) ? DEFAULT_CONTENT_TYPE : mDefaultContentType;
+    }
+
+    public void setDefaultContentType(String contentType) {
+        mDefaultContentType = contentType;
+    }
+
     /**
      * Read wrapper from a file
      * @param f  the file
@@ -453,7 +466,7 @@ protected HttpRequest addAuthHeader(HttpRequest request) {
     /** Forces JSON */
     protected HttpRequest addAcceptHeader(HttpRequest request) {
         if (!request.containsHeader("Accept")) {
-            request.addHeader("Accept", "application/json");
+            request.addHeader("Accept", getDefaultContentType());
         }
         return request;
     }
diff --git a/src/main/java/com/soundcloud/api/CloudAPI.java b/src/main/java/com/soundcloud/api/CloudAPI.java
@@ -201,6 +201,14 @@ public interface CloudAPI {
      */
     URI authorizationCodeUrl(String... options);
 
+    /**
+     * Changes the default content type sent in the "Accept" header.
+     * If you don't set this it defaults to "application/json".
+     *
+     * @param contentType the request mime type.
+     */
+    void setDefaultContentType(String contentType);
+
     /**
      * Interested in changes to the current token.
      */
diff --git a/src/test/java/com/soundcloud/api/CloudAPIIntegrationTest.java b/src/test/java/com/soundcloud/api/CloudAPIIntegrationTest.java
@@ -1,13 +1,15 @@
 package com.soundcloud.api;
 
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertThat;
 
 import org.apache.http.HttpResponse;
 import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.Test;
 
+import javax.xml.ws.Endpoint;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -125,6 +127,10 @@ public void readMyDetails() throws Exception {
         HttpResponse resp = api.get(Request.to(Endpoints.MY_DETAILS));
         assertThat(resp.getStatusLine().getStatusCode(), is(200));
 
+        assertThat(
+                resp.getFirstHeader("Content-Type").getValue(),
+                containsString("application/json"));
+
         JSONObject me = Http.getJSON(resp);
 
         assertThat(me.getString("username"), equalTo("api-testing"));
@@ -153,6 +159,18 @@ public void shouldNotRefreshWithNonExpiringScope() throws Exception {
         assertThat(resp.getStatusLine().getStatusCode(), is(401));
     }
 
+    @Test
+    public void shouldChangeContentType() throws Exception {
+        login();
+
+        api.setDefaultContentType("application/xml");
+        HttpResponse resp = api.get(Request.to(Endpoints.MY_DETAILS));
+
+        assertThat(
+                resp.getFirstHeader("Content-Type").getValue(),
+                containsString("application/xml"));
+    }
+
     /*
     @Test
     public void updateMyDetails() throws Exception {
