fix: revert the commit Use IEnumerable<T> instead of List<T> for TwiM…

…L enums via PR (#671) (#680) * revertUse IEnumerable<T> instead of List<T> for TwiML enums (#671)" This reverts commit dbab106. * Revert "Add .ToString override to TwiML class (#672)" This reverts commit ea30f5f.
twilio · May 23, 2023 · f1e1cb0 · f1e1cb0
1 parent ea30f5f
commit f1e1cb0
Show file tree

Hide file tree

Showing 30 changed files with 90 additions and 101 deletions.
diff --git a/src/Twilio/Converters/Promoter.cs b/src/Twilio/Converters/Promoter.cs
@@ -6,15 +6,13 @@ namespace Twilio.Converters
     /// <summary>
     /// Promote objects
     /// </summary>
-    [Obsolete]
     public class Promoter
     {
         /// <summary>
         /// Convert a string URL to a Uri object
         /// </summary>
         /// <param name="url">URL to convert</param>
         /// <returns>Converted Uri</returns>
-        [Obsolete]
         public static Uri UriFromString(string url)
         {
             return new Uri(url);
@@ -25,7 +23,6 @@ public static Uri UriFromString(string url)
         /// </summary>
         /// <param name="one">single entry to promote</param>
         /// <returns>List of the single object</returns>
-        [Obsolete]
         public static List<T> ListOfOne<T>(T one)
         {
             return new List<T> {one};

diff --git a/src/Twilio/TwiML/TwiML.cs b/src/Twilio/TwiML/TwiML.cs
@@ -166,19 +166,11 @@ public XDocument ToXDocument()
             return document;
         }
 
-        /// <summary>
-        /// Generate XML string from TwiML object
-        /// </summary>
-        public override string ToString()
-        {
-            return ToString(SaveOptions.None);
-        } 
-
         /// <summary>
         /// Generate XML string from TwiML object
         /// </summary>
         /// <param name="formattingOptions"> Change generated string format. </param>
-        public string ToString(SaveOptions formattingOptions)
+        public string ToString(SaveOptions formattingOptions = SaveOptions.None)
         {
             var document = this.ToXDocument();
             var writer = new Utf8StringWriter();

diff --git a/src/Twilio/TwiML/Voice/Application.cs b/src/Twilio/TwiML/Voice/Application.cs
@@ -50,7 +50,7 @@ public static implicit operator EventEnum(string value)
         /// <summary>
         /// Events to trigger status callback
         /// </summary>
-        public IEnumerable<Application.EventEnum> StatusCallbackEvent { get; set; }
+        public List<Application.EventEnum> StatusCallbackEvent { get; set; }
         /// <summary>
         /// Status Callback URL
         /// </summary>
@@ -83,7 +83,7 @@ public static implicit operator EventEnum(string value)
         public Application(string applicationSid = null,
                            Uri url = null,
                            Twilio.Http.HttpMethod method = null,
-                           IEnumerable<Application.EventEnum> statusCallbackEvent = null,
+                           List<Application.EventEnum> statusCallbackEvent = null,
                            Uri statusCallback = null,
                            Twilio.Http.HttpMethod statusCallbackMethod = null,
                            string customerId = null,

diff --git a/src/Twilio/TwiML/Voice/Client.cs b/src/Twilio/TwiML/Voice/Client.cs
@@ -50,7 +50,7 @@ public static implicit operator EventEnum(string value)
         /// <summary>
         /// Events to trigger status callback
         /// </summary>
-        public IEnumerable<Client.EventEnum> StatusCallbackEvent { get; set; }
+        public List<Client.EventEnum> StatusCallbackEvent { get; set; }
         /// <summary>
         /// Status Callback URL
         /// </summary>
@@ -72,7 +72,7 @@ public static implicit operator EventEnum(string value)
         public Client(string identity = null,
                       Uri url = null,
                       Twilio.Http.HttpMethod method = null,
-                      IEnumerable<Client.EventEnum> statusCallbackEvent = null,
+                      List<Client.EventEnum> statusCallbackEvent = null,
                       Uri statusCallback = null,
                       Twilio.Http.HttpMethod statusCallbackMethod = null) : base("Client")
         {

diff --git a/src/Twilio/TwiML/Voice/Conference.cs b/src/Twilio/TwiML/Voice/Conference.cs
@@ -179,7 +179,7 @@ public static implicit operator JitterBufferSizeEnum(string value)
         /// <summary>
         /// Events to call status callback URL
         /// </summary>
-        public IEnumerable<Conference.EventEnum> StatusCallbackEvent { get; set; }
+        public List<Conference.EventEnum> StatusCallbackEvent { get; set; }
         /// <summary>
         /// Status callback URL
         /// </summary>
@@ -199,7 +199,7 @@ public static implicit operator JitterBufferSizeEnum(string value)
         /// <summary>
         /// Recording status callback events
         /// </summary>
-        public IEnumerable<Conference.RecordingEventEnum> RecordingStatusCallbackEvent { get; set; }
+        public List<Conference.RecordingEventEnum> RecordingStatusCallbackEvent { get; set; }
         /// <summary>
         /// Event callback URL
         /// </summary>
@@ -249,12 +249,12 @@ public Conference(string name = null,
                           Conference.RegionEnum region = null,
                           string coach = null,
                           Conference.TrimEnum trim = null,
-                          IEnumerable<Conference.EventEnum> statusCallbackEvent = null,
+                          List<Conference.EventEnum> statusCallbackEvent = null,
                           Uri statusCallback = null,
                           Twilio.Http.HttpMethod statusCallbackMethod = null,
                           Uri recordingStatusCallback = null,
                           Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
-                          IEnumerable<Conference.RecordingEventEnum> recordingStatusCallbackEvent = null,
+                          List<Conference.RecordingEventEnum> recordingStatusCallbackEvent = null,
                           Uri eventCallbackUrl = null,
                           Conference.JitterBufferSizeEnum jitterBufferSize = null,
                           string participantLabel = null) : base("Conference")

diff --git a/src/Twilio/TwiML/Voice/Connect.cs b/src/Twilio/TwiML/Voice/Connect.cs
@@ -195,10 +195,10 @@ public Connect Conversation(string serviceInstanceSid = null,
                                     Conversation.TrimEnum trim = null,
                                     Uri recordingStatusCallback = null,
                                     Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
-                                    IEnumerable<Conversation.RecordingEventEnum> recordingStatusCallbackEvent = null,
+                                    List<Conversation.RecordingEventEnum> recordingStatusCallbackEvent = null,
                                     Uri statusCallback = null,
                                     Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                    IEnumerable<Conversation.EventEnum> statusCallbackEvent = null)
+                                    List<Conversation.EventEnum> statusCallbackEvent = null)
         {
             var newChild = new Conversation(
                 serviceInstanceSid,

diff --git a/src/Twilio/TwiML/Voice/Conversation.cs b/src/Twilio/TwiML/Voice/Conversation.cs
@@ -123,7 +123,7 @@ public static implicit operator EventEnum(string value)
         /// <summary>
         /// Recording status callback events
         /// </summary>
-        public IEnumerable<Conversation.RecordingEventEnum> RecordingStatusCallbackEvent { get; set; }
+        public List<Conversation.RecordingEventEnum> RecordingStatusCallbackEvent { get; set; }
         /// <summary>
         /// Status callback URL
         /// </summary>
@@ -135,7 +135,7 @@ public static implicit operator EventEnum(string value)
         /// <summary>
         /// Events to call status callback URL
         /// </summary>
-        public IEnumerable<Conversation.EventEnum> StatusCallbackEvent { get; set; }
+        public List<Conversation.EventEnum> StatusCallbackEvent { get; set; }
 
         /// <summary>
         /// Create a new Conversation
@@ -164,10 +164,10 @@ public Conversation(string serviceInstanceSid = null,
                             Conversation.TrimEnum trim = null,
                             Uri recordingStatusCallback = null,
                             Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
-                            IEnumerable<Conversation.RecordingEventEnum> recordingStatusCallbackEvent = null,
+                            List<Conversation.RecordingEventEnum> recordingStatusCallbackEvent = null,
                             Uri statusCallback = null,
                             Twilio.Http.HttpMethod statusCallbackMethod = null,
-                            IEnumerable<Conversation.EventEnum> statusCallbackEvent = null) : base("Conversation")
+                            List<Conversation.EventEnum> statusCallbackEvent = null) : base("Conversation")
         {
             this.ServiceInstanceSid = serviceInstanceSid;
             this.InboundAutocreation = inboundAutocreation;

diff --git a/src/Twilio/TwiML/Voice/Dial.cs b/src/Twilio/TwiML/Voice/Dial.cs
@@ -175,7 +175,7 @@ public static implicit operator RecordingTrackEnum(string value)
         /// <summary>
         /// Recording status callback events
         /// </summary>
-        public IEnumerable<Dial.RecordingEventEnum> RecordingStatusCallbackEvent { get; set; }
+        public List<Dial.RecordingEventEnum> RecordingStatusCallbackEvent { get; set; }
         /// <summary>
         /// Preserve the ringing behavior of the inbound call until the Dialed call picks up
         /// </summary>
@@ -236,7 +236,7 @@ public Dial(string number = null,
                     Dial.TrimEnum trim = null,
                     Uri recordingStatusCallback = null,
                     Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
-                    IEnumerable<Dial.RecordingEventEnum> recordingStatusCallbackEvent = null,
+                    List<Dial.RecordingEventEnum> recordingStatusCallbackEvent = null,
                     bool? answerOnBridge = null,
                     Dial.RingToneEnum ringTone = null,
                     Dial.RecordingTrackEnum recordingTrack = null,
@@ -361,7 +361,7 @@ protected override List<XAttribute> GetElementAttributes()
         public Dial Client(string identity = null,
                            Uri url = null,
                            Twilio.Http.HttpMethod method = null,
-                           IEnumerable<Client.EventEnum> statusCallbackEvent = null,
+                           List<Client.EventEnum> statusCallbackEvent = null,
                            Uri statusCallback = null,
                            Twilio.Http.HttpMethod statusCallbackMethod = null)
         {
@@ -424,12 +424,12 @@ public Dial Conference(string name = null,
                                Conference.RegionEnum region = null,
                                string coach = null,
                                Conference.TrimEnum trim = null,
-                               IEnumerable<Conference.EventEnum> statusCallbackEvent = null,
+                               List<Conference.EventEnum> statusCallbackEvent = null,
                                Uri statusCallback = null,
                                Twilio.Http.HttpMethod statusCallbackMethod = null,
                                Uri recordingStatusCallback = null,
                                Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
-                               IEnumerable<Conference.RecordingEventEnum> recordingStatusCallbackEvent = null,
+                               List<Conference.RecordingEventEnum> recordingStatusCallbackEvent = null,
                                Uri eventCallbackUrl = null,
                                Conference.JitterBufferSizeEnum jitterBufferSize = null,
                                string participantLabel = null)
@@ -495,7 +495,7 @@ public Dial Number(Types.PhoneNumber phoneNumber = null,
                            string sendDigits = null,
                            Uri url = null,
                            Twilio.Http.HttpMethod method = null,
-                           IEnumerable<Number.EventEnum> statusCallbackEvent = null,
+                           List<Number.EventEnum> statusCallbackEvent = null,
                            Uri statusCallback = null,
                            Twilio.Http.HttpMethod statusCallbackMethod = null,
                            string byoc = null,
@@ -615,7 +615,7 @@ public Dial Sip(Uri sipUrl = null,
                         string password = null,
                         Uri url = null,
                         Twilio.Http.HttpMethod method = null,
-                        IEnumerable<Sip.EventEnum> statusCallbackEvent = null,
+                        List<Sip.EventEnum> statusCallbackEvent = null,
                         Uri statusCallback = null,
                         Twilio.Http.HttpMethod statusCallbackMethod = null,
                         string machineDetection = null,
@@ -673,7 +673,7 @@ public Dial Sip(Sip sip)
         public Dial Application(string applicationSid = null,
                                 Uri url = null,
                                 Twilio.Http.HttpMethod method = null,
-                                IEnumerable<Application.EventEnum> statusCallbackEvent = null,
+                                List<Application.EventEnum> statusCallbackEvent = null,
                                 Uri statusCallback = null,
                                 Twilio.Http.HttpMethod statusCallbackMethod = null,
                                 string customerId = null,

diff --git a/src/Twilio/TwiML/Voice/Gather.cs b/src/Twilio/TwiML/Voice/Gather.cs
@@ -193,7 +193,7 @@ public static implicit operator SpeechModelEnum(string value)
         /// <summary>
         /// Input type Twilio should accept
         /// </summary>
-        public IEnumerable<Gather.InputEnum> Input { get; set; }
+        public List<Gather.InputEnum> Input { get; set; }
         /// <summary>
         /// Action URL
         /// </summary>
@@ -285,7 +285,7 @@ public static implicit operator SpeechModelEnum(string value)
         /// <param name="actionOnEmptyResult"> Force webhook to the action URL event if there is no input </param>
         /// <param name="speechModel"> Specify the model that is best suited for your use case </param>
         /// <param name="enhanced"> Use enhanced speech model </param>
-        public Gather(IEnumerable<Gather.InputEnum> input = null,
+        public Gather(List<Gather.InputEnum> input = null,
                       Uri action = null,
                       Twilio.Http.HttpMethod method = null,
                       int? timeout = null,

diff --git a/src/Twilio/TwiML/Voice/Number.cs b/src/Twilio/TwiML/Voice/Number.cs
@@ -54,7 +54,7 @@ public static implicit operator EventEnum(string value)
         /// <summary>
         /// Events to call status callback
         /// </summary>
-        public IEnumerable<Number.EventEnum> StatusCallbackEvent { get; set; }
+        public List<Number.EventEnum> StatusCallbackEvent { get; set; }
         /// <summary>
         /// Status callback URL
         /// </summary>
@@ -119,7 +119,7 @@ public Number(Types.PhoneNumber phoneNumber = null,
                       string sendDigits = null,
                       Uri url = null,
                       Twilio.Http.HttpMethod method = null,
-                      IEnumerable<Number.EventEnum> statusCallbackEvent = null,
+                      List<Number.EventEnum> statusCallbackEvent = null,
                       Uri statusCallback = null,
                       Twilio.Http.HttpMethod statusCallbackMethod = null,
                       string byoc = null,

diff --git a/src/Twilio/TwiML/Voice/Pay.cs b/src/Twilio/TwiML/Voice/Pay.cs
@@ -199,7 +199,7 @@ public static implicit operator PaymentMethodEnum(string value)
         /// <summary>
         /// Comma separated accepted card types
         /// </summary>
-        public IEnumerable<Pay.ValidCardTypesEnum> ValidCardTypes { get; set; }
+        public List<Pay.ValidCardTypesEnum> ValidCardTypes { get; set; }
         /// <summary>
         /// Language to use
         /// </summary>
@@ -244,7 +244,7 @@ public Pay(Pay.InputEnum input = null,
                    string chargeAmount = null,
                    string currency = null,
                    string description = null,
-                   IEnumerable<Pay.ValidCardTypesEnum> validCardTypes = null,
+                   List<Pay.ValidCardTypesEnum> validCardTypes = null,
                    Pay.LanguageEnum language = null) : base("Pay")
         {
             this.Input = input;
@@ -358,9 +358,9 @@ protected override List<XAttribute> GetElementAttributes()
         /// <param name="requireMatchingInputs"> Require customer to input requested information twice and verify matching.
         ///                             </param>
         public Pay Prompt(Prompt.ForEnum for_ = null,
-                          IEnumerable<Prompt.ErrorTypeEnum> errorType = null,
-                          IEnumerable<Prompt.CardTypeEnum> cardType = null,
-                          IEnumerable<int> attempt = null,
+                          List<Prompt.ErrorTypeEnum> errorType = null,
+                          List<Prompt.CardTypeEnum> cardType = null,
+                          List<int> attempt = null,
                           bool? requireMatchingInputs = null)
         {
             var newChild = new Prompt(for_, errorType, cardType, attempt, requireMatchingInputs);

diff --git a/src/Twilio/TwiML/Voice/Prompt.cs b/src/Twilio/TwiML/Voice/Prompt.cs
@@ -83,15 +83,15 @@ public static implicit operator CardTypeEnum(string value)
         /// <summary>
         /// Type of error
         /// </summary>
-        public IEnumerable<Prompt.ErrorTypeEnum> ErrorType { get; set; }
+        public List<Prompt.ErrorTypeEnum> ErrorType { get; set; }
         /// <summary>
         /// Type of the credit card
         /// </summary>
-        public IEnumerable<Prompt.CardTypeEnum> CardType { get; set; }
+        public List<Prompt.CardTypeEnum> CardType { get; set; }
         /// <summary>
         /// Current attempt count
         /// </summary>
-        public IEnumerable<int> Attempt { get; set; }
+        public List<int> Attempt { get; set; }
         /// <summary>
         /// Require customer to input requested information twice and verify matching.
         /// </summary>
@@ -107,9 +107,9 @@ public static implicit operator CardTypeEnum(string value)
         /// <param name="requireMatchingInputs"> Require customer to input requested information twice and verify matching.
         ///                             </param>
         public Prompt(Prompt.ForEnum for_ = null,
-                      IEnumerable<Prompt.ErrorTypeEnum> errorType = null,
-                      IEnumerable<Prompt.CardTypeEnum> cardType = null,
-                      IEnumerable<int> attempt = null,
+                      List<Prompt.ErrorTypeEnum> errorType = null,
+                      List<Prompt.CardTypeEnum> cardType = null,
+                      List<int> attempt = null,
                       bool? requireMatchingInputs = null) : base("Prompt")
         {
             this.For_ = for_;

diff --git a/src/Twilio/TwiML/Voice/Record.cs b/src/Twilio/TwiML/Voice/Record.cs
@@ -86,7 +86,7 @@ public static implicit operator RecordingEventEnum(string value)
         /// <summary>
         /// Recording status callback events
         /// </summary>
-        public IEnumerable<Record.RecordingEventEnum> RecordingStatusCallbackEvent { get; set; }
+        public List<Record.RecordingEventEnum> RecordingStatusCallbackEvent { get; set; }
         /// <summary>
         /// Transcribe the recording
         /// </summary>
@@ -120,7 +120,7 @@ public Record(Uri action = null,
                       Record.TrimEnum trim = null,
                       Uri recordingStatusCallback = null,
                       Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
-                      IEnumerable<Record.RecordingEventEnum> recordingStatusCallbackEvent = null,
+                      List<Record.RecordingEventEnum> recordingStatusCallbackEvent = null,
                       bool? transcribe = null,
                       Uri transcribeCallback = null) : base("Record")
         {

diff --git a/src/Twilio/TwiML/Voice/Sip.cs b/src/Twilio/TwiML/Voice/Sip.cs
@@ -58,7 +58,7 @@ public static implicit operator EventEnum(string value)
         /// <summary>
         /// Status callback events
         /// </summary>
-        public IEnumerable<Sip.EventEnum> StatusCallbackEvent { get; set; }
+        public List<Sip.EventEnum> StatusCallbackEvent { get; set; }
         /// <summary>
         /// Status callback URL
         /// </summary>
@@ -120,7 +120,7 @@ public Sip(Uri sipUrl = null,
                    string password = null,
                    Uri url = null,
                    Twilio.Http.HttpMethod method = null,
-                   IEnumerable<Sip.EventEnum> statusCallbackEvent = null,
+                   List<Sip.EventEnum> statusCallbackEvent = null,
                    Uri statusCallback = null,
                    Twilio.Http.HttpMethod statusCallbackMethod = null,
                    string machineDetection = null,