Merge branch 'alpha' of https://github.com/twilio/twilio-java into asym-auth

Author: jingming

CHANGES.md

@@ -1,7 +1,33 @@
 twilio-java changelog
 =====================
 
-[2016-10-05] Version 7.1.0
+[2016-11-16] Version 7.2.0-alpha-1
+--------------------------
+- Add PublicKey Credentials.
+- Add create/update to RatePlans.
+- Use separate enum for Updating  Call `status`. This enum only exposes the statuses that a Call can be updated to.
+- Move the `body` parameter to be required in updating Messages.
+- Move the `friendlyName` parameter to be r  equired in creating Queues.
+- Update to latest Notify.
+- Add Particpant creation to Conferences.
+- Add filtering by `CallSid` to Recordings.
+- Add missing fields to Call Recordings.
+- Add missing fields to Conferences.
+- Add missing fields to IncomingPhoneNumbers.
+- Add missing fields to Messages.
+
+- * Twilio Chat *
+    - Add Invites
+    - Add `reachabilityEnabled`, `preWebhookUrl`, `postWebhookUrl`, `webhookMethod`, `webhookFilters`, `notifications` to Services.
+    - Add `attributes`, `friendlyName`, `isOnline`, `isNotifiable` to Users.
+    - Add `lastConsumedMessageIndex`, `lastConsumptionTimestamp` to Members.
+    - Add `attributes`, `index` to Messages.
+    - Add ability to update Members.
+    - Add filtering by `identity` on Members.
+    - Add webhook related parameters to Service updates.
+    - Remove updating of `type` on Channels. 
+
+[2016-10-05] Version 7.1.0-alpha-1
 --------------------------
 - Update Usage Records to use `LocalDate` instead of `DateTime`
 - Update TwiML Generator to reflect latest docs:

pom.xml

@@ -7,7 +7,7 @@
   <artifactId>twilio</artifactId>
   <packaging>jar</packaging>
   <name>twilio</name>
-  <version>7.1.1-SNAPSHOT</version>
+  <version>7.1.0-alpha-2-SNAPSHOT</version>
   <description>Twilio Java Helper Library</description>
   <url>https://www.twilio.com</url>
   <licenses>
@@ -176,7 +176,7 @@
           <use>true</use>
           <windowtitle>Twilio Java</windowtitle>
           <doctitle><![CDATA[<h1>Twilio Java</h1>]]></doctitle>
-          <bottom><![CDATA[<i>Copyright &#169; 2011 Twilio, Inc. All Rights Reserved.</i>]]></bottom>
+          <bottom><![CDATA[<i>Copyright &#169; 2016 Twilio, Inc. All Rights Reserved.</i>]]></bottom>
         </configuration>
       </plugin>
 

src/main/java/com/twilio/Twilio.java

@@ -12,7 +12,7 @@
  */
 public class Twilio {
 
-    public static final String VERSION = "7.1.0";
+    public static final String VERSION = "7.1.0-alpha-1";
     public static final String JAVA_VERSION = System.getProperty("java.version");
 
     private static String username;

src/main/java/com/twilio/example/Example.java

@@ -7,6 +7,7 @@
 import com.twilio.rest.api.v2010.account.IncomingPhoneNumber;
 import com.twilio.rest.api.v2010.account.Message;
 import com.twilio.rest.api.v2010.account.availablephonenumbercountry.Local;
+import com.twilio.rest.api.v2010.account.usage.Record;
 import com.twilio.rest.trunking.v1.Trunk;
 import com.twilio.rest.trunking.v1.TrunkCreator;
 import com.twilio.twiml.Play;
@@ -36,6 +37,11 @@ public static void main(String[] args) throws TwiMLException {
 
         Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
+        Iterable<Record> usage = Record.reader().read();
+        for (Record record : usage) {
+            System.out.println(record);
+        }
+
         // Get a number
         IncomingPhoneNumber number = buyNumber();
         System.out.println(number.getPhoneNumber());

src/main/java/com/twilio/rest/Domains.java

@@ -14,6 +14,8 @@ public enum Domains {
     IPMESSAGING("ip-messaging"),
     LOOKUPS("lookups"),
     MONITOR("monitor"),
+    NOTIFY("notify"),
+    PREVIEW("preview"),
     PRICING("pricing"),
     TASKROUTER("taskrouter"),
     TRUNKING("trunking");

src/main/java/com/twilio/rest/accounts/v1/credential/PublicKeyCreator.java

@@ -99,7 +99,7 @@ public PublicKey create(final TwilioRestClient client) {
      */
     private void addPostParams(final Request request) {
         if (publicKey != null) {
-            request.addPostParam("PublicKey", publicKey);
+            request.addPostParam("PublicKey", publicKey.toString());
         }
 
         if (friendlyName != null) {

src/main/java/com/twilio/rest/accounts/v1/credential/PublicKeyUpdater.java

@@ -20,7 +20,6 @@
 public class PublicKeyUpdater extends Updater<PublicKey> {
     private final String sid;
     private String friendlyName;
-    private String publicKey;
 
     /**
      * Construct a new PublicKeyUpdater.
@@ -42,17 +41,6 @@ public PublicKeyUpdater setFriendlyName(final String friendlyName) {
         return this;
     }
 
-    /**
-     * The public_key.
-     * 
-     * @param publicKey The public_key
-     * @return this
-     */
-    public PublicKeyUpdater setPublicKey(final String publicKey) {
-        this.publicKey = publicKey;
-        return this;
-    }
-
     /**
      * Make the request to the Twilio API to perform the update.
      * 
@@ -101,9 +89,5 @@ private void addPostParams(final Request request) {
         if (friendlyName != null) {
             request.addPostParam("FriendlyName", friendlyName);
         }
-        
-        if (publicKey != null) {
-            request.addPostParam("PublicKey", publicKey);
-        }
     }
 }

src/main/java/com/twilio/rest/api/v2010/account/Call.java

@@ -112,6 +112,38 @@ public static Status forValue(final String value) {
         }
     }
 
+    public enum UpdateStatus {
+        CANCELED("canceled"),
+        COMPLETED("completed");
+    
+        private final String value;
+        
+        private UpdateStatus(final String value) {
+            this.value = value;
+        }
+        
+        public String toString() {
+            return value;
+        }
+        
+        /**
+         * Generate a UpdateStatus from a string.
+         * @param value string value
+         * @return generated UpdateStatus
+         */
+        @JsonCreator
+        public static UpdateStatus forValue(final String value) {
+            String normalized = value.replace("-", "_").toUpperCase();
+            try {
+                return UpdateStatus.valueOf(normalized);
+            } catch (RuntimeException e) {
+        
+                // Don't blow up of value does not exist
+                return null;
+            }
+        }
+    }
+
     /**
      * Create a CallCreator to execute create.
      * 

src/main/java/com/twilio/rest/api/v2010/account/CallUpdater.java

@@ -25,7 +25,7 @@ public class CallUpdater extends Updater<Call> {
     private final String sid;
     private URI url;
     private HttpMethod method;
-    private Call.Status status;
+    private Call.UpdateStatus status;
     private URI fallbackUrl;
     private HttpMethod fallbackMethod;
     private URI statusCallback;
@@ -96,7 +96,7 @@ public CallUpdater setMethod(final HttpMethod method) {
      * @param status Status to update the Call with
      * @return this
      */
-    public CallUpdater setStatus(final Call.Status status) {
+    public CallUpdater setStatus(final Call.UpdateStatus status) {
         this.status = status;
         return this;
     }

src/main/java/com/twilio/rest/api/v2010/account/Conference.java

@@ -33,7 +33,7 @@
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Conference extends Resource {
-    private static final long serialVersionUID = 42097688383145L;
+    private static final long serialVersionUID = 26859400656542L;
 
     public enum Status {
         INIT("init"),
@@ -155,6 +155,7 @@ public static Conference fromJson(final InputStream json, final ObjectMapper obj
     private final String sid;
     private final Conference.Status status;
     private final String uri;
+    private final Map<String, String> subresourceUris;
 
     @JsonCreator
     private Conference(@JsonProperty("account_sid")
@@ -172,7 +173,9 @@ private Conference(@JsonProperty("account_sid")
                        @JsonProperty("status")
                        final Conference.Status status, 
                        @JsonProperty("uri")
-                       final String uri) {
+                       final String uri, 
+                       @JsonProperty("subresource_uris")
+                       final Map<String, String> subresourceUris) {
         this.accountSid = accountSid;
         this.dateCreated = DateConverter.rfc2822DateTimeFromString(dateCreated);
         this.dateUpdated = DateConverter.rfc2822DateTimeFromString(dateUpdated);
@@ -181,6 +184,7 @@ private Conference(@JsonProperty("account_sid")
         this.sid = sid;
         this.status = status;
         this.uri = uri;
+        this.subresourceUris = subresourceUris;
     }
 
     /**
@@ -255,6 +259,15 @@ public final String getUri() {
         return this.uri;
     }
 
+    /**
+     * Returns The The subresource_uris.
+     * 
+     * @return The subresource_uris
+     */
+    public final Map<String, String> getSubresourceUris() {
+        return this.subresourceUris;
+    }
+
     @Override
     public boolean equals(final Object o) {
         if (this == o) {
@@ -274,7 +287,8 @@ public boolean equals(final Object o) {
                Objects.equals(friendlyName, other.friendlyName) && 
                Objects.equals(sid, other.sid) && 
                Objects.equals(status, other.status) && 
-               Objects.equals(uri, other.uri);
+               Objects.equals(uri, other.uri) && 
+               Objects.equals(subresourceUris, other.subresourceUris);
     }
 
     @Override
@@ -286,7 +300,8 @@ public int hashCode() {
                             friendlyName,
                             sid,
                             status,
-                            uri);
+                            uri,
+                            subresourceUris);
     }
 
     @Override
@@ -300,6 +315,7 @@ public String toString() {
                           .add("sid", sid)
                           .add("status", status)
                           .add("uri", uri)
+                          .add("subresourceUris", subresourceUris)
                           .toString();
     }
 }