watson-developer-cloud · kevinkowa · Dec 3, 2020 · Nov 9, 2020 · Nov 17, 2020 · Nov 18, 2020
diff --git a/README.md b/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.
 

diff --git a/assistant/build.gradle b/assistant/build.gradle
@@ -61,7 +61,7 @@ checkstyle {
 dependencies {
     compile project(':common')
     testCompile project(':common').sourceSets.test.output
-    compile 'com.ibm.cloud:sdk-core:9.5.0'
+    compile 'com.ibm.cloud:sdk-core:9.5.4'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
 }
 

diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v1/Assistant.java b/assistant/src/main/java/com/ibm/watson/assistant/v1/Assistant.java
@@ -12,7 +12,7 @@
  */
 
 /*
- * IBM OpenAPI SDK Code Generator Version: 99-SNAPSHOT-7cc05500-20201106-154555
+ * IBM OpenAPI SDK Code Generator Version: 99-SNAPSHOT-be3b4618-20201201-123423
  */
 
 package com.ibm.watson.assistant.v1;

diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v2/Assistant.java b/assistant/src/main/java/com/ibm/watson/assistant/v2/Assistant.java
@@ -12,7 +12,7 @@
  */
 
 /*
- * IBM OpenAPI SDK Code Generator Version: 99-SNAPSHOT-7cc05500-20201106-154555
+ * IBM OpenAPI SDK Code Generator Version: 99-SNAPSHOT-be3b4618-20201201-123423
  */
 
 package com.ibm.watson.assistant.v2;

diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v1/utils/TestUtilities.java b/assistant/src/test/java/com/ibm/watson/assistant/v1/utils/TestUtilities.java
@@ -13,10 +13,10 @@
 package com.ibm.watson.assistant.v1.utils;
 
 import com.ibm.cloud.sdk.core.service.model.FileWithMetadata;
+import com.ibm.cloud.sdk.core.util.DateUtils;
 import com.ibm.cloud.sdk.core.util.GsonSingleton;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -119,10 +119,10 @@ public static byte[] createMockByteArray(String bytes) {
   }
 
   public static Date createMockDate(String date) throws Exception {
-    return new SimpleDateFormat("yyyy-MM-dd").parse(date);
+    return DateUtils.parseAsDate(date);
   }
 
   public static Date createMockDateTime(String date) throws Exception {
-    return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").parse(date);
+    return DateUtils.parseAsDateTime(date);
   }
 }
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
@@ -343,7 +343,7 @@ public void testMessageWOptions() throws Throwable {
             .build();
 
     // Construct an instance of the MessageContextSkill model
-    final MessageContextSkill messageContextSkillModel =
+    MessageContextSkill messageContextSkillModel =
         new MessageContextSkill.Builder()
             .userDefined(
                 new java.util.HashMap<String, Object>() {
@@ -549,7 +549,7 @@ public void testMessageStatelessWOptions() throws Throwable {
             .build();
 
     // Construct an instance of the MessageContextSkill model
-    final MessageContextSkill messageContextSkillModel =
+    MessageContextSkill messageContextSkillModel =
         new MessageContextSkill.Builder()
             .userDefined(
                 new java.util.HashMap<String, Object>() {

diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageContextStatelessTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageContextStatelessTest.java
@@ -60,7 +60,7 @@ public void testMessageContextStateless() throws Throwable {
     assertEquals(messageContextSkillSystemModel.getState(), "testString");
     assertEquals(messageContextSkillSystemModel.get("foo"), "testString");
 
-    final MessageContextSkill messageContextSkillModel =
+    MessageContextSkill messageContextSkillModel =
         new MessageContextSkill.Builder()
             .userDefined(
                 new java.util.HashMap<String, Object>() {

diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageContextTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageContextTest.java
@@ -56,7 +56,7 @@ public void testMessageContext() throws Throwable {
     assertEquals(messageContextSkillSystemModel.getState(), "testString");
     assertEquals(messageContextSkillSystemModel.get("foo"), "testString");
 
-    final MessageContextSkill messageContextSkillModel =
+    MessageContextSkill messageContextSkillModel =
         new MessageContextSkill.Builder()
             .userDefined(
                 new java.util.HashMap<String, Object>() {

diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageOptionsTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageOptionsTest.java
@@ -225,7 +225,7 @@ public void testMessageOptions() throws Throwable {
     assertEquals(messageContextSkillSystemModel.getState(), "testString");
     assertEquals(messageContextSkillSystemModel.get("foo"), "testString");
 
-    final MessageContextSkill messageContextSkillModel =
+    MessageContextSkill messageContextSkillModel =
         new MessageContextSkill.Builder()
             .userDefined(
                 new java.util.HashMap<String, Object>() {
@@ -250,7 +250,7 @@ public void testMessageOptions() throws Throwable {
             .skills(
                 new java.util.HashMap<String, MessageContextSkill>() {
                   {
-                            put("foo", messageContextSkillModel);
+                    put("foo", messageContextSkillModel);
                   }
                 })
             .build();

diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageRequestTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageRequestTest.java
@@ -225,7 +225,7 @@ public void testMessageRequest() throws Throwable {
     assertEquals(messageContextSkillSystemModel.getState(), "testString");
     assertEquals(messageContextSkillSystemModel.get("foo"), "testString");
 
-    final MessageContextSkill messageContextSkillModel =
+    MessageContextSkill messageContextSkillModel =
         new MessageContextSkill.Builder()
             .userDefined(
                 new java.util.HashMap<String, Object>() {

diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageStatelessOptionsTest.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageStatelessOptionsTest.java
@@ -225,7 +225,7 @@ public void testMessageStatelessOptions() throws Throwable {
     assertEquals(messageContextSkillSystemModel.getState(), "testString");
     assertEquals(messageContextSkillSystemModel.get("foo"), "testString");
 
-    final MessageContextSkill messageContextSkillModel =
+    MessageContextSkill messageContextSkillModel =
         new MessageContextSkill.Builder()
             .userDefined(
                 new java.util.HashMap<String, Object>() {

diff --git a/assistant/src/test/java/com/ibm/watson/assistant/v2/utils/TestUtilities.java b/assistant/src/test/java/com/ibm/watson/assistant/v2/utils/TestUtilities.java
@@ -13,10 +13,10 @@
 package com.ibm.watson.assistant.v2.utils;
 
 import com.ibm.cloud.sdk.core.service.model.FileWithMetadata;
+import com.ibm.cloud.sdk.core.util.DateUtils;
 import com.ibm.cloud.sdk.core.util.GsonSingleton;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -119,10 +119,10 @@ public static byte[] createMockByteArray(String bytes) {
   }
 
   public static Date createMockDate(String date) throws Exception {
-    return new SimpleDateFormat("yyyy-MM-dd").parse(date);
+    return DateUtils.parseAsDate(date);
   }
 
   public static Date createMockDateTime(String date) throws Exception {
-    return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").parse(date);
+    return DateUtils.parseAsDateTime(date);
   }
 }
diff --git a/build.gradle b/build.gradle
@@ -63,8 +63,8 @@ allprojects {
   apply plugin: 'jacoco'
   apply plugin: 'com.github.johnrengelman.shadow'
 
-  sourceCompatibility = JavaVersion.VERSION_1_7
-  targetCompatibility = JavaVersion.VERSION_1_7
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
 
   repositories {
     maven { url "https://repo.maven.apache.org/maven2" }

diff --git a/common/build.gradle b/common/build.gradle
@@ -59,7 +59,7 @@ checkstyle {
 }
 
 dependencies {
-    compile 'com.ibm.cloud:sdk-core:9.5.0'
+    compile 'com.ibm.cloud:sdk-core:9.5.4'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
 }
 

diff --git a/compare-comply/build.gradle b/compare-comply/build.gradle
@@ -61,7 +61,7 @@ checkstyle {
 dependencies {
     compile project(':common')
     testCompile project(':common').sourceSets.test.output
-    compile 'com.ibm.cloud:sdk-core:9.5.0'
+    compile 'com.ibm.cloud:sdk-core:9.5.4'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
 }
 

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
@@ -12,7 +12,7 @@
  */
 
 /*
- * IBM OpenAPI SDK Code Generator Version: 99-SNAPSHOT-7cc05500-20201106-154555
+ * IBM OpenAPI SDK Code Generator Version: 99-SNAPSHOT-be3b4618-20201201-123423
  */
 
 package com.ibm.watson.compare_comply.v1;

diff --git a/compare-comply/src/test/java/com/ibm/watson/compare_comply/v1/utils/TestUtilities.java b/compare-comply/src/test/java/com/ibm/watson/compare_comply/v1/utils/TestUtilities.java
@@ -13,10 +13,10 @@
 package com.ibm.watson.compare_comply.v1.utils;
 
 import com.ibm.cloud.sdk.core.service.model.FileWithMetadata;
+import com.ibm.cloud.sdk.core.util.DateUtils;
 import com.ibm.cloud.sdk.core.util.GsonSingleton;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -119,10 +119,10 @@ public static byte[] createMockByteArray(String bytes) {
   }
 
   public static Date createMockDate(String date) throws Exception {
-    return new SimpleDateFormat("yyyy-MM-dd").parse(date);
+    return DateUtils.parseAsDate(date);
   }
 
   public static Date createMockDateTime(String date) throws Exception {
-    return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").parse(date);
+    return DateUtils.parseAsDateTime(date);
   }
 }
diff --git a/discovery/build.gradle b/discovery/build.gradle
@@ -65,7 +65,7 @@ checkstyle {
 dependencies {
     compile project(':common')
     testCompile project(':common').sourceSets.test.output
-    compile 'com.ibm.cloud:sdk-core:9.5.0'
+    compile 'com.ibm.cloud:sdk-core:9.5.4'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
 }
 

diff --git a/discovery/src/main/java/com/ibm/watson/discovery/v1/Discovery.java b/discovery/src/main/java/com/ibm/watson/discovery/v1/Discovery.java
@@ -12,7 +12,7 @@
  */
 
 /*
- * IBM OpenAPI SDK Code Generator Version: 99-SNAPSHOT-7cc05500-20201106-154555
+ * IBM OpenAPI SDK Code Generator Version: 99-SNAPSHOT-be3b4618-20201201-123423
  */
 
 package com.ibm.watson.discovery.v1;

diff --git a/discovery/src/main/java/com/ibm/watson/discovery/v1/model/SearchStatus.java b/discovery/src/main/java/com/ibm/watson/discovery/v1/model/SearchStatus.java
@@ -12,8 +12,10 @@
  */
 package com.ibm.watson.discovery.v1.model;
 
+import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.ibm.cloud.sdk.core.service.model.GenericModel;
+import com.ibm.cloud.sdk.core.util.DateTypeAdapter;
 import java.util.Date;
 
 /** Information about the Continuous Relevancy Training for this environment. */
@@ -39,6 +41,7 @@ public interface Status {
   @SerializedName("status_description")
   protected String statusDescription;
 
+  @JsonAdapter(DateTypeAdapter.class)
   @SerializedName("last_trained")
   protected Date lastTrained;
 

diff --git a/discovery/src/main/java/com/ibm/watson/discovery/v2/Discovery.java b/discovery/src/main/java/com/ibm/watson/discovery/v2/Discovery.java
@@ -12,7 +12,7 @@
  */
 
 /*
- * IBM OpenAPI SDK Code Generator Version: 99-SNAPSHOT-7cc05500-20201106-154555
+ * IBM OpenAPI SDK Code Generator Version: 99-SNAPSHOT-be3b4618-20201201-123423
  */
 
 package com.ibm.watson.discovery.v2;

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
@@ -52,7 +52,6 @@
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
-import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assume;
 import org.junit.Before;
@@ -154,7 +153,6 @@ public void setup() throws Exception {
   }
 
   /** Cleanup. */
-  @After
   public void cleanup() {
     for (String collectionId : collectionIds) {
       DeleteCollectionOptions deleteOptions =
@@ -178,6 +176,29 @@ public void cleanup() {
             "deleteConfiguration failed. Configuration " + configurationId + " not found");
       }
     }
+
+    ListCollectionsOptions listCollectionsOptions =
+        new ListCollectionsOptions.Builder().environmentId(environmentId).build();
+    ListCollectionsResponse response =
+        discovery.listCollections(listCollectionsOptions).execute().getResult();
+    for (Collection collection : response.getCollections()) {
+      if (collection.getName().matches("java-sdk-.*collection")
+          || collection.getName().matches("my_watson_developer_cloud_collection.*")
+          || collection.getName().matches("tokenization-dict-testing-collection.*")) {
+        DeleteCollectionOptions deleteCollectionOptions =
+            new DeleteCollectionOptions.Builder()
+                .collectionId(collection.getCollectionId())
+                .environmentId(environmentId)
+                .build();
+        try {
+          DeleteCollectionResponse deleteCollectionResponse =
+              discovery.deleteCollection(deleteCollectionOptions).execute().getResult();
+        } catch (NotFoundException ex) {
+          System.out.println("deleteCollection failed. Collection " + collectionId + " not found");
+        }
+      }
+    }
+    collectionId = null;
   }
 
   /**
@@ -196,7 +217,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;
@@ -361,7 +382,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();
   }
 

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
@@ -142,12 +142,10 @@
 import java.util.List;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.RecordedRequest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.*;
 
 /** Unit tests for {@link Discovery}. */
+@Ignore
 public class DiscoveryServiceTest extends WatsonServiceUnitTest {
   private Discovery discoveryService;
 

diff --git a/discovery/src/test/java/com/ibm/watson/discovery/v1/utils/TestUtilities.java b/discovery/src/test/java/com/ibm/watson/discovery/v1/utils/TestUtilities.java
@@ -13,10 +13,10 @@
 package com.ibm.watson.discovery.v1.utils;
 
 import com.ibm.cloud.sdk.core.service.model.FileWithMetadata;
+import com.ibm.cloud.sdk.core.util.DateUtils;
 import com.ibm.cloud.sdk.core.util.GsonSingleton;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -119,10 +119,10 @@ public static byte[] createMockByteArray(String bytes) {
   }
 
   public static Date createMockDate(String date) throws Exception {
-    return new SimpleDateFormat("yyyy-MM-dd").parse(date);
+    return DateUtils.parseAsDate(date);
   }
 
   public static Date createMockDateTime(String date) throws Exception {
-    return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").parse(date);
+    return DateUtils.parseAsDateTime(date);
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ @@
      */
     /*
-     * IBM OpenAPI SDK Code Generator Version: 99-SNAPSHOT-7cc05500-20201106-154555
+     * IBM OpenAPI SDK Code Generator Version: 99-SNAPSHOT-be3b4618-20201201-123423
      */
     package com.ibm.watson.assistant.v1;
@@ Expand Down @@