Merge pull request #323 from twilio/release-7.4.0

Release 7.4.0. Locale Fix PR-320; Undocumented Parameters PR-317; Wor…

Author: Tom

CHANGES.md

@@ -1,6 +1,33 @@
 twilio-java changelog
 =====================
 
+[2017-01-10] Version 7.4.0
+--------------------------
+- Added new AddOnResults API.
+- Allow undocumented TwiML voice parameters for Conference, Dial, and Pause PR #317.
+- Fix dates being serialized to null in some locales PR #320.
+- Add `emergencyEnabled` field to Addresses.
+- Add support for emergency phone numbers.
+- Add support for ending conferences via the API.
+- Add `region` field to Conferences.
+
+- **Twilio Chat**
+    - Add `membersCount` and `messagesCount` to Channel.
+    - Add support for filtering on channel type when reading list of Channels.
+    - Add `last_consumed_message_index` and `last_consumption_timestamp` fields to Member.
+    - Remove ability to update Message body, was never supported by API (backwards incompatible).
+    - Add support for new UserChannel Resource.
+
+- **Taskrouter**
+    - Add default worker fetch policy PR #313.
+    - Add queue ordering for Workspace, TaskQueue.
+    - Remove ability to specify `attributes` and `workflowSid` on Task creation (backwards incompatible).
+    - Add `addons`, `taskQueueFriendlyName`, `workflowFriendlyName`, metdata to Task.
+    - Use DateTimes for WorkspaceStatistics filtering (backwards incompatible).
+    - Fix TaskQueueStatistics `cumulative` field incorrect type (backwards incompatible).
+    - Fix TaskQueuesStatistics `cumulative` field incorrect type (backwards incompatible).
+    - Remove ability to set `friendlyName` on TaskQueueStatistics (backwards incompatible).
+
 [2016-11-30] Version 7.3.0
 --------------------------
 - Add `recordingStatusCallback` and `recordingStatusCallbackMethod` to Conference TwiML
@@ -19,7 +46,7 @@ twilio-java changelog
 - Add missing fields to IncomingPhoneNumbers.
 - Add missing fields to Messages.
 
-- * Twilio Chat *
+- **Twilio Chat**
     - Add Invites
     - Add `reachabilityEnabled`, `preWebhookUrl`, `postWebhookUrl`, `webhookMethod`, `webhookFilters`, `notifications` to Services.
     - Add `attributes`, `friendlyName`, `isOnline`, `isNotifiable` to Users.

pom.xml

@@ -7,7 +7,7 @@
   <artifactId>twilio</artifactId>
   <packaging>jar</packaging>
   <name>twilio</name>
-  <version>7.3.1-SNAPSHOT</version>
+  <version>7.4.0-SNAPSHOT</version>
   <description>Twilio Java Helper Library</description>
   <url>https://www.twilio.com</url>
   <licenses>

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

@@ -33,7 +33,7 @@
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Address extends Resource {
-    private static final long serialVersionUID = 241863313934407L;
+    private static final long serialVersionUID = 81565212445182L;
 
     /**
      * Create a AddressCreator to execute create.
@@ -211,6 +211,7 @@ public static Address fromJson(final InputStream json, final ObjectMapper object
     private final String sid;
     private final String street;
     private final String uri;
+    private final Boolean emergencyEnabled;
 
     @JsonCreator
     private Address(@JsonProperty("account_sid")
@@ -236,7 +237,9 @@ private Address(@JsonProperty("account_sid")
                     @JsonProperty("street")
                     final String street, 
                     @JsonProperty("uri")
-                    final String uri) {
+                    final String uri, 
+                    @JsonProperty("emergency_enabled")
+                    final Boolean emergencyEnabled) {
         this.accountSid = accountSid;
         this.city = city;
         this.customerName = customerName;
@@ -249,6 +252,7 @@ private Address(@JsonProperty("account_sid")
         this.sid = sid;
         this.street = street;
         this.uri = uri;
+        this.emergencyEnabled = emergencyEnabled;
     }
 
     /**
@@ -359,6 +363,15 @@ public final String getUri() {
         return this.uri;
     }
 
+    /**
+     * Returns The The emergency_enabled.
+     * 
+     * @return The emergency_enabled
+     */
+    public final Boolean getEmergencyEnabled() {
+        return this.emergencyEnabled;
+    }
+
     @Override
     public boolean equals(final Object o) {
         if (this == o) {
@@ -382,7 +395,8 @@ public boolean equals(final Object o) {
                Objects.equals(region, other.region) && 
                Objects.equals(sid, other.sid) && 
                Objects.equals(street, other.street) && 
-               Objects.equals(uri, other.uri);
+               Objects.equals(uri, other.uri) && 
+               Objects.equals(emergencyEnabled, other.emergencyEnabled);
     }
 
     @Override
@@ -398,7 +412,8 @@ public int hashCode() {
                             region,
                             sid,
                             street,
-                            uri);
+                            uri,
+                            emergencyEnabled);
     }
 
     @Override
@@ -416,6 +431,7 @@ public String toString() {
                           .add("sid", sid)
                           .add("street", street)
                           .add("uri", uri)
+                          .add("emergencyEnabled", emergencyEnabled)
                           .toString();
     }
 }

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

@@ -26,6 +26,7 @@ public class AddressCreator extends Creator<Address> {
     private final String postalCode;
     private final String isoCountry;
     private String friendlyName;
+    private Boolean emergencyEnabled;
 
     /**
      * Construct a new AddressCreator.
@@ -89,6 +90,17 @@ public AddressCreator setFriendlyName(final String friendlyName) {
         return this;
     }
 
+    /**
+     * The emergency_enabled.
+     * 
+     * @param emergencyEnabled The emergency_enabled
+     * @return this
+     */
+    public AddressCreator setEmergencyEnabled(final Boolean emergencyEnabled) {
+        this.emergencyEnabled = emergencyEnabled;
+        return this;
+    }
+
     /**
      * Make the request to the Twilio API to perform the create.
      * 
@@ -162,5 +174,9 @@ private void addPostParams(final Request request) {
         if (friendlyName != null) {
             request.addPostParam("FriendlyName", friendlyName);
         }
+        
+        if (emergencyEnabled != null) {
+            request.addPostParam("EmergencyEnabled", emergencyEnabled.toString());
+        }
     }
 }

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

@@ -26,6 +26,7 @@ public class AddressUpdater extends Updater<Address> {
     private String city;
     private String region;
     private String postalCode;
+    private Boolean emergencyEnabled;
 
     /**
      * Construct a new AddressUpdater.
@@ -114,6 +115,17 @@ public AddressUpdater setPostalCode(final String postalCode) {
         return this;
     }
 
+    /**
+     * The emergency_enabled.
+     * 
+     * @param emergencyEnabled The emergency_enabled
+     * @return this
+     */
+    public AddressUpdater setEmergencyEnabled(final Boolean emergencyEnabled) {
+        this.emergencyEnabled = emergencyEnabled;
+        return this;
+    }
+
     /**
      * Make the request to the Twilio API to perform the update.
      * 
@@ -183,5 +195,9 @@ private void addPostParams(final Request request) {
         if (postalCode != null) {
             request.addPostParam("PostalCode", postalCode);
         }
+        
+        if (emergencyEnabled != null) {
+            request.addPostParam("EmergencyEnabled", emergencyEnabled.toString());
+        }
     }
 }

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 = 26859400656542L;
+    private static final long serialVersionUID = 150944769427087L;
 
     public enum Status {
         INIT("init"),
@@ -68,6 +68,37 @@ public static Status forValue(final String value) {
         }
     }
 
+    public enum UpdateStatus {
+        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 ConferenceFetcher to execute fetch.
      * 
@@ -109,6 +140,28 @@ public static ConferenceReader reader() {
         return new ConferenceReader();
     }
 
+    /**
+     * Create a ConferenceUpdater to execute update.
+     * 
+     * @param accountSid The account_sid
+     * @param sid The sid
+     * @return ConferenceUpdater capable of executing the update
+     */
+    public static ConferenceUpdater updater(final String accountSid, 
+                                            final String sid) {
+        return new ConferenceUpdater(accountSid, sid);
+    }
+
+    /**
+     * Create a ConferenceUpdater to execute update.
+     * 
+     * @param sid The sid
+     * @return ConferenceUpdater capable of executing the update
+     */
+    public static ConferenceUpdater updater(final String sid) {
+        return new ConferenceUpdater(sid);
+    }
+
     /**
      * Converts a JSON String into a Conference object using the provided
      * ObjectMapper.
@@ -152,6 +205,7 @@ public static Conference fromJson(final InputStream json, final ObjectMapper obj
     private final DateTime dateUpdated;
     private final String apiVersion;
     private final String friendlyName;
+    private final String region;
     private final String sid;
     private final Conference.Status status;
     private final String uri;
@@ -168,6 +222,8 @@ private Conference(@JsonProperty("account_sid")
                        final String apiVersion, 
                        @JsonProperty("friendly_name")
                        final String friendlyName, 
+                       @JsonProperty("region")
+                       final String region, 
                        @JsonProperty("sid")
                        final String sid, 
                        @JsonProperty("status")
@@ -181,6 +237,7 @@ private Conference(@JsonProperty("account_sid")
         this.dateUpdated = DateConverter.rfc2822DateTimeFromString(dateUpdated);
         this.apiVersion = apiVersion;
         this.friendlyName = friendlyName;
+        this.region = region;
         this.sid = sid;
         this.status = status;
         this.uri = uri;
@@ -232,6 +289,15 @@ public final String getFriendlyName() {
         return this.friendlyName;
     }
 
+    /**
+     * Returns The The region.
+     * 
+     * @return The region
+     */
+    public final String getRegion() {
+        return this.region;
+    }
+
     /**
      * Returns The A string that uniquely identifies this conference.
      * 
@@ -285,6 +351,7 @@ public boolean equals(final Object o) {
                Objects.equals(dateUpdated, other.dateUpdated) && 
                Objects.equals(apiVersion, other.apiVersion) && 
                Objects.equals(friendlyName, other.friendlyName) && 
+               Objects.equals(region, other.region) && 
                Objects.equals(sid, other.sid) && 
                Objects.equals(status, other.status) && 
                Objects.equals(uri, other.uri) && 
@@ -298,6 +365,7 @@ public int hashCode() {
                             dateUpdated,
                             apiVersion,
                             friendlyName,
+                            region,
                             sid,
                             status,
                             uri,
@@ -312,6 +380,7 @@ public String toString() {
                           .add("dateUpdated", dateUpdated)
                           .add("apiVersion", apiVersion)
                           .add("friendlyName", friendlyName)
+                          .add("region", region)
                           .add("sid", sid)
                           .add("status", status)
                           .add("uri", uri)