Update TwiML to reflect current docs

Author: jingming

pom.xml

@@ -8,7 +8,7 @@
   <packaging>jar</packaging>
   <name>twilio</name>
   <version>7.0.1-SNAPSHOT</version>
-  <description>Release Candidate for Next-Gen Twilio Java Helper Library</description>
+  <description>Twilio Java Helper Library</description>
   <url>https://www.twilio.com</url>
   <licenses>
     <license>

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

@@ -1,9 +1,14 @@
 package com.twilio.twiml;
 
+import com.google.common.base.Function;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
+
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlValue;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.List;
 
 /**
  * TwiML wrapper for @see https://www.twilio.com/docs/api/twiml/conference.
@@ -45,6 +50,33 @@ public String toString() {
         }
     }
 
+    public enum ConferenceEvent {
+        START("start"),
+        END("end"),
+        JOIN("join"),
+        LEAVE("leave"),
+        MUTE("mute"),
+        HOLD("hold");
+
+        private final String value;
+
+        ConferenceEvent(String value) {
+            this.value = value;
+        }
+
+        @Override
+        public String toString() {
+            return this.value;
+        }
+
+        public static final Function<ConferenceEvent, String> TO_STRING = new Function<ConferenceEvent, String>() {
+            @Override
+            public String apply(ConferenceEvent event) {
+                return event.toString();
+            }
+        };
+    }
+
     @XmlAttribute
     private final Boolean muted;
 
@@ -78,9 +110,20 @@ public String toString() {
     @XmlAttribute
     private final String eventCallbackUrl;
 
+    @XmlAttribute
+    private final String statusCallbackEvent;
+
+    @XmlAttribute
+    private final Method statusCallbackMethod;
+
+    @XmlAttribute
+    private final String statusCallback;
+
     @XmlValue
     private final String name;
 
+    private final List<ConferenceEvent> statusCallbackEvents;
+
     // For XML Serialization
     private Conference() {
         this(new Builder(null));
@@ -98,6 +141,15 @@ private Conference(Builder b) {
         this.waitUrl = b.waitUrl;
         this.eventCallbackUrl = b.eventCallbackUrl;
         this.name = b.name;
+        this.statusCallbackEvents = b.statusCallbackEvents;
+        this.statusCallbackMethod = b.statusCallbackMethod;
+        this.statusCallback = b.statusCallback;
+
+        if (this.statusCallbackEvents != null) {
+            this.statusCallbackEvent = Joiner.on(" ").join(Lists.transform(this.statusCallbackEvents, ConferenceEvent.TO_STRING));
+        } else {
+            this.statusCallbackEvent = null;
+        }
     }
 
     public Boolean isMuted() {
@@ -140,6 +192,18 @@ public String getEventCallbackUrl() {
         return eventCallbackUrl;
     }
 
+    public Method getStatusCallbackMethod() {
+        return statusCallbackMethod;
+    }
+
+    public String getStatusCallback() {
+        return statusCallback;
+    }
+
+    public List<ConferenceEvent> getStatusCallbackEvents() {
+        return statusCallbackEvents;
+    }
+
     public String getName() {
         return name;
     }
@@ -155,6 +219,9 @@ public static class Builder {
         private Method waitMethod;
         private String waitUrl;
         private String eventCallbackUrl;
+        private List<ConferenceEvent> statusCallbackEvents;
+        private Method statusCallbackMethod;
+        private String statusCallback;
         private String name;
 
         public Builder(String name) {
@@ -206,6 +273,21 @@ public Builder waitUrl(String waitUrl) {
             return this;
         }
 
+        public Builder statusCallbackEvents(List<ConferenceEvent> statusCallbackEvents) {
+            this.statusCallbackEvents = statusCallbackEvents;
+            return this;
+        }
+
+        public Builder statusCallback(String statusCallback) {
+            this.statusCallback = statusCallback;
+            return this;
+        }
+
+        public Builder statusCallbackMethod(Method statusCallbackMethod) {
+            this.statusCallbackMethod = statusCallbackMethod;
+            return this;
+        }
+
         public Builder eventCallbackUrl(String eventCallbackUrl) {
             this.eventCallbackUrl = eventCallbackUrl;
             return this;

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

@@ -18,7 +18,9 @@ public class Dial extends TwiML {
     public enum Record {
         DO_NOT_RECORD("do-not-record"),
         RECORD_FROM_RINGING("record-from-ringing"),
-        RECORD_FROM_ANSWER("record-from-answer");
+        RECORD_FROM_ANSWER("record-from-answer"),
+        RECORD_FROM_ANSWER_DUAL("record-from-answer-dual"),
+        RECORD_FROM_RINGING_DUAL("record-from-ringing-dual");
 
         private final String value;
 
@@ -66,6 +68,12 @@ public String toString() {
     @XmlAttribute
     private final String callerId;
 
+    @XmlAttribute
+    private final String recordingStatusCallback;
+
+    @XmlAttribute
+    private final Method recordingStatusCallbackMethod;
+
     @XmlAttribute
     @XmlJavaTypeAdapter(TwiML.ToStringAdapter.class)
     private final Record record;
@@ -107,6 +115,8 @@ private Dial(Builder b) {
         this.action = b.action;
         this.method = b.method;
         this.callerId = b.callerId;
+        this.recordingStatusCallback = b.recordingStatusCallback;
+        this.recordingStatusCallbackMethod = b.recordingStatusCallbackMethod;
         this.record = b.record;
         this.trim = b.trim;
         this.numbers = Lists.newArrayList(b.numbers);
@@ -140,6 +150,14 @@ public String getCallerId() {
         return callerId;
     }
 
+    public String getRecordingStatusCallback() {
+        return recordingStatusCallback;
+    }
+
+    public Method getRecordingStatusCallbackMethod() {
+        return recordingStatusCallbackMethod;
+    }
+
     public Record getRecord() {
         return record;
     }
@@ -175,6 +193,8 @@ public static class Builder {
         private String action;
         private Method method;
         private String callerId;
+        private String recordingStatusCallback;
+        private Method recordingStatusCallbackMethod;
         private Record record;
         private Trim trim;
         private List<Number> numbers = Lists.newArrayList();
@@ -213,6 +233,16 @@ public Builder callerId(String callerId) {
             return this;
         }
 
+        public Builder recordingStatusCallback(String recordingStatusCallback) {
+            this.recordingStatusCallback = recordingStatusCallback;
+            return this;
+        }
+
+        public Builder recordingStatusCallbackMethod(Method recordingStatusCallbackMethod) {
+            this.recordingStatusCallbackMethod = recordingStatusCallbackMethod;
+            return this;
+        }
+
         public Builder trim(Trim trim) {
             this.trim = trim;
             return this;