Skip to content
Merged

3.8.0 #672

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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_
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ All the services:
<dependency>
<groupId>com.ibm.watson.developer_cloud</groupId>
<artifactId>java-sdk</artifactId>
<version>3.7.2</version>
<version>3.8.0</version>
</dependency>
```

Expand All @@ -63,25 +63,25 @@ Only Retrieve and Rank:
<dependency>
<groupId>com.ibm.watson.developer_cloud</groupId>
<artifactId>retrieve-and-rank</artifactId>
<version>3.7.2</version>
<version>3.8.0</version>
</dependency>
```

##### Gradle

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].
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions alchemy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<dependency>
<groupId>com.ibm.watson.developer_cloud</groupId>
<artifactId>alchemy</artifactId>
<version>3.7.2</version>
<version>3.8.0</version>
</dependency>
```

##### Gradle
```gradle
'com.ibm.watson.developer_cloud:alchemy:3.7.2'
'com.ibm.watson.developer_cloud:alchemy:3.8.0'
```

## Alchemy Language
Expand Down
4 changes: 2 additions & 2 deletions conversation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<dependency>
<groupId>com.ibm.watson.developer_cloud</groupId>
<artifactId>conversation</artifactId>
<version>3.7.2</version>
<version>3.8.0</version>
</dependency>
```

##### Gradle
```gradle
'com.ibm.watson.developer_cloud:conversation:3.7.2'
'com.ibm.watson.developer_cloud:conversation:3.8.0'
```

## Usage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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) {
Expand All @@ -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) {
Expand All @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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) {
Expand All @@ -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) {
Expand All @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand All @@ -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<IntentExportResponse> intents;
/** An array of entities. */
Expand Down Expand Up @@ -116,7 +138,7 @@ public String getWorkspaceId() {
*
* @return the status
*/
public String getStatus() {
public Status getStatus() {
return status;
}

Expand Down Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
11 changes: 0 additions & 11 deletions dialog/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions discovery/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<dependency>
<groupId>com.ibm.watson.developer_cloud</groupId>
<artifactId>discovery</artifactId>
<version>3.7.2</version>
<version>3.8.0</version>
</dependency>
```

##### Gradle
```gradle
'com.ibm.watson.developer_cloud:discovery:3.7.2'
'com.ibm.watson.developer_cloud:discovery:3.8.0'
```

## Usage
Expand Down
4 changes: 2 additions & 2 deletions document-conversion/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<dependency>
<groupId>com.ibm.watson.developer_cloud</groupId>
<artifactId>document-conversion</artifactId>
<version>3.7.2</version>
<version>3.8.0</version>
</dependency>
```

##### Gradle
```gradle
'com.ibm.watson.developer_cloud:document-conversion:3.7.2'
'com.ibm.watson.developer_cloud:document-conversion:3.8.0'
```

## Usage
Expand Down
4 changes: 2 additions & 2 deletions language-translation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ Formerly called Language Translation. No code changes are required to migrate.
<dependency>
<groupId>com.ibm.watson.developer_cloud</groupId>
<artifactId>language-translator</artifactId>
<version>3.7.2</version>
<version>3.8.0</version>
</dependency>
```

##### Gradle
```gradle
'com.ibm.watson.developer_cloud:language-translator:3.7.2'
'com.ibm.watson.developer_cloud:language-translator:3.8.0'
```

## Usage
Expand Down
4 changes: 2 additions & 2 deletions language-translator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ Formerly called Language Translation. No code changes are required to migrate.
<dependency>
<groupId>com.ibm.watson.developer_cloud</groupId>
<artifactId>language-translator</artifactId>
<version>3.7.2</version>
<version>3.8.0</version>
</dependency>
```

##### Gradle
```gradle
'com.ibm.watson.developer_cloud:language-translator:3.7.2'
'com.ibm.watson.developer_cloud:language-translator:3.8.0'
```

## Usage
Expand Down
4 changes: 2 additions & 2 deletions natural-language-classifier/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<dependency>
<groupId>com.ibm.watson.developer_cloud</groupId>
<artifactId>natural-language-classifier</artifactId>
<version>3.7.2</version>
<version>3.8.0</version>
</dependency>
```

##### 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
Expand Down
4 changes: 2 additions & 2 deletions natural-language-understanding/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<dependency>
<groupId>com.ibm.watson.developer_cloud</groupId>
<artifactId>natural-language-understanding</artifactId>
<version>3.7.2</version>
<version>3.8.0</version>
</dependency>
```

##### 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
Expand Down
4 changes: 2 additions & 2 deletions personality-insights/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<dependency>
<groupId>com.ibm.watson.developer_cloud</groupId>
<artifactId>personality-insights</artifactId>
<version>3.7.2</version>
<version>3.8.0</version>
</dependency>
```

##### Gradle
```gradle
'com.ibm.watson.developer_cloud:personality-insights:3.7.2'
'com.ibm.watson.developer_cloud:personality-insights:3.8.0'
```

## Usage
Expand Down
Loading