diff --git a/CHANGELOG.md b/CHANGELOG.md index 31460366ce8..208e305d6bd 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,24 @@ Change Log ========== +## Version 3.8.0 + +_2017-04-24_ + +* New: Add support for workspaces in Conversation 1b291a5 +* New: Update okhttp version to 3.7.0 7912344 +* New: Change WAV to WebM in comments in test-to-speech 4535c70 +* New: Add support for Customer Care API endpoint for Tone Analyzer 7a5fcfe +* New: Add new audio format to text-to-speech 07a375e +* New: Add new audio format to speech-to-text 1c93196 +* Fix: Enable cipher suites 4b51aee +* Fix: Enable all TLS protocols 842383b +* Fix: Use `target` in language translator Fixes #655 999f04c +* Fix: Date deserialization for ISO 8601 dates with Z timezone 6c870dc +* Fix: SerializedName annotation for configuration id and test dd0ec53 +* Fix: Fix NLU example 8c33f2b + + ## Version 3.7.2 _2017-04-07_ diff --git a/README.md b/README.md index cead2e48e09..2810517fea5 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ All the services: com.ibm.watson.developer_cloud java-sdk - 3.7.2 + 3.8.0 ``` @@ -63,7 +63,7 @@ Only Retrieve and Rank: com.ibm.watson.developer_cloud retrieve-and-rank - 3.7.2 + 3.8.0 ``` @@ -71,17 +71,17 @@ Only Retrieve and Rank: All the services: ```gradle -'com.ibm.watson.developer_cloud:java-sdk:3.7.2' +'com.ibm.watson.developer_cloud:java-sdk:3.8.0' ``` Only Retrieve and Rank: ```gradle -'com.ibm.watson.developer_cloud:retrieve-and-rank:3.7.2' +'com.ibm.watson.developer_cloud:retrieve-and-rank:3.8.0' ``` Only Visual Recognition: ```gradle -'com.ibm.watson.developer_cloud:visual-recognition:3.7.2' +'com.ibm.watson.developer_cloud:visual-recognition:3.8.0' ``` Snapshots of the development version are available in [Sonatype's snapshots repository][sonatype_snapshots]. @@ -286,7 +286,7 @@ Gradle: ```sh $ cd java-sdk - $ gradle jar # build jar file (build/libs/watson-developer-cloud-3.7.2.jar) + $ gradle jar # build jar file (build/libs/watson-developer-cloud-3.8.0.jar) $ gradle test # run tests $ gradle check # performs quality checks on source files and generates reports $ gradle testReport # run tests and generate the aggregated test report (build/reports/allTests) @@ -323,4 +323,4 @@ See [CONTRIBUTING.md](.github/CONTRIBUTING.md). [apache_maven]: http://maven.apache.org/ [sonatype_snapshots]: https://oss.sonatype.org/content/repositories/snapshots/com/ibm/watson/developer_cloud/ -[jar]: https://github.com/watson-developer-cloud/java-sdk/releases/download/java-sdk-3.7.2/java-sdk-3.7.2-jar-with-dependencies.jar +[jar]: https://github.com/watson-developer-cloud/java-sdk/releases/download/java-sdk-3.8.0/java-sdk-3.8.0-jar-with-dependencies.jar diff --git a/alchemy/README.md b/alchemy/README.md index 0c98ff86223..5b62ffe95f2 100644 --- a/alchemy/README.md +++ b/alchemy/README.md @@ -7,13 +7,13 @@ com.ibm.watson.developer_cloud alchemy - 3.7.2 + 3.8.0 ``` ##### Gradle ```gradle -'com.ibm.watson.developer_cloud:alchemy:3.7.2' +'com.ibm.watson.developer_cloud:alchemy:3.8.0' ``` ## Alchemy Language diff --git a/conversation/README.md b/conversation/README.md index 71d31b5913d..d836fbb787a 100644 --- a/conversation/README.md +++ b/conversation/README.md @@ -7,13 +7,13 @@ com.ibm.watson.developer_cloud conversation - 3.7.2 + 3.8.0 ``` ##### Gradle ```gradle -'com.ibm.watson.developer_cloud:conversation:3.7.2' +'com.ibm.watson.developer_cloud:conversation:3.8.0' ``` ## Usage diff --git a/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/CreateEntity.java b/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/CreateEntity.java index 7da4319d458..6215bec1fc5 100644 --- a/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/CreateEntity.java +++ b/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/CreateEntity.java @@ -62,6 +62,7 @@ public CreateEntity build() { * Adds an values to values. * * @param values the new values + * @return the builder */ public Builder values(CreateValue values) { if (this.values == null) { diff --git a/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/CreateIntent.java b/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/CreateIntent.java index 56e87055442..27f9c3fd1ad 100644 --- a/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/CreateIntent.java +++ b/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/CreateIntent.java @@ -62,6 +62,7 @@ public CreateIntent build() { * Adds an examples to examples. * * @param examples the new examples + * @return the builder */ public Builder examples(CreateExample examples) { if (this.examples == null) { diff --git a/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/CreateValue.java b/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/CreateValue.java index 20030319609..a1b044a1d0b 100644 --- a/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/CreateValue.java +++ b/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/CreateValue.java @@ -63,6 +63,7 @@ public CreateValue build() { * Adds an synonyms to synonyms. * * @param synonyms the new synonyms + * @return the builder */ public Builder synonyms(String synonyms) { if (this.synonyms == null) { diff --git a/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/CreateWorkspace.java b/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/CreateWorkspace.java index 422e4eb52ae..dc7bfa5639c 100644 --- a/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/CreateWorkspace.java +++ b/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/CreateWorkspace.java @@ -84,6 +84,7 @@ public CreateWorkspace build() { * Adds an intents to intents. * * @param intents the new intents + * @return the builder */ public Builder intents(CreateIntent intents) { if (this.intents == null) { @@ -97,6 +98,7 @@ public Builder intents(CreateIntent intents) { * Adds an entities to entities. * * @param entities the new entities + * @return the builder */ public Builder entities(CreateEntity entities) { if (this.entities == null) { @@ -110,6 +112,7 @@ public Builder entities(CreateEntity entities) { * Adds an dialogNodes to dialogNodes. * * @param dialogNodes the new dialogNodes + * @return the builder */ public Builder dialogNodes(CreateDialogNode dialogNodes) { if (this.dialogNodes == null) { @@ -123,6 +126,7 @@ public Builder dialogNodes(CreateDialogNode dialogNodes) { * Adds an counterexamples to counterexamples. * * @param counterexamples the new counterexamples + * @return the builder */ public Builder counterexamples(CreateExample counterexamples) { if (this.counterexamples == null) { diff --git a/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/UpdateWorkspace.java b/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/UpdateWorkspace.java index 3eea0700b74..5d93c4b45be 100644 --- a/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/UpdateWorkspace.java +++ b/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/UpdateWorkspace.java @@ -84,6 +84,7 @@ public UpdateWorkspace build() { * Adds an intents to intents. * * @param intents the new intents + * @return the builder */ public Builder intents(CreateIntent intents) { if (this.intents == null) { @@ -97,6 +98,7 @@ public Builder intents(CreateIntent intents) { * Adds an entities to entities. * * @param entities the new entities + * @return the builder */ public Builder entities(CreateEntity entities) { if (this.entities == null) { @@ -110,6 +112,7 @@ public Builder entities(CreateEntity entities) { * Adds an dialogNodes to dialogNodes. * * @param dialogNodes the new dialogNodes + * @return the builder */ public Builder dialogNodes(CreateDialogNode dialogNodes) { if (this.dialogNodes == null) { @@ -123,6 +126,7 @@ public Builder dialogNodes(CreateDialogNode dialogNodes) { * Adds an counterexamples to counterexamples. * * @param counterexamples the new counterexamples + * @return the builder */ public Builder counterexamples(CreateExample counterexamples) { if (this.counterexamples == null) { diff --git a/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/WorkspaceExportResponse.java b/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/WorkspaceExportResponse.java index f27e5c505dc..c339bbd3dde 100644 --- a/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/WorkspaceExportResponse.java +++ b/conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/model/WorkspaceExportResponse.java @@ -24,6 +24,28 @@ */ public class WorkspaceExportResponse extends GenericModel { + + /** + * Classifier Status. + */ + public enum Status { + + /** The available. */ + @SerializedName("Available") AVAILABLE, + + /** The failed. */ + @SerializedName("Failed") FAILED, + + /** The non existent. */ + @SerializedName("Non Existent") NON_EXISTENT, + + /** The training. */ + @SerializedName("Training") TRAINING, + + /** The unavailable. */ + @SerializedName("Unavailable") UNAVAILABLE + } + /** The name of the workspace. */ private String name; /** The description of the workspace. */ @@ -40,7 +62,7 @@ public class WorkspaceExportResponse extends GenericModel { @SerializedName("workspace_id") private String workspaceId; /** The current status of the workspace (`Non Existent`, `Training`, `Failed`, `Available`, or `Unavailable`). */ - private String status; + private Status status; /** An array of intents. */ private List intents; /** An array of entities. */ @@ -116,7 +138,7 @@ public String getWorkspaceId() { * * @return the status */ - public String getStatus() { + public Status getStatus() { return status; } @@ -215,7 +237,7 @@ public void setWorkspaceId(final String workspaceId) { * * @param status the new status */ - public void setStatus(final String status) { + public void setStatus(final Status status) { this.status = status; } diff --git a/core/src/test/java/com/ibm/watson/developer_cloud/util/DateDeserializerTest.java b/core/src/test/java/com/ibm/watson/developer_cloud/util/DateDeserializerTest.java index 5169b6a36fc..e2cd072b784 100644 --- a/core/src/test/java/com/ibm/watson/developer_cloud/util/DateDeserializerTest.java +++ b/core/src/test/java/com/ibm/watson/developer_cloud/util/DateDeserializerTest.java @@ -26,12 +26,12 @@ import java.util.Date; /** - * The Class DateDeserializerTest. + * Test the Date deserializer. */ public class DateDeserializerTest { /** - * Test deserialize. + * Test date deserializer. */ @Test public void testDeserialize() { diff --git a/dialog/build.gradle b/dialog/build.gradle index 89fb4be4299..e7651b2505b 100644 --- a/dialog/build.gradle +++ b/dialog/build.gradle @@ -77,17 +77,6 @@ dependencies { compile group: 'org.glassfish.jersey.bundles.repackaged', name: 'jersey-jsr166e', version: '2.22.2' testCompile project(path: ':core', configuration: 'tests') - testCompile project(':alchemy') - testCompile project(':document-conversion') - testCompile project(':language-translation') - testCompile project(':natural-language-classifier') - testCompile project(':personality-insights') - testCompile project(':retrieve-and-rank') - testCompile project(':speech-to-text') - testCompile project(':text-to-speech') - testCompile project(':tone-analyzer') - testCompile project(':tradeoff-analytics') - testCompile project(':visual-recognition') testCompile group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '3.6.0' testCompile group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.7' testCompile group: 'com.google.guava', name: 'guava', version: '19.0' diff --git a/discovery/README.md b/discovery/README.md index cf3521ab2b1..679e6d483c2 100644 --- a/discovery/README.md +++ b/discovery/README.md @@ -7,13 +7,13 @@ com.ibm.watson.developer_cloud discovery - 3.7.2 + 3.8.0 ``` ##### Gradle ```gradle -'com.ibm.watson.developer_cloud:discovery:3.7.2' +'com.ibm.watson.developer_cloud:discovery:3.8.0' ``` ## Usage diff --git a/document-conversion/README.md b/document-conversion/README.md index be42e5f198b..6fc5333e663 100644 --- a/document-conversion/README.md +++ b/document-conversion/README.md @@ -7,13 +7,13 @@ com.ibm.watson.developer_cloud document-conversion - 3.7.2 + 3.8.0 ``` ##### Gradle ```gradle -'com.ibm.watson.developer_cloud:document-conversion:3.7.2' +'com.ibm.watson.developer_cloud:document-conversion:3.8.0' ``` ## Usage diff --git a/language-translation/README.md b/language-translation/README.md index 8ca7afe0cc8..c5998507144 100644 --- a/language-translation/README.md +++ b/language-translation/README.md @@ -8,13 +8,13 @@ Formerly called Language Translation. No code changes are required to migrate. com.ibm.watson.developer_cloud language-translator - 3.7.2 + 3.8.0 ``` ##### Gradle ```gradle -'com.ibm.watson.developer_cloud:language-translator:3.7.2' +'com.ibm.watson.developer_cloud:language-translator:3.8.0' ``` ## Usage diff --git a/language-translator/README.md b/language-translator/README.md index 8ca7afe0cc8..c5998507144 100644 --- a/language-translator/README.md +++ b/language-translator/README.md @@ -8,13 +8,13 @@ Formerly called Language Translation. No code changes are required to migrate. com.ibm.watson.developer_cloud language-translator - 3.7.2 + 3.8.0 ``` ##### Gradle ```gradle -'com.ibm.watson.developer_cloud:language-translator:3.7.2' +'com.ibm.watson.developer_cloud:language-translator:3.8.0' ``` ## Usage diff --git a/natural-language-classifier/README.md b/natural-language-classifier/README.md index 973125d3e78..121d517cd8b 100644 --- a/natural-language-classifier/README.md +++ b/natural-language-classifier/README.md @@ -7,13 +7,13 @@ com.ibm.watson.developer_cloud natural-language-classifier - 3.7.2 + 3.8.0 ``` ##### Gradle ```gradle -'com.ibm.watson.developer_cloud:natural-language-classifier:3.7.2' +'com.ibm.watson.developer_cloud:natural-language-classifier:3.8.0' ``` ## Usage diff --git a/natural-language-understanding/README.md b/natural-language-understanding/README.md index 4c7b67be23a..c2382dd9075 100644 --- a/natural-language-understanding/README.md +++ b/natural-language-understanding/README.md @@ -7,13 +7,13 @@ com.ibm.watson.developer_cloud natural-language-understanding - 3.7.2 + 3.8.0 ``` ##### Gradle ```gradle -'com.ibm.watson.developer_cloud:natural-language-understanding:3.7.2' +'com.ibm.watson.developer_cloud:natural-language-understanding:3.8.0' ``` ## Usage diff --git a/personality-insights/README.md b/personality-insights/README.md index e67105e1f28..d3a0ac6405a 100644 --- a/personality-insights/README.md +++ b/personality-insights/README.md @@ -7,13 +7,13 @@ com.ibm.watson.developer_cloud personality-insights - 3.7.2 + 3.8.0 ``` ##### Gradle ```gradle -'com.ibm.watson.developer_cloud:personality-insights:3.7.2' +'com.ibm.watson.developer_cloud:personality-insights:3.8.0' ``` ## Usage diff --git a/retrieve-and-rank/README.md b/retrieve-and-rank/README.md index 0f261cc79bb..9edc33d8815 100644 --- a/retrieve-and-rank/README.md +++ b/retrieve-and-rank/README.md @@ -7,13 +7,13 @@ com.ibm.watson.developer_cloud retrieve-and-rank - 3.7.2 + 3.8.0 ``` ##### Gradle ```gradle -'com.ibm.watson.developer_cloud:retrieve-and-rank:3.7.2' +'com.ibm.watson.developer_cloud:retrieve-and-rank:3.8.0' ``` ## Usage diff --git a/speech-to-text/README.md b/speech-to-text/README.md index bf00dea16f9..b298bf9fd9a 100644 --- a/speech-to-text/README.md +++ b/speech-to-text/README.md @@ -7,13 +7,13 @@ com.ibm.watson.developer_cloud speech-to-text - 3.7.2 + 3.8.0 ``` ##### Gradle ```gradle -'com.ibm.watson.developer_cloud:speech-to-text:3.7.2' +'com.ibm.watson.developer_cloud:speech-to-text:3.8.0' ``` ## Usage diff --git a/text-to-speech/README.md b/text-to-speech/README.md index 6c4da065f5c..51f03519635 100644 --- a/text-to-speech/README.md +++ b/text-to-speech/README.md @@ -7,13 +7,13 @@ com.ibm.watson.developer_cloud text-to-speech - 3.7.2 + 3.8.0 ``` ##### Gradle ```gradle -'com.ibm.watson.developer_cloud:text-to-speech:3.7.2' +'com.ibm.watson.developer_cloud:text-to-speech:3.8.0' ``` ## Usage diff --git a/tone-analyzer/README.md b/tone-analyzer/README.md index c645aa256da..c183f412879 100644 --- a/tone-analyzer/README.md +++ b/tone-analyzer/README.md @@ -7,13 +7,13 @@ com.ibm.watson.developer_cloud tone-analyzer - 3.7.2 + 3.8.0 ``` ##### Gradle ```gradle -'com.ibm.watson.developer_cloud:tone-analyzer:3.7.2' +'com.ibm.watson.developer_cloud:tone-analyzer:3.8.0' ``` ## Usage diff --git a/tradeoff-analytics/README.md b/tradeoff-analytics/README.md index a90d1fdc3e0..5dbad2e5de3 100644 --- a/tradeoff-analytics/README.md +++ b/tradeoff-analytics/README.md @@ -7,13 +7,13 @@ com.ibm.watson.developer_cloud tradeoff-analytics - 3.7.2 + 3.8.0 ``` ##### Gradle ```gradle -'com.ibm.watson.developer_cloud:tradeoff-analytics:3.7.2' +'com.ibm.watson.developer_cloud:tradeoff-analytics:3.8.0' ``` ## Usage diff --git a/visual-recognition/README.md b/visual-recognition/README.md index 783bc6490d4..357f631a957 100644 --- a/visual-recognition/README.md +++ b/visual-recognition/README.md @@ -7,13 +7,13 @@ com.ibm.watson.developer_cloud visual-recognition - 3.7.2 + 3.8.0 ``` ##### Gradle ```gradle -'com.ibm.watson.developer_cloud:visual-recognition:3.7.2' +'com.ibm.watson.developer_cloud:visual-recognition:3.8.0' ``` ## Usage