fix string interpolation, dynamic type, move delegate to interface

Author: mediumTaj

Scripts/Services/Assistant/v1/Assistant.cs

@@ -15,11 +15,26 @@
 *
 */
 
+using IBM.Watson.DeveloperCloud.Connection;
 using System.Collections.Generic;
-using static IBM.Watson.DeveloperCloud.Services.Assistant.v1.Assistant;
 
 namespace IBM.Watson.DeveloperCloud.Services.Assistant.v1
 {
+    ///// <summary>
+    ///// Success callback delegate.
+    ///// </summary>
+    ///// <typeparam name="T">Type of the returned object.</typeparam>
+    ///// <param name="response">The returned object.</param>
+    ///// <param name="customData">user defined custom data including raw json.</param>
+    public delegate void SuccessCallback<T>(T response, Dictionary<string, object> customData);
+
+    ///// <summary>
+    ///// Fail callback delegate.
+    ///// </summary>
+    ///// <param name="error">The error object.</param>
+    ///// <param name="customData">User defined custom data</param>
+    public delegate void FailCallback(RESTConnector.Error error, Dictionary<string, object> customData);
+
     public interface IAssistant
     {
         /// <summary>

Scripts/Services/Assistant/v1/IAssistant.cs

@@ -16,6 +16,7 @@
 */
 
 using FullSerializer;
+using System.Collections.Generic;
 
 namespace IBM.Watson.DeveloperCloud.Services.Assistant.v1
 {
@@ -29,12 +30,12 @@ public class Context
         /// The unique identifier of the conversation.
         /// </summary>
         /// <value>The unique identifier of the conversation.</value>
-        public dynamic ConversationId { get; set; }
+        public Dictionary<string, object> ConversationId { get; set; }
         /// <summary>
         /// For internal use only.
         /// </summary>
         /// <value>For internal use only.</value>
-        public dynamic System { get; set; }
+        public Dictionary<string, object> System { get; set; }
     }
 
 }

Scripts/Services/Assistant/v1/Model/Context.cs

@@ -16,6 +16,7 @@
 */
 
 using FullSerializer;
+using System.Collections.Generic;
 using System.Runtime.Serialization;
 
 namespace IBM.Watson.DeveloperCloud.Services.Assistant.v1
@@ -61,7 +62,7 @@ public enum LevelEnum
         /// The text of the message.
         /// </summary>
         /// <value>The text of the message.</value>
-        public dynamic Msg { get; set; }
+        public Dictionary<string, object> Msg { get; set; }
     }
 
 }

Scripts/Services/Assistant/v1/Model/LogMessage.cs

@@ -30,32 +30,32 @@ public class MessageResponse
         /// The user input from the request.
         /// </summary>
         /// <value>The user input from the request.</value>
-        public dynamic Input { get; set; }
+        public Dictionary<string, object> Input { get; set; }
         /// <summary>
         /// An array of intents recognized in the user input, sorted in descending order of confidence.
         /// </summary>
         /// <value>An array of intents recognized in the user input, sorted in descending order of confidence.</value>
-        public dynamic Intents { get; set; }
+        public Dictionary<string, object> Intents { get; set; }
         /// <summary>
         /// An array of entities identified in the user input.
         /// </summary>
         /// <value>An array of entities identified in the user input.</value>
-        public dynamic Entities { get; set; }
+        public Dictionary<string, object> Entities { get; set; }
         /// <summary>
         /// Whether to return more than one intent. `true` indicates that all matching intents are returned.
         /// </summary>
         /// <value>Whether to return more than one intent. `true` indicates that all matching intents are returned.</value>
-        public dynamic AlternateIntents { get; set; }
+        public Dictionary<string, object> AlternateIntents { get; set; }
         /// <summary>
         /// State information for the conversation.
         /// </summary>
         /// <value>State information for the conversation.</value>
-        public dynamic Context { get; set; }
+        public Dictionary<string, object> Context { get; set; }
         /// <summary>
         /// Output from the dialog, including the response to the user, the nodes that were triggered, and log messages.
         /// </summary>
         /// <value>Output from the dialog, including the response to the user, the nodes that were triggered, and log messages.</value>
-        public dynamic Output { get; set; }
+        public Dictionary<string, object> Output { get; set; }
     }
 
 }

Scripts/Services/Assistant/v1/Model/MessageResponse.cs

@@ -30,22 +30,22 @@ public class OutputData
         /// Up to 50 messages logged with the request.
         /// </summary>
         /// <value>Up to 50 messages logged with the request.</value>
-        public dynamic LogMessages { get; set; }
+        public Dictionary<string, object> LogMessages { get; set; }
         /// <summary>
         /// An array of responses to the user.
         /// </summary>
         /// <value>An array of responses to the user.</value>
-        public dynamic Text { get; set; }
+        public Dictionary<string, object> Text { get; set; }
         /// <summary>
         /// An array of the nodes that were triggered to create the response.
         /// </summary>
         /// <value>An array of the nodes that were triggered to create the response.</value>
-        public dynamic NodesVisited { get; set; }
+        public Dictionary<string, object> NodesVisited { get; set; }
         /// <summary>
         /// An array of objects containing detailed diagnostic information about the nodes that were triggered during processing of the input message.
         /// </summary>
         /// <value>An array of objects containing detailed diagnostic information about the nodes that were triggered during processing of the input message.</value>
-        public dynamic NodesVisitedDetails { get; set; }
+        public Dictionary<string, object> NodesVisitedDetails { get; set; }
     }
 
 }

Scripts/Services/Assistant/v1/Model/OutputData.cs

@@ -30,32 +30,32 @@ public class RuntimeEntity
         /// The recognized entity from a term in the input.
         /// </summary>
         /// <value>The recognized entity from a term in the input.</value>
-        public dynamic Entity { get; set; }
+        public Dictionary<string, object> Entity { get; set; }
         /// <summary>
         /// Zero-based character offsets that indicate where the entity value begins and ends in the input text.
         /// </summary>
         /// <value>Zero-based character offsets that indicate where the entity value begins and ends in the input text.</value>
-        public dynamic Location { get; set; }
+        public Dictionary<string, object> Location { get; set; }
         /// <summary>
         /// The term in the input text that was recognized.
         /// </summary>
         /// <value>The term in the input text that was recognized.</value>
-        public dynamic Value { get; set; }
+        public Dictionary<string, object> Value { get; set; }
         /// <summary>
         /// A decimal percentage that represents Watson's confidence in the entity.
         /// </summary>
         /// <value>A decimal percentage that represents Watson's confidence in the entity.</value>
-        public dynamic Confidence { get; set; }
+        public Dictionary<string, object> Confidence { get; set; }
         /// <summary>
         /// The metadata for the entity.
         /// </summary>
         /// <value>The metadata for the entity.</value>
-        public dynamic Metadata { get; set; }
+        public Dictionary<string, object> Metadata { get; set; }
         /// <summary>
         /// The recognized capture groups for the entity, as defined by the entity pattern.
         /// </summary>
         /// <value>The recognized capture groups for the entity, as defined by the entity pattern.</value>
-        public dynamic Groups { get; set; }
+        public Dictionary<string, object> Groups { get; set; }
     }
 
 }

Scripts/Services/Assistant/v1/Model/RuntimeEntity.cs

@@ -16,6 +16,7 @@
 */
 
 using FullSerializer;
+using System.Collections.Generic;
 
 namespace IBM.Watson.DeveloperCloud.Services.Assistant.v1
 {
@@ -29,12 +30,12 @@ public class RuntimeIntent
         /// The name of the recognized intent.
         /// </summary>
         /// <value>The name of the recognized intent.</value>
-        public dynamic Intent { get; set; }
+        public Dictionary<string, object> Intent { get; set; }
         /// <summary>
         /// A decimal percentage that represents Watson's confidence in the intent.
         /// </summary>
         /// <value>A decimal percentage that represents Watson's confidence in the intent.</value>
-        public dynamic Confidence { get; set; }
+        public Dictionary<string, object> Confidence { get; set; }
     }
 
 }