From f05579ce2a5988f5e989e4fd7a715c14ed995aa3 Mon Sep 17 00:00:00 2001
From: Ajiemar Santiago <ajiemar@gmail.com>
Date: Mon, 9 Nov 2020 15:26:00 -0600
Subject: [PATCH 1/2] chore: update gateway urls

---
 .../com/ibm/watson/compare_comply/v1/CompareComply.java     | 2 +-
 .../com/ibm/watson/discovery/v1/DiscoveryServiceIT.java     | 4 ++--
 .../natural_language_classifier/classification.json         | 4 ++--
 .../classification_collection.json                          | 4 ++--
 .../resources/natural_language_classifier/classifier.json   | 4 ++--
 .../resources/natural_language_classifier/classifiers.json  | 6 +++---
 speech-to-text/README.md                                    | 2 +-
 speech-to-text/src/test/resources/speech_to_text/jobs.json  | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/compare-comply/src/main/java/com/ibm/watson/compare_comply/v1/CompareComply.java b/compare-comply/src/main/java/com/ibm/watson/compare_comply/v1/CompareComply.java
index a7e4a09c525..4d939064c77 100644
--- a/compare-comply/src/main/java/com/ibm/watson/compare_comply/v1/CompareComply.java
+++ b/compare-comply/src/main/java/com/ibm/watson/compare_comply/v1/CompareComply.java
@@ -61,7 +61,7 @@ public class CompareComply extends BaseService {
   private static final String DEFAULT_SERVICE_NAME = "compare_comply";
 
   private static final String DEFAULT_SERVICE_URL =
-      "https://gateway.watsonplatform.net/compare-comply/api";
+      "https://api.us-south.compare-comply.watson.cloud.ibm.com";
 
   private String versionDate;
 
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
index f86ab6f90df..39a57ff0fba 100644
--- a/discovery/src/test/java/com/ibm/watson/discovery/v1/DiscoveryServiceIT.java
+++ b/discovery/src/test/java/com/ibm/watson/discovery/v1/DiscoveryServiceIT.java
@@ -198,7 +198,7 @@ public boolean ping() throws RuntimeException {
   @Test
   public void exampleIsSuccessful() {
     //    Discovery discovery = new Discovery("2016-12-15");
-    //    discovery.setServiceUrl("https://gateway.watsonplatform.net/discovery/api");
+    //    discovery.setServiceUrl("https://api.us-south.discovery.watson.cloud.ibm.com");
     //    discovery.setUsernameAndPassword("<username>", "<password");
     String environmentId = null;
     String configurationId = null;
@@ -363,7 +363,7 @@ public void badCredentialsThrowsException() {
   /** Ping bad url throws exception. */
   @Test(expected = NotFoundException.class)
   public void pingBadUrlThrowsException() {
-    discovery.setServiceUrl("https://gateway.watsonplatform.net/discovery-foo/api");
+    discovery.setServiceUrl("https://api.us-south.discovery-foo.watson.cloud.ibm.com");
     ping();
   }
 
diff --git a/natural-language-classifier/src/test/resources/natural_language_classifier/classification.json b/natural-language-classifier/src/test/resources/natural_language_classifier/classification.json
index fd42da197ae..3caba48f408 100644
--- a/natural-language-classifier/src/test/resources/natural_language_classifier/classification.json
+++ b/natural-language-classifier/src/test/resources/natural_language_classifier/classification.json
@@ -1,6 +1,6 @@
 {
   "classifier_id": "47C164-nlc-243",
-  "url": "https://gateway.watsonplatform.net/natural-language-classifier/api/v1/classifiers/47C164-nlc-243",
+  "url": "https://api.us-south.natural-language-classifier.watson.cloud.ibm.com/v1/classifiers/47C164-nlc-243",
   "text": "is it hot ?",
   "top_class": "temperature",
   "classes": [
@@ -13,4 +13,4 @@
       "confidence": 0.018102824692296068
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/natural-language-classifier/src/test/resources/natural_language_classifier/classification_collection.json b/natural-language-classifier/src/test/resources/natural_language_classifier/classification_collection.json
index 9ebc67cd830..1c26952ee4a 100644
--- a/natural-language-classifier/src/test/resources/natural_language_classifier/classification_collection.json
+++ b/natural-language-classifier/src/test/resources/natural_language_classifier/classification_collection.json
@@ -1,6 +1,6 @@
 {
   "classifier_id" : "10D41B-nlc-1",
-  "url" : "https://gateway.watsonplatform.net/natural-language-classifier/api/v1/classifiers/10D41B-nlc-1",
+  "url" : "https://api.us-south.natural-language-classifier.watson.cloud.ibm.com/v1/classifiers/10D41B-nlc-1",
   "collection" : [ {
     "text" : "How hot will it be today?",
     "top_class" : "temperature",
@@ -22,4 +22,4 @@
       "confidence" : 0
     } ]
   } ]
-}
\ No newline at end of file
+}
diff --git a/natural-language-classifier/src/test/resources/natural_language_classifier/classifier.json b/natural-language-classifier/src/test/resources/natural_language_classifier/classifier.json
index cf6ff545823..8eda59de82f 100644
--- a/natural-language-classifier/src/test/resources/natural_language_classifier/classifier.json
+++ b/natural-language-classifier/src/test/resources/natural_language_classifier/classifier.json
@@ -1,7 +1,7 @@
 {
   "classifier_id": "5E00F7x2-nlc-507",
-  "url": "https://gateway.watsonplatform.net/natural-language-classifier/api/v1/classifiers/5E00F7x2-nlc-507",
+  "url": "https://api.us-south.natural-language-classifier.watson.cloud.ibm.com/v1/classifiers/5E00F7x2-nlc-507",
   "name": "Music controls",
   "language": "en",
   "created": "2015-10-17T20:56:29.974Z"
-}
\ No newline at end of file
+}
diff --git a/natural-language-classifier/src/test/resources/natural_language_classifier/classifiers.json b/natural-language-classifier/src/test/resources/natural_language_classifier/classifiers.json
index cf4afcf95fc..e8f3ddb0366 100644
--- a/natural-language-classifier/src/test/resources/natural_language_classifier/classifiers.json
+++ b/natural-language-classifier/src/test/resources/natural_language_classifier/classifiers.json
@@ -2,17 +2,17 @@
   "classifiers": [
     {
       "classifier_id": "47C164-nlc-243",
-      "url": "https://gateway.watsonplatform.net/natural-language-classifier/api/v1/classifiers/47C164-nlc-243",
+      "url": "https://api.us-south.natural-language-classifier.watson.cloud.ibm.com/v1/classifiers/47C164-nlc-243",
       "name": "weather",
       "language": "en",
       "created": "2015-08-24T18:42:25.324Z"
     },
     {
       "classifier_id": "5E00F7x2-nlc-507",
-      "url": "https://gateway.watsonplatform.net/natural-language-classifier/api/v1/classifiers/5E00F7x2-nlc-507",
+      "url": "https://api.us-south.natural-language-classifier.watson.cloud.ibm.com/v1/classifiers/5E00F7x2-nlc-507",
       "name": "Music controls",
       "language": "en",
       "created": "2015-10-17T20:56:29.974Z"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/speech-to-text/README.md b/speech-to-text/README.md
index 662f9bbcd37..4dee05f1281 100755
--- a/speech-to-text/README.md
+++ b/speech-to-text/README.md
@@ -39,7 +39,7 @@ System.out.println(transcript);
 
 #### WebSocket support
 
-Speech to Text supports WebSocket, the url is: `wss://stream.watsonplatform.net/speech-to-text/api/v1/recognize`
+Speech to Text supports WebSocket, the url is: `wss://api.us-south.speech-to-text.watson.cloud.ibm.com/v1/recognize`
 
 ```java
 Authenticator authenticator = new IamAuthenticator("<iam_api_key>");
diff --git a/speech-to-text/src/test/resources/speech_to_text/jobs.json b/speech-to-text/src/test/resources/speech_to_text/jobs.json
index ae23a245c21..91ffc855712 100644
--- a/speech-to-text/src/test/resources/speech_to_text/jobs.json
+++ b/speech-to-text/src/test/resources/speech_to_text/jobs.json
@@ -8,7 +8,7 @@
     "id": "2d0ef860-872e-11e6-90d3-5f28bc58ceb2",
     "status": "processing",
     "created": "2016-09-30T16:51:47.558",
-    "url": "https://stream.watsonplatform.net/speech-to-text/api/v1/recognitions/2d0ef860-872e-11e6-90d3-5f28bc58ceb2"
+    "url": "https://api.us-south.speech-to-text.watson.cloud.ibm.com/v1/recognitions/2d0ef860-872e-11e6-90d3-5f28bc58ceb2"
   }, {
     "id": "2d0ef860-872e-11e6-90d3-5f28bc58ceb2",
     "results": [{

From 194d2abdff2c86ecfb81ae06a467e173c00b61cd Mon Sep 17 00:00:00 2001
From: Kevin Kowalski <kevin.kowalski@ibm.com>
Date: Tue, 17 Nov 2020 15:19:24 -0600
Subject: [PATCH 2/2] test(discovery-v1-it): update test url

---
 .../java/com/ibm/watson/discovery/v1/DiscoveryServiceIT.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 39a57ff0fba..389f560d93a 100644
--- a/discovery/src/test/java/com/ibm/watson/discovery/v1/DiscoveryServiceIT.java
+++ b/discovery/src/test/java/com/ibm/watson/discovery/v1/DiscoveryServiceIT.java
@@ -363,7 +363,7 @@ public void badCredentialsThrowsException() {
   /** Ping bad url throws exception. */
   @Test(expected = NotFoundException.class)
   public void pingBadUrlThrowsException() {
-    discovery.setServiceUrl("https://api.us-south.discovery-foo.watson.cloud.ibm.com");
+    discovery.setServiceUrl("https://api.us-south.discovery.watson.cloud.ibm.com/discovery-foo");
     ping();
   }