Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
351a1c9
Merge branch 'master' into develop
lpatino10 Mar 19, 2018
8497462
docs(READMEs): Update READMEs to capture v5.0 changes and use consist…
lpatino10 Mar 23, 2018
6f539c1
feat(visual-recognition): Add Core ML changes minus new methods
lpatino10 Mar 26, 2018
e29bac5
feat(visual-recognition): Add Core ML endpoint and options model
lpatino10 Mar 26, 2018
c0a0166
test(visual-recognition): Add unit and integration tests for Core ML …
lpatino10 Mar 26, 2018
8dac882
Merge pull request #902 from watson-developer-cloud/readme-fixes
germanattanasio Mar 26, 2018
9330f3c
Merge branch 'develop' into core-ml
lpatino10 Mar 26, 2018
0506ea0
Merge pull request #903 from watson-developer-cloud/core-ml
germanattanasio Mar 27, 2018
1b2c135
feat(nlc): Add tentative support for classifyCollection endpoint with…
lpatino10 Mar 30, 2018
f164e37
refactor(examples): Remove deprecated examples and update SDK version
lpatino10 Mar 30, 2018
4eddbda
refactor(assistant): Rename and update assistant examples
lpatino10 Mar 30, 2018
8d36b5c
refactor(examples): Remove duplicate assistant example
lpatino10 Mar 30, 2018
6e01d0a
refactor(examples): Update Discovery example version
lpatino10 Mar 30, 2018
413ec06
style(examples): Update language translator example
lpatino10 Mar 30, 2018
2ef1023
refactor(examples): Update NLC example
lpatino10 Mar 30, 2018
8094827
style(examples): Update Personality Insights example
lpatino10 Mar 30, 2018
448cd41
refactor(examples): Update Speech to Text examples
lpatino10 Mar 30, 2018
8455dbf
refactor(examples): Update Text to Speech examples
lpatino10 Mar 30, 2018
7786c44
refactor(examples): Update Tone Analyzer examples
lpatino10 Mar 30, 2018
bbb3cfc
refactor(examples): Update Visual Recognition example
lpatino10 Mar 30, 2018
b3473ce
style(examples): Standardize formatting
lpatino10 Mar 30, 2018
acc9a5e
build(nlc): Remove unused import for checkstyle
lpatino10 Apr 1, 2018
bc4dd51
test(properties): Update properties to use new pre-trained NLC classi…
lpatino10 Apr 1, 2018
1dd5de7
Revert "test(properties): Update properties to use new pre-trained NL…
lpatino10 Apr 2, 2018
b3713c3
Merge pull request #909 from watson-developer-cloud/add-classify-coll…
germanattanasio Apr 2, 2018
e455134
Merge branch 'develop' into example-updates
germanattanasio Apr 2, 2018
2649610
Merge pull request #908 from watson-developer-cloud/example-updates
germanattanasio Apr 2, 2018
e100c41
feat(visual recognition): Update Visual Recognition service
lpatino10 Apr 5, 2018
ae2eec8
refactor(visual-recognition): Remove unnecessary models
lpatino10 Apr 5, 2018
d317458
test(core): Temporarily ignore JDNI test
lpatino10 Apr 5, 2018
424add6
Merge branch 'develop' into visual-recognition-update
lpatino10 Apr 5, 2018
7d3be70
Merge pull request #912 from watson-developer-cloud/visual-recognitio…
lpatino10 Apr 5, 2018
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ All the services:
Only Assistant:

```gradle
'com.ibm.watson.developer_cloud:assistant:5.0.1'
'com.ibm.watson.developer_cloud:assistant:5.1.1'
```

##### Development Snapshots
Expand All @@ -97,7 +97,7 @@ And then reference the snapshot version on your app module gradle
Only Speech to Text:

```gradle
'com.ibm.watson.developer_cloud:speech-to-text:5.1.1-SNAPSHOT'
'com.ibm.watson.developer_cloud:speech-to-text:5.1.2-SNAPSHOT'
```

##### JAR
Expand Down
26 changes: 14 additions & 12 deletions assistant/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
##### Maven
```xml
<dependency>
<groupId>com.ibm.watson.developer_cloud</groupId>
<artifactId>assistant</artifactId>
<version>5.0.0</version>
<groupId>com.ibm.watson.developer_cloud</groupId>
<artifactId>assistant</artifactId>
<version>5.1.1</version>
</dependency>
```

Expand All @@ -25,7 +25,9 @@ Assistant service = new Assistant("2018-02-16");
service.setUsernameAndPassword("<username>", "<password>");

InputData input = new InputData.Builder("Hi").build();
MessageOptions options = new MessageOptions.Builder(workspaceId).input(input).build();
MessageOptions options = new MessageOptions.Builder(workspaceId)
.input(input)
.build();
MessageResponse response = service.message(options).execute();
System.out.println(response);
```
Expand All @@ -37,19 +39,19 @@ Context context = null;

// first message
MessageOptions newMessageOptions = new MessageOptions.Builder()
.workspaceId("<workspace-id>")
.input(new InputData.Builder("First message").build())
.context(context)
.build();
.workspaceId("<workspace-id>")
.input(new InputData.Builder("First message").build())
.context(context)
.build();

MessageResponse response = service.message(newMessageOptions).execute();

// second message
newMessageOptions = new MessageOptions.Builder()
.workspaceId("<workspace-id>")
.input(new InputData.Builder("Second message").build())
.context(response.getContext()) // output context from the first message
.build();
.workspaceId("<workspace-id>")
.input(new InputData.Builder("Second message").build())
.context(response.getContext()) // output context from the first message
.build();

response = service.message(newMessageOptions).execute();

Expand Down
Binary file modified config.properties.enc
Binary file not shown.
26 changes: 14 additions & 12 deletions conversation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
##### Maven
```xml
<dependency>
<groupId>com.ibm.watson.developer_cloud</groupId>
<artifactId>conversation</artifactId>
<version>5.1.1</version>
<groupId>com.ibm.watson.developer_cloud</groupId>
<artifactId>conversation</artifactId>
<version>5.1.1</version>
</dependency>
```

Expand All @@ -25,7 +25,9 @@ Conversation service = new Conversation("2018-02-16");
service.setUsernameAndPassword("<username>", "<password>");

InputData input = new InputData.Builder("Hi").build();
MessageOptions options = new MessageOptions.Builder(workspaceId).input(input).build();
MessageOptions options = new MessageOptions.Builder(workspaceId)
.input(input)
.build();
MessageResponse response = service.message(options).execute();
System.out.println(response);
```
Expand All @@ -37,19 +39,19 @@ Context context = null;

// first message
MessageOptions newMessageOptions = new MessageOptions.Builder()
.workspaceId("<workspace-id>")
.input(new InputData.Builder("First message").build())
.context(context)
.build();
.workspaceId("<workspace-id>")
.input(new InputData.Builder("First message").build())
.context(context)
.build();

MessageResponse response = service.message(newMessageOptions).execute();

// second message
newMessageOptions = new MessageOptions.Builder()
.workspaceId("<workspace-id>")
.input(new InputData.Builder("Second message").build())
.context(response.getContext()) // output context from the first message
.build();
.workspaceId("<workspace-id>")
.input(new InputData.Builder("Second message").build())
.context(response.getContext()) // output context from the first message
.build();

response = service.message(newMessageOptions).execute();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;

import com.ibm.watson.developer_cloud.WatsonServiceTest;
Expand Down Expand Up @@ -129,6 +130,7 @@ public void testGetUserCredentialsWithPlan() {
* it always fails there.
*/
@Test
@Ignore
public void testGetAPIUrlFromJDNI() {
assertEquals(CredentialUtils.getAPIUrlTest(SERVICE_NAME), PERSONALITY_INSIGHTS_URL);
}
Expand Down
2 changes: 1 addition & 1 deletion examples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ checkstyle {
}

dependencies {
compile group: 'com.ibm.watson.developer_cloud', name: 'java-sdk', version: '3.7.2'
compile group: 'com.ibm.watson.developer_cloud', name: 'java-sdk', version: '5.1.1'
}
36 changes: 0 additions & 36 deletions examples/conversation_tone_analyzer_integration/README.md

This file was deleted.

28 changes: 0 additions & 28 deletions examples/conversation_tone_analyzer_integration/build.gradle

This file was deleted.

This file was deleted.

Loading