feat(Regeneration): Regenerate with generator 2.0.0 and api definition sdk-2019-11-19

Author: mediumTaj

src/IBM.Watson.Discovery.v2/DiscoveryService.cs

@@ -940,7 +940,7 @@ public DetailedResponse<object> DeleteTrainingQueries(string projectId)
         /// Discovery administrative tooling.</param>
         /// <param name="trainingQuery">An object that represents the query to be submitted. (optional)</param>
         /// <returns><see cref="TrainingQuery" />TrainingQuery</returns>
-        public DetailedResponse<TrainingQuery> CreateTrainingQuery(string projectId, string naturalLanguageQuery = null, string filter = null, List<TrainingExample> examples = null)
+        public DetailedResponse<TrainingQuery> CreateTrainingQuery(string projectId, string naturalLanguageQuery, List<TrainingExample> examples, string filter = null)
         {
             if (string.IsNullOrEmpty(projectId))
             {
@@ -974,14 +974,14 @@ public DetailedResponse<TrainingQuery> CreateTrainingQuery(string projectId, str
                 {
                     bodyObject["natural_language_query"] = naturalLanguageQuery;
                 }
-                if (!string.IsNullOrEmpty(filter))
-                {
-                    bodyObject["filter"] = filter;
-                }
                 if (examples != null && examples.Count > 0)
                 {
                     bodyObject["examples"] = JToken.FromObject(examples);
                 }
+                if (!string.IsNullOrEmpty(filter))
+                {
+                    bodyObject["filter"] = filter;
+                }
                 var httpContent = new StringContent(JsonConvert.SerializeObject(bodyObject), Encoding.UTF8, HttpMediaType.APPLICATION_JSON);
                 restRequest.WithBodyContent(httpContent);
 
@@ -1076,7 +1076,7 @@ public DetailedResponse<TrainingQuery> GetTrainingQuery(string projectId, string
         /// <param name="queryId">The ID of the query used for training.</param>
         /// <param name="body">The body of the example that is to be added to the specified query.</param>
         /// <returns><see cref="TrainingQuery" />TrainingQuery</returns>
-        public DetailedResponse<TrainingQuery> UpdateTrainingQuery(string projectId, string queryId, string naturalLanguageQuery = null, string filter = null, List<TrainingExample> examples = null)
+        public DetailedResponse<TrainingQuery> UpdateTrainingQuery(string projectId, string queryId, string naturalLanguageQuery, List<TrainingExample> examples, string filter = null)
         {
             if (string.IsNullOrEmpty(projectId))
             {
@@ -1094,6 +1094,14 @@ public DetailedResponse<TrainingQuery> UpdateTrainingQuery(string projectId, str
             {
                 queryId = Uri.EscapeDataString(queryId);
             }
+            if (string.IsNullOrEmpty(naturalLanguageQuery))
+            {
+                throw new ArgumentNullException("`naturalLanguageQuery` is required for `UpdateTrainingQuery`");
+            }
+            if (examples == null)
+            {
+                throw new ArgumentNullException("`examples` is required for `UpdateTrainingQuery`");
+            }
 
             if (string.IsNullOrEmpty(VersionDate))
             {
@@ -1118,14 +1126,14 @@ public DetailedResponse<TrainingQuery> UpdateTrainingQuery(string projectId, str
                 {
                     bodyObject["natural_language_query"] = naturalLanguageQuery;
                 }
-                if (!string.IsNullOrEmpty(filter))
-                {
-                    bodyObject["filter"] = filter;
-                }
                 if (examples != null && examples.Count > 0)
                 {
                     bodyObject["examples"] = JToken.FromObject(examples);
                 }
+                if (!string.IsNullOrEmpty(filter))
+                {
+                    bodyObject["filter"] = filter;
+                }
                 var httpContent = new StringContent(JsonConvert.SerializeObject(bodyObject), Encoding.UTF8, HttpMediaType.APPLICATION_JSON);
                 restRequest.WithBodyContent(httpContent);
 

src/IBM.Watson.Discovery.v2/IDiscoveryService.cs

@@ -34,8 +34,8 @@ public partial interface IDiscoveryService
         DetailedResponse<DeleteDocumentResponse> DeleteDocument(string projectId, string collectionId, string documentId, bool? xWatsonDiscoveryForce = null);
         DetailedResponse<TrainingQuerySet> ListTrainingQueries(string projectId);
         DetailedResponse<object> DeleteTrainingQueries(string projectId);
-        DetailedResponse<TrainingQuery> CreateTrainingQuery(string projectId, string naturalLanguageQuery = null, string filter = null, List<TrainingExample> examples = null);
+        DetailedResponse<TrainingQuery> CreateTrainingQuery(string projectId, string naturalLanguageQuery, List<TrainingExample> examples, string filter = null);
         DetailedResponse<TrainingQuery> GetTrainingQuery(string projectId, string queryId);
-        DetailedResponse<TrainingQuery> UpdateTrainingQuery(string projectId, string queryId, string naturalLanguageQuery = null, string filter = null, List<TrainingExample> examples = null);
+        DetailedResponse<TrainingQuery> UpdateTrainingQuery(string projectId, string queryId, string naturalLanguageQuery, List<TrainingExample> examples, string filter = null);
     }
 }