merge master

Author: Doug Black

AUTHORS

@@ -0,0 +1,35 @@
+Authors
+=======
+
+A huge thanks to all of our contributors:
+
+
+- Adam Ballai 
+- Adam Rich 
+- Adam Richeimer 
+- Andrew Benton 
+- Beans0063 
+- Brett Gerry 
+- Brian Levine 
+- Carlos Diaz-Padron 
+- Christer Fahlgren 
+- ChristerF 
+- Christopher C. Merris 
+- D Keith Casey Jr 
+- Doug Black 
+- Eric Anderle 
+- Frank 
+- Frank Stratton 
+- Girish Bharadwaj 
+- Guillaume BINET 
+- Jancsi Farkas 
+- Jason Li 
+- Jon Plax 
+- Kevin Burke 
+- Kevin Whinnery 
+- Kyle 
+- Kyle Conroy 
+- RonaldWentworth 
+- Sam Kimbrel 
+- Thomas Wilsher 
+- rschiffert@twilio.com 

AUTHORS.md

@@ -3,6 +3,21 @@ twilio-java Changelog
 
 Here you can see the full list of changes between each twilio-java release.
 
+Version 3.3.16
+--------------
+
+- Adds a Makefile for consistency with other helper libraries
+- You can delete transcriptions
+
+Version 3.3.15
+--------------
+
+Released n/a
+
+- Content-type detection is now friendlier to charset declarations in header.
+- GET Requests now use secure HTTPS endpoint.
+- TwilioUtil for validation using accountSid deprecated because accountSid is not needed.
+
 Version 3.3.15
 --------------
 

CHANGES

@@ -0,0 +1,16 @@
+# In this case the Makefile is fairly simple. Still providing it to provide
+# consistency with other helper libraries
+.PHONY: test install clean authors
+
+install:
+	mvn install
+
+test:
+	mvn test
+
+clean:
+	rm -rf target
+
+authors:
+	echo "Authors\n=======\n\nA huge thanks to all of our contributors:\n\n" > AUTHORS.md
+	git log --raw | grep "^Author: " | cut -d ' ' -f2- | cut -d '<' -f1 | sed 's/^/- /' | sort | uniq >> AUTHORS.md

Makefile

@@ -1,26 +1,28 @@
-# Installing 
+[![Build Status](https://travis-ci.org/twilio/twilio-java.png?branch=master)](https://travis-ci.org/twilio/twilio-java)
 
-TwilioJava is now using Maven.  At present the jars *are* available from a public [maven](http://maven.apache.org/download.html) repository. 
+# Installing
+
+TwilioJava is now using Maven.  At present the jars *are* available from a public [maven](http://maven.apache.org/download.html) repository.
 
 Use the following dependency in your project:
 
        <dependency>
           <groupId>com.twilio.sdk</groupId>
           <artifactId>twilio-java-sdk</artifactId>
-          <version>3.3.15</version>
+          <version>3.3.16</version>
           <scope>compile</scope>
        </dependency>
 
 If you want to compile it yourself, here's how:
 
     $ git clone git@github.com:twilio/twilio-java
-    $ cd twilio-java 
+    $ cd twilio-java
     $ mvn install       # Requires maven, download from http://maven.apache.org/download.html
 
 This will also build the javadoc in `twilio-java/target/apidocs`. You can open the
 index.html located there to view it locally.
 
-The pre-built jars are available at: 
+The pre-built jars are available at:
 
 *   [twilio-java-sdk-3.3.15-with-dependencies.jar](http://search.maven.org/remotecontent?filepath=com/twilio/sdk/twilio-java-sdk/3.3.15/twilio-java-sdk-3.3.15-jar-with-dependencies.jar)
 *   [twilio-java-sdk-3.3.15.jar](http://search.maven.org/remotecontent?filepath=com/twilio/sdk/twilio-java-sdk/3.3.15/twilio-java-sdk-3.3.15.jar) -- use this if you have issues with conflicting jars in your project.  You'll need to include versions of the dependencies yourself.  See the pom.xml for the list of libraries.
@@ -30,7 +32,7 @@ You can view the javadocs for this project at:
 
 # Examples
 
-Here are some examples (also found in [TwilioRestExamples.java](https://github.com/twilio/twilio-java/blob/master/src/main/java/com/twilio/sdk/examples/RestExamples.java) ) 
+Here are some examples (also found in [TwilioRestExamples.java](https://github.com/twilio/twilio-java/blob/master/src/main/java/com/twilio/sdk/examples/RestExamples.java) )
 
 ```java
 package com.twilio.sdk.examples;

README.md

@@ -4,7 +4,7 @@
   <artifactId>twilio-java-sdk</artifactId>
   <packaging>jar</packaging>
   <name>twilio-java-sdk</name>
-  <version>3.3.16-SNAPSHOT</version>
+  <version>3.3.17-SNAPSHOT</version>
   <description>Java helper library for Twilio services</description>
   <url>http://www.twilio.com</url>
   <licenses>

pom.xml

@@ -46,7 +46,7 @@
 public class TwilioRestClient {
 
 	/** The Constant VERSION. */
-	private static final String VERSION = "3.3.15";
+	private static final String VERSION = "3.3.16";
 
 	/** The endpoint. */
 	private String endpoint = "https://api.twilio.com";
@@ -97,8 +97,12 @@ public void setHttpclient(HttpClient httpclient) {
 		this.httpclient = httpclient;
 	}
 
+	public HttpClient getHttpClient() {
+		return 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
@@ -113,7 +117,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
@@ -526,6 +530,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/TwilioRestClient.java

@@ -44,19 +44,19 @@ public class TwilioRestResponse {
 
 	/** The response text. */
 	private String responseText;
-	
+
 	/** The http status. */
 	private int httpStatus;
-	
+
 	/** The url. */
 	private String url;
-	
+
 	/** The query string. */
 	private String queryString;
-	
+
 	/** The error. */
 	private boolean error;
-	
+
 	/** The content type. */
 	private String contentType;
 
@@ -81,7 +81,7 @@ public TwilioRestResponse(String url, String text, int status) {
 
 	/**
 	 * Get the raw response body as a String
-	 * 
+	 *
 	 * @return the response body
 	 */
 	public String getResponseText() {
@@ -100,7 +100,7 @@ public void setResponseText(String responseText) {
 	/**
 
 	 * Get the http status code associated with this response.
-	 * 
+	 *
 	 * @return the int value of the response status
 	 */
 	public int getHttpStatus() {
@@ -118,7 +118,7 @@ public void setHttpStatus(int httpStatus) {
 
 	/**
 	 * Get the url that resulted in this response
-	 * 
+	 *
 	 * @return the url
 	 */
 	public String getUrl() {
@@ -136,7 +136,7 @@ public void setUrl(String url) {
 
 	/**
 	 * Get the query string that resulted in this response
-	 * 
+	 *
 	 */
 	public String getQueryString() {
 		return queryString;
@@ -153,7 +153,7 @@ public void setQueryString(String queryString) {
 
 	/**
 	 * Determine if this request resulted in any kind of error
-	 * 
+	 *
 	 * @return true if an error occured
 	 */
 	public boolean isError() {
@@ -171,7 +171,7 @@ public void setError(boolean error) {
 
 	/**
 	 * Determines if the response was a client side error (HTTP 4XX status)
-	 * 
+	 *
 	 * @return true if this was a client error
 	 */
 	public boolean isClientError() {
@@ -180,7 +180,7 @@ public boolean isClientError() {
 
 	/**
 	 * Determines if the response was a server side error (HTTP 5XX status)
-	 * 
+	 *
 	 * @return true if this was a server error
 	 */
 	public boolean isServerError() {
@@ -198,26 +198,27 @@ public void setContentType(String contentType) {
 
 	/**
 	 * Method to determine if the response content type was a JSON type
-	 * 
+	 *
 	 * @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"));
 	}
 
 	/**
 	 * Method to determine if the response content type was an XML type
-	 * 
+	 *
 	 * @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"));
 	}
 
 	/**
 	 * Get an appropriate response parser for this response type
-	 * 
+	 *
 	 * @return a response parser capable of parsing this response body.
 	 */
 	public ResponseParser getParser() {
@@ -235,7 +236,7 @@ public ResponseParser getParser() {
 	 * Helper method to convert the response to a canonical object map. This
 	 * method will use the appropriate parser to map the response body to a Map
 	 * of elements.
-	 * 
+	 *
 	 * @return a normalized Map of objects. Repeated elements are List values,
 	 *         sub-objects are Map values. All other types are String values.
 	 */