merge master

Author: Doug Black

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

@@ -220,6 +220,15 @@ public String getUri() {
         return getProperty("Uri");
     }
 
+    /**
+     * Get the account sid
+     *
+     * @return account sid
+     */
+    public String getAccountSid() {
+        return getProperty("AccountSid");
+    }
+
     /**
      * Delete
      *

src/main/java/com/twilio/sdk/resource/list/UsageTriggerList.java

@@ -39,39 +39,39 @@ public UsageTriggerList(TwilioRestClient client,
 	 * @see com.twilio.sdk.resource.Resource#getResourceLocation()
 	 */
 	@Override
-		protected String getResourceLocation() {
-			return "/" + TwilioRestClient.DEFAULT_VERSION + "/Accounts/"
-				+ this.getRequestAccountSid() + "/Usage/Triggers";
-		}
+	protected String getResourceLocation() {
+		return "/" + TwilioRestClient.DEFAULT_VERSION + "/Accounts/"
+			+ this.getRequestAccountSid() + "/Usage/Triggers";
+	}
 
 	/* (non-Javadoc)
 	 * @see com.twilio.sdk.resource.ListResource#makeNew(com.twilio.sdk.TwilioRestClient, java.util.Map)
 	 */
 	@Override
-		protected UsageTrigger makeNew(TwilioRestClient client,
-				Map<String, Object> properties) {
-			return new UsageTrigger(client, properties);
-		}
+	protected UsageTrigger makeNew(TwilioRestClient client,
+			Map<String, Object> properties) {
+		return new UsageTrigger(client, properties);
+	}
 
 	/* (non-Javadoc)
 	 * @see com.twilio.sdk.resource.ListResource#getListKey()
 	 */
 	@Override
-		protected String getListKey() {
-			return "UsageTriggers";
-		}
+	protected String getListKey() {
+		return "UsageTriggers";
+	}
 
 	@Override
-		public UsageTrigger create(Map<String, String> params) throws TwilioRestException {
-			TwilioRestResponse response = this.getClient().safeRequest(
-					this.getResourceLocation(), "POST", params);
-			return makeNew(this.getClient(), (Map<String, Object>) response.toMap().get("UsageTrigger"));
-		}
+	public UsageTrigger create(Map<String, String> params) throws TwilioRestException {
+		TwilioRestResponse response = this.getClient().safeRequest(
+				this.getResourceLocation(), "POST", params);
+		return makeNew(this.getClient(), (Map<String, Object>) response.toMap().get("UsageTriggers"));
+	}
 
 	@Override
-		public UsageTrigger create(List<NameValuePair> params) throws TwilioRestException {
-			TwilioRestResponse response = this.getClient().safeRequest(
-					this.getResourceLocation(), "POST", params);
-			return makeNew(this.getClient(), (Map<String, Object>) response.toMap().get("UsageTrigger"));
-		}
+	public UsageTrigger create(List<NameValuePair> params) throws TwilioRestException {
+		TwilioRestResponse response = this.getClient().safeRequest(
+				this.getResourceLocation(), "POST", params);
+		return makeNew(this.getClient(), (Map<String, Object>) response.toMap().get("UsageTriggers"));
+	}
 }

src/main/java/com/twilio/sdk/verbs/Sip.java

@@ -8,12 +8,19 @@ public class Sip extends Verb {
     /**
      * Instantiates a new Sip.
      */
-    public Sip() {
-        super(V_SIP, null);
+    public Sip(final String uri) {
+        super(V_SIP, uri);
         this.allowedVerbs = new ArrayList<String>();
         this.allowedVerbs.add(Verb.V_URI);
     }
 
+    /**
+     * Instantiates a new Sip Noun with no URI.
+     */
+    public Sip() {
+        this(null);
+    }
+
     public void setUsername(String username) {
         this.set("username", username);
     }

src/main/java/com/twilio/sdk/verbs/Uri.java

@@ -1,10 +1,7 @@
 package com.twilio.sdk.verbs;
 
-import java.util.ArrayList;
-
 public class Uri extends Verb {
 
-
     /**
      * Instantiates a new Uri to dial with Sip
      */

src/test/java/com/twilio/sdk/verbs/SipTest.java

@@ -0,0 +1,32 @@
+package com.twilio.sdk.verbs;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class SipTest {
+
+    /**
+     * Test the SIP noun with a text element representing the URI.
+     */
+    @Test
+    public void testBasicSip() {
+        Sip sip = new Sip("sip:alice@twilio.com;transport=udp");
+        assertEquals("<Sip>sip:alice@twilio.com;transport=udp</Sip>", sip.toXML());
+    }
+
+    /**
+     * Test the SIP noun with a child URI noun.
+     * @throws TwiMLException
+     */
+    @Test
+    public void testSipUriNoun() throws TwiMLException {
+        Sip sip = new Sip();
+        Uri uri = new Uri("sip:alice@twilio.com;transport=udp");
+        uri.setUsername("alice");
+        uri.setPassword("hellotwilio");
+        sip.append(uri);
+        assertEquals("<Sip><Uri username=\"alice\" password=\"hellotwilio\">sip:alice@twilio.com;transport=udp</Uri></Sip>",
+                sip.toXML());
+    }
+}