chore(Assistant V1): Use JObject as dynamic type, write integration tests

mediumTaj · mediumTaj · commit 25344f826e4b · 2019-03-06T14:52:29.000-06:00
diff --git a/Scripts/Services/Assistant/V1/AssistantService.cs b/Scripts/Services/Assistant/V1/AssistantService.cs
@@ -153,15 +153,15 @@ public AssistantService(string versionDate, Credentials credentials) : base(vers
         /// <param name="customData">A Dictionary<string, object> of data that will be passed to the callback. The raw
         /// json output from the REST call will be passed in this object as the value of the 'json'
         /// key.</string></param>
-        /// <returns><see cref="Dictionary<string, JObject>" />Dictionary<string, JObject></returns>
-        public bool Message(Callback<Dictionary<string, JObject>> callback, string workspaceId, Dictionary<string, object> customData = null, Dictionary<string, JObject> input = null, bool? alternateIntents = null, Dictionary<string, JObject> context = null, List<Dictionary<string, JObject>> entities = null, List<Dictionary<string, JObject>> intents = null, Dictionary<string, JObject> output = null, bool? nodesVisitedDetails = null)
+        /// <returns><see cref="JObject" />JObject</returns>
+        public bool Message(Callback<JObject> callback, string workspaceId, Dictionary<string, object> customData = null, JObject input = null, bool? alternateIntents = null, JObject context = null, List<JObject> entities = null, List<JObject> intents = null, JObject output = null, bool? nodesVisitedDetails = null)
         {
             if (callback == null)
                 throw new ArgumentNullException("`callback` is required for `Message`");
             if (string.IsNullOrEmpty(workspaceId))
                 throw new ArgumentNullException("`workspaceId` is required for `Message`");
 
-            RequestObject<Dictionary<string, JObject>> req = new RequestObject<Dictionary<string, JObject>>
+            RequestObject<JObject> req = new RequestObject<JObject>
             {
                 Callback = callback,
                 HttpMethod = UnityWebRequest.kHttpVerbPOST,
@@ -218,8 +218,8 @@ public bool Message(Callback<Dictionary<string, JObject>> callback, string works
 
         private void OnMessageResponse(RESTConnector.Request req, RESTConnector.Response resp)
         {
-            DetailedResponse<Dictionary<string, JObject>> response = new DetailedResponse<Dictionary<string, JObject>>();
-            Dictionary<string, object> customData = ((RequestObject<Dictionary<string, JObject>>)req).CustomData;
+            DetailedResponse<JObject> response = new DetailedResponse<JObject>();
+            Dictionary<string, object> customData = ((RequestObject<JObject>)req).CustomData;
             foreach (KeyValuePair<string, string> kvp in resp.Headers)
             {
                 response.Headers.Add(kvp.Key, kvp.Value);
@@ -229,7 +229,7 @@ private void OnMessageResponse(RESTConnector.Request req, RESTConnector.Response
             try
             {
                 string json = Encoding.UTF8.GetString(resp.Data);
-                response.Result = JsonConvert.DeserializeObject<Dictionary<string, JObject>>(json);
+                response.Result = JsonConvert.DeserializeObject<JObject>(json);
                 customData.Add("json", json);
             }
             catch (Exception e)
@@ -238,8 +238,8 @@ private void OnMessageResponse(RESTConnector.Request req, RESTConnector.Response
                 resp.Success = false;
             }
 
-            if (((RequestObject<Dictionary<string, JObject>>)req).Callback != null)
-                ((RequestObject<Dictionary<string, JObject>>)req).Callback(response, resp.Error, customData);
+            if (((RequestObject<JObject>)req).Callback != null)
+                ((RequestObject<JObject>)req).Callback(response, resp.Error, customData);
         }
         /// <summary>
         /// Create workspace.
@@ -3895,7 +3895,7 @@ private void OnUpdateSynonymResponse(RESTConnector.Request req, RESTConnector.Re
         /// json output from the REST call will be passed in this object as the value of the 'json'
         /// key.</string></param>
         /// <returns><see cref="DialogNode" />DialogNode</returns>
-        public bool CreateDialogNode(Callback<DialogNode> callback, string workspaceId, string dialogNode, Dictionary<string, object> customData = null, string description = null, string conditions = null, string parent = null, string previousSibling = null, Dictionary<string, JObject> output = null, object context = null, object metadata = null, DialogNodeNextStep nextStep = null, List<DialogNodeAction> actions = null, string title = null, string type = null, string eventName = null, string variable = null, string digressIn = null, string digressOut = null, string digressOutSlots = null, string userLabel = null)
+        public bool CreateDialogNode(Callback<DialogNode> callback, string workspaceId, string dialogNode, Dictionary<string, object> customData = null, string description = null, string conditions = null, string parent = null, string previousSibling = null, JObject output = null, object context = null, object metadata = null, DialogNodeNextStep nextStep = null, List<DialogNodeAction> actions = null, string title = null, string type = null, string eventName = null, string variable = null, string digressIn = null, string digressOut = null, string digressOutSlots = null, string userLabel = null)
         {
             if (callback == null)
                 throw new ArgumentNullException("`callback` is required for `CreateDialogNode`");
@@ -4328,7 +4328,7 @@ private void OnListDialogNodesResponse(RESTConnector.Request req, RESTConnector.
         /// json output from the REST call will be passed in this object as the value of the 'json'
         /// key.</string></param>
         /// <returns><see cref="DialogNode" />DialogNode</returns>
-        public bool UpdateDialogNode(Callback<DialogNode> callback, string workspaceId, string dialogNode, Dictionary<string, object> customData = null, string newDialogNode = null, string newDescription = null, string newConditions = null, string newParent = null, string newPreviousSibling = null, Dictionary<string, JObject> newOutput = null, object newContext = null, object newMetadata = null, DialogNodeNextStep newNextStep = null, string newTitle = null, string newType = null, string newEventName = null, string newVariable = null, List<DialogNodeAction> newActions = null, string newDigressIn = null, string newDigressOut = null, string newDigressOutSlots = null, string newUserLabel = null)
+        public bool UpdateDialogNode(Callback<DialogNode> callback, string workspaceId, string dialogNode, Dictionary<string, object> customData = null, string newDialogNode = null, string newDescription = null, string newConditions = null, string newParent = null, string newPreviousSibling = null, JObject newOutput = null, object newContext = null, object newMetadata = null, DialogNodeNextStep newNextStep = null, string newTitle = null, string newType = null, string newEventName = null, string newVariable = null, List<DialogNodeAction> newActions = null, string newDigressIn = null, string newDigressOut = null, string newDigressOutSlots = null, string newUserLabel = null)
         {
             if (callback == null)
                 throw new ArgumentNullException("`callback` is required for `UpdateDialogNode`");
diff --git a/Scripts/Services/Assistant/V1/Model/Context.cs b/Scripts/Services/Assistant/V1/Model/Context.cs
@@ -15,7 +15,6 @@
 *
 */
 
-using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -35,7 +34,7 @@ public class Context
         /// For internal use only.
         /// </summary>
         [JsonProperty("system", NullValueHandling = NullValueHandling.Ignore)]
-        public Dictionary<string, JObject> System { get; set; }
+        public JObject System { get; set; }
         /// <summary>
         /// Metadata related to the message.
         /// </summary>
diff --git a/Scripts/Services/Assistant/V1/Model/CreateDialogNode.cs b/Scripts/Services/Assistant/V1/Model/CreateDialogNode.cs
@@ -226,7 +226,7 @@ public class DigressOutSlotsValue
         /// [documentation](https://cloud.ibm.com/docs/services/assistant/dialog-overview.html#complex).
         /// </summary>
         [JsonProperty("output", NullValueHandling = NullValueHandling.Ignore)]
-        public Dictionary<string, JObject> Output { get; set; }
+        public JObject Output { get; set; }
         /// <summary>
         /// The context for the dialog node.
         /// </summary>
diff --git a/Scripts/Services/Assistant/V1/Model/DialogNode.cs b/Scripts/Services/Assistant/V1/Model/DialogNode.cs
@@ -227,7 +227,7 @@ public class DigressOutSlotsValue
         /// [documentation](https://cloud.ibm.com/docs/services/assistant/dialog-overview.html#complex).
         /// </summary>
         [JsonProperty("output", NullValueHandling = NullValueHandling.Ignore)]
-        public Dictionary<string, JObject> Output { get; set; }
+        public JObject Output { get; set; }
         /// <summary>
         /// The context for the dialog node.
         /// </summary>
diff --git a/Scripts/Services/Assistant/V1/Model/DialogNodeOutputOptionsElementValue.cs b/Scripts/Services/Assistant/V1/Model/DialogNodeOutputOptionsElementValue.cs
@@ -15,7 +15,6 @@
 *
 */
 
-using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -31,6 +30,6 @@ public class DialogNodeOutputOptionsElementValue
         /// An input object that includes the input text.
         /// </summary>
         [JsonProperty("input", NullValueHandling = NullValueHandling.Ignore)]
-        public Dictionary<string, JObject> Input { get; set; }
+        public JObject Input { get; set; }
     }
 }
diff --git a/Scripts/Services/Assistant/V1/Model/DialogSuggestionValue.cs b/Scripts/Services/Assistant/V1/Model/DialogSuggestionValue.cs
@@ -31,16 +31,16 @@ public class DialogSuggestionValue
         /// An input object that includes the input text.
         /// </summary>
         [JsonProperty("input", NullValueHandling = NullValueHandling.Ignore)]
-        public Dictionary<string, JObject> Input { get; set; }
+        public JObject Input { get; set; }
         /// <summary>
         /// An array of intents to be sent along with the user input.
         /// </summary>
         [JsonProperty("intents", NullValueHandling = NullValueHandling.Ignore)]
-        public List<Dictionary<string, JObject>> Intents { get; set; }
+        public List<JObject> Intents { get; set; }
         /// <summary>
         /// An array of entities to be sent along with the user input.
         /// </summary>
         [JsonProperty("entities", NullValueHandling = NullValueHandling.Ignore)]
-        public List<Dictionary<string, JObject>> Entities { get; set; }
+        public List<JObject> Entities { get; set; }
     }
 }
diff --git a/Scripts/Services/Assistant/V1/Model/LogExport.cs b/Scripts/Services/Assistant/V1/Model/LogExport.cs
@@ -15,7 +15,6 @@
 *
 */
 
-using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -35,7 +34,7 @@ public class LogExport
         /// The response sent by the workspace, including the output text, detected intents and entities, and context.
         /// </summary>
         [JsonProperty("response", NullValueHandling = NullValueHandling.Ignore)]
-        public Dictionary<string, JObject> Response { get; set; }
+        public JObject Response { get; set; }
         /// <summary>
         /// A unique identifier for the logged event.
         /// </summary>
diff --git a/Scripts/Services/Assistant/V1/Model/MessageRequest.cs b/Scripts/Services/Assistant/V1/Model/MessageRequest.cs
@@ -30,7 +30,7 @@ public class MessageRequest
         /// An input object that includes the input text.
         /// </summary>
         [JsonProperty("input", NullValueHandling = NullValueHandling.Ignore)]
-        public Dictionary<string, JObject> Input { get; set; }
+        public JObject Input { get; set; }
         /// <summary>
         /// Whether to return more than one intent. Set to `true` to return all matching intents.
         /// </summary>
@@ -40,24 +40,24 @@ public class MessageRequest
         /// State information for the conversation. To maintain state, include the context from the previous response.
         /// </summary>
         [JsonProperty("context", NullValueHandling = NullValueHandling.Ignore)]
-        public Dictionary<string, JObject> Context { get; set; }
+        public JObject Context { get; set; }
         /// <summary>
         /// Entities to use when evaluating the message. Include entities from the previous response to continue using
         /// those entities rather than detecting entities in the new input.
         /// </summary>
         [JsonProperty("entities", NullValueHandling = NullValueHandling.Ignore)]
-        public List<Dictionary<string, JObject>> Entities { get; set; }
+        public List<JObject> Entities { get; set; }
         /// <summary>
         /// Intents to use when evaluating the user input. Include intents from the previous response to continue using
         /// those intents rather than trying to recognize intents in the new input.
         /// </summary>
         [JsonProperty("intents", NullValueHandling = NullValueHandling.Ignore)]
-        public List<Dictionary<string, JObject>> Intents { get; set; }
+        public List<JObject> Intents { get; set; }
         /// <summary>
         /// An output object that includes the response to the user, the dialog nodes that were triggered, and messages
         /// from the log.
         /// </summary>
         [JsonProperty("output", NullValueHandling = NullValueHandling.Ignore)]
-        public Dictionary<string, JObject> Output { get; set; }
+        public JObject Output { get; set; }
     }
 }
diff --git a/Scripts/Services/Assistant/V1/Model/MessageResponse.cs b/Scripts/Services/Assistant/V1/Model/MessageResponse.cs
@@ -35,12 +35,12 @@ public class MessageResponse
         /// An array of intents recognized in the user input, sorted in descending order of confidence.
         /// </summary>
         [JsonProperty("intents", NullValueHandling = NullValueHandling.Ignore)]
-        public List<Dictionary<string, JObject>> Intents { get; set; }
+        public List<JObject> Intents { get; set; }
         /// <summary>
         /// An array of entities identified in the user input.
         /// </summary>
         [JsonProperty("entities", NullValueHandling = NullValueHandling.Ignore)]
-        public List<Dictionary<string, JObject>> Entities { get; set; }
+        public List<JObject> Entities { get; set; }
         /// <summary>
         /// Whether to return more than one intent. A value of `true` indicates that all matching intents are returned.
         /// </summary>
@@ -50,13 +50,13 @@ public class MessageResponse
         /// State information for the conversation. To maintain state, include the context from the previous response.
         /// </summary>
         [JsonProperty("context", NullValueHandling = NullValueHandling.Ignore)]
-        public Dictionary<string, JObject> Context { get; set; }
+        public JObject Context { get; set; }
         /// <summary>
         /// An output object that includes the response to the user, the dialog nodes that were triggered, and messages
         /// from the log.
         /// </summary>
         [JsonProperty("output", NullValueHandling = NullValueHandling.Ignore)]
-        public Dictionary<string, JObject> Output { get; set; }
+        public JObject Output { get; set; }
         /// <summary>
         /// An array of objects describing any actions requested by the dialog node.
         /// </summary>
diff --git a/Scripts/Services/Assistant/V1/Model/OutputData.cs b/Scripts/Services/Assistant/V1/Model/OutputData.cs
@@ -31,7 +31,7 @@ public class OutputData
         /// An array of up to 50 messages logged with the request.
         /// </summary>
         [JsonProperty("log_messages", NullValueHandling = NullValueHandling.Ignore)]
-        public List<Dictionary<string, JObject>> LogMessages { get; set; }
+        public List<JObject> LogMessages { get; set; }
         /// <summary>
         /// An array of responses to the user.
         /// </summary>
diff --git a/Tests/AssistantV1IntegrationTests.cs b/Tests/AssistantV1IntegrationTests.cs

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`*`
`16`	`16`	`*/`
`17`	`17`
`18`		`-using System.Collections.Generic;`
`19`	`18`	`using Newtonsoft.Json;`
`20`	`19`	`using Newtonsoft.Json.Linq;`
`21`	`20`
`@@ -31,6 +30,6 @@ public class DialogNodeOutputOptionsElementValue`
`31`	`30`	`/// An input object that includes the input text.`
`32`	`31`	`/// </summary>`
`33`	`32`	`[JsonProperty("input", NullValueHandling = NullValueHandling.Ignore)]`
`34`		`- public Dictionary<string, JObject> Input { get; set; }`
	`33`	`+ public JObject Input { get; set; }`
`35`	`34`	`}`
`36`	`35`	`}`