Merge pull request #236 from watson-developer-cloud/feature-user-set-endpoint

User set endpoint

Author: mediumTaj

src/IBM.WatsonDeveloperCloud/Service/IWatsonService.cs

@@ -16,7 +16,8 @@
 */
 
 using IBM.WatsonDeveloperCloud.Http;
-
+using IBM.WatsonDeveloperCloud.Util;
+
 namespace IBM.WatsonDeveloperCloud.Service
 {
     public interface IWatsonService
@@ -25,10 +26,12 @@ public interface IWatsonService
 
         string ServiceName { get; set; }
         string ApiKey { get; set; }
-        string Endpoint { get; set; }
         string UserName { get; set; }
         string Password { get; set; }
 
         void SetCredential(string userName, string password);
+        void SetCredential(string apikey);
+        void SetCredential(TokenOptions tokenOptions);
+        void SetEndpoint(string endpoint);
     }
-}
+}

src/IBM.WatsonDeveloperCloud/Service/WatsonService.cs

@@ -24,12 +24,12 @@ namespace IBM.WatsonDeveloperCloud.Service
     public abstract class WatsonService : IWatsonService
     {
         const string PATH_AUTHORIZATION_V1_TOKEN = "/authorization/api/v1/token";
-
+        
         public IClient Client { get; set; }
 
         public string ServiceName { get; set; }
         public string ApiKey { get; set; }
-        public string Endpoint { get
+        protected string Endpoint { get
             {
                 if (this.Client.BaseClient == null ||
                     this.Client.BaseClient.BaseAddress == null)
@@ -45,6 +45,7 @@ public string Endpoint { get
         public string UserName { get; set; }
         public string Password { get; set; }
         protected TokenManager _tokenManager = null;
+        protected bool _userSetEndpoint = false;
 
         protected WatsonService(string serviceName)
         {
@@ -81,22 +82,45 @@ protected WatsonService(string serviceName, string url, IClient httpClient)
             //this.Endpoint = CredentialUtils.GetApiUrl(serviceName);
         }
 
+        /// <summary>
+        /// Sets the username and password credentials.
+        /// </summary>
+        /// <param name="userName">The username</param>
+        /// <param name="password">The password</param>
         public void SetCredential(string userName, string password)
         {
             this.UserName = userName;
             this.Password = password;
         }
 
+        /// <summary>
+        /// Sets the apikey of the service. 
+        /// Also sets the endpoint if the user has not set the endpoint.
+        /// </summary>
+        /// <param name="apikey"></param>
         public void SetCredential(string apikey)
         {
             this.ApiKey = apikey;
-            this.Endpoint = "https://gateway-a.watsonplatform.net/visual-recognition/api";
+            if (!_userSetEndpoint)
+                this.Endpoint = "https://gateway-a.watsonplatform.net/visual-recognition/api";
         }
 
+        /// <summary>
+        /// Sets the tokenOptions for the service. 
+        /// Also sets the endpoint if the user has not set the endpoint.
+        /// </summary>
+        /// <param name="options"></param>
         public void SetCredential(TokenOptions options)
         {
-            this.Endpoint = options.IamUrl;
+            if(!_userSetEndpoint)
+                this.Endpoint = options.IamUrl;
             _tokenManager = new TokenManager(options);
         }
+
+        public void SetEndpoint(string url)
+        {
+            _userSetEndpoint = true;
+            this.Endpoint = url;
+        }
     }
-}
+}

test/IBM.WatsonDeveloperCloud.Assistant.v1.IntegrationTests/AssistantServiceIntegrationTests.cs

@@ -94,10 +94,8 @@ public void Setup()
             }
             #endregion
 
-            _service = new AssistantService(_username, _password, "2018-02-16")
-            {
-                Endpoint = _endpoint
-            };
+            _service = new AssistantService(_username, _password, "2018-02-16");
+            _service.SetEndpoint(_endpoint);
 
 #if DELETE_DOTNET_WORKSPACES
             var workspaces = _service.ListWorkspaces();

test/IBM.WatsonDeveloperCloud.Discovery.v1.IntegrationTests/DiscoveryIntegrationTests.cs

@@ -97,7 +97,7 @@ public void Setup()
             #endregion
 
             _service = new DiscoveryService(_username, _password, version);
-            _service.Endpoint = _endpoint;
+            _service.SetEndpoint(_endpoint);
 
 
             var environments = ListEnvironments();

test/IBM.WatsonDeveloperCloud.LanguageTranslator.v2.IntegrationTests/LanguageTranslatorServiceIntegrationTests.cs

@@ -82,8 +82,8 @@ public void Setup()
         public void GetIdentifiableLanguages_Sucess()
         {
             _service =
-                new LanguageTranslatorService(_username, _password);
-            _service.Endpoint = _endpoint;
+                new LanguageTranslatorService(_username, _password);
+            _service.SetEndpoint(_endpoint);
 
             var results = _service.ListIdentifiableLanguages();
 
@@ -95,8 +95,8 @@ public void GetIdentifiableLanguages_Sucess()
         public void Identify_Sucess()
         {
             _service =
-                new LanguageTranslatorService(_username, _password);
-            _service.Endpoint = _endpoint;
+                new LanguageTranslatorService(_username, _password);
+            _service.SetEndpoint(_endpoint);
 
             var results = _service.Identify(_text);
 
@@ -108,8 +108,8 @@ public void Identify_Sucess()
         public void Translate_Sucess()
         {
             _service =
-                new LanguageTranslatorService(_username, _password);
-            _service.Endpoint = _endpoint;
+                new LanguageTranslatorService(_username, _password);
+            _service.SetEndpoint(_endpoint);
 
             var translateRequest = new TranslateRequest()
             {
@@ -130,8 +130,8 @@ public void Translate_Sucess()
         public void LisListModels_Sucess()
         {
             _service =
-                new LanguageTranslatorService(_username, _password);
-            _service.Endpoint = _endpoint;
+                new LanguageTranslatorService(_username, _password);
+            _service.SetEndpoint(_endpoint);
 
             var results = _service.ListModels();
 
@@ -143,8 +143,8 @@ public void LisListModels_Sucess()
         public void GetModelDetails_Success()
         {
             _service =
-                new LanguageTranslatorService(_username, _password);
-            _service.Endpoint = _endpoint;
+                new LanguageTranslatorService(_username, _password);
+            _service.SetEndpoint(_endpoint);
 
             var results = _service.GetModel(_baseModel);
 
@@ -157,7 +157,7 @@ public void Model_Success()
         {
             _service =
                 new LanguageTranslatorService(_username, _password);
-            _service.Endpoint = _endpoint;
+            _service.SetEndpoint(_endpoint);
 
             TranslationModel createModelResult;
 

test/IBM.WatsonDeveloperCloud.NLC.v1.IntegrationTests/NaturalLanguageClassifierServiceIntegrationTests.cs

@@ -76,7 +76,7 @@ public void Setup()
             #endregion
 
             _service = new NaturalLanguageClassifierService(_username, _password);
-            _service.Endpoint = _endpoint;
+            _service.SetEndpoint(_endpoint);
         }
 
         #region Classifiers

test/IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1.IntTests/NaturalLanguageUnderstandingIntegrationTests.cs

@@ -73,7 +73,7 @@ public void Setup()
             #endregion
 
             _service = new NaturalLanguageUnderstandingService(_username, _password, "2017-02-27");
-            _service.Endpoint = _endpoint;
+            _service.SetEndpoint(_endpoint);
         }
 
         [TestMethod]

test/IBM.WatsonDeveloperCloud.SpeechToText.v1.IntegrationTests/SpeechToTextServiceIntegrationTest.cs

@@ -88,7 +88,7 @@ public void Setup()
             #endregion
 
             _service = new SpeechToTextService(_username, _password);
-            _service.Endpoint = _endpoint;
+            _service.SetEndpoint(_endpoint);
         }
 
         #region Models

test/IBM.WatsonDeveloperCloud.TextToSpeech.v1.IntegrationTests/TextToSpeechServiceIntegrationTests.cs

@@ -78,7 +78,7 @@ public void Setup()
             #endregion
 
             _service = new TextToSpeechService(_username, _password);
-            _service.Endpoint = _endpoint;
+            _service.SetEndpoint(_endpoint);
         }
 
         #region Voices