chore(merge): pull changes from master

Author: kevinkowa

README.md

@@ -53,11 +53,14 @@ Java client library to use the [Watson APIs][wdc].
 </details>
 
 ## ANNOUNCEMENTS!
-### Personality Insights Deprecation
-IBM® will begin sunsetting IBM Watson™ Personality Insights on 1 December 2020. For a period of one year from this date, you will still be able to use Watson Personality Insights. However, as of 1 December 2021, the offering will no longer be available.
+### Personality Insights deprecation
+IBM Watson™ Personality Insights is discontinued. For a period of one year from 1 December 2020, you will still be able to use Watson Personality Insights. However, as of 1 December 2021, the offering will no longer be available.
 
 As an alternative, we encourage you to consider migrating to IBM Watson™ [Natural Language Understanding](https://cloud.ibm.com/docs/natural-language-understanding), a service on IBM Cloud® that uses deep learning to extract data and insights from text such as keywords, categories, sentiment, emotion, and syntax to provide insights for your business or industry. For more information, see About Natural Language Understanding.
 
+### Visual Recognition deprecation
+IBM Watson™ Visual Recognition is discontinued. Existing instances are supported until 1 December 2021, but as of 7 January 2021, you can't create instances. Any instance that is provisioned on 1 December 2021 will be deleted.
+
 ## Before you begin
 * You need an [IBM Cloud][ibm-cloud-onboarding] account.
 

discovery/src/test/java/com/ibm/watson/discovery/v1/DiscoveryServiceIT.java

@@ -216,7 +216,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;
@@ -381,7 +381,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.watson.cloud.ibm.com/discovery-foo");
     ping();
   }
 

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
     }
   ]
-}
+}

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
     } ]
   } ]
-}
+}

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"
-}
+}

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"
     }
   ]
-}
+}

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>");

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": [{