refactor: Update all setEndPoint calls to setServiceUrl

lpatino10 · lpatino10 · commit d8786f389282 · 2019-10-03T14:57:50.000-04:00
diff --git a/README.md b/README.md
@@ -225,14 +225,14 @@ Authenticator authenticator = new CloudPakForDataAuthenticator(
   null,
 );
 Discovery service = new Discovery("2019-04-30", authenticator);
-service.setEndPoint("<service CP4D URL>");
+service.setServiceUrl("<service CP4D URL>");
 ```
 
 ```java
 // assuming control of managing the access token
 Authenticator authenticator = new BearerTokenAuthenticator("<access_token>");
 Discovery service = new Discovery("2019-04-30", authenticator);
-service.setEndPoint("<service CP4D URL>");
+service.setServiceUrl("<service CP4D URL>");
 ```
 
 Be sure to both disable SSL verification when authenticating and set the endpoint explicitly to the URL given in Cloud Pak for Data.
diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v1/AssistantServiceTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v1/AssistantServiceTest.java
@@ -48,7 +48,7 @@ public void setUp() throws Exception {
 
     Authenticator authenticator = new IamAuthenticator(apiKey);
     service = new Assistant("2019-02-28", authenticator);
-    service.setEndPoint(getProperty("assistant.url"));
+    service.setServiceUrl(getProperty("assistant.url"));
     service.setDefaultHeaders(getDefaultHeaders());
   }
 
diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v1/AssistantTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v1/AssistantTest.java
@@ -102,7 +102,7 @@ public class AssistantTest extends WatsonServiceUnitTest {
   public void setUp() throws Exception {
     super.setUp();
     service = new Assistant(VERSION_DATE, new NoAuthAuthenticator());
-    service.setEndPoint(getMockWebServerUrl());
+    service.setServiceUrl(getMockWebServerUrl());
   }
 
   /**
diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/AssistantServiceTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/AssistantServiceTest.java
@@ -48,7 +48,7 @@ public void setUp() throws Exception {
 
     Authenticator authenticator = new IamAuthenticator(apiKey);
     service = new Assistant("2019-02-28", authenticator);
-    service.setEndPoint(getProperty("assistant.url"));
+    service.setServiceUrl(getProperty("assistant.url"));
     service.setDefaultHeaders(getDefaultHeaders());
   }
 
diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/AssistantTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/AssistantTest.java
@@ -119,7 +119,7 @@ public void setUp() throws Exception {
     sessionResponse = loadFixture(RESOURCE + "session_response.json", SessionResponse.class);
 
     service = new Assistant(VERSION, new NoAuthAuthenticator());
-    service.setEndPoint(getMockWebServerUrl());
+    service.setServiceUrl(getMockWebServerUrl());
   }
 
   @Test
diff --git a/compare-comply/src/test/java/com/ibm/watson/compare_comply/v1/CompareComplyServiceTest.java b/compare-comply/src/test/java/com/ibm/watson/compare_comply/v1/CompareComplyServiceTest.java
@@ -28,7 +28,7 @@ public void setUp() throws Exception {
 
     Authenticator authenticator = new IamAuthenticator(apiKey);
     service = new CompareComply(VERSION, authenticator);
-    service.setEndPoint(getProperty("compare_comply.url"));
+    service.setServiceUrl(getProperty("compare_comply.url"));
     service.setDefaultHeaders(getDefaultHeaders());
   }
 }
diff --git a/compare-comply/src/test/java/com/ibm/watson/compare_comply/v1/CompareComplyTest.java b/compare-comply/src/test/java/com/ibm/watson/compare_comply/v1/CompareComplyTest.java
@@ -223,7 +223,7 @@ public void setUp() throws Exception {
     batchesResponse = loadFixture(RESOURCE + "batches.json", Batches.class);
 
     service = new CompareComply(VERSION, new NoAuthAuthenticator());
-    service.setEndPoint(getMockWebServerUrl());
+    service.setServiceUrl(getMockWebServerUrl());
   }
 
   // --- MODELS ---
diff --git a/discovery/src/test/java/com/ibm/watson/discovery/v1/DiscoveryServiceIT.java b/discovery/src/test/java/com/ibm/watson/discovery/v1/DiscoveryServiceIT.java
@@ -229,7 +229,7 @@ public void setup() throws Exception {
     String url = getProperty("discovery.url");
     Authenticator authenticator = new IamAuthenticator(apiKey);
     discovery = new Discovery("2019-04-30", authenticator);
-    discovery.setEndPoint(url);
+    discovery.setServiceUrl(url);
     discovery.setDefaultHeaders(getDefaultHeaders());
 
     uniqueName = UUID.randomUUID().toString();
@@ -269,7 +269,7 @@ public boolean ping() throws RuntimeException {
   @Test
   public void exampleIsSuccessful() {
     //    Discovery discovery = new Discovery("2016-12-15");
-    //    discovery.setEndPoint("https://gateway.watsonplatform.net/discovery/api");
+    //    discovery.setServiceUrl("https://gateway.watsonplatform.net/discovery/api");
     //    discovery.setUsernameAndPassword("<username>", "<password");
     String environmentId = null;
     String configurationId = null;
@@ -420,7 +420,7 @@ public void badCredentialsThrowsException() {
 
   @Test(expected = ForbiddenException.class)
   public void pingBadUrlThrowsException() {
-    discovery.setEndPoint("https://gateway.watsonplatform.net/discovery-foo/api");
+    discovery.setServiceUrl("https://gateway.watsonplatform.net/discovery-foo/api");
     ping();
   }
 
diff --git a/discovery/src/test/java/com/ibm/watson/discovery/v1/DiscoveryServiceTest.java b/discovery/src/test/java/com/ibm/watson/discovery/v1/DiscoveryServiceTest.java
@@ -298,7 +298,7 @@ public static void setupClass() {
   public void setup() throws Exception {
     super.setUp();
     discoveryService = new Discovery(VERSION, new NoAuthAuthenticator());
-    discoveryService.setEndPoint(getMockWebServerUrl());
+    discoveryService.setServiceUrl(getMockWebServerUrl());
 
     environmentId = "mock_envid";
     environmentName = "my_environment";
diff --git a/language-translator/src/test/java/com/ibm/watson/language_translator/v3/LanguageTranslatorIT.java b/language-translator/src/test/java/com/ibm/watson/language_translator/v3/LanguageTranslatorIT.java
@@ -84,7 +84,7 @@ public void setUp() throws Exception {
 
     Authenticator authenticator = new IamAuthenticator(iamApiKey);
     service = new LanguageTranslator("2018-05-01", authenticator);
-    service.setEndPoint(getProperty("language_translator.url"));
+    service.setServiceUrl(getProperty("language_translator.url"));
 
     // issue currently where document translation fails with learning opt-out
     Map<String, String> headers = new HashMap<>();
diff --git a/language-translator/src/test/java/com/ibm/watson/language_translator/v3/LanguageTranslatorTest.java b/language-translator/src/test/java/com/ibm/watson/language_translator/v3/LanguageTranslatorTest.java
@@ -103,7 +103,7 @@ public void setUp() throws Exception {
     super.setUp();
 
     service = new LanguageTranslator("2018-05-01", new NoAuthAuthenticator());
-    service.setEndPoint(getMockWebServerUrl());
+    service.setServiceUrl(getMockWebServerUrl());
 
     // fixtures
     String jsonString = getStringFromInputStream(new FileInputStream(RESOURCE + "identifiable_languages.json"));
diff --git a/natural-language-classifier/src/test/java/com/ibm/watson/natural_language_classifier/v1/NaturalLanguageClassifierIT.java b/natural-language-classifier/src/test/java/com/ibm/watson/natural_language_classifier/v1/NaturalLanguageClassifierIT.java
@@ -68,7 +68,7 @@ public void setUp() throws Exception {
     Authenticator authenticator = new IamAuthenticator(apiKey);
     service = new NaturalLanguageClassifier(authenticator);
     service.setDefaultHeaders(getDefaultHeaders());
-    service.setEndPoint(getProperty("natural_language_classifier.url"));
+    service.setServiceUrl(getProperty("natural_language_classifier.url"));
 
     preCreatedClassifierId = getProperty("natural_language_classifier.classifier_id");
   }
diff --git a/natural-language-classifier/src/test/java/com/ibm/watson/natural_language_classifier/v1/NaturalLanguageClassifierTest.java b/natural-language-classifier/src/test/java/com/ibm/watson/natural_language_classifier/v1/NaturalLanguageClassifierTest.java
@@ -63,7 +63,7 @@ public class NaturalLanguageClassifierTest extends WatsonServiceUnitTest {
   public void setUp() throws Exception {
     super.setUp();
     service = new NaturalLanguageClassifier(new NoAuthAuthenticator());
-    service.setEndPoint(getMockWebServerUrl());
+    service.setServiceUrl(getMockWebServerUrl());
 
     classifierId = "foo";
     classifiers = loadFixture(RESOURCE + "classifiers.json", ClassifierList.class);
diff --git a/natural-language-understanding/src/test/java/com/ibm/watson/natural_language_understanding/v1/NaturalLanguageUnderstandingIT.java b/natural-language-understanding/src/test/java/com/ibm/watson/natural_language_understanding/v1/NaturalLanguageUnderstandingIT.java
@@ -81,7 +81,7 @@ public void setUp() throws Exception {
     Authenticator authenticator = new IamAuthenticator(apiKey);
     service = new NaturalLanguageUnderstanding("2019-07-12", authenticator);
     service.setDefaultHeaders(getDefaultHeaders());
-    service.setEndPoint(getProperty("natural_language_understanding.url"));
+    service.setServiceUrl(getProperty("natural_language_understanding.url"));
   }
 
   /**
diff --git a/natural-language-understanding/src/test/java/com/ibm/watson/natural_language_understanding/v1/NaturalLanguageUnderstandingTest.java b/natural-language-understanding/src/test/java/com/ibm/watson/natural_language_understanding/v1/NaturalLanguageUnderstandingTest.java
@@ -69,7 +69,7 @@ public class NaturalLanguageUnderstandingTest extends WatsonServiceUnitTest {
   public void setUp() throws Exception {
     super.setUp();
     service = new NaturalLanguageUnderstanding("2019-07-12", new NoAuthAuthenticator());
-    service.setEndPoint(getMockWebServerUrl());
+    service.setServiceUrl(getMockWebServerUrl());
 
     modelId = "foo";
     models = loadFixture(RESOURCE + "models.json", ListModelsResults.class);
diff --git a/personality-insights/src/test/java/com/ibm/watson/personality_insights/v3/PersonalityInsightsIT.java b/personality-insights/src/test/java/com/ibm/watson/personality_insights/v3/PersonalityInsightsIT.java
@@ -59,7 +59,7 @@ public void setUp() throws Exception {
 
     Authenticator authenticator = new IamAuthenticator(apiKey);
     service = new PersonalityInsights(VERSION, authenticator);
-    service.setEndPoint(getProperty("personality_insights.url"));
+    service.setServiceUrl(getProperty("personality_insights.url"));
     service.setDefaultHeaders(getDefaultHeaders());
   }
 
diff --git a/personality-insights/src/test/java/com/ibm/watson/personality_insights/v3/PersonalityInsightsTest.java b/personality-insights/src/test/java/com/ibm/watson/personality_insights/v3/PersonalityInsightsTest.java
@@ -66,7 +66,7 @@ public PersonalityInsightsTest() throws FileNotFoundException {
   public void setUp() throws Exception {
     super.setUp();
     service = new PersonalityInsights(VERSION_DATE_2016_10_19, new NoAuthAuthenticator());
-    service.setEndPoint(getMockWebServerUrl());
+    service.setServiceUrl(getMockWebServerUrl());
   }
 
   /**
diff --git a/speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/SpeechToTextTest.java b/speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/SpeechToTextTest.java
@@ -170,7 +170,7 @@ public void setUp() throws Exception {
     super.setUp();
 
     service = new SpeechToText(new NoAuthAuthenticator());
-    service.setEndPoint(getMockWebServerUrl());
+    service.setServiceUrl(getMockWebServerUrl());
 
     speechModel = loadFixture("src/test/resources/speech_to_text/speech-model.json", SpeechModel.class);
     speechModels = loadFixture("src/test/resources/speech_to_text/speech-models.json", SpeechModels.class);
diff --git a/text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/CustomizationsIT.java b/text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/CustomizationsIT.java
@@ -80,7 +80,7 @@ public void setUp() throws Exception {
 
     Authenticator authenticator = new IamAuthenticator(apiKey);
     service = new TextToSpeech(authenticator);
-    service.setEndPoint(getProperty("text_to_speech.url"));
+    service.setServiceUrl(getProperty("text_to_speech.url"));
     service.setDefaultHeaders(getDefaultHeaders());
   }
 
diff --git a/text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/CustomizationsTest.java b/text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/CustomizationsTest.java
@@ -83,7 +83,7 @@ public void setUp() throws Exception {
     super.setUp();
 
     service = new TextToSpeech(new NoAuthAuthenticator());
-    service.setEndPoint(getMockWebServerUrl());
+    service.setServiceUrl(getMockWebServerUrl());
 
     voiceModel = loadFixture("src/test/resources/text_to_speech/voice_model.json", VoiceModel.class);
     voiceModelWords = loadFixture("src/test/resources/text_to_speech/voice_model_words.json", VoiceModel.class);
diff --git a/text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/TextToSpeechIT.java b/text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/TextToSpeechIT.java
@@ -81,7 +81,7 @@ public void setUp() throws Exception {
 
     Authenticator authenticator = new IamAuthenticator(apiKey);
     service = new TextToSpeech(authenticator);
-    service.setEndPoint(getProperty("text_to_speech.url"));
+    service.setServiceUrl(getProperty("text_to_speech.url"));
     service.setDefaultHeaders(getDefaultHeaders());
     voiceName = getProperty("text_to_speech.voice_name");
 
diff --git a/text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/TextToSpeechTest.java b/text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/TextToSpeechTest.java
@@ -106,7 +106,7 @@ public void setUp() throws Exception {
     super.setUp();
 
     service = new TextToSpeech(new NoAuthAuthenticator());
-    service.setEndPoint(getMockWebServerUrl());
+    service.setServiceUrl(getMockWebServerUrl());
 
     getVoiceResponse = loadFixture("src/test/resources/text_to_speech/get_voice_response.json", Voice.class);
     listVoicesResponse = loadFixture("src/test/resources/text_to_speech/list_voices_response.json", Voices.class);
diff --git a/tone-analyzer/src/test/java/com/ibm/watson/tone_analyzer/v3/ToneAnalyzerIT.java b/tone-analyzer/src/test/java/com/ibm/watson/tone_analyzer/v3/ToneAnalyzerIT.java
@@ -68,7 +68,7 @@ public void setUp() throws Exception {
 
     Authenticator authenticator = new IamAuthenticator(apiKey);
     service = new ToneAnalyzer(VERSION_DATE_VALUE, authenticator);
-    service.setEndPoint(getProperty("tone_analyzer.url"));
+    service.setServiceUrl(getProperty("tone_analyzer.url"));
     service.setDefaultHeaders(getDefaultHeaders());
 
   }
diff --git a/tone-analyzer/src/test/java/com/ibm/watson/tone_analyzer/v3/ToneAnalyzerTest.java b/tone-analyzer/src/test/java/com/ibm/watson/tone_analyzer/v3/ToneAnalyzerTest.java
@@ -58,7 +58,7 @@ public class ToneAnalyzerTest extends WatsonServiceUnitTest {
   public void setUp() throws Exception {
     super.setUp();
     service = new ToneAnalyzer(VERSION_DATE_VALUE, new NoAuthAuthenticator());
-    service.setEndPoint(getMockWebServerUrl());
+    service.setServiceUrl(getMockWebServerUrl());
 
   }
 
@@ -70,7 +70,7 @@ public void testReadme() throws InterruptedException, IOException {
 
     ToneAnalyzer service = new ToneAnalyzer(VERSION_DATE, new NoAuthAuthenticator());
 
-    service.setEndPoint(getMockWebServerUrl()); // exclude
+    service.setServiceUrl(getMockWebServerUrl()); // exclude
     ToneAnalysis mockResponse = loadFixture(FIXTURE, ToneAnalysis.class); // exclude
     server.enqueue(jsonResponse(mockResponse)); // exclude
 
diff --git a/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v3/VisualRecognitionIT.java b/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v3/VisualRecognitionIT.java
@@ -95,7 +95,7 @@ public void setUp() throws Exception {
     Authenticator authenticator = new IamAuthenticator(iamApiKey);
     service = new VisualRecognition(VERSION, authenticator);
     service.setDefaultHeaders(getDefaultHeaders());
-    service.setEndPoint(url);
+    service.setServiceUrl(url);
   }
 
   /**
diff --git a/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v3/VisualRecognitionTest.java b/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v3/VisualRecognitionTest.java
@@ -74,7 +74,7 @@ public void setUp() throws Exception {
     super.setUp();
 
     service = new VisualRecognition(VERSION, new NoAuthAuthenticator());
-    service.setEndPoint(getMockWebServerUrl());
+    service.setServiceUrl(getMockWebServerUrl());
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public void setUp() throws Exception {`
`48`	`48`
`49`	`49`	`Authenticator authenticator = new IamAuthenticator(apiKey);`
`50`	`50`	`service = new Assistant("2019-02-28", authenticator);`
`51`		`- service.setEndPoint(getProperty("assistant.url"));`
	`51`	`+ service.setServiceUrl(getProperty("assistant.url"));`
`52`	`52`	`service.setDefaultHeaders(getDefaultHeaders());`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public class AssistantTest extends WatsonServiceUnitTest {`
`102`	`102`	`public void setUp() throws Exception {`
`103`	`103`	`super.setUp();`
`104`	`104`	`service = new Assistant(VERSION_DATE, new NoAuthAuthenticator());`
`105`		`- service.setEndPoint(getMockWebServerUrl());`
	`105`	`+ service.setServiceUrl(getMockWebServerUrl());`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public void setUp() throws Exception {`
`119`	`119`	`sessionResponse = loadFixture(RESOURCE + "session_response.json", SessionResponse.class);`
`120`	`120`
`121`	`121`	`service = new Assistant(VERSION, new NoAuthAuthenticator());`
`122`		`- service.setEndPoint(getMockWebServerUrl());`
	`122`	`+ service.setServiceUrl(getMockWebServerUrl());`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public void setUp() throws Exception {`
`28`	`28`
`29`	`29`	`Authenticator authenticator = new IamAuthenticator(apiKey);`
`30`	`30`	`service = new CompareComply(VERSION, authenticator);`
`31`		`- service.setEndPoint(getProperty("compare_comply.url"));`
	`31`	`+ service.setServiceUrl(getProperty("compare_comply.url"));`
`32`	`32`	`service.setDefaultHeaders(getDefaultHeaders());`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ public void setUp() throws Exception {`
`223`	`223`	`batchesResponse = loadFixture(RESOURCE + "batches.json", Batches.class);`
`224`	`224`
`225`	`225`	`service = new CompareComply(VERSION, new NoAuthAuthenticator());`
`226`		`- service.setEndPoint(getMockWebServerUrl());`
	`226`	`+ service.setServiceUrl(getMockWebServerUrl());`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`// --- MODELS ---`