Merge pull request #96 from skimbrel/master

Support and request UTF-8 charset responses

Author: Doug Black

src/main/java/com/twilio/sdk/TwilioRestClient.java

@@ -97,7 +97,7 @@ public void setHttpclient(HttpClient httpclient) {
 	}
 
 	/**
-	 * Explcitly construct a TwilioRestClient with the given API credentials.
+	 * Explicitly construct a TwilioRestClient with the given API credentials.
 	 *
 	 * @param accountSid
 	 *            the 34 character Account identifier (starting with 'AC'). This
@@ -112,7 +112,7 @@ public TwilioRestClient(String accountSid, String authToken) {
 	}
 
 	/**
-	 * Explcitly construct a TwilioRestClient with the given API credentials and
+	 * Explicitly construct a TwilioRestClient with the given API credentials and
 	 * endpoint.
 	 *
 	 * @param accountSid
@@ -501,6 +501,7 @@ private HttpUriRequest setupRequest(String path, String method,
 		request.addHeader(new BasicHeader("User-Agent", "twilio-java/"
 				+ VERSION));
 		request.addHeader(new BasicHeader("Accept", "application/json"));
+		request.addHeader(new BasicHeader("Accept-Charset", "utf-8"));
 
 		if (httpclient instanceof DefaultHttpClient) { // as DefaultHttpClient class has final method, I need httpClient to be a plain interface to be able to mock it
             ((DefaultHttpClient) httpclient).getCredentialsProvider()

src/main/java/com/twilio/sdk/TwilioRestResponse.java

@@ -202,7 +202,7 @@ public void setContentType(String contentType) {
 	 * @return true if this looks like a JSON response
 	 */
 	public boolean isJson() {
-		return (this.contentType.equalsIgnoreCase("application/json"));
+		return (this.contentType.toLowerCase().contains("application/json"));
 	}
 
 	/**
@@ -211,8 +211,9 @@ public boolean isJson() {
 	 * @return true if this looks like an XML response
 	 */
 	public boolean isXml() {
-		return (this.contentType.equalsIgnoreCase("text/xml") || this.contentType
-				.equalsIgnoreCase("application/xml"));
+		String lowercaseContentType = this.contentType.toLowerCase();
+		return (lowercaseContentType.contains("text/xml") ||
+			lowercaseContentType.contains("application/xml"));
 	}
 
 	/**

src/test/java/com/twilio/sdk/TwilioRestResponseTest.java

@@ -0,0 +1,65 @@
+package com.twilio.sdk;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+
+import com.twilio.sdk.parser.JsonResponseParser;
+import com.twilio.sdk.parser.XmlResponseParser;
+
+import org.junit.Test;
+
+
+/**
+ * Tests for TwilioRestResponse.
+ */
+public class TwilioRestResponseTest {
+
+	/**
+	 * Test content-type logic.
+	 */
+	@Test
+	public void testTwilioRestResponseContentType() {
+		TwilioRestResponse response = new TwilioRestResponse("http://example.com/test", "don't care", 200);
+		response.setContentType("application/json; charset=utf-8");
+		assertTrue(response.isJson());
+		assertFalse(response.isXml());
+
+		response.setContentType("application/xml; charset=utf-8");
+		assertTrue(response.isXml());
+		assertFalse(response.isJson());
+
+		response.setContentType("text/xml; charset=utf-8");
+		assertTrue(response.isXml());
+		assertFalse(response.isJson());
+
+		// Should work without charsets too
+		response.setContentType("application/json");
+		assertTrue(response.isJson());
+		assertFalse(response.isXml());
+
+		response.setContentType("application/xml");
+		assertTrue(response.isXml());
+		assertFalse(response.isJson());
+
+		response.setContentType("text/xml");
+		assertTrue(response.isXml());
+		assertFalse(response.isJson());
+	}
+
+	/**
+	 * Test response parsers.
+	 */
+	@Test
+	public void testTwilioRestResponseParser() throws UnsupportedOperationException {
+		TwilioRestResponse response = new TwilioRestResponse("http://example.com/test", "don't care", 200);
+
+		response.setContentType("application/json; charset=utf-8");
+		assertTrue(response.getParser() instanceof JsonResponseParser);
+
+		response.setContentType("application/xml; charset=utf-8");
+		assertTrue(response.getParser() instanceof XmlResponseParser);
+
+		response.setContentType("text/html");
+	}
+
+}