Update Enqueue TwiML, extend TaskRouterResource on TaskRouting/Workflow

Author: jingming

src/main/java/com/twilio/taskrouter/TaskRouting.java

@@ -12,7 +12,7 @@
 
 @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
-public class TaskRouting {
+public class TaskRouting extends TaskRouterResource {
 
     @JsonProperty("filters")
     private final List<WorkflowRule> workflowRules;

src/main/java/com/twilio/taskrouter/Workflow.java

@@ -14,7 +14,7 @@
 
 @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
-public class Workflow {
+public class Workflow extends TaskRouterResource {
 
     @JsonProperty("task_routing")
     private final TaskRouting taskRouting;

src/main/java/com/twilio/twiml/Enqueue.java

@@ -31,7 +31,7 @@ public class Enqueue extends TwiML {
 
     // For XML Serialization
     private Enqueue() {
-        this(new Builder(null));
+        this(new Builder());
     }
 
     private Enqueue(Builder b) {
@@ -75,8 +75,9 @@ public static class Builder {
         private String workflowSid;
         private String queueName;
 
-        public Builder(String queueName) {
+        public Builder queueName(String queueName) {
             this.queueName = queueName;
+            return this;
         }
 
         public Builder action(String action) {

src/main/java/com/twilio/twiml/VoiceResponse.java

@@ -51,6 +51,11 @@ public Builder enqueue(Enqueue enqueue) {
             return this;
         }
 
+        public Builder enqueue(EnqueueTask enqueue) {
+            this.actions.add(enqueue);
+            return this;
+        }
+
         public Builder gather(Gather gather) {
             this.actions.add(gather);
             return this;

src/test/java/com/twilio/twiml/EnqueueTest.java

@@ -10,7 +10,8 @@ public class EnqueueTest {
 
     @Test
     public void testXml() throws TwiMLException {
-        Enqueue enqueue = new Enqueue.Builder("enqueue")
+        Enqueue enqueue = new Enqueue.Builder()
+            .queueName("enqueue")
             .action("/enqueue")
             .method(Method.GET)
             .waitUrl("/wait")
@@ -23,7 +24,8 @@ public void testXml() throws TwiMLException {
 
     @Test
     public void testUrl() throws TwiMLException {
-        Enqueue enqueue = new Enqueue.Builder("enqueue")
+        Enqueue enqueue = new Enqueue.Builder()
+            .queueName("enqueue")
             .action("/enqueue")
             .method(Method.GET)
             .waitUrl("/wait")

src/test/java/com/twilio/twiml/VoiceResponseTest.java

@@ -13,7 +13,7 @@ public void testXml() throws TwiMLException {
         VoiceResponse response = new VoiceResponse.Builder()
             .redirect(new Redirect.Builder().build())
             .dial(new Dial.Builder().build())
-            .enqueue(new Enqueue.Builder("enqueue").build())
+            .enqueue(new Enqueue.Builder().queueName("enqueue").build())
             .gather(new Gather.Builder().build())
             .hangup(new Hangup())
             .leave(new Leave())
@@ -49,7 +49,7 @@ public void testUrl() throws TwiMLException {
         VoiceResponse response = new VoiceResponse.Builder()
             .redirect(new Redirect.Builder().build())
             .dial(new Dial.Builder().build())
-            .enqueue(new Enqueue.Builder("enqueue").build())
+            .enqueue(new Enqueue.Builder().queueName("enqueue").build())
             .gather(new Gather.Builder().build())
             .hangup(new Hangup())
             .leave(new Leave())