Merge 4.0.0-rc2 into feat/dynamic-model

Author: mamoonraja

Examples/GenericSerialization.cs

@@ -33,21 +33,8 @@ void Start()
             LogSystem.InstallDefaultReactors();
 
             MessageResponse messageResponse = JsonConvert.DeserializeObject<MessageResponse>(responseJson);
-            //Dictionary<string, object> e = Json.Deserialize(responseJson) as Dictionary<string, object>;
-            //Dictionary<string, object> context = e["context"] as Dictionary<string, object>;
-            //Dictionary<string, object> skills = context["skills"] as Dictionary<string, object>;
-            //Dictionary<string, object> main_skill = skills["main skill"] as Dictionary<string, object>;
-            //Dictionary<string, object> user_defined = main_skill["user_defined"] as Dictionary<string, object>;
 
-            //string name = user_defined["name"] as string;
-
-            //var user_defined = messageResponse.Context.Skills["main skill"]["user_defined"].ToString();
-            //var uDefinedObject = JsonConvert.DeserializeObject<Dictionary<string, object>>(user_defined);
-
-            //Log.Debug("GenericSerialization", "main skill: {0}", uDefinedObject["name"]);
-            //Log.Debug("GenericSerialization", "test: {0}", messageResponse);
-
-            var name = messageResponse.Context.Skills.Skill.UserDefined["name"].ToString();
+            var name = messageResponse.Context.Skills.Get("main skill").UserDefined["name"].ToString();
             Log.Debug("GenericSerialization", "name: {0}", name);
 
         }

README.md

@@ -119,6 +119,7 @@ IEnumerator TokenExample()
         yield return null;
 
     assistant = new AssistantService(versionDate, authenticator);
+    assistant.SetServiceUrl("<service-url>");
     assistant.ListWorkspaces(callback: OnListWorkspaces);
 }
 
@@ -140,6 +141,7 @@ void TokenExample()
     authenticator = new BearerTokenAuthenticator("<bearer-token>");
 
     assistant = new AssistantService(versionDate, authenticator);
+    assistant.SetServiceUrl("<service-url>");
     assistant.ListWorkspaces(callback: OnListWorkspaces);
 }
 
@@ -159,6 +161,7 @@ void UsernamePasswordExample()
 {
     Authenticator authenticator = new BasicAuthenticator("<username>", "<password>", "<url>");
     assistant = new AssistantService(versionDate, authenticator);
+    assistant.SetServiceUrl("<service-url>");
 }
 ```
 
@@ -221,8 +224,10 @@ Authenticator discoveryAuthenticator;
 private void Example()
 {
     assistant = new AssistantService(assistantVersionDate, assistantAuthenticator);
+    assistant.SetServiceUrl("<service-url>");
 
     discovery = new DiscoveryService(discoveryVersionDate, discoveryAuthenticator);
+    discovery.SetServiceUrl("<service-url>");
 
     //  Call with sepcific callbacks
     assistant.Message(
@@ -260,6 +265,7 @@ Authenticator discoveryAuthenticator;
 private void Example()
 {
     assistant = new AssistantService(assistantVersionDate, assistantAuthenticator);
+    assistant.SetServiceUrl("<service-url>");
 
     //  Call with generic callbacks
     JObject input = new JObject();
@@ -270,6 +276,9 @@ private void Example()
         input: input
     );
 
+    discovery = new DiscoveryService(discoveryVersionDate, discoveryAuthenticator);
+    discovery.SetServiceUrl("<service-url>");
+
     discovery.ListEnvironments(
         callback: OnSuccess
     );
@@ -303,6 +312,7 @@ private void Example()
         sort: "-name",
         includeAudit: true
     );
+    assistant.SetServiceUrl("<service-url>");
 }
 ```
 

Scripts/Services/Assistant/V2/Model/MessageContextSkills.cs

@@ -16,7 +16,6 @@
 */
 
 using IBM.Cloud.SDK.Model;
-using Newtonsoft.Json;
 
 namespace IBM.Watson.Assistant.V2.Model
 {
@@ -28,13 +27,5 @@ namespace IBM.Watson.Assistant.V2.Model
     /// </summary>
     public class MessageContextSkills: DynamicModel<MessageContextSkill>
     {
-        /// <summary>
-        /// Information specific to particular skills used by the Assistant.
-        ///
-        /// **Note:** Currently, only a single property named `main skill` is supported. This object contains variables
-        /// that apply to the dialog skill used by the assistant.
-        /// </summary>
-        [JsonProperty("main skill", NullValueHandling = NullValueHandling.Ignore)]
-        public MessageContextSkill Skill { get; set; }
     }
 }