Skip to content

Commit 61ccd85

Browse files
lpatino10lpatino10
authored
Merge pull request #951 from watson-developer-cloud/develop
Changes for release v6.1.0
2 parents f774d19 + 0f9864e commit 61ccd85

File tree

127 files changed

+4676
-1003
lines changed

Some content is hidden

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

127 files changed

+4676
-1003
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,5 @@ docs
2020
.vscode/
2121
conversation/src/test/java/com/ibm/watson/developer_cloud/conversation/v1/ConversationTest.java
2222
.swagger-codegen/VERSION
23+
*.orig
24+
*.rej

‎.utility/generate-api-diff.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Author: Hanbin Cho ([email protected])
33
# Description: This script 1) downloads the latest java-sdk jar published in Maven Repo 2) builds the jar of current java-sdk version, then 3) generate an API diff report of the two versions.
44
# Assumptions
5-
# 1. This script is placed in the project root of java-sdk.
5+
# 1. This script is placed in .utility folder of the java-sdk.
66
# 2. Version format is [0-9].[0-9].[0-9]
77

88
# Step 1: Download the latest release of java-sdk published in Maven Repository.
@@ -34,7 +34,7 @@ popd
3434
./gradlew shadowJar
3535

3636
# Step 5: Construct the filepath to the current version of java-sdk.
37-
CURRENT_VERSION=`cat gradle.properties | grep "version=[0-9]\.[0-9]\.[0-9]" | cut -d '=' -f 2`
37+
CURRENT_VERSION=`cat ../gradle.properties | grep "version=[0-9]\.[0-9]\.[0-9]" | cut -d '=' -f 2`
3838
CURRENT_JAR_FILENAME="java-sdk-${CURRENT_VERSION}-jar-with-dependencies.jar"
3939
CURRENT_JAR_BASEPATH="java-sdk/build/libs"
4040
CURRENT_JAR_PATH="${CURRENT_JAR_BASEPATH}/${CURRENT_JAR_FILENAME}"
@@ -46,5 +46,4 @@ if [ ! -f $CURRENT_JAR_PATH ]; then
4646
fi
4747

4848
# Step 7: Produce an API diff between the latest release and the current version using japicmp module.
49-
# TODO: Figure out how to set japicmp task's properties (oldClasspath and newClasspath) through command-line invocation.
5049
./gradlew japicmp -PoldJarPath="${LATEST_RELEASE_JAR_PATH}" -PnewJarPath="${CURRENT_JAR_PATH}" -PoldJarVersion="${LATEST_RELEASE_VERSION}" -PnewJarVersion="${CURRENT_VERSION}"

‎.utility/generate_apidiff_index_html.sh

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/usr/bin/env bash
22

33
# based on https://odoepner.wordpress.com/2012/02/17/shell-script-to-generate-simple-index-html/
44

‎assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/CreateDialogNodeOptions.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,9 @@ public String workspaceId() {
452452
/**
453453
* Gets the dialogNode.
454454
*
455-
* The dialog node ID. This string must conform to the following restrictions: - It can contain only Unicode
456-
* alphanumeric, space, underscore, hyphen, and dot characters. - It must be no longer than 1024 characters.
455+
* The dialog node ID. This string must conform to the following restrictions:
456+
* - It can contain only Unicode alphanumeric, space, underscore, hyphen, and dot characters.
457+
* - It must be no longer than 1024 characters.
457458
*
458459
* @return the dialogNode
459460
*/
@@ -566,9 +567,9 @@ public List<DialogNodeAction> actions() {
566567
/**
567568
* Gets the title.
568569
*
569-
* The alias used to identify the dialog node. This string must conform to the following restrictions: - It can
570-
* contain only Unicode alphanumeric, space, underscore, hyphen, and dot characters. - It must be no longer than 64
571-
* characters.
570+
* The alias used to identify the dialog node. This string must conform to the following restrictions:
571+
* - It can contain only Unicode alphanumeric, space, underscore, hyphen, and dot characters.
572+
* - It must be no longer than 64 characters.
572573
*
573574
* @return the title
574575
*/

‎assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/CreateEntity.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,10 @@ public Builder newBuilder() {
167167
/**
168168
* Gets the entity.
169169
*
170-
* The name of the entity. This string must conform to the following restrictions: - It can contain only Unicode
171-
* alphanumeric, underscore, and hyphen characters. - It cannot begin with the reserved prefix `sys-`. - It must be no
172-
* longer than 64 characters.
170+
* The name of the entity. This string must conform to the following restrictions:
171+
* - It can contain only Unicode alphanumeric, underscore, and hyphen characters.
172+
* - It cannot begin with the reserved prefix `sys-`.
173+
* - It must be no longer than 64 characters.
173174
*
174175
* @return the entity
175176
*/

‎assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/CreateEntityOptions.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,10 @@ public String workspaceId() {
194194
/**
195195
* Gets the entity.
196196
*
197-
* The name of the entity. This string must conform to the following restrictions: - It can contain only Unicode
198-
* alphanumeric, underscore, and hyphen characters. - It cannot begin with the reserved prefix `sys-`. - It must be no
199-
* longer than 64 characters.
197+
* The name of the entity. This string must conform to the following restrictions:
198+
* - It can contain only Unicode alphanumeric, underscore, and hyphen characters.
199+
* - It cannot begin with the reserved prefix `sys-`.
200+
* - It must be no longer than 64 characters.
200201
*
201202
* @return the entity
202203
*/

‎assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/CreateExample.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,10 @@ public Builder newBuilder() {
8585
/**
8686
* Gets the text.
8787
*
88-
* The text of a user input example. This string must conform to the following restrictions: - It cannot contain
89-
* carriage return, newline, or tab characters. - It cannot consist of only whitespace characters. - It must be no
90-
* longer than 1024 characters.
88+
* The text of a user input example. This string must conform to the following restrictions:
89+
* - It cannot contain carriage return, newline, or tab characters.
90+
* - It cannot consist of only whitespace characters.
91+
* - It must be no longer than 1024 characters.
9192
*
9293
* @return the text
9394
*/

‎assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/CreateExampleOptions.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,10 @@ public String intent() {
143143
/**
144144
* Gets the text.
145145
*
146-
* The text of a user input example. This string must conform to the following restrictions: - It cannot contain
147-
* carriage return, newline, or tab characters. - It cannot consist of only whitespace characters. - It must be no
148-
* longer than 1024 characters.
146+
* The text of a user input example. This string must conform to the following restrictions:
147+
* - It cannot contain carriage return, newline, or tab characters.
148+
* - It cannot consist of only whitespace characters.
149+
* - It must be no longer than 1024 characters.
149150
*
150151
* @return the text
151152
*/

‎assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/CreateIntent.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,10 @@ public Builder newBuilder() {
134134
/**
135135
* Gets the intent.
136136
*
137-
* The name of the intent. This string must conform to the following restrictions: - It can contain only Unicode
138-
* alphanumeric, underscore, hyphen, and dot characters. - It cannot begin with the reserved prefix `sys-`. - It must
139-
* be no longer than 128 characters.
137+
* The name of the intent. This string must conform to the following restrictions:
138+
* - It can contain only Unicode alphanumeric, underscore, hyphen, and dot characters.
139+
* - It cannot begin with the reserved prefix `sys-`.
140+
* - It must be no longer than 128 characters.
140141
*
141142
* @return the intent
142143
*/

‎assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/CreateIntentOptions.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,10 @@ public String workspaceId() {
163163
/**
164164
* Gets the intent.
165165
*
166-
* The name of the intent. This string must conform to the following restrictions: - It can contain only Unicode
167-
* alphanumeric, underscore, hyphen, and dot characters. - It cannot begin with the reserved prefix `sys-`. - It must
168-
* be no longer than 128 characters.
166+
* The name of the intent. This string must conform to the following restrictions:
167+
* - It can contain only Unicode alphanumeric, underscore, hyphen, and dot characters.
168+
* - It cannot begin with the reserved prefix `sys-`.
169+
* - It must be no longer than 128 characters.
169170
*
170171
* @return the intent
171172
*/

‎assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/CreateSynonymOptions.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,10 @@ public String value() {
172172
/**
173173
* Gets the synonym.
174174
*
175-
* The text of the synonym. This string must conform to the following restrictions: - It cannot contain carriage
176-
* return, newline, or tab characters. - It cannot consist of only whitespace characters. - It must be no longer than
177-
* 64 characters.
175+
* The text of the synonym. This string must conform to the following restrictions:
176+
* - It cannot contain carriage return, newline, or tab characters.
177+
* - It cannot consist of only whitespace characters.
178+
* - It must be no longer than 64 characters.
178179
*
179180
* @return the synonym
180181
*/

‎assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/CreateValue.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,10 @@ public Builder newBuilder() {
193193
/**
194194
* Gets the value.
195195
*
196-
* The text of the entity value. This string must conform to the following restrictions: - It cannot contain carriage
197-
* return, newline, or tab characters. - It cannot consist of only whitespace characters. - It must be no longer than
198-
* 64 characters.
196+
* The text of the entity value. This string must conform to the following restrictions:
197+
* - It cannot contain carriage return, newline, or tab characters.
198+
* - It cannot consist of only whitespace characters.
199+
* - It must be no longer than 64 characters.
199200
*
200201
* @return the value
201202
*/
@@ -218,9 +219,10 @@ public Map metadata() {
218219
* Gets the synonyms.
219220
*
220221
* An array containing any synonyms for the entity value. You can provide either synonyms or patterns (as indicated by
221-
* **type**), but not both. A synonym must conform to the following restrictions: - It cannot contain carriage return,
222-
* newline, or tab characters. - It cannot consist of only whitespace characters. - It must be no longer than 64
223-
* characters.
222+
* **type**), but not both. A synonym must conform to the following restrictions:
223+
* - It cannot contain carriage return, newline, or tab characters.
224+
* - It cannot consist of only whitespace characters.
225+
* - It must be no longer than 64 characters.
224226
*
225227
* @return the synonyms
226228
*/

‎assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/CreateValueOptions.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,10 @@ public String entity() {
249249
/**
250250
* Gets the value.
251251
*
252-
* The text of the entity value. This string must conform to the following restrictions: - It cannot contain carriage
253-
* return, newline, or tab characters. - It cannot consist of only whitespace characters. - It must be no longer than
254-
* 64 characters.
252+
* The text of the entity value. This string must conform to the following restrictions:
253+
* - It cannot contain carriage return, newline, or tab characters.
254+
* - It cannot consist of only whitespace characters.
255+
* - It must be no longer than 64 characters.
255256
*
256257
* @return the value
257258
*/
@@ -274,9 +275,10 @@ public Map metadata() {
274275
* Gets the synonyms.
275276
*
276277
* An array containing any synonyms for the entity value. You can provide either synonyms or patterns (as indicated by
277-
* **type**), but not both. A synonym must conform to the following restrictions: - It cannot contain carriage return,
278-
* newline, or tab characters. - It cannot consist of only whitespace characters. - It must be no longer than 64
279-
* characters.
278+
* **type**), but not both. A synonym must conform to the following restrictions:
279+
* - It cannot contain carriage return, newline, or tab characters.
280+
* - It cannot consist of only whitespace characters.
281+
* - It must be no longer than 64 characters.
280282
*
281283
* @return the synonyms
282284
*/

‎assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/DialogNodeNextStep.java

Lines changed: 40 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,26 @@
2121
public class DialogNodeNextStep extends GenericModel {
2222

2323
/**
24-
* What happens after the dialog node completes. The valid values depend on the node type: - The following values are
25-
* valid for any node: - `get_user_input` - `skip_user_input` - `jump_to` - If the node is of type `event_handler` and
26-
* its parent node is of type `slot` or `frame`, additional values are also valid: - if **event_name**=`filled` and
27-
* the type of the parent node is `slot`: - `reprompt` - `skip_all_slots` - if **event_name**=`nomatch` and the type
28-
* of the parent node is `slot`: - `reprompt` - `skip_slot` - `skip_all_slots` - if **event_name**=`generic` and the
29-
* type of the parent node is `frame`: - `reprompt` - `skip_slot` - `skip_all_slots` If you specify `jump_to`, then
30-
* you must also specify a value for the `dialog_node` property.
24+
* What happens after the dialog node completes. The valid values depend on the node type:
25+
* - The following values are valid for any node:
26+
* - `get_user_input`
27+
* - `skip_user_input`
28+
* - `jump_to`
29+
* - If the node is of type `event_handler` and its parent node is of type `slot` or `frame`, additional values are
30+
* also valid:
31+
* - if **event_name**=`filled` and the type of the parent node is `slot`:
32+
* - `reprompt`
33+
* - `skip_all_slots`
34+
* - if **event_name**=`nomatch` and the type of the parent node is `slot`:
35+
* - `reprompt`
36+
* - `skip_slot`
37+
* - `skip_all_slots`
38+
* - if **event_name**=`generic` and the type of the parent node is `frame`:
39+
* - `reprompt`
40+
* - `skip_slot`
41+
* - `skip_all_slots`
42+
*
43+
* If you specify `jump_to`, then you must also specify a value for the `dialog_node` property.
3144
*/
3245
public interface Behavior {
3346
/** get_user_input. */
@@ -66,13 +79,26 @@ public interface Selector {
6679
/**
6780
* Gets the behavior.
6881
*
69-
* What happens after the dialog node completes. The valid values depend on the node type: - The following values are
70-
* valid for any node: - `get_user_input` - `skip_user_input` - `jump_to` - If the node is of type `event_handler` and
71-
* its parent node is of type `slot` or `frame`, additional values are also valid: - if **event_name**=`filled` and
72-
* the type of the parent node is `slot`: - `reprompt` - `skip_all_slots` - if **event_name**=`nomatch` and the type
73-
* of the parent node is `slot`: - `reprompt` - `skip_slot` - `skip_all_slots` - if **event_name**=`generic` and the
74-
* type of the parent node is `frame`: - `reprompt` - `skip_slot` - `skip_all_slots` If you specify `jump_to`, then
75-
* you must also specify a value for the `dialog_node` property.
82+
* What happens after the dialog node completes. The valid values depend on the node type:
83+
* - The following values are valid for any node:
84+
* - `get_user_input`
85+
* - `skip_user_input`
86+
* - `jump_to`
87+
* - If the node is of type `event_handler` and its parent node is of type `slot` or `frame`, additional values are
88+
* also valid:
89+
* - if **event_name**=`filled` and the type of the parent node is `slot`:
90+
* - `reprompt`
91+
* - `skip_all_slots`
92+
* - if **event_name**=`nomatch` and the type of the parent node is `slot`:
93+
* - `reprompt`
94+
* - `skip_slot`
95+
* - `skip_all_slots`
96+
* - if **event_name**=`generic` and the type of the parent node is `frame`:
97+
* - `reprompt`
98+
* - `skip_slot`
99+
* - `skip_all_slots`
100+
*
101+
* If you specify `jump_to`, then you must also specify a value for the `dialog_node` property.
76102
*
77103
* @return the behavior
78104
*/

‎assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/UpdateDialogNodeOptions.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -556,9 +556,9 @@ public Map newMetadata() {
556556
/**
557557
* Gets the newTitle.
558558
*
559-
* The alias used to identify the dialog node. This string must conform to the following restrictions: - It can
560-
* contain only Unicode alphanumeric, space, underscore, hyphen, and dot characters. - It must be no longer than 64
561-
* characters.
559+
* The alias used to identify the dialog node. This string must conform to the following restrictions:
560+
* - It can contain only Unicode alphanumeric, space, underscore, hyphen, and dot characters.
561+
* - It must be no longer than 64 characters.
562562
*
563563
* @return the newTitle
564564
*/
@@ -659,8 +659,9 @@ public String newParent() {
659659
/**
660660
* Gets the newDialogNode.
661661
*
662-
* The dialog node ID. This string must conform to the following restrictions: - It can contain only Unicode
663-
* alphanumeric, space, underscore, hyphen, and dot characters. - It must be no longer than 1024 characters.
662+
* The dialog node ID. This string must conform to the following restrictions:
663+
* - It can contain only Unicode alphanumeric, space, underscore, hyphen, and dot characters.
664+
* - It must be no longer than 1024 characters.
664665
*
665666
* @return the newDialogNode
666667
*/

‎assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/UpdateEntityOptions.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,10 @@ public Boolean newFuzzyMatch() {
231231
/**
232232
* Gets the newEntity.
233233
*
234-
* The name of the entity. This string must conform to the following restrictions: - It can contain only Unicode
235-
* alphanumeric, underscore, and hyphen characters. - It cannot begin with the reserved prefix `sys-`. - It must be no
236-
* longer than 64 characters.
234+
* The name of the entity. This string must conform to the following restrictions:
235+
* - It can contain only Unicode alphanumeric, underscore, and hyphen characters.
236+
* - It cannot begin with the reserved prefix `sys-`.
237+
* - It must be no longer than 64 characters.
237238
*
238239
* @return the newEntity
239240
*/

‎assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/UpdateExampleOptions.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,10 @@ public String text() {
169169
/**
170170
* Gets the newText.
171171
*
172-
* The text of the user input example. This string must conform to the following restrictions: - It cannot contain
173-
* carriage return, newline, or tab characters. - It cannot consist of only whitespace characters. - It must be no
174-
* longer than 1024 characters.
172+
* The text of the user input example. This string must conform to the following restrictions:
173+
* - It cannot contain carriage return, newline, or tab characters.
174+
* - It cannot consist of only whitespace characters.
175+
* - It must be no longer than 1024 characters.
175176
*
176177
* @return the newText
177178
*/

‎assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/UpdateIntentOptions.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,10 @@ public String intent() {
189189
/**
190190
* Gets the newIntent.
191191
*
192-
* The name of the intent. This string must conform to the following restrictions: - It can contain only Unicode
193-
* alphanumeric, underscore, hyphen, and dot characters. - It cannot begin with the reserved prefix `sys-`. - It must
194-
* be no longer than 128 characters.
192+
* The name of the intent. This string must conform to the following restrictions:
193+
* - It can contain only Unicode alphanumeric, underscore, hyphen, and dot characters.
194+
* - It cannot begin with the reserved prefix `sys-`.
195+
* - It must be no longer than 128 characters.
195196
*
196197
* @return the newIntent
197198
*/

‎assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/UpdateSynonymOptions.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,10 @@ public String synonym() {
198198
/**
199199
* Gets the newSynonym.
200200
*
201-
* The text of the synonym. This string must conform to the following restrictions: - It cannot contain carriage
202-
* return, newline, or tab characters. - It cannot consist of only whitespace characters. - It must be no longer than
203-
* 64 characters.
201+
* The text of the synonym. This string must conform to the following restrictions:
202+
* - It cannot contain carriage return, newline, or tab characters.
203+
* - It cannot consist of only whitespace characters.
204+
* - It must be no longer than 64 characters.
204205
*
205206
* @return the newSynonym
206207
*/

‎assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/UpdateValueOptions.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,10 @@ public String value() {
276276
* Gets the newSynonyms.
277277
*
278278
* An array of synonyms for the entity value. You can provide either synonyms or patterns (as indicated by **type**),
279-
* but not both. A synonym must conform to the following resrictions: - It cannot contain carriage return, newline, or
280-
* tab characters. - It cannot consist of only whitespace characters. - It must be no longer than 64 characters.
279+
* but not both. A synonym must conform to the following resrictions:
280+
* - It cannot contain carriage return, newline, or tab characters.
281+
* - It cannot consist of only whitespace characters.
282+
* - It must be no longer than 64 characters.
281283
*
282284
* @return the newSynonyms
283285
*/
@@ -324,9 +326,10 @@ public List<String> newPatterns() {
324326
/**
325327
* Gets the newValue.
326328
*
327-
* The text of the entity value. This string must conform to the following restrictions: - It cannot contain carriage
328-
* return, newline, or tab characters. - It cannot consist of only whitespace characters. - It must be no longer than
329-
* 64 characters.
329+
* The text of the entity value. This string must conform to the following restrictions:
330+
* - It cannot contain carriage return, newline, or tab characters.
331+
* - It cannot consist of only whitespace characters.
332+
* - It must be no longer than 64 characters.
330333
*
331334
* @return the newValue
332335
*/

0 commit comments

Comments
 (0)