From f05579ce2a5988f5e989e4fd7a715c14ed995aa3 Mon Sep 17 00:00:00 2001 From: Ajiemar Santiago Date: Mon, 9 Nov 2020 15:26:00 -0600 Subject: [PATCH 01/25] 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("", ""); 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 Date: Tue, 17 Nov 2020 15:19:24 -0600 Subject: [PATCH 02/25] 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(); } From bd39340e9738aa9a8ebce282585cfadcfbe39a47 Mon Sep 17 00:00:00 2001 From: Ajiemar Santiago Date: Tue, 1 Dec 2020 10:44:11 -0600 Subject: [PATCH 03/25] [docs] Revise PI deprecation, add VisRec deprecation --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c4e1845d545..aadece43b30 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. From 3414833807abe8534e6daf838500a5426e9e4e04 Mon Sep 17 00:00:00 2001 From: Kevin Kowalski Date: Tue, 1 Dec 2020 12:55:43 -0600 Subject: [PATCH 04/25] feat(generation): api def tag 'sdk-major-release-2020' gen tag 3.19.0 BREAKING CHANGE: api def tag 'sdk-major-release-2020' gen tag 3.19.0 --- .../ibm/watson/assistant/v1/Assistant.java | 6 +- .../v1/model/DialogNodeOutputGeneric.java | 2 +- .../ibm/watson/assistant/v2/Assistant.java | 6 +- .../assistant/v1/utils/TestUtilities.java | 6 +- .../watson/assistant/v2/AssistantTest.java | 6 +- .../v2/model/MessageContextStatelessTest.java | 2 +- .../v2/model/MessageContextTest.java | 2 +- .../v2/model/MessageOptionsTest.java | 4 +- .../v2/model/MessageRequestTest.java | 2 +- .../v2/model/MessageStatelessOptionsTest.java | 2 +- .../assistant/v2/utils/TestUtilities.java | 6 +- .../compare_comply/v1/CompareComply.java | 4 +- .../v1/utils/TestUtilities.java | 6 +- .../ibm/watson/discovery/v1/Discovery.java | 4 +- .../discovery/v1/model/SearchStatus.java | 5 +- .../ibm/watson/discovery/v2/Discovery.java | 4 +- .../discovery/v1/utils/TestUtilities.java | 6 +- .../discovery/v2/utils/TestUtilities.java | 6 +- .../v3/LanguageTranslator.java | 4 +- .../v3/utils/TestUtilities.java | 6 +- .../v1/NaturalLanguageClassifier.java | 4 +- .../v1/utils/TestUtilities.java | 6 +- .../v1/NaturalLanguageUnderstanding.java | 4 +- .../v1/utils/TestUtilities.java | 6 +- .../v3/PersonalityInsights.java | 25 ++++--- .../v3/utils/TestUtilities.java | 6 +- .../speech_to_text/v1/SpeechToText.java | 75 +++---------------- .../v1/model/CreateAcousticModelOptions.java | 6 +- .../v1/model/CreateLanguageModelOptions.java | 6 +- .../v1/model/ListAcousticModelsOptions.java | 4 +- .../v1/model/ListLanguageModelsOptions.java | 4 +- .../v1/model/RecognizeOptions.java | 6 +- .../model/SpeechRecognitionAlternative.java | 10 +-- .../speech_to_text/v1/SpeechToTextTest.java | 10 +-- .../v1/utils/TestUtilities.java | 6 +- .../text_to_speech/v1/TextToSpeech.java | 57 +------------- .../v1/model/CreateCustomModelOptions.java | 2 - .../v1/model/ListCustomModelsOptions.java | 2 - .../v1/model/SynthesizeOptions.java | 35 +-------- .../text_to_speech/v1/TextToSpeechTest.java | 8 +- .../model/CreateCustomModelOptionsTest.java | 4 +- .../v1/model/ListCustomModelsOptionsTest.java | 4 +- .../v1/utils/TestUtilities.java | 6 +- .../watson/tone_analyzer/v3/ToneAnalyzer.java | 4 +- .../tone_analyzer/v3/utils/TestUtilities.java | 6 +- .../v3/VisualRecognition.java | 35 +++++---- .../v4/VisualRecognition.java | 26 +++++-- .../v4/model/CreateCollectionOptions.java | 16 +++- .../v4/model/UpdateCollectionOptions.java | 16 +++- .../v3/utils/TestUtilities.java | 6 +- .../v4/VisualRecognitionTest.java | 34 ++++++++- .../v4/model/CreateCollectionOptionsTest.java | 1 + .../v4/model/UpdateCollectionOptionsTest.java | 1 + .../v4/utils/TestUtilities.java | 6 +- 54 files changed, 244 insertions(+), 292 deletions(-) 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..fac7348fa5b 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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2019, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -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; @@ -109,7 +109,7 @@ */ public class Assistant extends BaseService { - public static final String DEFAULT_SERVICE_NAME = "assistant"; + public static final String DEFAULT_SERVICE_NAME = "conversation"; public static final String DEFAULT_SERVICE_URL = "https://api.us-south.assistant.watson.cloud.ibm.com"; diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v1/model/DialogNodeOutputGeneric.java b/assistant/src/main/java/com/ibm/watson/assistant/v1/model/DialogNodeOutputGeneric.java index c035556e7dc..aa36d306d20 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v1/model/DialogNodeOutputGeneric.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v1/model/DialogNodeOutputGeneric.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2018, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at 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..7f2248dd06a 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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2019, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -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; @@ -55,7 +55,7 @@ */ public class Assistant extends BaseService { - public static final String DEFAULT_SERVICE_NAME = "assistant"; + public static final String DEFAULT_SERVICE_NAME = "conversation"; public static final String DEFAULT_SERVICE_URL = "https://api.us-south.assistant.watson.cloud.ibm.com"; 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..464324727b1 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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2019, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -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/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..950399e9ab4 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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2019, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -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/src/main/java/com/ibm/watson/discovery/v1/Discovery.java b/discovery/src/main/java/com/ibm/watson/discovery/v1/Discovery.java index 716cfadd636..3b30583a186 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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2019, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -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..437d0d942df 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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2018, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -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..3db5d8d1bda 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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2019, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -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/utils/TestUtilities.java b/discovery/src/test/java/com/ibm/watson/discovery/v1/utils/TestUtilities.java index 825710d38e6..a944fd256d4 100644 --- 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); } } diff --git a/discovery/src/test/java/com/ibm/watson/discovery/v2/utils/TestUtilities.java b/discovery/src/test/java/com/ibm/watson/discovery/v2/utils/TestUtilities.java index 600ab75893a..a3905c15979 100644 --- a/discovery/src/test/java/com/ibm/watson/discovery/v2/utils/TestUtilities.java +++ b/discovery/src/test/java/com/ibm/watson/discovery/v2/utils/TestUtilities.java @@ -13,10 +13,10 @@ package com.ibm.watson.discovery.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/language-translator/src/main/java/com/ibm/watson/language_translator/v3/LanguageTranslator.java b/language-translator/src/main/java/com/ibm/watson/language_translator/v3/LanguageTranslator.java index c657175286d..9b068d3716b 100644 --- a/language-translator/src/main/java/com/ibm/watson/language_translator/v3/LanguageTranslator.java +++ b/language-translator/src/main/java/com/ibm/watson/language_translator/v3/LanguageTranslator.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2019, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -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.language_translator.v3; diff --git a/language-translator/src/test/java/com/ibm/watson/language_translator/v3/utils/TestUtilities.java b/language-translator/src/test/java/com/ibm/watson/language_translator/v3/utils/TestUtilities.java index 7e4a2b959ff..0516d727da0 100644 --- a/language-translator/src/test/java/com/ibm/watson/language_translator/v3/utils/TestUtilities.java +++ b/language-translator/src/test/java/com/ibm/watson/language_translator/v3/utils/TestUtilities.java @@ -13,10 +13,10 @@ package com.ibm.watson.language_translator.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/natural-language-classifier/src/main/java/com/ibm/watson/natural_language_classifier/v1/NaturalLanguageClassifier.java b/natural-language-classifier/src/main/java/com/ibm/watson/natural_language_classifier/v1/NaturalLanguageClassifier.java index b83f4d032ba..b2b5db0487e 100644 --- a/natural-language-classifier/src/main/java/com/ibm/watson/natural_language_classifier/v1/NaturalLanguageClassifier.java +++ b/natural-language-classifier/src/main/java/com/ibm/watson/natural_language_classifier/v1/NaturalLanguageClassifier.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2019, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -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.natural_language_classifier.v1; diff --git a/natural-language-classifier/src/test/java/com/ibm/watson/natural_language_classifier/v1/utils/TestUtilities.java b/natural-language-classifier/src/test/java/com/ibm/watson/natural_language_classifier/v1/utils/TestUtilities.java index 040a43c1a57..0da423339d9 100644 --- a/natural-language-classifier/src/test/java/com/ibm/watson/natural_language_classifier/v1/utils/TestUtilities.java +++ b/natural-language-classifier/src/test/java/com/ibm/watson/natural_language_classifier/v1/utils/TestUtilities.java @@ -13,10 +13,10 @@ package com.ibm.watson.natural_language_classifier.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/natural-language-understanding/src/main/java/com/ibm/watson/natural_language_understanding/v1/NaturalLanguageUnderstanding.java b/natural-language-understanding/src/main/java/com/ibm/watson/natural_language_understanding/v1/NaturalLanguageUnderstanding.java index d8b2a155af7..0c220dae080 100644 --- a/natural-language-understanding/src/main/java/com/ibm/watson/natural_language_understanding/v1/NaturalLanguageUnderstanding.java +++ b/natural-language-understanding/src/main/java/com/ibm/watson/natural_language_understanding/v1/NaturalLanguageUnderstanding.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2019, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -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.natural_language_understanding.v1; diff --git a/natural-language-understanding/src/test/java/com/ibm/watson/natural_language_understanding/v1/utils/TestUtilities.java b/natural-language-understanding/src/test/java/com/ibm/watson/natural_language_understanding/v1/utils/TestUtilities.java index e6fa31df673..dfd35f5307c 100644 --- a/natural-language-understanding/src/test/java/com/ibm/watson/natural_language_understanding/v1/utils/TestUtilities.java +++ b/natural-language-understanding/src/test/java/com/ibm/watson/natural_language_understanding/v1/utils/TestUtilities.java @@ -13,10 +13,10 @@ package com.ibm.watson.natural_language_understanding.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/personality-insights/src/main/java/com/ibm/watson/personality_insights/v3/PersonalityInsights.java b/personality-insights/src/main/java/com/ibm/watson/personality_insights/v3/PersonalityInsights.java index b1944f05c99..d8ecb994457 100644 --- a/personality-insights/src/main/java/com/ibm/watson/personality_insights/v3/PersonalityInsights.java +++ b/personality-insights/src/main/java/com/ibm/watson/personality_insights/v3/PersonalityInsights.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2016, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -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.personality_insights.v3; @@ -32,8 +32,19 @@ import java.util.Map.Entry; /** - * The IBM Watson&trade; Personality Insights service enables applications to derive insights - * from social media, enterprise data, or other digital communications. The service uses linguistic + * IBM&reg; will begin sunsetting IBM Watson&trade; 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.<br/><br/>As an alternative, we encourage you to consider migrating to IBM + * Watson&trade; Natural Language Understanding, a service on IBM Cloud&reg; 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](https://cloud.ibm.com/docs/natural-language-understanding?topic=natural-language-understanding-about). + * {: deprecated} + * + *

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. * @@ -114,12 +125,6 @@ public PersonalityInsights(String version, String serviceName, Authenticator aut setServiceUrl(DEFAULT_SERVICE_URL); setVersion(version); this.configureService(serviceName); - - System.err.println( - "On 1 December 2021, Personality Insights will no longer be available." - + " Consider migrating to Watson Natural Language Understanding." - + "\nFor more information, see Personality Insights Deprecation " - + "(https://github.com/watson-developer-cloud/java-sdk/tree/master#personality-insights-deprecation)."); } /** 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/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..0ef00e2b380 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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2016, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -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; @@ -72,7 +72,6 @@ import com.ibm.watson.speech_to_text.v1.model.RecognitionJob; import com.ibm.watson.speech_to_text.v1.model.RecognitionJobs; import com.ibm.watson.speech_to_text.v1.model.RecognizeOptions; -import com.ibm.watson.speech_to_text.v1.model.RecognizeWithWebsocketsOptions; import com.ibm.watson.speech_to_text.v1.model.RegisterCallbackOptions; import com.ibm.watson.speech_to_text.v1.model.RegisterStatus; import com.ibm.watson.speech_to_text.v1.model.ResetAcousticModelOptions; @@ -88,15 +87,10 @@ import com.ibm.watson.speech_to_text.v1.model.UpgradeLanguageModelOptions; import com.ibm.watson.speech_to_text.v1.model.Word; import com.ibm.watson.speech_to_text.v1.model.Words; -import com.ibm.watson.speech_to_text.v1.websocket.RecognizeCallback; -import com.ibm.watson.speech_to_text.v1.websocket.SpeechToTextWebSocketListener; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import okhttp3.HttpUrl; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.WebSocket; +import okhttp3.MultipartBody; /** * The IBM Watson&trade; Speech to Text service provides APIs that use IBM's speech-recognition @@ -429,61 +423,6 @@ public ServiceCall recognize(RecognizeOptions recogniz return createServiceCall(builder.build(), responseConverter); } - /** - * Sends audio and returns transcription results for recognition requests over a WebSocket - * connection. Requests and responses are enabled over a single TCP connection that abstracts much - * of the complexity of the request to offer efficient implementation, low latency, high - * throughput, and an asynchronous response. By default, only final results are returned for any - * request; to enable interim results, set the interimResults parameter to true. - * - *

The service imposes a data size limit of 100 MB per utterance (per recognition request). You - * can send multiple utterances over a single WebSocket connection. The service automatically - * detects the endianness of the incoming audio and, for audio that includes multiple channels, - * downmixes the audio to one-channel mono during transcoding. (For the audio/l16 format, you can - * specify the endianness.) - * - * @param recognizeOptions the recognize options - * @param callback the {@link RecognizeCallback} instance where results will be sent - * @return the {@link WebSocket} - */ - public WebSocket recognizeUsingWebSocket( - RecognizeWithWebsocketsOptions recognizeOptions, RecognizeCallback callback) { - com.ibm.cloud.sdk.core.util.Validator.notNull( - recognizeOptions, "recognizeOptions cannot be null"); - com.ibm.cloud.sdk.core.util.Validator.notNull(recognizeOptions.audio(), "audio cannot be null"); - com.ibm.cloud.sdk.core.util.Validator.notNull(callback, "callback cannot be null"); - - HttpUrl.Builder urlBuilder = HttpUrl.parse(getServiceUrl() + "/v1/recognize").newBuilder(); - - if (recognizeOptions.model() != null) { - urlBuilder.addQueryParameter("model", recognizeOptions.model()); - } - if (recognizeOptions.customizationId() != null) { - urlBuilder.addQueryParameter("customization_id", recognizeOptions.customizationId()); - } - if (recognizeOptions.languageCustomizationId() != null) { - urlBuilder.addQueryParameter( - "language_customization_id", recognizeOptions.languageCustomizationId()); - } - if (recognizeOptions.acousticCustomizationId() != null) { - urlBuilder.addQueryParameter( - "acoustic_customization_id", recognizeOptions.acousticCustomizationId()); - } - if (recognizeOptions.baseModelVersion() != null) { - urlBuilder.addQueryParameter("base_model_version", recognizeOptions.baseModelVersion()); - } - - String url = urlBuilder.toString().replace("https://", "wss://"); - Request.Builder builder = new Request.Builder().url(url); - - setAuthentication(builder); - setDefaultHeaders(builder); - - OkHttpClient client = configureHttpClient(); - return client.newWebSocket( - builder.build(), new SpeechToTextWebSocketListener(recognizeOptions, callback)); - } - /** * Register a callback. * @@ -1321,8 +1260,12 @@ public ServiceCall addCorpus(AddCorpusOptions addCorpusOptions) { if (addCorpusOptions.allowOverwrite() != null) { builder.query("allow_overwrite", String.valueOf(addCorpusOptions.allowOverwrite())); } - builder.body(RequestUtils.inputStreamBody(addCorpusOptions.corpusFile(), "text/plain")); - + MultipartBody.Builder multipartBuilder = new MultipartBody.Builder(); + multipartBuilder.setType(MultipartBody.FORM); + okhttp3.RequestBody corpusFileBody = + RequestUtils.inputStreamBody(addCorpusOptions.corpusFile(), "text/plain"); + multipartBuilder.addFormDataPart("corpus_file", "filename", corpusFileBody); + builder.body(multipartBuilder.build()); ResponseConverter responseConverter = ResponseConverterUtils.getVoid(); return createServiceCall(builder.build(), responseConverter); } 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..e9fbb098116 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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2018, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -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..d0e5e30377a 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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2018, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -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..6c5802676b6 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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2018, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -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..b03cf78ae79 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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2018, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -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/RecognizeOptions.java b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/RecognizeOptions.java index 9f631b09ed8..bb9fa9087dc 100644 --- a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/RecognizeOptions.java +++ b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/RecognizeOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2016, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -12,7 +12,6 @@ */ package com.ibm.watson.speech_to_text.v1.model; -import com.google.gson.annotations.SerializedName; import com.ibm.cloud.sdk.core.service.model.GenericModel; import java.io.File; import java.io.FileInputStream; @@ -108,10 +107,7 @@ public interface Model { } protected InputStream audio; - - @SerializedName("content-type") protected String contentType; - protected String model; protected String languageCustomizationId; protected String acousticCustomizationId; diff --git a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/SpeechRecognitionAlternative.java b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/SpeechRecognitionAlternative.java index da4516574c9..5ee36370d52 100644 --- a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/SpeechRecognitionAlternative.java +++ b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/SpeechRecognitionAlternative.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2018, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -21,10 +21,10 @@ public class SpeechRecognitionAlternative extends GenericModel { protected String transcript; protected Double confidence; - protected List timestamps; + protected List timestamps; @SerializedName("word_confidence") - protected List wordConfidence; + protected List wordConfidence; /** * Gets the transcript. @@ -60,7 +60,7 @@ public Double getConfidence() { * * @return the timestamps */ - public List getTimestamps() { + public List getTimestamps() { return timestamps; } @@ -74,7 +74,7 @@ public List getTimestamps() { * * @return the wordConfidence */ - public List getWordConfidence() { + public List getWordConfidence() { return wordConfidence; } } diff --git a/speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/SpeechToTextTest.java b/speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/SpeechToTextTest.java index 2c1f34a1770..0e179d42b4b 100755 --- a/speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/SpeechToTextTest.java +++ b/speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/SpeechToTextTest.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2019, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -215,7 +215,7 @@ public void testGetModelNoOptions() throws Throwable { public void testRecognizeWOptions() throws Throwable { // Schedule some responses. String mockResponseBody = - "{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [[\"several\", 1.0, 1.51], [\"tornadoes\", 1.51, 2.15], [\"touch\", 2.15, 2.5]], \"word_confidence\": [[\"you\", 0.36485132893469713]]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}"; + "{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [\"timestamps\"], \"word_confidence\": [\"wordConfidence\"]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}"; String recognizePath = "/v1/recognize"; server.enqueue( @@ -425,7 +425,7 @@ public void testUnregisterCallbackNoOptions() throws Throwable { public void testCreateJobWOptions() throws Throwable { // Schedule some responses. String mockResponseBody = - "{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [[\"several\", 1.0, 1.51], [\"tornadoes\", 1.51, 2.15], [\"touch\", 2.15, 2.5]], \"word_confidence\": [[\"you\", 0.36485132893469713]]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}"; + "{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [\"timestamps\"], \"word_confidence\": [\"wordConfidence\"]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}"; String createJobPath = "/v1/recognitions"; server.enqueue( @@ -542,7 +542,7 @@ public void testCreateJobNoOptions() throws Throwable { public void testCheckJobsWOptions() throws Throwable { // Schedule some responses. String mockResponseBody = - "{\"recognitions\": [{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [[\"several\", 1.0, 1.51], [\"tornadoes\", 1.51, 2.15], [\"touch\", 2.15, 2.5]], \"word_confidence\": [[\"you\", 0.36485132893469713]]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}]}"; + "{\"recognitions\": [{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [\"timestamps\"], \"word_confidence\": [\"wordConfidence\"]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}]}"; String checkJobsPath = "/v1/recognitions"; server.enqueue( @@ -581,7 +581,7 @@ public void testCheckJobsWOptions() throws Throwable { public void testCheckJobWOptions() throws Throwable { // Schedule some responses. String mockResponseBody = - "{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [[\"several\", 1.0, 1.51], [\"tornadoes\", 1.51, 2.15], [\"touch\", 2.15, 2.5]], \"word_confidence\": [[\"you\", 0.36485132893469713]]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}"; + "{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [\"timestamps\"], \"word_confidence\": [\"wordConfidence\"]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}"; String checkJobPath = "/v1/recognitions/testString"; server.enqueue( 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/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..a4695903aea 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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2019, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -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; @@ -48,16 +48,10 @@ import com.ibm.watson.text_to_speech.v1.model.Voice; import com.ibm.watson.text_to_speech.v1.model.Voices; import com.ibm.watson.text_to_speech.v1.model.Words; -import com.ibm.watson.text_to_speech.v1.websocket.SynthesizeCallback; -import com.ibm.watson.text_to_speech.v1.websocket.TextToSpeechWebSocketListener; import java.io.InputStream; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import okhttp3.HttpUrl; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.WebSocket; /** * The IBM Watson&trade; Text to Speech service provides APIs that use IBM's speech-synthesis @@ -297,53 +291,6 @@ public ServiceCall synthesize(SynthesizeOptions synthesizeOptions) return createServiceCall(builder.build(), responseConverter); } - /** - * Synthesize audio. - * - *

Synthesizes text to audio that is spoken in the specified voice. The service bases its - * understanding of the language for the input text on the specified voice. Use a voice that - * matches the language of the input text. - * - *

The method accepts a maximum of 5 KB of input text in the body of the request, and 8 KB for - * the URL and headers. The 5 KB limit includes any SSML tags that you specify. The service - * returns the synthesized audio stream as an array of bytes. - * - *

### Audio formats (accept types) - * - *

For more information about specifying an audio format, including additional details about - * some of the formats, see [Audio - * formats](https://cloud.ibm.com/docs/text-to-speech?topic=text-to-speech-audioFormats#audioFormats). - * - * @param synthesizeOptions the {@link SynthesizeOptions} containing the options for the call - * @param callback the {@link SynthesizeCallback} callback - * @return a {@link WebSocket} instance - */ - public WebSocket synthesizeUsingWebSocket( - SynthesizeOptions synthesizeOptions, SynthesizeCallback callback) { - com.ibm.cloud.sdk.core.util.Validator.notNull( - synthesizeOptions, "synthesizeOptions cannot be null"); - com.ibm.cloud.sdk.core.util.Validator.notNull(callback, "callback cannot be null"); - - HttpUrl.Builder urlBuilder = HttpUrl.parse(getServiceUrl() + "/v1/synthesize").newBuilder(); - - if (synthesizeOptions.voice() != null) { - urlBuilder.addQueryParameter("voice", synthesizeOptions.voice()); - } - if (synthesizeOptions.customizationId() != null) { - urlBuilder.addQueryParameter("customization_id", synthesizeOptions.customizationId()); - } - - String url = urlBuilder.toString().replace("https://", "wss://"); - Request.Builder builder = new Request.Builder().url(url); - - setAuthentication(builder); - setDefaultHeaders(builder); - - OkHttpClient client = configureHttpClient(); - return client.newWebSocket( - builder.build(), new TextToSpeechWebSocketListener(synthesizeOptions, callback)); - } - /** * Get pronunciation. * 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/main/java/com/ibm/watson/text_to_speech/v1/model/SynthesizeOptions.java b/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/SynthesizeOptions.java index 3cbde3d9d61..0dcb8490253 100644 --- a/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/SynthesizeOptions.java +++ b/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/SynthesizeOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2018, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -13,7 +13,6 @@ package com.ibm.watson.text_to_speech.v1.model; import com.ibm.cloud.sdk.core.service.model.GenericModel; -import java.util.List; /** The synthesize options. */ public class SynthesizeOptions extends GenericModel { @@ -114,7 +113,6 @@ public interface Voice { protected String accept; protected String voice; protected String customizationId; - protected List timings; /** Builder. */ public static class Builder { @@ -122,14 +120,12 @@ public static class Builder { private String accept; private String voice; private String customizationId; - protected List timings; private Builder(SynthesizeOptions synthesizeOptions) { this.text = synthesizeOptions.text; this.accept = synthesizeOptions.accept; this.voice = synthesizeOptions.voice; this.customizationId = synthesizeOptions.customizationId; - this.timings = synthesizeOptions.timings; } /** Instantiates a new builder. */ @@ -196,17 +192,6 @@ public Builder customizationId(String customizationId) { this.customizationId = customizationId; return this; } - - /** - * Set the timings. - * - * @param timings the timings - * @return the SynthesizeOptions builder - */ - public Builder timings(List timings) { - this.timings = timings; - return this; - } } protected SynthesizeOptions(Builder builder) { @@ -215,7 +200,6 @@ protected SynthesizeOptions(Builder builder) { accept = builder.accept; voice = builder.voice; customizationId = builder.customizationId; - timings = builder.timings; } /** @@ -275,21 +259,4 @@ public String voice() { public String customizationId() { return customizationId; } - - /** - * Gets the timings. - * - *

An array that specifies whether the service is to return word timing information for all - * strings of the input text. Specify `words` as the element of the array to request word timing - * information. The service returns the start and end time of each word of the input. Specify an - * empty array or omit the parameter to receive no word timing information. Not supported for - * Japanese input text. - * - *

NOTE: This parameter only works for the `synthesizeUsingWebSocket` method. - * - * @return the timings - */ - public List getTimings() { - return timings; - } } 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..293093f1303 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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2019, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -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/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..c5aad08fe8f 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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2016, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -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/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..f6a062f1412 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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2016, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -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,16 +44,20 @@ import okhttp3.MultipartBody; /** - * The IBM Watson&trade; 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&trade; 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 */ public class VisualRecognition extends BaseService { - public static final String DEFAULT_SERVICE_NAME = "visual_recognition"; + public static final String DEFAULT_SERVICE_NAME = "watson_vision_combined"; public static final String DEFAULT_SERVICE_URL = "https://api.us-south.visual-recognition.watson.cloud.ibm.com"; @@ -182,11 +186,14 @@ public ServiceCall classify(ClassifyOptions classifyOptions) { multipartBuilder.addFormDataPart("threshold", String.valueOf(classifyOptions.threshold())); } if (classifyOptions.owners() != null) { - multipartBuilder.addFormDataPart("owners", RequestUtils.join(classifyOptions.owners(), ",")); + for (String item : classifyOptions.owners()) { + multipartBuilder.addFormDataPart("owners", item); + } } if (classifyOptions.classifierIds() != null) { - multipartBuilder.addFormDataPart( - "classifier_ids", RequestUtils.join(classifyOptions.classifierIds(), ",")); + for (String item : classifyOptions.classifierIds()) { + multipartBuilder.addFormDataPart("classifier_ids", item); + } } builder.body(multipartBuilder.build()); ResponseConverter responseConverter = @@ -248,18 +255,16 @@ public ServiceCall createClassifier(CreateClassifierOptions createCl String partName = String.format("%s_positive_examples", entry.getKey()); okhttp3.RequestBody part = RequestUtils.inputStreamBody(entry.getValue(), "application/octet-stream"); - multipartBuilder.addFormDataPart(partName, entry.getKey() + ".zip", part); + multipartBuilder.addFormDataPart(partName, entry.getKey(), part); } if (createClassifierOptions.negativeExamples() != null) { okhttp3.RequestBody negativeExamplesBody = RequestUtils.inputStreamBody( createClassifierOptions.negativeExamples(), "application/octet-stream"); - String negativeExamplesFilename = createClassifierOptions.negativeExamplesFilename(); - if (!negativeExamplesFilename.contains(".")) { - negativeExamplesFilename += ".zip"; - } multipartBuilder.addFormDataPart( - "negative_examples", negativeExamplesFilename, negativeExamplesBody); + "negative_examples", + createClassifierOptions.negativeExamplesFilename(), + negativeExamplesBody); } builder.body(multipartBuilder.build()); ResponseConverter responseConverter = 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..0cd92509ae8 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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2019, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -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,8 +67,12 @@ import okhttp3.MultipartBody; /** - * Provide images to the IBM Watson&trade; Visual Recognition service for analysis. The service - * detects objects based on a set of images with training data. + * IBM Watson&trade; 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 createCollection(CreateCollectionOptions createCo if (createCollectionOptions.description() != null) { contentJson.addProperty("description", createCollectionOptions.description()); } + if (createCollectionOptions.trainingStatus() != null) { + contentJson.add( + "training_status", + com.ibm.cloud.sdk.core.util.GsonSingleton.getGson() + .toJsonTree(createCollectionOptions.trainingStatus())); + } builder.bodyJson(contentJson); ResponseConverter responseConverter = ResponseConverterUtils.getValue( @@ -375,6 +385,12 @@ public ServiceCall updateCollection(UpdateCollectionOptions updateCo if (updateCollectionOptions.description() != null) { contentJson.addProperty("description", updateCollectionOptions.description()); } + if (updateCollectionOptions.trainingStatus() != null) { + contentJson.add( + "training_status", + com.ibm.cloud.sdk.core.util.GsonSingleton.getGson() + .toJsonTree(updateCollectionOptions.trainingStatus())); + } builder.bodyJson(contentJson); ResponseConverter responseConverter = ResponseConverterUtils.getValue( diff --git a/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/CreateCollectionOptions.java b/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/CreateCollectionOptions.java index bab756aacd8..dd93c64a946 100644 --- a/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/CreateCollectionOptions.java +++ b/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/CreateCollectionOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2019, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -25,10 +25,12 @@ public class CreateCollectionOptions extends GenericModel { public static class Builder { private String name; private String description; + private TrainingStatus trainingStatus; private Builder(CreateCollectionOptions createCollectionOptions) { this.name = createCollectionOptions.name; this.description = createCollectionOptions.description; + this.trainingStatus = createCollectionOptions.trainingStatus; } /** Instantiates a new builder. */ @@ -64,11 +66,23 @@ public Builder description(String description) { this.description = description; return this; } + + /** + * Set the trainingStatus. + * + * @param trainingStatus the trainingStatus + * @return the CreateCollectionOptions builder + */ + public Builder trainingStatus(TrainingStatus trainingStatus) { + this.trainingStatus = trainingStatus; + return this; + } } protected CreateCollectionOptions(Builder builder) { name = builder.name; description = builder.description; + trainingStatus = builder.trainingStatus; } /** diff --git a/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/UpdateCollectionOptions.java b/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/UpdateCollectionOptions.java index e388865d4c3..0d6d1ffa819 100644 --- a/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/UpdateCollectionOptions.java +++ b/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/UpdateCollectionOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2019, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -27,11 +27,13 @@ public static class Builder { private String collectionId; private String name; private String description; + private TrainingStatus trainingStatus; private Builder(UpdateCollectionOptions updateCollectionOptions) { this.collectionId = updateCollectionOptions.collectionId; this.name = updateCollectionOptions.name; this.description = updateCollectionOptions.description; + this.trainingStatus = updateCollectionOptions.trainingStatus; } /** Instantiates a new builder. */ @@ -87,6 +89,17 @@ public Builder description(String description) { this.description = description; return this; } + + /** + * Set the trainingStatus. + * + * @param trainingStatus the trainingStatus + * @return the UpdateCollectionOptions builder + */ + public Builder trainingStatus(TrainingStatus trainingStatus) { + this.trainingStatus = trainingStatus; + return this; + } } protected UpdateCollectionOptions(Builder builder) { @@ -95,6 +108,7 @@ protected UpdateCollectionOptions(Builder builder) { collectionId = builder.collectionId; name = builder.name; description = builder.description; + trainingStatus = builder.trainingStatus; } /** 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..09e9d1f1ab2 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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2019, 2020. + * (C) Copyright IBM Corp. 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -178,11 +178,27 @@ public void testCreateCollectionWOptions() throws Throwable { constructClientService(); + // Construct an instance of the ObjectTrainingStatus model + ObjectTrainingStatus objectTrainingStatusModel = + new ObjectTrainingStatus.Builder() + .ready(true) + .inProgress(true) + .dataChanged(true) + .latestFailed(true) + .rscnnReady(true) + .description("testString") + .build(); + + // Construct an instance of the TrainingStatus model + TrainingStatus trainingStatusModel = + new TrainingStatus.Builder().objects(objectTrainingStatusModel).build(); + // Construct an instance of the CreateCollectionOptions model CreateCollectionOptions createCollectionOptionsModel = new CreateCollectionOptions.Builder() .name("testString") .description("testString") + .trainingStatus(trainingStatusModel) .build(); // Invoke operation with valid options model (positive test) @@ -315,12 +331,28 @@ public void testUpdateCollectionWOptions() throws Throwable { constructClientService(); + // Construct an instance of the ObjectTrainingStatus model + ObjectTrainingStatus objectTrainingStatusModel = + new ObjectTrainingStatus.Builder() + .ready(true) + .inProgress(true) + .dataChanged(true) + .latestFailed(true) + .rscnnReady(true) + .description("testString") + .build(); + + // Construct an instance of the TrainingStatus model + TrainingStatus trainingStatusModel = + new TrainingStatus.Builder().objects(objectTrainingStatusModel).build(); + // Construct an instance of the UpdateCollectionOptions model UpdateCollectionOptions updateCollectionOptionsModel = new UpdateCollectionOptions.Builder() .collectionId("testString") .name("testString") .description("testString") + .trainingStatus(trainingStatusModel) .build(); // Invoke operation with valid options model (positive test) 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..b057a107d13 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 @@ -54,6 +54,7 @@ public void testCreateCollectionOptions() throws Throwable { new CreateCollectionOptions.Builder() .name("testString") .description("testString") + .trainingStatus(trainingStatusModel) .build(); assertEquals(createCollectionOptionsModel.name(), "testString"); assertEquals(createCollectionOptionsModel.description(), "testString"); diff --git a/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v4/model/UpdateCollectionOptionsTest.java b/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v4/model/UpdateCollectionOptionsTest.java index 244e1e6f5dd..db6c45728c7 100644 --- a/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v4/model/UpdateCollectionOptionsTest.java +++ b/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v4/model/UpdateCollectionOptionsTest.java @@ -55,6 +55,7 @@ public void testUpdateCollectionOptions() throws Throwable { .collectionId("testString") .name("testString") .description("testString") + .trainingStatus(trainingStatusModel) .build(); assertEquals(updateCollectionOptionsModel.collectionId(), "testString"); assertEquals(updateCollectionOptionsModel.name(), "testString"); 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); } } From c8f9131129038f24ca4d4236269840ef8d6a8a6b Mon Sep 17 00:00:00 2001 From: Kevin Kowalski Date: Thu, 5 Nov 2020 12:51:28 -0600 Subject: [PATCH 05/25] chore(assistant-v1): manual changes --- .../src/main/java/com/ibm/watson/assistant/v1/Assistant.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fac7348fa5b..873652d4abe 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 @@ -109,7 +109,7 @@ */ public class Assistant extends BaseService { - public static final String DEFAULT_SERVICE_NAME = "conversation"; + public static final String DEFAULT_SERVICE_NAME = "assistant"; public static final String DEFAULT_SERVICE_URL = "https://api.us-south.assistant.watson.cloud.ibm.com"; From dc53a78088358e4f04ae006994d43a4d2db6663e Mon Sep 17 00:00:00 2001 From: Kevin Kowalski Date: Thu, 5 Nov 2020 12:54:13 -0600 Subject: [PATCH 06/25] chore(assistant-v2): manual changes --- .../src/main/java/com/ibm/watson/assistant/v2/Assistant.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7f2248dd06a..1c2bcc3731a 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 @@ -55,7 +55,7 @@ */ public class Assistant extends BaseService { - public static final String DEFAULT_SERVICE_NAME = "conversation"; + public static final String DEFAULT_SERVICE_NAME = "assistant"; public static final String DEFAULT_SERVICE_URL = "https://api.us-south.assistant.watson.cloud.ibm.com"; From 629cfc84a88b3d895402a1bb6a7aa94f786b0803 Mon Sep 17 00:00:00 2001 From: Kevin Kowalski Date: Thu, 5 Nov 2020 13:14:48 -0600 Subject: [PATCH 07/25] chore(speech-to-text-v1): manual changes --- .../speech_to_text/v1/SpeechToText.java | 71 +++++++++++++++++-- .../v1/model/RecognizeOptions.java | 2 + .../model/SpeechRecognitionAlternative.java | 8 +-- 3 files changed, 71 insertions(+), 10 deletions(-) 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 0ef00e2b380..77b07b0282e 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 @@ -72,6 +72,7 @@ import com.ibm.watson.speech_to_text.v1.model.RecognitionJob; import com.ibm.watson.speech_to_text.v1.model.RecognitionJobs; import com.ibm.watson.speech_to_text.v1.model.RecognizeOptions; +import com.ibm.watson.speech_to_text.v1.model.RecognizeWithWebsocketsOptions; import com.ibm.watson.speech_to_text.v1.model.RegisterCallbackOptions; import com.ibm.watson.speech_to_text.v1.model.RegisterStatus; import com.ibm.watson.speech_to_text.v1.model.ResetAcousticModelOptions; @@ -90,7 +91,14 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; + +import com.ibm.watson.speech_to_text.v1.websocket.RecognizeCallback; +import com.ibm.watson.speech_to_text.v1.websocket.SpeechToTextWebSocketListener; +import okhttp3.HttpUrl; import okhttp3.MultipartBody; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.WebSocket; /** * The IBM Watson&trade; Speech to Text service provides APIs that use IBM's speech-recognition @@ -423,6 +431,61 @@ public ServiceCall recognize(RecognizeOptions recogniz return createServiceCall(builder.build(), responseConverter); } + /** + * Sends audio and returns transcription results for recognition requests over a WebSocket + * connection. Requests and responses are enabled over a single TCP connection that abstracts much + * of the complexity of the request to offer efficient implementation, low latency, high + * throughput, and an asynchronous response. By default, only final results are returned for any + * request; to enable interim results, set the interimResults parameter to true. + * + *

The service imposes a data size limit of 100 MB per utterance (per recognition request). You + * can send multiple utterances over a single WebSocket connection. The service automatically + * detects the endianness of the incoming audio and, for audio that includes multiple channels, + * downmixes the audio to one-channel mono during transcoding. (For the audio/l16 format, you can + * specify the endianness.) + * + * @param recognizeOptions the recognize options + * @param callback the {@link RecognizeCallback} instance where results will be sent + * @return the {@link WebSocket} + */ + public WebSocket recognizeUsingWebSocket( + RecognizeWithWebsocketsOptions recognizeOptions, RecognizeCallback callback) { + com.ibm.cloud.sdk.core.util.Validator.notNull( + recognizeOptions, "recognizeOptions cannot be null"); + com.ibm.cloud.sdk.core.util.Validator.notNull(recognizeOptions.audio(), "audio cannot be null"); + com.ibm.cloud.sdk.core.util.Validator.notNull(callback, "callback cannot be null"); + + HttpUrl.Builder urlBuilder = HttpUrl.parse(getServiceUrl() + "/v1/recognize").newBuilder(); + + if (recognizeOptions.model() != null) { + urlBuilder.addQueryParameter("model", recognizeOptions.model()); + } + if (recognizeOptions.customizationId() != null) { + urlBuilder.addQueryParameter("customization_id", recognizeOptions.customizationId()); + } + if (recognizeOptions.languageCustomizationId() != null) { + urlBuilder.addQueryParameter( + "language_customization_id", recognizeOptions.languageCustomizationId()); + } + if (recognizeOptions.acousticCustomizationId() != null) { + urlBuilder.addQueryParameter( + "acoustic_customization_id", recognizeOptions.acousticCustomizationId()); + } + if (recognizeOptions.baseModelVersion() != null) { + urlBuilder.addQueryParameter("base_model_version", recognizeOptions.baseModelVersion()); + } + + String url = urlBuilder.toString().replace("https://", "wss://"); + Request.Builder builder = new Request.Builder().url(url); + + setAuthentication(builder); + setDefaultHeaders(builder); + + OkHttpClient client = configureHttpClient(); + return client.newWebSocket( + builder.build(), new SpeechToTextWebSocketListener(recognizeOptions, callback)); + } + /** * Register a callback. * @@ -1260,12 +1323,8 @@ public ServiceCall addCorpus(AddCorpusOptions addCorpusOptions) { if (addCorpusOptions.allowOverwrite() != null) { builder.query("allow_overwrite", String.valueOf(addCorpusOptions.allowOverwrite())); } - MultipartBody.Builder multipartBuilder = new MultipartBody.Builder(); - multipartBuilder.setType(MultipartBody.FORM); - okhttp3.RequestBody corpusFileBody = - RequestUtils.inputStreamBody(addCorpusOptions.corpusFile(), "text/plain"); - multipartBuilder.addFormDataPart("corpus_file", "filename", corpusFileBody); - builder.body(multipartBuilder.build()); + builder.body(RequestUtils.inputStreamBody(addCorpusOptions.corpusFile(), "text/plain")); + ResponseConverter responseConverter = ResponseConverterUtils.getVoid(); return createServiceCall(builder.build(), responseConverter); } diff --git a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/RecognizeOptions.java b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/RecognizeOptions.java index bb9fa9087dc..14eae269b45 100644 --- a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/RecognizeOptions.java +++ b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/RecognizeOptions.java @@ -12,6 +12,7 @@ */ package com.ibm.watson.speech_to_text.v1.model; +import com.google.gson.annotations.SerializedName; import com.ibm.cloud.sdk.core.service.model.GenericModel; import java.io.File; import java.io.FileInputStream; @@ -107,6 +108,7 @@ public interface Model { } protected InputStream audio; + @SerializedName("content-type") protected String contentType; protected String model; protected String languageCustomizationId; diff --git a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/SpeechRecognitionAlternative.java b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/SpeechRecognitionAlternative.java index 5ee36370d52..39e94945bbd 100644 --- a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/SpeechRecognitionAlternative.java +++ b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/SpeechRecognitionAlternative.java @@ -21,10 +21,10 @@ public class SpeechRecognitionAlternative extends GenericModel { protected String transcript; protected Double confidence; - protected List timestamps; + protected List timestamps; @SerializedName("word_confidence") - protected List wordConfidence; + protected List wordConfidence; /** * Gets the transcript. @@ -60,7 +60,7 @@ public Double getConfidence() { * * @return the timestamps */ - public List getTimestamps() { + public List getTimestamps() { return timestamps; } @@ -74,7 +74,7 @@ public List getTimestamps() { * * @return the wordConfidence */ - public List getWordConfidence() { + public List getWordConfidence() { return wordConfidence; } } From 73286e5f43f9c9e96001deec6f556071fc682e91 Mon Sep 17 00:00:00 2001 From: Kevin Kowalski Date: Thu, 5 Nov 2020 13:50:54 -0600 Subject: [PATCH 08/25] chore(text-to-speech-v1): manual changes --- .../text_to_speech/v1/TextToSpeech.java | 54 +++++++++++++++++++ .../v1/model/SynthesizeOptions.java | 34 ++++++++++++ 2 files changed, 88 insertions(+) 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 a4695903aea..504bcf26416 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 @@ -48,6 +48,13 @@ import com.ibm.watson.text_to_speech.v1.model.Voice; import com.ibm.watson.text_to_speech.v1.model.Voices; import com.ibm.watson.text_to_speech.v1.model.Words; +import com.ibm.watson.text_to_speech.v1.websocket.SynthesizeCallback; +import com.ibm.watson.text_to_speech.v1.websocket.TextToSpeechWebSocketListener; +import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.WebSocket; + import java.io.InputStream; import java.util.HashMap; import java.util.Map; @@ -291,6 +298,53 @@ public ServiceCall synthesize(SynthesizeOptions synthesizeOptions) return createServiceCall(builder.build(), responseConverter); } + /** + * Synthesize audio. + * + *

Synthesizes text to audio that is spoken in the specified voice. The service bases its + * understanding of the language for the input text on the specified voice. Use a voice that + * matches the language of the input text. + * + *

The method accepts a maximum of 5 KB of input text in the body of the request, and 8 KB for + * the URL and headers. The 5 KB limit includes any SSML tags that you specify. The service + * returns the synthesized audio stream as an array of bytes. + * + *

### Audio formats (accept types) + * + *

For more information about specifying an audio format, including additional details about + * some of the formats, see [Audio + * formats](https://cloud.ibm.com/docs/text-to-speech?topic=text-to-speech-audioFormats#audioFormats). + * + * @param synthesizeOptions the {@link SynthesizeOptions} containing the options for the call + * @param callback the {@link SynthesizeCallback} callback + * @return a {@link WebSocket} instance + */ + public WebSocket synthesizeUsingWebSocket( + SynthesizeOptions synthesizeOptions, SynthesizeCallback callback) { + com.ibm.cloud.sdk.core.util.Validator.notNull( + synthesizeOptions, "synthesizeOptions cannot be null"); + com.ibm.cloud.sdk.core.util.Validator.notNull(callback, "callback cannot be null"); + + HttpUrl.Builder urlBuilder = HttpUrl.parse(getServiceUrl() + "/v1/synthesize").newBuilder(); + + if (synthesizeOptions.voice() != null) { + urlBuilder.addQueryParameter("voice", synthesizeOptions.voice()); + } + if (synthesizeOptions.customizationId() != null) { + urlBuilder.addQueryParameter("customization_id", synthesizeOptions.customizationId()); + } + + String url = urlBuilder.toString().replace("https://", "wss://"); + Request.Builder builder = new Request.Builder().url(url); + + setAuthentication(builder); + setDefaultHeaders(builder); + + OkHttpClient client = configureHttpClient(); + return client.newWebSocket( + builder.build(), new TextToSpeechWebSocketListener(synthesizeOptions, callback)); + } + /** * Get pronunciation. * diff --git a/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/SynthesizeOptions.java b/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/SynthesizeOptions.java index 0dcb8490253..156d69cfc00 100644 --- a/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/SynthesizeOptions.java +++ b/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/SynthesizeOptions.java @@ -14,6 +14,8 @@ import com.ibm.cloud.sdk.core.service.model.GenericModel; +import java.util.List; + /** The synthesize options. */ public class SynthesizeOptions extends GenericModel { @@ -113,6 +115,7 @@ public interface Voice { protected String accept; protected String voice; protected String customizationId; + protected List timings; /** Builder. */ public static class Builder { @@ -120,12 +123,14 @@ public static class Builder { private String accept; private String voice; private String customizationId; + protected List timings; private Builder(SynthesizeOptions synthesizeOptions) { this.text = synthesizeOptions.text; this.accept = synthesizeOptions.accept; this.voice = synthesizeOptions.voice; this.customizationId = synthesizeOptions.customizationId; + this.timings = synthesizeOptions.timings; } /** Instantiates a new builder. */ @@ -192,6 +197,17 @@ public Builder customizationId(String customizationId) { this.customizationId = customizationId; return this; } + + /** + * Set the timings. + * + * @param timings the timings + * @return the SynthesizeOptions builder + */ + public Builder timings(List timings) { + this.timings = timings; + return this; + } } protected SynthesizeOptions(Builder builder) { @@ -200,6 +216,7 @@ protected SynthesizeOptions(Builder builder) { accept = builder.accept; voice = builder.voice; customizationId = builder.customizationId; + timings = builder.timings; } /** @@ -259,4 +276,21 @@ public String voice() { public String customizationId() { return customizationId; } + + /** + * Gets the timings. + * + *

An array that specifies whether the service is to return word timing information for all + * strings of the input text. Specify `words` as the element of the array to request word timing + * information. The service returns the start and end time of each word of the input. Specify an + * empty array or omit the parameter to receive no word timing information. Not supported for + * Japanese input text. + * + *

NOTE: This parameter only works for the `synthesizeUsingWebSocket` method. + * + * @return the timings + */ + public List getTimings() { + return timings; + } } From 7b1d74a82dd92f256064420a365a1f9476895ae3 Mon Sep 17 00:00:00 2001 From: Kevin Kowalski Date: Thu, 5 Nov 2020 14:04:18 -0600 Subject: [PATCH 09/25] chore(visual-recognition-v3): manual changes --- .../v3/VisualRecognition.java | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) 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 f6a062f1412..15f985d7088 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 @@ -57,7 +57,7 @@ */ public class VisualRecognition extends BaseService { - public static final String DEFAULT_SERVICE_NAME = "watson_vision_combined"; + public static final String DEFAULT_SERVICE_NAME = "visual_recognition"; public static final String DEFAULT_SERVICE_URL = "https://api.us-south.visual-recognition.watson.cloud.ibm.com"; @@ -186,14 +186,10 @@ public ServiceCall classify(ClassifyOptions classifyOptions) { multipartBuilder.addFormDataPart("threshold", String.valueOf(classifyOptions.threshold())); } if (classifyOptions.owners() != null) { - for (String item : classifyOptions.owners()) { - multipartBuilder.addFormDataPart("owners", item); - } + multipartBuilder.addFormDataPart("owners", RequestUtils.join(classifyOptions.owners(), ",")); } if (classifyOptions.classifierIds() != null) { - for (String item : classifyOptions.classifierIds()) { - multipartBuilder.addFormDataPart("classifier_ids", item); - } + multipartBuilder.addFormDataPart("classifier_ids", RequestUtils.join(classifyOptions.classifierIds(), ",")); } builder.body(multipartBuilder.build()); ResponseConverter responseConverter = @@ -255,16 +251,17 @@ public ServiceCall createClassifier(CreateClassifierOptions createCl String partName = String.format("%s_positive_examples", entry.getKey()); okhttp3.RequestBody part = RequestUtils.inputStreamBody(entry.getValue(), "application/octet-stream"); - multipartBuilder.addFormDataPart(partName, entry.getKey(), part); + multipartBuilder.addFormDataPart(partName, entry.getKey() + ".zip", part); } if (createClassifierOptions.negativeExamples() != null) { okhttp3.RequestBody negativeExamplesBody = RequestUtils.inputStreamBody( createClassifierOptions.negativeExamples(), "application/octet-stream"); - multipartBuilder.addFormDataPart( - "negative_examples", - createClassifierOptions.negativeExamplesFilename(), - negativeExamplesBody); + String negativeExamplesFilename = createClassifierOptions.negativeExamplesFilename(); + if (!negativeExamplesFilename.contains(".")) { + negativeExamplesFilename += ".zip"; + } + multipartBuilder.addFormDataPart("negative_examples", negativeExamplesFilename, negativeExamplesBody); } builder.body(multipartBuilder.build()); ResponseConverter responseConverter = From b0184ac612b05a5e8e116ae39e6b3aa587c4e754 Mon Sep 17 00:00:00 2001 From: Kevin Kowalski Date: Fri, 6 Nov 2020 17:57:17 -0600 Subject: [PATCH 10/25] chore(visual-recognition-v4): manual changes --- .../com/ibm/watson/visual_recognition/v4/VisualRecognition.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0cd92509ae8..1a427dd0207 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 @@ -81,7 +81,7 @@ */ public class VisualRecognition extends BaseService { - public static final String DEFAULT_SERVICE_NAME = "watson_vision_combined"; + public static final String DEFAULT_SERVICE_NAME = "visual_recognition"; public static final String DEFAULT_SERVICE_URL = "https://api.us-south.visual-recognition.watson.cloud.ibm.com"; From d4e8aa89c75b49a0dd60a5eca3b9db957978c001 Mon Sep 17 00:00:00 2001 From: Kevin Kowalski Date: Tue, 1 Dec 2020 14:12:14 -0600 Subject: [PATCH 11/25] chore(personality-insights-v3): add deprecation message --- .../v3/PersonalityInsights.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/personality-insights/src/main/java/com/ibm/watson/personality_insights/v3/PersonalityInsights.java b/personality-insights/src/main/java/com/ibm/watson/personality_insights/v3/PersonalityInsights.java index d8ecb994457..e03202142be 100644 --- a/personality-insights/src/main/java/com/ibm/watson/personality_insights/v3/PersonalityInsights.java +++ b/personality-insights/src/main/java/com/ibm/watson/personality_insights/v3/PersonalityInsights.java @@ -64,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"; @@ -125,6 +133,11 @@ public PersonalityInsights(String version, String serviceName, Authenticator aut setServiceUrl(DEFAULT_SERVICE_URL); setVersion(version); this.configureService(serviceName); + + System.err.println("On 1 December 2021, Personality Insights will no longer be available." + + " Consider migrating to Watson Natural Language Understanding." + + "\nFor more information, see Personality Insights Deprecation " + + "(https://github.com/watson-developer-cloud/java-sdk/tree/master#personality-insights-deprecation)."); } /** From 02e3dfd0fb972f3081c91921f6acf61fdcc2f1e6 Mon Sep 17 00:00:00 2001 From: Kevin Kowalski Date: Mon, 16 Nov 2020 21:11:24 -0600 Subject: [PATCH 12/25] fix(visual-recognition-v4): remove trainingStatus as a parameter for create & update Collection --- .../visual_recognition/v4/VisualRecognition.java | 12 ------------ .../v4/model/CreateCollectionOptions.java | 14 -------------- .../v4/model/UpdateCollectionOptions.java | 14 -------------- 3 files changed, 40 deletions(-) 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 1a427dd0207..b15d45d637b 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 @@ -252,12 +252,6 @@ public ServiceCall createCollection(CreateCollectionOptions createCo if (createCollectionOptions.description() != null) { contentJson.addProperty("description", createCollectionOptions.description()); } - if (createCollectionOptions.trainingStatus() != null) { - contentJson.add( - "training_status", - com.ibm.cloud.sdk.core.util.GsonSingleton.getGson() - .toJsonTree(createCollectionOptions.trainingStatus())); - } builder.bodyJson(contentJson); ResponseConverter responseConverter = ResponseConverterUtils.getValue( @@ -385,12 +379,6 @@ public ServiceCall updateCollection(UpdateCollectionOptions updateCo if (updateCollectionOptions.description() != null) { contentJson.addProperty("description", updateCollectionOptions.description()); } - if (updateCollectionOptions.trainingStatus() != null) { - contentJson.add( - "training_status", - com.ibm.cloud.sdk.core.util.GsonSingleton.getGson() - .toJsonTree(updateCollectionOptions.trainingStatus())); - } builder.bodyJson(contentJson); ResponseConverter responseConverter = ResponseConverterUtils.getValue( diff --git a/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/CreateCollectionOptions.java b/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/CreateCollectionOptions.java index dd93c64a946..a2c2fc2481a 100644 --- a/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/CreateCollectionOptions.java +++ b/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/CreateCollectionOptions.java @@ -25,12 +25,10 @@ public class CreateCollectionOptions extends GenericModel { public static class Builder { private String name; private String description; - private TrainingStatus trainingStatus; private Builder(CreateCollectionOptions createCollectionOptions) { this.name = createCollectionOptions.name; this.description = createCollectionOptions.description; - this.trainingStatus = createCollectionOptions.trainingStatus; } /** Instantiates a new builder. */ @@ -66,23 +64,11 @@ public Builder description(String description) { this.description = description; return this; } - - /** - * Set the trainingStatus. - * - * @param trainingStatus the trainingStatus - * @return the CreateCollectionOptions builder - */ - public Builder trainingStatus(TrainingStatus trainingStatus) { - this.trainingStatus = trainingStatus; - return this; - } } protected CreateCollectionOptions(Builder builder) { name = builder.name; description = builder.description; - trainingStatus = builder.trainingStatus; } /** diff --git a/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/UpdateCollectionOptions.java b/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/UpdateCollectionOptions.java index 0d6d1ffa819..b12c95ab419 100644 --- a/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/UpdateCollectionOptions.java +++ b/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/UpdateCollectionOptions.java @@ -27,13 +27,11 @@ public static class Builder { private String collectionId; private String name; private String description; - private TrainingStatus trainingStatus; private Builder(UpdateCollectionOptions updateCollectionOptions) { this.collectionId = updateCollectionOptions.collectionId; this.name = updateCollectionOptions.name; this.description = updateCollectionOptions.description; - this.trainingStatus = updateCollectionOptions.trainingStatus; } /** Instantiates a new builder. */ @@ -89,17 +87,6 @@ public Builder description(String description) { this.description = description; return this; } - - /** - * Set the trainingStatus. - * - * @param trainingStatus the trainingStatus - * @return the UpdateCollectionOptions builder - */ - public Builder trainingStatus(TrainingStatus trainingStatus) { - this.trainingStatus = trainingStatus; - return this; - } } protected UpdateCollectionOptions(Builder builder) { @@ -108,7 +95,6 @@ protected UpdateCollectionOptions(Builder builder) { collectionId = builder.collectionId; name = builder.name; description = builder.description; - trainingStatus = builder.trainingStatus; } /** From a00e2f7ee31904a3e6df44fee912c71b9c528f5f Mon Sep 17 00:00:00 2001 From: Kevin Kowalski Date: Mon, 16 Nov 2020 21:12:10 -0600 Subject: [PATCH 13/25] test(visual-recognition-v4-tests): update tests using trainingStatus --- .../v4/VisualRecognitionTest.java | 32 ------------------- .../v4/model/CreateCollectionOptionsTest.java | 1 - .../v4/model/UpdateCollectionOptionsTest.java | 1 - 3 files changed, 34 deletions(-) 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 09e9d1f1ab2..7cc4687a289 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 @@ -178,27 +178,11 @@ public void testCreateCollectionWOptions() throws Throwable { constructClientService(); - // Construct an instance of the ObjectTrainingStatus model - ObjectTrainingStatus objectTrainingStatusModel = - new ObjectTrainingStatus.Builder() - .ready(true) - .inProgress(true) - .dataChanged(true) - .latestFailed(true) - .rscnnReady(true) - .description("testString") - .build(); - - // Construct an instance of the TrainingStatus model - TrainingStatus trainingStatusModel = - new TrainingStatus.Builder().objects(objectTrainingStatusModel).build(); - // Construct an instance of the CreateCollectionOptions model CreateCollectionOptions createCollectionOptionsModel = new CreateCollectionOptions.Builder() .name("testString") .description("testString") - .trainingStatus(trainingStatusModel) .build(); // Invoke operation with valid options model (positive test) @@ -331,28 +315,12 @@ public void testUpdateCollectionWOptions() throws Throwable { constructClientService(); - // Construct an instance of the ObjectTrainingStatus model - ObjectTrainingStatus objectTrainingStatusModel = - new ObjectTrainingStatus.Builder() - .ready(true) - .inProgress(true) - .dataChanged(true) - .latestFailed(true) - .rscnnReady(true) - .description("testString") - .build(); - - // Construct an instance of the TrainingStatus model - TrainingStatus trainingStatusModel = - new TrainingStatus.Builder().objects(objectTrainingStatusModel).build(); - // Construct an instance of the UpdateCollectionOptions model UpdateCollectionOptions updateCollectionOptionsModel = new UpdateCollectionOptions.Builder() .collectionId("testString") .name("testString") .description("testString") - .trainingStatus(trainingStatusModel) .build(); // Invoke operation with valid options model (positive test) 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 b057a107d13..b107b955108 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 @@ -54,7 +54,6 @@ public void testCreateCollectionOptions() throws Throwable { new CreateCollectionOptions.Builder() .name("testString") .description("testString") - .trainingStatus(trainingStatusModel) .build(); assertEquals(createCollectionOptionsModel.name(), "testString"); assertEquals(createCollectionOptionsModel.description(), "testString"); diff --git a/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v4/model/UpdateCollectionOptionsTest.java b/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v4/model/UpdateCollectionOptionsTest.java index db6c45728c7..244e1e6f5dd 100644 --- a/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v4/model/UpdateCollectionOptionsTest.java +++ b/visual-recognition/src/test/java/com/ibm/watson/visual_recognition/v4/model/UpdateCollectionOptionsTest.java @@ -55,7 +55,6 @@ public void testUpdateCollectionOptions() throws Throwable { .collectionId("testString") .name("testString") .description("testString") - .trainingStatus(trainingStatusModel) .build(); assertEquals(updateCollectionOptionsModel.collectionId(), "testString"); assertEquals(updateCollectionOptionsModel.name(), "testString"); From d35c0b5840064f443f6c74d4c30c66a7cf1339bf Mon Sep 17 00:00:00 2001 From: Kevin Kowalski Date: Tue, 1 Dec 2020 14:18:09 -0600 Subject: [PATCH 14/25] chore(java-format): ran java_format_google.sh --- .../v3/PersonalityInsights.java | 17 +++++++++-------- .../watson/speech_to_text/v1/SpeechToText.java | 16 +++++++--------- .../v1/model/RecognizeOptions.java | 2 ++ .../watson/text_to_speech/v1/TextToSpeech.java | 15 +++++++-------- .../v1/model/SynthesizeOptions.java | 1 - .../v3/VisualRecognition.java | 6 ++++-- .../v4/VisualRecognitionTest.java | 7 +------ .../v4/model/CreateCollectionOptionsTest.java | 5 +---- 8 files changed, 31 insertions(+), 38 deletions(-) diff --git a/personality-insights/src/main/java/com/ibm/watson/personality_insights/v3/PersonalityInsights.java b/personality-insights/src/main/java/com/ibm/watson/personality_insights/v3/PersonalityInsights.java index e03202142be..449628b79d1 100644 --- a/personality-insights/src/main/java/com/ibm/watson/personality_insights/v3/PersonalityInsights.java +++ b/personality-insights/src/main/java/com/ibm/watson/personality_insights/v3/PersonalityInsights.java @@ -66,10 +66,10 @@ */ /** - * @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 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 { @@ -134,10 +134,11 @@ public PersonalityInsights(String version, String serviceName, Authenticator aut setVersion(version); this.configureService(serviceName); - System.err.println("On 1 December 2021, Personality Insights will no longer be available." + - " Consider migrating to Watson Natural Language Understanding." + - "\nFor more information, see Personality Insights Deprecation " + - "(https://github.com/watson-developer-cloud/java-sdk/tree/master#personality-insights-deprecation)."); + System.err.println( + "On 1 December 2021, Personality Insights will no longer be available." + + " Consider migrating to Watson Natural Language Understanding." + + "\nFor more information, see Personality Insights Deprecation " + + "(https://github.com/watson-developer-cloud/java-sdk/tree/master#personality-insights-deprecation)."); } /** 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 77b07b0282e..d3039f38198 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 @@ -88,14 +88,12 @@ import com.ibm.watson.speech_to_text.v1.model.UpgradeLanguageModelOptions; import com.ibm.watson.speech_to_text.v1.model.Word; import com.ibm.watson.speech_to_text.v1.model.Words; +import com.ibm.watson.speech_to_text.v1.websocket.RecognizeCallback; +import com.ibm.watson.speech_to_text.v1.websocket.SpeechToTextWebSocketListener; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; - -import com.ibm.watson.speech_to_text.v1.websocket.RecognizeCallback; -import com.ibm.watson.speech_to_text.v1.websocket.SpeechToTextWebSocketListener; import okhttp3.HttpUrl; -import okhttp3.MultipartBody; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.WebSocket; @@ -449,9 +447,9 @@ public ServiceCall recognize(RecognizeOptions recogniz * @return the {@link WebSocket} */ public WebSocket recognizeUsingWebSocket( - RecognizeWithWebsocketsOptions recognizeOptions, RecognizeCallback callback) { + RecognizeWithWebsocketsOptions recognizeOptions, RecognizeCallback callback) { com.ibm.cloud.sdk.core.util.Validator.notNull( - recognizeOptions, "recognizeOptions cannot be null"); + recognizeOptions, "recognizeOptions cannot be null"); com.ibm.cloud.sdk.core.util.Validator.notNull(recognizeOptions.audio(), "audio cannot be null"); com.ibm.cloud.sdk.core.util.Validator.notNull(callback, "callback cannot be null"); @@ -465,11 +463,11 @@ public WebSocket recognizeUsingWebSocket( } if (recognizeOptions.languageCustomizationId() != null) { urlBuilder.addQueryParameter( - "language_customization_id", recognizeOptions.languageCustomizationId()); + "language_customization_id", recognizeOptions.languageCustomizationId()); } if (recognizeOptions.acousticCustomizationId() != null) { urlBuilder.addQueryParameter( - "acoustic_customization_id", recognizeOptions.acousticCustomizationId()); + "acoustic_customization_id", recognizeOptions.acousticCustomizationId()); } if (recognizeOptions.baseModelVersion() != null) { urlBuilder.addQueryParameter("base_model_version", recognizeOptions.baseModelVersion()); @@ -483,7 +481,7 @@ public WebSocket recognizeUsingWebSocket( OkHttpClient client = configureHttpClient(); return client.newWebSocket( - builder.build(), new SpeechToTextWebSocketListener(recognizeOptions, callback)); + builder.build(), new SpeechToTextWebSocketListener(recognizeOptions, callback)); } /** diff --git a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/RecognizeOptions.java b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/RecognizeOptions.java index 14eae269b45..a6ed045d619 100644 --- a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/RecognizeOptions.java +++ b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/RecognizeOptions.java @@ -108,8 +108,10 @@ public interface Model { } protected InputStream audio; + @SerializedName("content-type") protected String contentType; + protected String model; protected String languageCustomizationId; protected String acousticCustomizationId; 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 504bcf26416..5b68692b60e 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 @@ -50,15 +50,14 @@ import com.ibm.watson.text_to_speech.v1.model.Words; import com.ibm.watson.text_to_speech.v1.websocket.SynthesizeCallback; import com.ibm.watson.text_to_speech.v1.websocket.TextToSpeechWebSocketListener; -import okhttp3.HttpUrl; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.WebSocket; - import java.io.InputStream; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; +import okhttp3.HttpUrl; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.WebSocket; /** * The IBM Watson&trade; Text to Speech service provides APIs that use IBM's speech-synthesis @@ -320,9 +319,9 @@ public ServiceCall synthesize(SynthesizeOptions synthesizeOptions) * @return a {@link WebSocket} instance */ public WebSocket synthesizeUsingWebSocket( - SynthesizeOptions synthesizeOptions, SynthesizeCallback callback) { + SynthesizeOptions synthesizeOptions, SynthesizeCallback callback) { com.ibm.cloud.sdk.core.util.Validator.notNull( - synthesizeOptions, "synthesizeOptions cannot be null"); + synthesizeOptions, "synthesizeOptions cannot be null"); com.ibm.cloud.sdk.core.util.Validator.notNull(callback, "callback cannot be null"); HttpUrl.Builder urlBuilder = HttpUrl.parse(getServiceUrl() + "/v1/synthesize").newBuilder(); @@ -342,7 +341,7 @@ public WebSocket synthesizeUsingWebSocket( OkHttpClient client = configureHttpClient(); return client.newWebSocket( - builder.build(), new TextToSpeechWebSocketListener(synthesizeOptions, callback)); + builder.build(), new TextToSpeechWebSocketListener(synthesizeOptions, callback)); } /** diff --git a/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/SynthesizeOptions.java b/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/SynthesizeOptions.java index 156d69cfc00..b2b0530c720 100644 --- a/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/SynthesizeOptions.java +++ b/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/SynthesizeOptions.java @@ -13,7 +13,6 @@ package com.ibm.watson.text_to_speech.v1.model; import com.ibm.cloud.sdk.core.service.model.GenericModel; - import java.util.List; /** The synthesize options. */ 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 15f985d7088..47ad898ae32 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 @@ -189,7 +189,8 @@ public ServiceCall classify(ClassifyOptions classifyOptions) { multipartBuilder.addFormDataPart("owners", RequestUtils.join(classifyOptions.owners(), ",")); } if (classifyOptions.classifierIds() != null) { - multipartBuilder.addFormDataPart("classifier_ids", RequestUtils.join(classifyOptions.classifierIds(), ",")); + multipartBuilder.addFormDataPart( + "classifier_ids", RequestUtils.join(classifyOptions.classifierIds(), ",")); } builder.body(multipartBuilder.build()); ResponseConverter responseConverter = @@ -261,7 +262,8 @@ public ServiceCall createClassifier(CreateClassifierOptions createCl if (!negativeExamplesFilename.contains(".")) { negativeExamplesFilename += ".zip"; } - multipartBuilder.addFormDataPart("negative_examples", negativeExamplesFilename, negativeExamplesBody); + multipartBuilder.addFormDataPart( + "negative_examples", negativeExamplesFilename, negativeExamplesBody); } builder.body(multipartBuilder.build()); ResponseConverter responseConverter = 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 7cc4687a289..dfbe5b6de3b 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); From 2d553a7e482a3274aeaca2af9de8d650d8940b34 Mon Sep 17 00:00:00 2001 From: Kevin Kowalski Date: Tue, 1 Dec 2020 14:24:53 -0600 Subject: [PATCH 15/25] chore(copyrights): ran lint-copyrights --- .../src/main/java/com/ibm/watson/assistant/v1/Assistant.java | 2 +- .../ibm/watson/assistant/v1/model/DialogNodeOutputGeneric.java | 2 +- .../src/main/java/com/ibm/watson/assistant/v2/Assistant.java | 2 +- .../test/java/com/ibm/watson/assistant/v2/AssistantTest.java | 2 +- .../java/com/ibm/watson/compare_comply/v1/CompareComply.java | 2 +- .../src/main/java/com/ibm/watson/discovery/v1/Discovery.java | 2 +- .../java/com/ibm/watson/discovery/v1/model/SearchStatus.java | 2 +- .../src/main/java/com/ibm/watson/discovery/v2/Discovery.java | 2 +- .../ibm/watson/language_translator/v3/LanguageTranslator.java | 2 +- .../v1/NaturalLanguageClassifier.java | 2 +- .../v1/NaturalLanguageUnderstanding.java | 2 +- .../ibm/watson/personality_insights/v3/PersonalityInsights.java | 2 +- .../java/com/ibm/watson/speech_to_text/v1/SpeechToText.java | 2 +- .../speech_to_text/v1/model/CreateAcousticModelOptions.java | 2 +- .../speech_to_text/v1/model/CreateLanguageModelOptions.java | 2 +- .../speech_to_text/v1/model/ListAcousticModelsOptions.java | 2 +- .../speech_to_text/v1/model/ListLanguageModelsOptions.java | 2 +- .../ibm/watson/speech_to_text/v1/model/RecognizeOptions.java | 2 +- .../speech_to_text/v1/model/SpeechRecognitionAlternative.java | 2 +- .../java/com/ibm/watson/speech_to_text/v1/SpeechToTextTest.java | 2 +- .../java/com/ibm/watson/text_to_speech/v1/TextToSpeech.java | 2 +- .../ibm/watson/text_to_speech/v1/model/SynthesizeOptions.java | 2 +- .../java/com/ibm/watson/text_to_speech/v1/TextToSpeechTest.java | 2 +- .../main/java/com/ibm/watson/tone_analyzer/v3/ToneAnalyzer.java | 2 +- .../com/ibm/watson/visual_recognition/v3/VisualRecognition.java | 2 +- .../com/ibm/watson/visual_recognition/v4/VisualRecognition.java | 2 +- .../visual_recognition/v4/model/CreateCollectionOptions.java | 2 +- .../visual_recognition/v4/model/UpdateCollectionOptions.java | 2 +- .../ibm/watson/visual_recognition/v4/VisualRecognitionTest.java | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) 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 873652d4abe..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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2019, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at diff --git a/assistant/src/main/java/com/ibm/watson/assistant/v1/model/DialogNodeOutputGeneric.java b/assistant/src/main/java/com/ibm/watson/assistant/v1/model/DialogNodeOutputGeneric.java index aa36d306d20..c035556e7dc 100644 --- a/assistant/src/main/java/com/ibm/watson/assistant/v1/model/DialogNodeOutputGeneric.java +++ b/assistant/src/main/java/com/ibm/watson/assistant/v1/model/DialogNodeOutputGeneric.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2018, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at 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 1c2bcc3731a..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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2019, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at 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 464324727b1..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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2019, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at 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 950399e9ab4..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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2019, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at 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 3b30583a186..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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2019, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at 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 437d0d942df..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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2018, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at 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 3db5d8d1bda..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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2019, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at diff --git a/language-translator/src/main/java/com/ibm/watson/language_translator/v3/LanguageTranslator.java b/language-translator/src/main/java/com/ibm/watson/language_translator/v3/LanguageTranslator.java index 9b068d3716b..64a1ba1b14e 100644 --- a/language-translator/src/main/java/com/ibm/watson/language_translator/v3/LanguageTranslator.java +++ b/language-translator/src/main/java/com/ibm/watson/language_translator/v3/LanguageTranslator.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2019, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at diff --git a/natural-language-classifier/src/main/java/com/ibm/watson/natural_language_classifier/v1/NaturalLanguageClassifier.java b/natural-language-classifier/src/main/java/com/ibm/watson/natural_language_classifier/v1/NaturalLanguageClassifier.java index b2b5db0487e..40a563db639 100644 --- a/natural-language-classifier/src/main/java/com/ibm/watson/natural_language_classifier/v1/NaturalLanguageClassifier.java +++ b/natural-language-classifier/src/main/java/com/ibm/watson/natural_language_classifier/v1/NaturalLanguageClassifier.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2019, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at diff --git a/natural-language-understanding/src/main/java/com/ibm/watson/natural_language_understanding/v1/NaturalLanguageUnderstanding.java b/natural-language-understanding/src/main/java/com/ibm/watson/natural_language_understanding/v1/NaturalLanguageUnderstanding.java index 0c220dae080..01d5ebe0a13 100644 --- a/natural-language-understanding/src/main/java/com/ibm/watson/natural_language_understanding/v1/NaturalLanguageUnderstanding.java +++ b/natural-language-understanding/src/main/java/com/ibm/watson/natural_language_understanding/v1/NaturalLanguageUnderstanding.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2019, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at diff --git a/personality-insights/src/main/java/com/ibm/watson/personality_insights/v3/PersonalityInsights.java b/personality-insights/src/main/java/com/ibm/watson/personality_insights/v3/PersonalityInsights.java index 449628b79d1..dbfd96c5741 100644 --- a/personality-insights/src/main/java/com/ibm/watson/personality_insights/v3/PersonalityInsights.java +++ b/personality-insights/src/main/java/com/ibm/watson/personality_insights/v3/PersonalityInsights.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2016, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at 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 d3039f38198..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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2016, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at 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 e9fbb098116..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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2018, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at 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 d0e5e30377a..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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2018, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at 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 6c5802676b6..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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2018, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at 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 b03cf78ae79..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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2018, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at diff --git a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/RecognizeOptions.java b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/RecognizeOptions.java index a6ed045d619..9f631b09ed8 100644 --- a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/RecognizeOptions.java +++ b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/RecognizeOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2016, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at diff --git a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/SpeechRecognitionAlternative.java b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/SpeechRecognitionAlternative.java index 39e94945bbd..da4516574c9 100644 --- a/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/SpeechRecognitionAlternative.java +++ b/speech-to-text/src/main/java/com/ibm/watson/speech_to_text/v1/model/SpeechRecognitionAlternative.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2018, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at diff --git a/speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/SpeechToTextTest.java b/speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/SpeechToTextTest.java index 0e179d42b4b..5c00ce8cd59 100755 --- a/speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/SpeechToTextTest.java +++ b/speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/SpeechToTextTest.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2019, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at 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 5b68692b60e..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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2019, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at diff --git a/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/SynthesizeOptions.java b/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/SynthesizeOptions.java index b2b0530c720..3cbde3d9d61 100644 --- a/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/SynthesizeOptions.java +++ b/text-to-speech/src/main/java/com/ibm/watson/text_to_speech/v1/model/SynthesizeOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2018, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at 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 293093f1303..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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2019, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at 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 c5aad08fe8f..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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2016, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at 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 47ad898ae32..bd1b7be55b0 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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2016, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at 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 b15d45d637b..e4205ad96a9 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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2019, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at diff --git a/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/CreateCollectionOptions.java b/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/CreateCollectionOptions.java index a2c2fc2481a..bab756aacd8 100644 --- a/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/CreateCollectionOptions.java +++ b/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/CreateCollectionOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2019, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at diff --git a/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/UpdateCollectionOptions.java b/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/UpdateCollectionOptions.java index b12c95ab419..e388865d4c3 100644 --- a/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/UpdateCollectionOptions.java +++ b/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v4/model/UpdateCollectionOptions.java @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2019, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at 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 dfbe5b6de3b..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 @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 2020. + * (C) Copyright IBM Corp. 2019, 2020. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at From 337ceb6bc788e048749d61b5f9ff9dba7bb1e168 Mon Sep 17 00:00:00 2001 From: Kevin Kowalski Date: Tue, 1 Dec 2020 14:32:41 -0600 Subject: [PATCH 16/25] chore(visual-recognition): add deprecation message --- .../visual_recognition/v3/VisualRecognition.java | 10 ++++++++++ .../visual_recognition/v4/VisualRecognition.java | 10 ++++++++++ 2 files changed, 20 insertions(+) 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 bd1b7be55b0..dfa4fbb5a52 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 @@ -55,6 +55,12 @@ * @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"; @@ -116,6 +122,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 e4205ad96a9..bc08e9a7292 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 @@ -79,6 +79,12 @@ * href="https://cloud.ibm.com/docs/visual-recognition?topic=visual-recognition-object-detection-overview">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"; @@ -140,6 +146,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)."); } /** From cc70d12e77f2133399b74a25ecb79f9238dc5933 Mon Sep 17 00:00:00 2001 From: Kevin Kowalski Date: Tue, 1 Dec 2020 14:34:51 -0600 Subject: [PATCH 17/25] chore(java-format): ran java_format_google.sh --- .../watson/visual_recognition/v3/VisualRecognition.java | 9 +++++---- .../watson/visual_recognition/v4/VisualRecognition.java | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) 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 dfa4fbb5a52..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 @@ -57,8 +57,9 @@ */ /** - * @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 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 { @@ -124,8 +125,8 @@ public VisualRecognition(String version, String serviceName, Authenticator authe 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)."); + "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 bc08e9a7292..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 @@ -81,8 +81,9 @@ */ /** - * @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 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 { @@ -148,8 +149,8 @@ public VisualRecognition(String version, String serviceName, Authenticator authe 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)."); + "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)."); } /** From 687c661464157a692302cc925ea470bcac329bef Mon Sep 17 00:00:00 2001 From: Kevin Kowalski Date: Tue, 1 Dec 2020 14:38:48 -0600 Subject: [PATCH 18/25] chore(build.gradle): update java version to 8 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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" } From b52246eab8453ba71b9029b38ab41b980ee99635 Mon Sep 17 00:00:00 2001 From: Kevin Kowalski Date: Tue, 1 Dec 2020 14:59:05 -0600 Subject: [PATCH 19/25] test(discovery-v1): clean collections --- .../discovery/v1/DiscoveryServiceIT.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) 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..bbc96820edc 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 @@ -178,6 +178,26 @@ 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"); + } + } + } } /** From 02d78b20b67f2c0f21d1a0116bad23211770bacf Mon Sep 17 00:00:00 2001 From: Kevin Kowalski Date: Tue, 1 Dec 2020 15:01:37 -0600 Subject: [PATCH 20/25] chore(build.gradle): update core from 9.5.0 to 9.5.4 --- assistant/build.gradle | 2 +- common/build.gradle | 2 +- compare-comply/build.gradle | 2 +- discovery/build.gradle | 2 +- language-translator/build.gradle | 2 +- natural-language-classifier/build.gradle | 2 +- natural-language-understanding/build.gradle | 2 +- personality-insights/build.gradle | 2 +- speech-to-text/build.gradle | 2 +- text-to-speech/build.gradle | 2 +- tone-analyzer/build.gradle | 2 +- visual-recognition/build.gradle | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) 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/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/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/language-translator/build.gradle b/language-translator/build.gradle index e121e45eb92..75f8ce03715 100644 --- a/language-translator/build.gradle +++ b/language-translator/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/natural-language-classifier/build.gradle b/natural-language-classifier/build.gradle index 8d842e81ad3..be6433205a7 100644 --- a/natural-language-classifier/build.gradle +++ b/natural-language-classifier/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/natural-language-understanding/build.gradle b/natural-language-understanding/build.gradle index e121e45eb92..75f8ce03715 100644 --- a/natural-language-understanding/build.gradle +++ b/natural-language-understanding/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/personality-insights/build.gradle b/personality-insights/build.gradle index e121e45eb92..75f8ce03715 100644 --- a/personality-insights/build.gradle +++ b/personality-insights/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/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/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/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/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' } From 3e0e774f0509fee8ac999089a5721215f034c242 Mon Sep 17 00:00:00 2001 From: Kevin Kowalski Date: Tue, 1 Dec 2020 15:13:00 -0600 Subject: [PATCH 21/25] chore(java-format): ran java_format_google.sh --- .../discovery/v1/DiscoveryServiceIT.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) 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 8773972b5e0..456f982c883 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 @@ -179,20 +179,22 @@ public void cleanup() { } } - 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() + 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(); + DeleteCollectionResponse deleteCollectionResponse = + discovery.deleteCollection(deleteCollectionOptions).execute().getResult(); } catch (NotFoundException ex) { System.out.println("deleteCollection failed. Collection " + collectionId + " not found"); } From cde7e20e3789bedd96591f6ae4026b8b9b37e8eb Mon Sep 17 00:00:00 2001 From: Kevin Kowalski Date: Wed, 2 Dec 2020 09:09:50 -0600 Subject: [PATCH 22/25] test(speech-to-text-v1): fix mock response body --- .../ibm/watson/speech_to_text/v1/SpeechToTextTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/SpeechToTextTest.java b/speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/SpeechToTextTest.java index 5c00ce8cd59..ddb4f7f4969 100755 --- a/speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/SpeechToTextTest.java +++ b/speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/SpeechToTextTest.java @@ -215,7 +215,7 @@ public void testGetModelNoOptions() throws Throwable { public void testRecognizeWOptions() throws Throwable { // Schedule some responses. String mockResponseBody = - "{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [\"timestamps\"], \"word_confidence\": [\"wordConfidence\"]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}"; + "{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [[\"several\", 1.0, 1.51], [\"tornadoes\", 1.51, 2.15], [\"touch\", 2.15, 2.5]], \"word_confidence\": [[\"you\", 0.36485132893469713]]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}"; String recognizePath = "/v1/recognize"; server.enqueue( @@ -425,7 +425,7 @@ public void testUnregisterCallbackNoOptions() throws Throwable { public void testCreateJobWOptions() throws Throwable { // Schedule some responses. String mockResponseBody = - "{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [\"timestamps\"], \"word_confidence\": [\"wordConfidence\"]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}"; + "{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [[\"several\", 1.0, 1.51], [\"tornadoes\", 1.51, 2.15], [\"touch\", 2.15, 2.5]], \"word_confidence\": [[\"you\", 0.36485132893469713]]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}"; String createJobPath = "/v1/recognitions"; server.enqueue( @@ -542,7 +542,7 @@ public void testCreateJobNoOptions() throws Throwable { public void testCheckJobsWOptions() throws Throwable { // Schedule some responses. String mockResponseBody = - "{\"recognitions\": [{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [\"timestamps\"], \"word_confidence\": [\"wordConfidence\"]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}]}"; + "{\"recognitions\": [{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [[\"several\", 1.0, 1.51], [\"tornadoes\", 1.51, 2.15], [\"touch\", 2.15, 2.5]], \"word_confidence\": [[\"you\", 0.36485132893469713]]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}]}"; String checkJobsPath = "/v1/recognitions"; server.enqueue( @@ -581,7 +581,7 @@ public void testCheckJobsWOptions() throws Throwable { public void testCheckJobWOptions() throws Throwable { // Schedule some responses. String mockResponseBody = - "{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [\"timestamps\"], \"word_confidence\": [\"wordConfidence\"]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}"; + "{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [[\"several\", 1.0, 1.51], [\"tornadoes\", 1.51, 2.15], [\"touch\", 2.15, 2.5]], \"word_confidence\": [[\"you\", 0.36485132893469713]]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}"; String checkJobPath = "/v1/recognitions/testString"; server.enqueue( From b4cf28f02c53a89ebe5dadc5d7d220adef582b3d Mon Sep 17 00:00:00 2001 From: Kevin Kowalski Date: Wed, 2 Dec 2020 09:34:22 -0600 Subject: [PATCH 23/25] test(discovery-v1): fix cleanup method to be called after the tests are done cleanup was called after each test --- .../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 456f982c883..bd85202ece9 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 @@ -154,7 +154,6 @@ public void setup() throws Exception { } /** Cleanup. */ - @After public void cleanup() { for (String collectionId : collectionIds) { DeleteCollectionOptions deleteOptions = @@ -200,6 +199,7 @@ public void cleanup() { } } } + collectionId = null; } /** From 1f5e1ecdb2a17910a311d9be113fd0f1bbedeb57 Mon Sep 17 00:00:00 2001 From: Kevin Kowalski Date: Wed, 2 Dec 2020 09:35:58 -0600 Subject: [PATCH 24/25] chore(java-format): ran java_format_google.sh --- .../com/ibm/watson/discovery/v1/DiscoveryServiceIT.java | 1 - .../ibm/watson/speech_to_text/v1/SpeechToTextTest.java | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) 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 bd85202ece9..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; diff --git a/speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/SpeechToTextTest.java b/speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/SpeechToTextTest.java index ddb4f7f4969..2c1f34a1770 100755 --- a/speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/SpeechToTextTest.java +++ b/speech-to-text/src/test/java/com/ibm/watson/speech_to_text/v1/SpeechToTextTest.java @@ -215,7 +215,7 @@ public void testGetModelNoOptions() throws Throwable { public void testRecognizeWOptions() throws Throwable { // Schedule some responses. String mockResponseBody = - "{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [[\"several\", 1.0, 1.51], [\"tornadoes\", 1.51, 2.15], [\"touch\", 2.15, 2.5]], \"word_confidence\": [[\"you\", 0.36485132893469713]]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}"; + "{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [[\"several\", 1.0, 1.51], [\"tornadoes\", 1.51, 2.15], [\"touch\", 2.15, 2.5]], \"word_confidence\": [[\"you\", 0.36485132893469713]]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}"; String recognizePath = "/v1/recognize"; server.enqueue( @@ -425,7 +425,7 @@ public void testUnregisterCallbackNoOptions() throws Throwable { public void testCreateJobWOptions() throws Throwable { // Schedule some responses. String mockResponseBody = - "{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [[\"several\", 1.0, 1.51], [\"tornadoes\", 1.51, 2.15], [\"touch\", 2.15, 2.5]], \"word_confidence\": [[\"you\", 0.36485132893469713]]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}"; + "{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [[\"several\", 1.0, 1.51], [\"tornadoes\", 1.51, 2.15], [\"touch\", 2.15, 2.5]], \"word_confidence\": [[\"you\", 0.36485132893469713]]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}"; String createJobPath = "/v1/recognitions"; server.enqueue( @@ -542,7 +542,7 @@ public void testCreateJobNoOptions() throws Throwable { public void testCheckJobsWOptions() throws Throwable { // Schedule some responses. String mockResponseBody = - "{\"recognitions\": [{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [[\"several\", 1.0, 1.51], [\"tornadoes\", 1.51, 2.15], [\"touch\", 2.15, 2.5]], \"word_confidence\": [[\"you\", 0.36485132893469713]]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}]}"; + "{\"recognitions\": [{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [[\"several\", 1.0, 1.51], [\"tornadoes\", 1.51, 2.15], [\"touch\", 2.15, 2.5]], \"word_confidence\": [[\"you\", 0.36485132893469713]]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}]}"; String checkJobsPath = "/v1/recognitions"; server.enqueue( @@ -581,7 +581,7 @@ public void testCheckJobsWOptions() throws Throwable { public void testCheckJobWOptions() throws Throwable { // Schedule some responses. String mockResponseBody = - "{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [[\"several\", 1.0, 1.51], [\"tornadoes\", 1.51, 2.15], [\"touch\", 2.15, 2.5]], \"word_confidence\": [[\"you\", 0.36485132893469713]]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}"; + "{\"id\": \"id\", \"status\": \"waiting\", \"created\": \"created\", \"updated\": \"updated\", \"url\": \"url\", \"user_token\": \"userToken\", \"results\": [{\"results\": [{\"final\": true, \"alternatives\": [{\"transcript\": \"transcript\", \"confidence\": 0, \"timestamps\": [[\"several\", 1.0, 1.51], [\"tornadoes\", 1.51, 2.15], [\"touch\", 2.15, 2.5]], \"word_confidence\": [[\"you\", 0.36485132893469713]]}], \"keywords_result\": {\"mapKey\": [{\"normalized_text\": \"normalizedText\", \"start_time\": 9, \"end_time\": 7, \"confidence\": 0}]}, \"word_alternatives\": [{\"start_time\": 9, \"end_time\": 7, \"alternatives\": [{\"confidence\": 0, \"word\": \"word\"}]}], \"end_of_utterance\": \"end_of_data\"}], \"result_index\": 11, \"speaker_labels\": [{\"from\": 4, \"to\": 2, \"speaker\": 7, \"confidence\": 10, \"final\": true}], \"processing_metrics\": {\"processed_audio\": {\"received\": 8, \"seen_by_engine\": 12, \"transcription\": 13, \"speaker_labels\": 13}, \"wall_clock_since_first_byte_received\": 31, \"periodic\": true}, \"audio_metrics\": {\"sampling_interval\": 16, \"accumulated\": {\"final\": true, \"end_time\": 7, \"signal_to_noise_ratio\": 18, \"speech_ratio\": 11, \"high_frequency_loss\": 17, \"direct_current_offset\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"clipping_rate\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}], \"non_speech_level\": [{\"begin\": 5, \"end\": 3, \"count\": 5}]}}, \"warnings\": [\"warnings\"]}], \"warnings\": [\"warnings\"]}"; String checkJobPath = "/v1/recognitions/testString"; server.enqueue( From 3c58ef9bddcf37808b4e9e5a4185c47d9e4660c9 Mon Sep 17 00:00:00 2001 From: Kevin Kowalski Date: Wed, 2 Dec 2020 13:05:53 -0600 Subject: [PATCH 25/25] test(discovery-v1): ignore old unit tests --- .../com/ibm/watson/discovery/v1/DiscoveryServiceTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 index 3e5610cec59..bb8a201e604 100644 --- 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;