diff --git a/README.md b/README.md index f91a1c0f58a..d44c497601f 100644 --- a/README.md +++ b/README.md @@ -53,11 +53,14 @@ Java client library to use the [Watson APIs][wdc]. ## 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 index 0ef3f7db98d..cc75f65174d 100644 --- 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 index d1e6a22baef..180f6e5e038 100644 --- 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 index 05c9ac02518..3d68123e0ad 100644 --- 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 index 2c22a2df327..94cf7454f67 100644 --- 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 index b919ff60a2a..6674a17020d 100644 --- 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() { @@ -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() { 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 index 500c707415a..625d14de78b 100644 --- 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() { 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 index ac1cf194d54..8bce37c31d6 100644 --- 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() { 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 index ea3c6837947..3039fd0f27b 100644 --- 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() { @@ -250,7 +250,7 @@ public void testMessageOptions() throws Throwable { .skills( new java.util.HashMap() { { - 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 index 8d194d6f3dd..e2919f1d8a3 100644 --- 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() { 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 index 1048b64bd3e..7a04624de0d 100644 --- 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() { 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 index 3fab8ceb653..b1dd36beb43 100644 --- 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 index a45684dbc47..a635373dd1e 100644 --- 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 index 6e85f44dc62..c5844eb725f 100644 --- 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 index 0ef3f7db98d..cc75f65174d 100644 --- 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 index a55c840a50d..8699f52f2d9 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 @@ -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 index 9da4aa5265c..154d47086ae 100644 --- 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 index 8d842e81ad3..be6433205a7 100644 --- 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 index 716cfadd636..d491333a631 100644 --- 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 index 2cb9c929d72..2903bebcd82 100644 --- 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 index 7d3f66903e5..f7676e591ef 100644 --- 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 index 718cba82ef2..fec70e263ce 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 @@ -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("", "The IBM Watson Personality Insights service enables applications to derive insights from + * social media, enterprise data, or other digital communications. The service uses linguistic * analytics to infer individuals' intrinsic personality characteristics, including Big Five, Needs, * and Values, from digital communications such as email, text messages, tweets, and forum posts. * @@ -53,6 +64,14 @@ * @version v3 * @see Personality Insights */ + +/** + * @deprecated On 1 December 2021, Personality Insights will no longer be available. Consider + * migrating to Watson Natural Language Understanding. For more information, see Personality + * Insights Deprecation + * (https://github.com/watson-developer-cloud/java-sdk/tree/master#personality-insights-deprecation). + */ +@Deprecated public class PersonalityInsights extends BaseService { public static final String DEFAULT_SERVICE_NAME = "personality_insights"; diff --git a/personality-insights/src/test/java/com/ibm/watson/personality_insights/v3/utils/TestUtilities.java b/personality-insights/src/test/java/com/ibm/watson/personality_insights/v3/utils/TestUtilities.java index 11f74b2adf3..885debb0bc2 100644 --- a/personality-insights/src/test/java/com/ibm/watson/personality_insights/v3/utils/TestUtilities.java +++ b/personality-insights/src/test/java/com/ibm/watson/personality_insights/v3/utils/TestUtilities.java @@ -13,10 +13,10 @@ package com.ibm.watson.personality_insights.v3.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/speech-to-text/README.md b/speech-to-text/README.md index b667ef97b31..15a187c310c 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(""); diff --git a/speech-to-text/build.gradle b/speech-to-text/build.gradle index 8d842e81ad3..be6433205a7 100644 --- a/speech-to-text/build.gradle +++ b/speech-to-text/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/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/SpeechToText.java b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/SpeechToText.java index 6c657068dd7..d743bb311e7 100644 --- a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/SpeechToText.java +++ b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/SpeechToText.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.speech_to_text.v1; diff --git a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/CreateAcousticModelOptions.java b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/CreateAcousticModelOptions.java index 562fef0d0cb..b02531a0d52 100644 --- a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/CreateAcousticModelOptions.java +++ b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/CreateAcousticModelOptions.java @@ -70,6 +70,10 @@ public interface BaseModelName { String ES_PE_BROADBANDMODEL = "es-PE_BroadbandModel"; /** es-PE_NarrowbandModel. */ String ES_PE_NARROWBANDMODEL = "es-PE_NarrowbandModel"; + /** fr-CA_BroadbandModel. */ + String FR_CA_BROADBANDMODEL = "fr-CA_BroadbandModel"; + /** fr-CA_NarrowbandModel. */ + String FR_CA_NARROWBANDMODEL = "fr-CA_NarrowbandModel"; /** fr-FR_BroadbandModel. */ String FR_FR_BROADBANDMODEL = "fr-FR_BroadbandModel"; /** fr-FR_NarrowbandModel. */ diff --git a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/CreateLanguageModelOptions.java b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/CreateLanguageModelOptions.java index 6b1ab461cc6..5897cef37c6 100644 --- a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/CreateLanguageModelOptions.java +++ b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/CreateLanguageModelOptions.java @@ -69,6 +69,10 @@ public interface BaseModelName { String ES_PE_BROADBANDMODEL = "es-PE_BroadbandModel"; /** es-PE_NarrowbandModel. */ String ES_PE_NARROWBANDMODEL = "es-PE_NarrowbandModel"; + /** fr-CA_BroadbandModel. */ + String FR_CA_BROADBANDMODEL = "fr-CA_BroadbandModel"; + /** fr-CA_NarrowbandModel. */ + String FR_CA_NARROWBANDMODEL = "fr-CA_NarrowbandModel"; /** fr-FR_BroadbandModel. */ String FR_FR_BROADBANDMODEL = "fr-FR_BroadbandModel"; /** fr-FR_NarrowbandModel. */ diff --git a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/ListAcousticModelsOptions.java b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/ListAcousticModelsOptions.java index 3bce601a52a..dcfeef25b7b 100644 --- a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/ListAcousticModelsOptions.java +++ b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/ListAcousticModelsOptions.java @@ -48,6 +48,8 @@ public interface Language { String ES_MX = "es-MX"; /** es-PE. */ String ES_PE = "es-PE"; + /** fr-CA. */ + String FR_CA = "fr-CA"; /** fr-FR. */ String FR_FR = "fr-FR"; /** it-IT. */ diff --git a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/ListLanguageModelsOptions.java b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/ListLanguageModelsOptions.java index 041cf0e13b4..99ff9e2a084 100644 --- a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/ListLanguageModelsOptions.java +++ b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/ListLanguageModelsOptions.java @@ -48,6 +48,8 @@ public interface Language { String ES_MX = "es-MX"; /** es-PE. */ String ES_PE = "es-PE"; + /** fr-CA. */ + String FR_CA = "fr-CA"; /** fr-FR. */ String FR_FR = "fr-FR"; /** it-IT. */ diff --git a/speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/utils/TestUtilities.java b/speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/utils/TestUtilities.java index b89353cf1b2..5074c91f25e 100644 --- a/speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/utils/TestUtilities.java +++ b/speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/utils/TestUtilities.java @@ -13,10 +13,10 @@ package com.ibm.watson.speech_to_text.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/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": [{ diff --git a/text-to-speech/build.gradle b/text-to-speech/build.gradle index e121e45eb92..75f8ce03715 100644 --- a/text-to-speech/build.gradle +++ b/text-to-speech/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/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/TextToSpeech.java b/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/TextToSpeech.java index ee7ef4595d6..c1874b451b0 100644 --- a/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/TextToSpeech.java +++ b/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/TextToSpeech.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.text_to_speech.v1; diff --git a/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/CreateCustomModelOptions.java b/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/CreateCustomModelOptions.java index d5449770491..a7c4f352959 100644 --- a/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/CreateCustomModelOptions.java +++ b/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/CreateCustomModelOptions.java @@ -23,8 +23,6 @@ public class CreateCustomModelOptions extends GenericModel { * specified language. Omit the parameter to use the the default language, `en-US`. */ public interface Language { - /** ar-AR. */ - String AR_AR = "ar-AR"; /** de-DE. */ String DE_DE = "de-DE"; /** en-GB. */ diff --git a/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/ListCustomModelsOptions.java b/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/ListCustomModelsOptions.java index 691abca354d..f82d9bb75b1 100644 --- a/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/ListCustomModelsOptions.java +++ b/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/ListCustomModelsOptions.java @@ -22,8 +22,6 @@ public class ListCustomModelsOptions extends GenericModel { * returned. Omit the parameter to see all custom models that are owned by the requester. */ public interface Language { - /** ar-AR. */ - String AR_AR = "ar-AR"; /** de-DE. */ String DE_DE = "de-DE"; /** en-GB. */ 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 index fb0ed711d56..00385ef9d7d 100644 --- 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 @@ -312,7 +312,7 @@ public void testCreateCustomModelWOptions() throws Throwable { CreateCustomModelOptions createCustomModelOptionsModel = new CreateCustomModelOptions.Builder() .name("testString") - .language("ar-AR") + .language("de-DE") .description("testString") .build(); @@ -366,7 +366,7 @@ public void testListCustomModelsWOptions() throws Throwable { // Construct an instance of the ListCustomModelsOptions model ListCustomModelsOptions listCustomModelsOptionsModel = - new ListCustomModelsOptions.Builder().language("ar-AR").build(); + new ListCustomModelsOptions.Builder().language("de-DE").build(); // Invoke operation with valid options model (positive test) Response response = @@ -384,7 +384,7 @@ public void testListCustomModelsWOptions() throws Throwable { Map query = TestUtilities.parseQueryString(request); assertNotNull(query); // Get query params - assertEquals(query.get("language"), "ar-AR"); + assertEquals(query.get("language"), "de-DE"); // Check request path String parsedPath = TestUtilities.parseReqPath(request); assertEquals(parsedPath, listCustomModelsPath); diff --git a/text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/model/CreateCustomModelOptionsTest.java b/text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/model/CreateCustomModelOptionsTest.java index 2dde8269943..c7cf5093172 100644 --- a/text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/model/CreateCustomModelOptionsTest.java +++ b/text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/model/CreateCustomModelOptionsTest.java @@ -33,11 +33,11 @@ public void testCreateCustomModelOptions() throws Throwable { CreateCustomModelOptions createCustomModelOptionsModel = new CreateCustomModelOptions.Builder() .name("testString") - .language("ar-AR") + .language("de-DE") .description("testString") .build(); assertEquals(createCustomModelOptionsModel.name(), "testString"); - assertEquals(createCustomModelOptionsModel.language(), "ar-AR"); + assertEquals(createCustomModelOptionsModel.language(), "de-DE"); assertEquals(createCustomModelOptionsModel.description(), "testString"); } diff --git a/text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/model/ListCustomModelsOptionsTest.java b/text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/model/ListCustomModelsOptionsTest.java index 86cb4c74df6..914161b68c8 100644 --- a/text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/model/ListCustomModelsOptionsTest.java +++ b/text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/model/ListCustomModelsOptionsTest.java @@ -31,7 +31,7 @@ public class ListCustomModelsOptionsTest { @Test public void testListCustomModelsOptions() throws Throwable { ListCustomModelsOptions listCustomModelsOptionsModel = - new ListCustomModelsOptions.Builder().language("ar-AR").build(); - assertEquals(listCustomModelsOptionsModel.language(), "ar-AR"); + new ListCustomModelsOptions.Builder().language("de-DE").build(); + assertEquals(listCustomModelsOptionsModel.language(), "de-DE"); } } diff --git a/text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/utils/TestUtilities.java b/text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/utils/TestUtilities.java index af82875e077..22c7e5c65a0 100644 --- a/text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/utils/TestUtilities.java +++ b/text-to-speech/src/test/java/com/ibm/watson/text_to_speech/v1/utils/TestUtilities.java @@ -13,10 +13,10 @@ package com.ibm.watson.text_to_speech.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/tone-analyzer/build.gradle b/tone-analyzer/build.gradle index e121e45eb92..75f8ce03715 100644 --- a/tone-analyzer/build.gradle +++ b/tone-analyzer/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/tone-analyzer/src/main/java/com/ibm/watson/tone_analyzer/v3/ToneAnalyzer.java b/tone-analyzer/src/main/java/com/ibm/watson/tone_analyzer/v3/ToneAnalyzer.java index db46e404703..7c4de58e9d7 100644 --- a/tone-analyzer/src/main/java/com/ibm/watson/tone_analyzer/v3/ToneAnalyzer.java +++ b/tone-analyzer/src/main/java/com/ibm/watson/tone_analyzer/v3/ToneAnalyzer.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.tone_analyzer.v3; diff --git a/tone-analyzer/src/test/java/com/ibm/watson/tone_analyzer/v3/utils/TestUtilities.java b/tone-analyzer/src/test/java/com/ibm/watson/tone_analyzer/v3/utils/TestUtilities.java index 13f7cd83c51..81930890ee5 100644 --- a/tone-analyzer/src/test/java/com/ibm/watson/tone_analyzer/v3/utils/TestUtilities.java +++ b/tone-analyzer/src/test/java/com/ibm/watson/tone_analyzer/v3/utils/TestUtilities.java @@ -13,10 +13,10 @@ package com.ibm.watson.tone_analyzer.v3.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/visual-recognition/build.gradle b/visual-recognition/build.gradle index 8d842e81ad3..be6433205a7 100644 --- a/visual-recognition/build.gradle +++ b/visual-recognition/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/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v3/VisualRecognition.java b/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v3/VisualRecognition.java index abb031629f5..dae769d324d 100644 --- a/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v3/VisualRecognition.java +++ b/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v3/VisualRecognition.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.visual_recognition.v3; @@ -44,13 +44,24 @@ import okhttp3.MultipartBody; /** - * The IBM Watson™ Visual Recognition service uses deep learning algorithms to identify - * scenes and objects in images that you upload to the service. You can create and train a custom - * classifier to identify subjects that suit your needs. + * 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. {: deprecated} + * + *

The IBM Watson Visual Recognition service uses deep learning algorithms to identify scenes and + * objects in images that you upload to the service. You can create and train a custom classifier to + * identify subjects that suit your needs. * * @version v3 * @see Visual Recognition */ + +/** + * @deprecated On 1 December 2021, Visual Recognition will no longer be available. For more + * information, see Visual Recognition Deprecation + * (https://github.com/watson-developer-cloud/java-sdk/tree/master#visual-recognition-deprecation). + */ +@Deprecated public class VisualRecognition extends BaseService { public static final String DEFAULT_SERVICE_NAME = "visual_recognition"; @@ -112,6 +123,10 @@ public VisualRecognition(String version, String serviceName, Authenticator authe setServiceUrl(DEFAULT_SERVICE_URL); setVersion(version); this.configureService(serviceName); + + System.err.println( + "On 1 December 2021, Visual Recognition will no longer be available. For more information, see Visual\n" + + "Recognition Deprecation (https://github.com/watson-developer-cloud/java-sdk/tree/master#visual-recognition-deprecation)."); } /** diff --git a/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/VisualRecognition.java b/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/VisualRecognition.java index 72292cfb841..b0ca0c13b23 100644 --- a/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/VisualRecognition.java +++ b/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/VisualRecognition.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.visual_recognition.v4; @@ -67,14 +67,25 @@ import okhttp3.MultipartBody; /** - * Provide images to the IBM Watson™ Visual Recognition service for analysis. The service - * detects objects based on a set of images with training data. + * 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. {: deprecated} + * + *

Provide images to the IBM Watson Visual Recognition service for analysis. The service detects + * objects based on a set of images with training data. * * @version v4 * @see Visual * Recognition */ + +/** + * @deprecated On 1 December 2021, Visual Recognition will no longer be available. For more + * information, see Visual Recognition Deprecation + * (https://github.com/watson-developer-cloud/java-sdk/tree/master#visual-recognition-deprecation). + */ +@Deprecated public class VisualRecognition extends BaseService { public static final String DEFAULT_SERVICE_NAME = "visual_recognition"; @@ -136,6 +147,10 @@ public VisualRecognition(String version, String serviceName, Authenticator authe setServiceUrl(DEFAULT_SERVICE_URL); setVersion(version); this.configureService(serviceName); + + System.err.println( + "On 1 December 2021, Visual Recognition will no longer be available. For more information, see Visual\n" + + "Recognition Deprecation (https://github.com/watson-developer-cloud/java-sdk/tree/master#visual-recognition-deprecation)."); } /** diff --git a/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v3/utils/TestUtilities.java b/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v3/utils/TestUtilities.java index bf33eb9be8e..108c9470612 100644 --- a/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v3/utils/TestUtilities.java +++ b/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v3/utils/TestUtilities.java @@ -13,10 +13,10 @@ package com.ibm.watson.visual_recognition.v3.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/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v4/VisualRecognitionTest.java b/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v4/VisualRecognitionTest.java index b5fad1875d2..e87c98ee953 100644 --- a/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v4/VisualRecognitionTest.java +++ b/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v4/VisualRecognitionTest.java @@ -44,12 +44,10 @@ import com.ibm.watson.visual_recognition.v4.model.Location; import com.ibm.watson.visual_recognition.v4.model.ObjectMetadata; import com.ibm.watson.visual_recognition.v4.model.ObjectMetadataList; -import com.ibm.watson.visual_recognition.v4.model.ObjectTrainingStatus; import com.ibm.watson.visual_recognition.v4.model.TrainOptions; import com.ibm.watson.visual_recognition.v4.model.TrainingDataObject; import com.ibm.watson.visual_recognition.v4.model.TrainingDataObjects; import com.ibm.watson.visual_recognition.v4.model.TrainingEvents; -import com.ibm.watson.visual_recognition.v4.model.TrainingStatus; import com.ibm.watson.visual_recognition.v4.model.UpdateCollectionOptions; import com.ibm.watson.visual_recognition.v4.model.UpdateObjectMetadata; import com.ibm.watson.visual_recognition.v4.model.UpdateObjectMetadataOptions; @@ -180,10 +178,7 @@ public void testCreateCollectionWOptions() throws Throwable { // Construct an instance of the CreateCollectionOptions model CreateCollectionOptions createCollectionOptionsModel = - new CreateCollectionOptions.Builder() - .name("testString") - .description("testString") - .build(); + new CreateCollectionOptions.Builder().name("testString").description("testString").build(); // Invoke operation with valid options model (positive test) Response response = diff --git a/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v4/model/CreateCollectionOptionsTest.java b/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v4/model/CreateCollectionOptionsTest.java index b107b955108..c2f83ea28bf 100644 --- a/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v4/model/CreateCollectionOptionsTest.java +++ b/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v4/model/CreateCollectionOptionsTest.java @@ -51,10 +51,7 @@ public void testCreateCollectionOptions() throws Throwable { assertEquals(trainingStatusModel.objects(), objectTrainingStatusModel); CreateCollectionOptions createCollectionOptionsModel = - new CreateCollectionOptions.Builder() - .name("testString") - .description("testString") - .build(); + new CreateCollectionOptions.Builder().name("testString").description("testString").build(); assertEquals(createCollectionOptionsModel.name(), "testString"); assertEquals(createCollectionOptionsModel.description(), "testString"); assertEquals(createCollectionOptionsModel.trainingStatus(), trainingStatusModel); diff --git a/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v4/utils/TestUtilities.java b/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v4/utils/TestUtilities.java index 17f0fe29a68..5762fbe493b 100644 --- a/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v4/utils/TestUtilities.java +++ b/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v4/utils/TestUtilities.java @@ -13,10 +13,10 @@ package com.ibm.watson.visual_recognition.v4.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); } }