Upgrade twilio to 7.17.0

Author: hortega

build.gradle

@@ -23,7 +23,7 @@ repositories {
 dependencies {
   providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
   compile 'org.slf4j:slf4j-api:1.7.21'
-  compile 'com.twilio.sdk:twilio:7.0.0-rc-29'
+  compile 'com.twilio.sdk:twilio:7.17.0'
   compile 'org.json:json:20160810'
   compile 'org.apache.commons:commons-lang3:3.0'
 

classes/production/taskrouter-servlets/workspace.json

@@ -56,7 +56,7 @@
   "workflow": {
     "name": "Sales",
     "callback": "%(host)s/assignment",
-    "timeout": "60",
+    "timeout": "15",
     "routingConfiguration": [
       {
         "expression": "selected_product==\"ProgrammableSMS\"",

src/main/java/com/twilio/taskrouter/application/servlet/EnqueueServlet.java

@@ -1,10 +1,10 @@
 package com.twilio.taskrouter.application.servlet;
 
 import com.twilio.taskrouter.domain.common.TwilioAppSettings;
-import com.twilio.twiml.EnqueueTask;
-import com.twilio.twiml.Task;
 import com.twilio.twiml.TwiMLException;
 import com.twilio.twiml.VoiceResponse;
+import com.twilio.twiml.voice.Enqueue;
+import com.twilio.twiml.voice.Task;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -39,13 +39,13 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp)
     throws ServletException, IOException {
 
     String selectedProduct = getSelectedProduct(req);
-    Task task = new Task.Builder()
-      .data(format("{\"selected_product\": \"%s\"}", selectedProduct))
+    Task task = new Task
+      .Builder(format("{\"selected_product\": \"%s\"}", selectedProduct))
       .build();
 
-    EnqueueTask enqueueTask = new EnqueueTask.Builder(task).workflowSid(workflowSid).build();
+    Enqueue enqueue = new Enqueue.Builder().task(task).workflowSid(workflowSid).build();
 
-    VoiceResponse voiceResponse = new VoiceResponse.Builder().enqueue(enqueueTask).build();
+    VoiceResponse voiceResponse = new VoiceResponse.Builder().enqueue(enqueue).build();
     resp.setContentType("application/xml");
     try {
       resp.getWriter().print(voiceResponse.toXml());

src/main/java/com/twilio/taskrouter/application/servlet/IncomingCallServlet.java

@@ -1,11 +1,11 @@
 package com.twilio.taskrouter.application.servlet;
 
 
-import com.twilio.twiml.Gather;
-import com.twilio.twiml.Method;
-import com.twilio.twiml.Say;
+import com.twilio.http.HttpMethod;
 import com.twilio.twiml.TwiMLException;
 import com.twilio.twiml.VoiceResponse;
+import com.twilio.twiml.voice.Gather;
+import com.twilio.twiml.voice.Say;
 
 import javax.inject.Singleton;
 import javax.servlet.ServletException;
@@ -33,7 +33,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws Serv
           .action("/call/enqueue")
           .numDigits(1)
           .timeout(10)
-          .method(Method.POST)
+          .method(HttpMethod.POST)
           .say(new Say
             .Builder("For Programmable SMS, press one. For Voice, press any other key.")
             .build()

src/main/java/com/twilio/taskrouter/application/servlet/MessageServlet.java

@@ -2,9 +2,9 @@
 
 import com.google.inject.Singleton;
 import com.twilio.taskrouter.domain.model.WorkspaceFacade;
-import com.twilio.twiml.Sms;
 import com.twilio.twiml.TwiMLException;
 import com.twilio.twiml.VoiceResponse;
+import com.twilio.twiml.voice.Sms;
 
 import javax.inject.Inject;
 import javax.servlet.ServletException;