Skip to content

Commit 2218ced

Browse files
authored
Merge pull request #1143 from watson-developer-cloud/sdk-major-release-2020
Sdk major release 2020
2 parents 22b4473 + 3c58ef9 commit 2218ced

File tree

68 files changed

+201
-127
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+201
-127
lines changed

README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,14 @@ Java client library to use the [Watson APIs][wdc].
5353
</details>
5454

5555
## ANNOUNCEMENTS!
56-
### Personality Insights Deprecation
57-
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.
56+
### Personality Insights deprecation
57+
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.
5858

5959
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.
6060

61+
### Visual Recognition deprecation
62+
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.
63+
6164
## Before you begin
6265
* You need an [IBM Cloud][ibm-cloud-onboarding] account.
6366

assistant/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ checkstyle {
6161
dependencies {
6262
compile project(':common')
6363
testCompile project(':common').sourceSets.test.output
64-
compile 'com.ibm.cloud:sdk-core:9.5.0'
64+
compile 'com.ibm.cloud:sdk-core:9.5.4'
6565
signature 'org.codehaus.mojo.signature:java17:1.0@signature'
6666
}
6767

assistant/src/main/java/com/ibm/watson/assistant/v1/Assistant.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313

1414
/*
15-
* IBM OpenAPI SDK Code Generator Version: 99-SNAPSHOT-7cc05500-20201106-154555
15+
* IBM OpenAPI SDK Code Generator Version: 99-SNAPSHOT-be3b4618-20201201-123423
1616
*/
1717

1818
package com.ibm.watson.assistant.v1;

assistant/src/main/java/com/ibm/watson/assistant/v2/Assistant.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313

1414
/*
15-
* IBM OpenAPI SDK Code Generator Version: 99-SNAPSHOT-7cc05500-20201106-154555
15+
* IBM OpenAPI SDK Code Generator Version: 99-SNAPSHOT-be3b4618-20201201-123423
1616
*/
1717

1818
package com.ibm.watson.assistant.v2;

assistant/src/test/java/com/ibm/watson/assistant/v1/utils/TestUtilities.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
package com.ibm.watson.assistant.v1.utils;
1414

1515
import com.ibm.cloud.sdk.core.service.model.FileWithMetadata;
16+
import com.ibm.cloud.sdk.core.util.DateUtils;
1617
import com.ibm.cloud.sdk.core.util.GsonSingleton;
1718
import java.io.ByteArrayInputStream;
1819
import java.io.InputStream;
19-
import java.text.SimpleDateFormat;
2020
import java.util.ArrayList;
2121
import java.util.Date;
2222
import java.util.HashMap;
@@ -119,10 +119,10 @@ public static byte[] createMockByteArray(String bytes) {
119119
}
120120

121121
public static Date createMockDate(String date) throws Exception {
122-
return new SimpleDateFormat("yyyy-MM-dd").parse(date);
122+
return DateUtils.parseAsDate(date);
123123
}
124124

125125
public static Date createMockDateTime(String date) throws Exception {
126-
return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").parse(date);
126+
return DateUtils.parseAsDateTime(date);
127127
}
128128
}

assistant/src/test/java/com/ibm/watson/assistant/v2/AssistantTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ public void testMessageWOptions() throws Throwable {
343343
.build();
344344

345345
// Construct an instance of the MessageContextSkill model
346-
final MessageContextSkill messageContextSkillModel =
346+
MessageContextSkill messageContextSkillModel =
347347
new MessageContextSkill.Builder()
348348
.userDefined(
349349
new java.util.HashMap<String, Object>() {
@@ -549,7 +549,7 @@ public void testMessageStatelessWOptions() throws Throwable {
549549
.build();
550550

551551
// Construct an instance of the MessageContextSkill model
552-
final MessageContextSkill messageContextSkillModel =
552+
MessageContextSkill messageContextSkillModel =
553553
new MessageContextSkill.Builder()
554554
.userDefined(
555555
new java.util.HashMap<String, Object>() {

assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageContextStatelessTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void testMessageContextStateless() throws Throwable {
6060
assertEquals(messageContextSkillSystemModel.getState(), "testString");
6161
assertEquals(messageContextSkillSystemModel.get("foo"), "testString");
6262

63-
final MessageContextSkill messageContextSkillModel =
63+
MessageContextSkill messageContextSkillModel =
6464
new MessageContextSkill.Builder()
6565
.userDefined(
6666
new java.util.HashMap<String, Object>() {

assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageContextTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void testMessageContext() throws Throwable {
5656
assertEquals(messageContextSkillSystemModel.getState(), "testString");
5757
assertEquals(messageContextSkillSystemModel.get("foo"), "testString");
5858

59-
final MessageContextSkill messageContextSkillModel =
59+
MessageContextSkill messageContextSkillModel =
6060
new MessageContextSkill.Builder()
6161
.userDefined(
6262
new java.util.HashMap<String, Object>() {

assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageOptionsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ public void testMessageOptions() throws Throwable {
225225
assertEquals(messageContextSkillSystemModel.getState(), "testString");
226226
assertEquals(messageContextSkillSystemModel.get("foo"), "testString");
227227

228-
final MessageContextSkill messageContextSkillModel =
228+
MessageContextSkill messageContextSkillModel =
229229
new MessageContextSkill.Builder()
230230
.userDefined(
231231
new java.util.HashMap<String, Object>() {
@@ -250,7 +250,7 @@ public void testMessageOptions() throws Throwable {
250250
.skills(
251251
new java.util.HashMap<String, MessageContextSkill>() {
252252
{
253-
put("foo", messageContextSkillModel);
253+
put("foo", messageContextSkillModel);
254254
}
255255
})
256256
.build();

assistant/src/test/java/com/ibm/watson/assistant/v2/model/MessageRequestTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ public void testMessageRequest() throws Throwable {
225225
assertEquals(messageContextSkillSystemModel.getState(), "testString");
226226
assertEquals(messageContextSkillSystemModel.get("foo"), "testString");
227227

228-
final MessageContextSkill messageContextSkillModel =
228+
MessageContextSkill messageContextSkillModel =
229229
new MessageContextSkill.Builder()
230230
.userDefined(
231231
new java.util.HashMap<String, Object>() {

0 commit comments

Comments
 (0)