refactor: keep vis rec handwritten changes

mamoonraja · mamoonraja · commit 735668ff3214 · 2020-12-09T20:04:10.000-05:00
diff --git a/Examples/GenericSerialization.cs b/Examples/GenericSerialization.cs
@@ -34,7 +34,7 @@ void Start()
 
             MessageResponse messageResponse = JsonConvert.DeserializeObject<MessageResponse>(responseJson);
 
-            var name = messageResponse.Context.Skills.Get("main skill").UserDefined["name"].ToString();
+            var name = messageResponse.Context.Skills["main skill"].UserDefined["name"].ToString();
             Log.Debug("GenericSerialization", "name: {0}", name);
 
         }
diff --git a/Scripts/Services/Assistant/V1/AssistantService.cs b/Scripts/Services/Assistant/V1/AssistantService.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/Assistant/V1/Model/Context.cs b/Scripts/Services/Assistant/V1/Model/Context.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/Assistant/V1/Model/DialogNodeOutputGeneric.cs b/Scripts/Services/Assistant/V1/Model/DialogNodeOutputGeneric.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/Assistant/V1/Model/RuntimeResponseGeneric.cs b/Scripts/Services/Assistant/V1/Model/RuntimeResponseGeneric.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/Assistant/V2/AssistantService.cs b/Scripts/Services/Assistant/V2/AssistantService.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/Assistant/V2/Model/MessageContext.cs b/Scripts/Services/Assistant/V2/Model/MessageContext.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2018, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/Assistant/V2/Model/RuntimeResponseGeneric.cs b/Scripts/Services/Assistant/V2/Model/RuntimeResponseGeneric.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/CompareComply/V1/CompareComplyService.cs b/Scripts/Services/CompareComply/V1/CompareComplyService.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/Discovery/V1/DiscoveryService.cs b/Scripts/Services/Discovery/V1/DiscoveryService.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/Discovery/V1/Model/NluEnrichmentFeatures.cs b/Scripts/Services/Discovery/V1/Model/NluEnrichmentFeatures.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/Discovery/V2/DiscoveryService.cs b/Scripts/Services/Discovery/V2/DiscoveryService.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/Discovery/V2/Model/QueryAggregation.cs b/Scripts/Services/Discovery/V2/Model/QueryAggregation.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/Discovery/V2/Model/QueryFilterAggregation.cs b/Scripts/Services/Discovery/V2/Model/QueryFilterAggregation.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/Discovery/V2/Model/QueryHistogramAggregation.cs b/Scripts/Services/Discovery/V2/Model/QueryHistogramAggregation.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/Discovery/V2/Model/QueryLargePassages.cs b/Scripts/Services/Discovery/V2/Model/QueryLargePassages.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/Discovery/V2/Model/QueryLargeSuggestedRefinements.cs b/Scripts/Services/Discovery/V2/Model/QueryLargeSuggestedRefinements.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/Discovery/V2/Model/QueryLargeTableResults.cs b/Scripts/Services/Discovery/V2/Model/QueryLargeTableResults.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/Discovery/V2/Model/QueryNestedAggregation.cs b/Scripts/Services/Discovery/V2/Model/QueryNestedAggregation.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/Discovery/V2/Model/QueryTermAggregation.cs b/Scripts/Services/Discovery/V2/Model/QueryTermAggregation.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/Discovery/V2/Model/QueryTimesliceAggregation.cs b/Scripts/Services/Discovery/V2/Model/QueryTimesliceAggregation.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/Discovery/V2/Model/QueryTopHitsAggregation.cs b/Scripts/Services/Discovery/V2/Model/QueryTopHitsAggregation.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/LanguageTranslator/V3/LanguageTranslatorService.cs b/Scripts/Services/LanguageTranslator/V3/LanguageTranslatorService.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/NaturalLanguageClassifier/V1/NaturalLanguageClassifierService.cs b/Scripts/Services/NaturalLanguageClassifier/V1/NaturalLanguageClassifierService.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/NaturalLanguageUnderstanding/V1/Model/AnalysisResults.cs b/Scripts/Services/NaturalLanguageUnderstanding/V1/Model/AnalysisResults.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/NaturalLanguageUnderstanding/V1/Model/Features.cs b/Scripts/Services/NaturalLanguageUnderstanding/V1/Model/Features.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/NaturalLanguageUnderstanding/V1/Model/FeaturesResultsMetadata.cs b/Scripts/Services/NaturalLanguageUnderstanding/V1/Model/FeaturesResultsMetadata.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/NaturalLanguageUnderstanding/V1/NaturalLanguageUnderstandingService.cs b/Scripts/Services/NaturalLanguageUnderstanding/V1/NaturalLanguageUnderstandingService.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/PersonalityInsights/V3/PersonalityInsightsService.cs b/Scripts/Services/PersonalityInsights/V3/PersonalityInsightsService.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/SpeechToText/V1/SpeechToTextService.cs b/Scripts/Services/SpeechToText/V1/SpeechToTextService.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/TextToSpeech/V1/TextToSpeechService.cs b/Scripts/Services/TextToSpeech/V1/TextToSpeechService.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/ToneAnalyzer/V3/ToneAnalyzerService.cs b/Scripts/Services/ToneAnalyzer/V3/ToneAnalyzerService.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/VisualRecognition/V3/VisualRecognitionService.cs b/Scripts/Services/VisualRecognition/V3/VisualRecognitionService.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -193,19 +193,13 @@ public bool Classify(Callback<ClassifiedImages> callback, System.IO.MemoryStream
             {
                 req.Forms["threshold"] = new RESTConnector.Form(threshold.ToString());
             }
-            if (owners != null)
+            if (owners != null && owners.Count > 0)
             {
-                    foreach (string item in owners)
-                    {
-                            req.Forms["owners"] = new RESTConnector.Form(item);
-                    }
+                req.Forms["owners"] = new RESTConnector.Form(string.Join(", ", owners.ToArray()));
             }
-            if (classifierIds != null)
+            if (classifierIds != null && classifierIds.Count > 0)
             {
-                    foreach (string item in classifierIds)
-                    {
-                            req.Forms["classifier_ids"] = new RESTConnector.Form(item);
-                    }
+                req.Forms["classifier_ids"] = new RESTConnector.Form(string.Join(", ", classifierIds.ToArray()));
             }
             if (!string.IsNullOrEmpty(Version))
             {
diff --git a/Scripts/Services/VisualRecognition/V4/Model/Collection.cs b/Scripts/Services/VisualRecognition/V4/Model/Collection.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/VisualRecognition/V4/Model/ObjectDetail.cs b/Scripts/Services/VisualRecognition/V4/Model/ObjectDetail.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/VisualRecognition/V4/Model/ObjectDetailLocation.cs b/Scripts/Services/VisualRecognition/V4/Model/ObjectDetailLocation.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/Scripts/Services/VisualRecognition/V4/VisualRecognitionService.cs b/Scripts/Services/VisualRecognition/V4/VisualRecognitionService.cs
@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2020.
+* (C) Copyright IBM Corp. 2019, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -150,11 +150,14 @@ public bool Analyze(Callback<AnalyzeResponse> callback, List<string> collectionI
                 throw new ArgumentNullException("`callback` is required for `Analyze`");
             if (string.IsNullOrEmpty(Version))
                 throw new ArgumentNullException("`Version` is required");
-            if (string.IsNullOrEmpty(collectionIds))
+            if (collectionIds == null || collectionIds.Count == 0)
+            {
                 throw new ArgumentNullException("`collectionIds` is required for `Analyze`");
-            if (string.IsNullOrEmpty(features))
+            }
+            if (features == null || features.Count == 0)
+            {
                 throw new ArgumentNullException("`features` is required for `Analyze`");
-
+            }
             RequestObject<AnalyzeResponse> req = new RequestObject<AnalyzeResponse>
             {
                 Callback = callback,

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ void Start()`
`34`	`34`
`35`	`35`	`MessageResponse messageResponse = JsonConvert.DeserializeObject<MessageResponse>(responseJson);`
`36`	`36`
`37`		`- var name = messageResponse.Context.Skills.Get("main skill").UserDefined["name"].ToString();`
	`37`	`+ var name = messageResponse.Context.Skills["main skill"].UserDefined["name"].ToString();`
`38`	`38`	`Log.Debug("GenericSerialization", "name: {0}", name);`
`39`	`39`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/**`
`2`		`-* (C) Copyright IBM Corp. 2020.`
	`2`	`+* (C) Copyright IBM Corp. 2019, 2020.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`