Merge branch 'transcription-delete'

Author: Kevin Burke

src/main/java/com/twilio/sdk/TwilioRestResponse.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,7 +198,7 @@ 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() {
@@ -207,7 +207,7 @@ public boolean isJson() {
 
 	/**
 	 * Method to determine if the response content type was an XML type
-	 * 
+	 *
 	 * @return true if this looks like an XML response
 	 */
 	public boolean isXml() {
@@ -218,7 +218,7 @@ public boolean isXml() {
 
 	/**
 	 * Get an appropriate response parser for this response type
-	 * 
+	 *
 	 * @return a response parser capable of parsing this response body.
 	 */
 	public ResponseParser getParser() {
@@ -236,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.
 	 */

src/main/java/com/twilio/sdk/resource/instance/Transcription.java

@@ -5,16 +5,18 @@
 import java.util.Date;
 import java.util.Map;
 
+import com.twilio.sdk.TwilioRestException;
 import com.twilio.sdk.TwilioRestClient;
+import com.twilio.sdk.TwilioRestResponse;
 import com.twilio.sdk.resource.InstanceResource;
 
 /**
  * The Class Transcription.
- * 
+ *
  * For more information see <a href="http://www.twilio.com/docs/api/rest/transcription">http://www.twilio.com/docs/api/rest/transcription</a>
  */
 public class Transcription extends InstanceResource {
-	
+
 	/** The Constant SID_PROPERTY. */
 	private static final String SID_PROPERTY = "sid";
 
@@ -35,7 +37,7 @@ public Transcription(TwilioRestClient client) {
 	 */
 	public Transcription(TwilioRestClient client, String sid) {
 		super(client);
-	    if (sid == null) { 
+	    if (sid == null) {
             throw new IllegalStateException("The Sid for a Transcription can not be null");
         }
 		this.setProperty(SID_PROPERTY, sid);
@@ -156,4 +158,17 @@ public String getPrice() {
 	public String getTranscriptionText() {
 		return this.getProperty("transcription_text");
 	}
+
+	/**
+	 * Delete this Transcription
+	 *
+	 * @return true, if successful
+	 * @throws TwilioRestException the twilio rest exception
+	 */
+	public boolean delete() throws TwilioRestException {
+		TwilioRestResponse response = this.getClient().safeRequest(
+				this.getResourceLocation(), "DELETE", null);
+
+		return !response.isError();
+	}
 }

src/test/java/com/twilio/sdk/resource/instance/TranscriptionTest.java

@@ -0,0 +1,15 @@
+package com.twilio.sdk.resource.instance;
+
+import com.twilio.sdk.resource.instance.Transcription;
+import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+public class TranscriptionTest extends BasicRequestTester {
+
+    @Test
+    public void testDeleteTranscription() throws Exception {
+        setExpectedServerAnswer(null);
+        setExpectedServerReturnCode(204);
+        Transcription tr = new Transcription(client, "TR5f539674e9b84c2ba39a4156f264a347");
+        assertTrue(tr.delete());
+    }
+}