Revise handwritten visrec methods

Author: mediumTaj

src/IBM.WatsonDeveloperCloud.VisualRecognition.v3/VisualRecognitionServiceExtension.cs

@@ -82,13 +82,28 @@ public Classifier CreateClassifier(CreateClassifier createClassifier, Dictionary
                     formData.Add(negativeExamplesContent, "negative_examples", "negative_examples.zip");
                 }
 
-                result = this.Client.PostAsync($"{this.Endpoint}/v3/classifiers")
-                                .WithArgument("api_key", ApiKey)
-                                .WithArgument("version", VersionDate)
-                                .WithBodyContent(formData)
-                                .WithFormatter(new MediaTypeHeaderValue("application/octet-stream"))
-                                .As<Classifier>()
-                                .Result;
+                IClient client;
+                if (_tokenManager == null)
+                {
+                    client = this.Client;
+                }
+                else
+                {
+                    client = this.Client.WithAuthentication(_tokenManager.GetToken());
+                }
+                var restRequest = client.PostAsync($"{this.Endpoint}/v3/classifiers");
+
+                restRequest.WithArgument("version", VersionDate);
+                if(!string.IsNullOrEmpty(ApiKey))
+                    restRequest.WithArgument("api_key", ApiKey);
+                restRequest.WithBodyContent(formData);
+                if (customData != null)
+                    restRequest.WithCustomData(customData);
+                restRequest.WithFormatter(new MediaTypeHeaderValue("application/octet-stream"));
+                result = restRequest.As<Classifier>().Result;
+                if (result == null)
+                    result = new Classifier();
+                result.CustomData = restRequest.CustomData;
             }
             catch (AggregateException ae)
             {
@@ -141,13 +156,28 @@ public Classifier UpdateClassifier(UpdateClassifier updateClassifier, Dictionary
                     formData.Add(negativeExamplesContent, "negative_examples", "negative_examples.zip");
                 }
 
-                result = this.Client.PostAsync($"{this.Endpoint}/v3/classifiers/{updateClassifier.ClassifierId}")
-                                .WithArgument("api_key", ApiKey)
-                                .WithArgument("version", VersionDate)
-                                .WithBodyContent(formData)
-                                .WithFormatter(new MediaTypeHeaderValue("application/octet-stream"))
-                                .As<Classifier>()
-                                .Result;
+                IClient client;
+                if (_tokenManager == null)
+                {
+                    client = this.Client;
+                }
+                else
+                {
+                    client = this.Client.WithAuthentication(_tokenManager.GetToken());
+                }
+                var restRequest = client.PostAsync($"{this.Endpoint}/v3/classifiers/{updateClassifier.ClassifierId}");
+
+                restRequest.WithArgument("version", VersionDate);
+                if (!string.IsNullOrEmpty(ApiKey))
+                    restRequest.WithArgument("api_key", ApiKey);
+                restRequest.WithBodyContent(formData);
+                if (customData != null)
+                    restRequest.WithCustomData(customData);
+                restRequest.WithFormatter(new MediaTypeHeaderValue("application/octet-stream"));
+                result = restRequest.As<Classifier>().Result;
+                if (result == null)
+                    result = new Classifier();
+                result.CustomData = restRequest.CustomData;
             }
             catch (AggregateException ae)
             {
@@ -171,12 +201,25 @@ public Task<Stream> GetCoreMlModel(string classifierId, Dictionary<string, objec
 
             try
             {
-                var request = this.Client.GetAsync($"{this.Endpoint}/v3/classifiers/{classifierId}/core_ml_model");
-                request.WithArgument("api_key", ApiKey);
-                request.WithArgument("version", VersionDate);
-                request.WithArgument("classifier_id", classifierId);
-                request.WithFormatter(MediaTypeHeaderValue.Parse("application/octet-stream"));
-                result = request.AsStream();
+                IClient client;
+                if (_tokenManager == null)
+                {
+                    client = this.Client;
+                }
+                else
+                {
+                    client = this.Client.WithAuthentication(_tokenManager.GetToken());
+                }
+                var restRequest = client.PostAsync($"{this.Endpoint}/v3/classifiers/{classifierId}/core_ml_model");
+
+                restRequest.WithArgument("version", VersionDate);
+                if (!string.IsNullOrEmpty(ApiKey))
+                    restRequest.WithArgument("api_key", ApiKey);
+                restRequest.WithArgument("classifier_id", classifierId);
+                if (customData != null)
+                    restRequest.WithCustomData(customData);
+                restRequest.WithFormatter(new MediaTypeHeaderValue("application/octet-stream"));
+                result = restRequest.AsStream();
             }
             catch (AggregateException ae)
             {

test/IBM.WatsonDeveloperCloud.VisualRecognition.v3.IntegrationTests/VisualRecognitionServiceRCIntegrationTests.cs

@@ -82,9 +82,9 @@ public void Setup()
                 VcapCredentials vcapCredentials = JsonConvert.DeserializeObject<VcapCredentials>(credentials);
                 var vcapServices = JObject.Parse(credentials);
 
-                Credential credential = vcapCredentials.GetCredentialByname("visual-recognition-sdk")[0].Credentials;
+                Credential credential = vcapCredentials.GetCredentialByname("visual-recognition-iam-sdk")[0].Credentials;
                 _endpoint = credential.Url;
-                _apikey = credential.ApiKey;
+                _apikey = credential.IamApikey;
             }
             #endregion
 
@@ -199,7 +199,7 @@ public void ListClassifiers_RC_Success()
         }
 
         #region Custom
-        //[TestMethod]
+        [TestMethod]
         public void TestClassifiers_RC_Success()
         {
             Classifier createClassifierResult = null;