Merge master 7.4.0

Author: Tom Connors

AUTHORS.md

@@ -23,6 +23,7 @@ A huge thanks to all of our contributors:
 - D Keith Casey Jr
 - Doug Black
 - Eric Anderle
+- Evan Fossier
 - Frank
 - Frank Stratton
 - Girish Bharadwaj
@@ -47,6 +48,7 @@ A huge thanks to all of our contributors:
 - Sunil Veluvali
 - Takuji Shimokawa
 - Thomas Wilsher
+- Thomas Connors
 - Vincent Pizzo
 - olivier bourgain
 - rschiffert@twilio.com

CHANGES.md

@@ -1,6 +1,33 @@
 twilio-java changelog
 =====================
 
+[2017-01-10] Version 7.4.0-alpha-1
+--------------------------
+- 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-alpha-1
 --------------------------
 - Add `recordingStatusCallback` and `recordingStatusCallbackMethod` to Conference TwiML
@@ -22,7 +49,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.
@@ -31,7 +58,7 @@ twilio-java changelog
     - Add ability to update Members.
     - Add filtering by `identity` on Members.
     - Add webhook related parameters to Service updates.
-    - Remove updating of `type` on Channels. 
+    - Remove updating of `type` on Channels.
 
 [2016-10-05] Version 7.1.0-alpha-1
 --------------------------
@@ -121,5 +148,3 @@ This version brings a host of changes to update and modernize the `twilio-java`
 [2015-09-14] Version 5.0.0
 --------------------------
 - Remove deprecated total and numpages from ListResource and response parsers
-
-

pom.xml

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

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

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

src/main/java/com/twilio/converter/DateConverter.java

@@ -1,5 +1,6 @@
 package com.twilio.converter;
 
+import java.util.Locale;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.LocalDate;
@@ -16,7 +17,7 @@ public class DateConverter {
         DateTimeFormat.forPattern(DATE_PATTERN).withZone(DateTimeZone.UTC);
 
     private static final DateTimeFormatter RFC2822_DATE_TIME_FORMATTER =
-        DateTimeFormat.forPattern(RFC2822_DATE_TIME).withZone(DateTimeZone.UTC);
+        DateTimeFormat.forPattern(RFC2822_DATE_TIME).withZone(DateTimeZone.UTC).withLocale(new Locale("en_US"));
 
     private static final DateTimeFormatter ISO8601_DATE_TIME_FORMATTER =
         DateTimeFormat.forPattern(ISO8601_DATE_TIME).withZone(DateTimeZone.UTC);

src/main/java/com/twilio/jwt/taskrouter/PolicyUtils.java

@@ -37,8 +37,14 @@ public static List<Policy> defaultWorkerPolicies(String workspaceSid, String wor
             .method(HttpMethod.GET)
             .allowed(true)
             .build();
+        
+        Policy workerFetch = new Policy.Builder()
+            .url(UrlUtils.worker(workspaceSid, workerSid))
+            .method(HttpMethod.GET)
+            .allowed(true)
+            .build();
 
-        return Lists.newArrayList(activities, tasks, reservations);
+        return Lists.newArrayList(activities, tasks, reservations, workerFetch);
     }
 
     /**

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());
+        }
     }
 }