Skip to content

Commit e7513b9

Browse files
authored
Merge pull request #1028 from watson-developer-cloud/dialog-node-fix
Add missing property to Assistant v1 DialogNode model
2 parents 24b66fa + dd965e4 commit e7513b9

File tree

36 files changed

+69
-54
lines changed

36 files changed

+69
-54
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 6.11.2
2+
current_version = 6.11.3
33
commit = True
44
message = [skip ci] docs: Update version numbers from {current_version} -> {new_version}
55

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ All the services:
6161
<dependency>
6262
<groupId>com.ibm.watson.developer_cloud</groupId>
6363
<artifactId>java-sdk</artifactId>
64-
<version>6.11.2</version>
64+
<version>6.11.3</version>
6565
</dependency>
6666
```
6767

@@ -71,7 +71,7 @@ Only Discovery:
7171
<dependency>
7272
<groupId>com.ibm.watson.developer_cloud</groupId>
7373
<artifactId>discovery</artifactId>
74-
<version>6.11.2</version>
74+
<version>6.11.3</version>
7575
</dependency>
7676
```
7777

@@ -80,13 +80,13 @@ Only Discovery:
8080
All the services:
8181

8282
```gradle
83-
'com.ibm.watson.developer_cloud:java-sdk:6.11.2'
83+
'com.ibm.watson.developer_cloud:java-sdk:6.11.3'
8484
```
8585

8686
Only Assistant:
8787

8888
```gradle
89-
'com.ibm.watson.developer_cloud:assistant:6.11.2'
89+
'com.ibm.watson.developer_cloud:assistant:6.11.3'
9090
```
9191

9292
##### Development snapshots
@@ -109,7 +109,7 @@ And then reference the snapshot version on your app module gradle
109109
Only Speech to Text:
110110

111111
```gradle
112-
'com.ibm.watson.developer_cloud:speech-to-text:6.11.3-SNAPSHOT'
112+
'com.ibm.watson.developer_cloud:speech-to-text:6.11.4-SNAPSHOT'
113113
```
114114

115115
##### JAR
@@ -348,7 +348,7 @@ Gradle:
348348

349349
```sh
350350
cd java-sdk
351-
gradle jar # build jar file (build/libs/watson-developer-cloud-6.11.2.jar)
351+
gradle jar # build jar file (build/libs/watson-developer-cloud-6.11.3.jar)
352352
gradle test # run tests
353353
gradle check # performs quality checks on source files and generates reports
354354
gradle testReport # run tests and generate the aggregated test report (build/reports/allTests)
@@ -401,4 +401,4 @@ or [Stack Overflow](http://stackoverflow.com/questions/ask?tags=ibm-watson).
401401
[ibm-cloud-onboarding]: http://console.bluemix.net/registration?target=/developer/watson&cm_sp=WatsonPlatform-WatsonServices-_-OnPageNavLink-IBMWatson_SDKs-_-Java
402402

403403

404-
[jar]: https://github.com/watson-developer-cloud/java-sdk/releases/download/java-sdk-6.11.2/java-sdk-6.11.2-jar-with-dependencies.jar
404+
[jar]: https://github.com/watson-developer-cloud/java-sdk/releases/download/java-sdk-6.11.3/java-sdk-6.11.3-jar-with-dependencies.jar

assistant/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<dependency>
88
<groupId>com.ibm.watson.developer_cloud</groupId>
99
<artifactId>assistant</artifactId>
10-
<version>6.11.2</version>
10+
<version>6.11.3</version>
1111
</dependency>
1212
```
1313

1414
##### Gradle
1515
```gradle
16-
'com.ibm.watson.developer_cloud:assistant:6.11.2'
16+
'com.ibm.watson.developer_cloud:assistant:6.11.3'
1717
```
1818

1919
## Usage

assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/Assistant.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1594,7 +1594,7 @@ public ServiceCall<LogCollection> listLogs(ListLogsOptions listLogsOptions) {
15941594
*
15951595
* You associate a customer ID with data by passing the `X-Watson-Metadata` header with a request that passes data.
15961596
* For more information about personal data and customer IDs, see [Information
1597-
* security](https://console.bluemix.net/docs/services/conversation/information-security.html).
1597+
* security](https://cloud.ibm.com/docs/services/assistant/information-security.html).
15981598
*
15991599
* @param deleteUserDataOptions the {@link DeleteUserDataOptions} containing the options for the call
16001600
* @return a {@link ServiceCall} with a response type of Void

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ public String previousSibling() {
508508
* Gets the output.
509509
*
510510
* The output of the dialog node. For more information about how to specify dialog node output, see the
511-
* [documentation](https://console.bluemix.net/docs/services/conversation/dialog-overview.html#complex).
511+
* [documentation](https://cloud.ibm.com/docs/services/assistant/dialog-overview.html#complex).
512512
*
513513
* @return the output
514514
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ public String previousSibling() {
527527
* Gets the output.
528528
*
529529
* The output of the dialog node. For more information about how to specify dialog node output, see the
530-
* [documentation](https://console.bluemix.net/docs/services/conversation/dialog-overview.html#complex).
530+
* [documentation](https://cloud.ibm.com/docs/services/assistant/dialog-overview.html#complex).
531531
*
532532
* @return the output
533533
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ public List<String> synonyms() {
236236
* An array of patterns for the entity value. You can provide either synonyms or patterns (as indicated by **type**),
237237
* but not both. A pattern is a regular expression no longer than 512 characters. For more information about how to
238238
* specify a pattern, see the
239-
* [documentation](https://console.bluemix.net/docs/services/conversation/entities.html#creating-entities).
239+
* [documentation](https://cloud.ibm.com/docs/services/assistant/entities.html#creating-entities).
240240
*
241241
* @return the patterns
242242
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ public List<String> synonyms() {
292292
* An array of patterns for the entity value. You can provide either synonyms or patterns (as indicated by **type**),
293293
* but not both. A pattern is a regular expression no longer than 512 characters. For more information about how to
294294
* specify a pattern, see the
295-
* [documentation](https://console.bluemix.net/docs/services/conversation/entities.html#creating-entities).
295+
* [documentation](https://cloud.ibm.com/docs/services/assistant/entities.html#creating-entities).
296296
*
297297
* @return the patterns
298298
*/

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ public interface DigressOutSlots {
118118
private Date updated;
119119
private List<DialogNodeAction> actions;
120120
private String title;
121+
private Boolean disabled;
121122
@SerializedName("type")
122123
private String nodeType;
123124
@SerializedName("event_name")
@@ -192,7 +193,7 @@ public String getPreviousSibling() {
192193
* Gets the output.
193194
*
194195
* The output of the dialog node. For more information about how to specify dialog node output, see the
195-
* [documentation](https://console.bluemix.net/docs/services/conversation/dialog-overview.html#complex).
196+
* [documentation](https://cloud.ibm.com/docs/services/assistant/dialog-overview.html#complex).
196197
*
197198
* @return the output
198199
*/
@@ -277,6 +278,17 @@ public String getTitle() {
277278
return title;
278279
}
279280

281+
/**
282+
* Gets the disabled.
283+
*
284+
* For internal use only.
285+
*
286+
* @return the disabled
287+
*/
288+
public Boolean isDisabled() {
289+
return disabled;
290+
}
291+
280292
/**
281293
* Gets the nodeType.
282294
*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
/**
2323
* The output of the dialog node. For more information about how to specify dialog node output, see the
24-
* [documentation](https://console.bluemix.net/docs/services/conversation/dialog-overview.html#complex).
24+
* [documentation](https://cloud.ibm.com/docs/services/assistant/dialog-overview.html#complex).
2525
*/
2626
public class DialogNodeOutput extends DynamicModel {
2727
private Type genericType = new TypeToken<List<DialogNodeOutputGeneric>>() {

0 commit comments

Comments
 (0)