Merge pull request #1028 from watson-developer-cloud/dialog-node-fix

Add missing property to Assistant v1 DialogNode model

Author: lpatino10

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 6.11.2
+current_version = 6.11.3
 commit = True
 message = [skip ci] docs: Update version numbers from {current_version} -> {new_version}
 

README.md

@@ -61,7 +61,7 @@ All the services:
 <dependency>
 	<groupId>com.ibm.watson.developer_cloud</groupId>
 	<artifactId>java-sdk</artifactId>
-	<version>6.11.2</version>
+	<version>6.11.3</version>
 </dependency>
 ```
 
@@ -71,7 +71,7 @@ Only Discovery:
 <dependency>
 	<groupId>com.ibm.watson.developer_cloud</groupId>
 	<artifactId>discovery</artifactId>
-	<version>6.11.2</version>
+	<version>6.11.3</version>
 </dependency>
 ```
 
@@ -80,13 +80,13 @@ Only Discovery:
 All the services:
 
 ```gradle
-'com.ibm.watson.developer_cloud:java-sdk:6.11.2'
+'com.ibm.watson.developer_cloud:java-sdk:6.11.3'
 ```
 
 Only Assistant:
 
 ```gradle
-'com.ibm.watson.developer_cloud:assistant:6.11.2'
+'com.ibm.watson.developer_cloud:assistant:6.11.3'
 ```
 
 ##### Development snapshots
@@ -109,7 +109,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:6.11.3-SNAPSHOT'
+'com.ibm.watson.developer_cloud:speech-to-text:6.11.4-SNAPSHOT'
 ```
 
 ##### JAR
@@ -348,7 +348,7 @@ Gradle:
 
 ```sh
 cd java-sdk
-gradle jar  # build jar file (build/libs/watson-developer-cloud-6.11.2.jar)
+gradle jar  # build jar file (build/libs/watson-developer-cloud-6.11.3.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)
@@ -401,4 +401,4 @@ or [Stack Overflow](http://stackoverflow.com/questions/ask?tags=ibm-watson).
 [ibm-cloud-onboarding]: http://console.bluemix.net/registration?target=/developer/watson&cm_sp=WatsonPlatform-WatsonServices-_-OnPageNavLink-IBMWatson_SDKs-_-Java
 
 
-[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
+[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

@@ -7,13 +7,13 @@
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>assistant</artifactId>
-  <version>6.11.2</version>
+  <version>6.11.3</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:assistant:6.11.2'
+'com.ibm.watson.developer_cloud:assistant:6.11.3'
 ```
 
 ## Usage

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

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

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

@@ -508,7 +508,7 @@ public String previousSibling() {
    * Gets the output.
    *
    * The output of the dialog node. For more information about how to specify dialog node output, see the
-   * [documentation](https://console.bluemix.net/docs/services/conversation/dialog-overview.html#complex).
+   * [documentation](https://cloud.ibm.com/docs/services/assistant/dialog-overview.html#complex).
    *
    * @return the output
    */

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

@@ -527,7 +527,7 @@ public String previousSibling() {
    * Gets the output.
    *
    * The output of the dialog node. For more information about how to specify dialog node output, see the
-   * [documentation](https://console.bluemix.net/docs/services/conversation/dialog-overview.html#complex).
+   * [documentation](https://cloud.ibm.com/docs/services/assistant/dialog-overview.html#complex).
    *
    * @return the output
    */

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

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

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

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

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

@@ -118,6 +118,7 @@ public interface DigressOutSlots {
   private Date updated;
   private List<DialogNodeAction> actions;
   private String title;
+  private Boolean disabled;
   @SerializedName("type")
   private String nodeType;
   @SerializedName("event_name")
@@ -192,7 +193,7 @@ public String getPreviousSibling() {
    * Gets the output.
    *
    * The output of the dialog node. For more information about how to specify dialog node output, see the
-   * [documentation](https://console.bluemix.net/docs/services/conversation/dialog-overview.html#complex).
+   * [documentation](https://cloud.ibm.com/docs/services/assistant/dialog-overview.html#complex).
    *
    * @return the output
    */
@@ -277,6 +278,17 @@ public String getTitle() {
     return title;
   }
 
+  /**
+   * Gets the disabled.
+   *
+   * For internal use only.
+   *
+   * @return the disabled
+   */
+  public Boolean isDisabled() {
+    return disabled;
+  }
+
   /**
    * Gets the nodeType.
    *

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

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

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

@@ -25,7 +25,7 @@ public class DialogNodeOutputOptionsElementValue extends GenericModel {
   /**
    * Gets the input.
    *
-   * The user input.
+   * An input object that includes the input text.
    *
    * @return the input
    */

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

@@ -29,7 +29,7 @@ public class DialogSuggestionValue extends GenericModel {
   /**
    * Gets the input.
    *
-   * The user input.
+   * An input object that includes the input text.
    *
    * @return the input
    */

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

@@ -16,7 +16,7 @@
 import com.ibm.watson.developer_cloud.util.Validator;
 
 /**
- * The user input.
+ * An input object that includes the input text.
  */
 public class InputData extends GenericModel {
 

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

@@ -133,7 +133,7 @@ public Builder newBuilder() {
    * A cacheable parameter that limits the results to those matching the specified filter. You must specify a filter
    * query that includes a value for `language`, as well as a value for `workspace_id` or
    * `request.context.metadata.deployment`. For more information, see the
-   * [documentation](https://console.bluemix.net/docs/services/conversation/filter-reference.html#filter-query-syntax).
+   * [documentation](https://cloud.ibm.com/docs/services/assistant/filter-reference.html#filter-query-syntax).
    *
    * @return the filter
    */

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

@@ -169,7 +169,7 @@ public String sort() {
    * Gets the filter.
    *
    * A cacheable parameter that limits the results to those matching the specified filter. For more information, see the
-   * [documentation](https://console.bluemix.net/docs/services/conversation/filter-reference.html#filter-query-syntax).
+   * [documentation](https://cloud.ibm.com/docs/services/assistant/filter-reference.html#filter-query-syntax).
    *
    * @return the filter
    */

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

@@ -35,7 +35,7 @@ public class LogExport extends GenericModel {
   /**
    * Gets the request.
    *
-   * A message request formatted for the Watson Assistant service.
+   * A request sent to the workspace, including the user input and context.
    *
    * @return the request
    */
@@ -46,7 +46,7 @@ public MessageRequest getRequest() {
   /**
    * Gets the response.
    *
-   * A response from the Watson Assistant service.
+   * The response sent by the workspace, including the output text, detected intents and entities, and context.
    *
    * @return the response
    */

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

@@ -252,7 +252,7 @@ public String workspaceId() {
   /**
    * Gets the input.
    *
-   * The user input.
+   * An input object that includes the input text.
    *
    * @return the input
    */

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

@@ -18,7 +18,7 @@
 import com.ibm.watson.developer_cloud.service.model.GenericModel;
 
 /**
- * A message request formatted for the Watson Assistant service.
+ * A request sent to the workspace, including the user input and context.
  */
 public class MessageRequest extends GenericModel {
 
@@ -33,7 +33,7 @@ public class MessageRequest extends GenericModel {
   /**
    * Gets the input.
    *
-   * The user input.
+   * An input object that includes the input text.
    *
    * @return the input
    */

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

@@ -20,7 +20,7 @@
 import com.ibm.watson.developer_cloud.util.GsonSerializationHelper;
 
 /**
- * A response from the Watson Assistant service.
+ * The response sent by the workspace, including the output text, detected intents and entities, and context.
  */
 public class MessageResponse extends DynamicModel {
   private Type inputType = new TypeToken<MessageInput>() {

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

@@ -664,7 +664,7 @@ public String newDigressIn() {
    * Gets the newOutput.
    *
    * The output of the dialog node. For more information about how to specify dialog node output, see the
-   * [documentation](https://console.bluemix.net/docs/services/conversation/dialog-overview.html#complex).
+   * [documentation](https://cloud.ibm.com/docs/services/assistant/dialog-overview.html#complex).
    *
    * @return the newOutput
    */

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

@@ -315,7 +315,7 @@ public Map newMetadata() {
    * An array of patterns for the entity value. You can provide either synonyms or patterns (as indicated by **type**),
    * but not both. A pattern is a regular expression no longer than 512 characters. For more information about how to
    * specify a pattern, see the
-   * [documentation](https://console.bluemix.net/docs/services/conversation/entities.html#creating-entities).
+   * [documentation](https://cloud.ibm.com/docs/services/assistant/entities.html#creating-entities).
    *
    * @return the newPatterns
    */

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

@@ -18,7 +18,7 @@
 import com.ibm.watson.developer_cloud.service.model.GenericModel;
 
 /**
- * WorkspaceSystemSettings.
+ * Global settings for the workspace.
  */
 public class WorkspaceSystemSettings extends GenericModel {
 

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

@@ -16,7 +16,9 @@
 import com.ibm.watson.developer_cloud.service.model.GenericModel;
 
 /**
- * WorkspaceSystemSettingsDisambiguation.
+ * Workspace settings related to the disambiguation feature.
+ *
+ * **Note:** This feature is available only to Premium users.
  */
 public class WorkspaceSystemSettingsDisambiguation extends GenericModel {
 

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

@@ -16,7 +16,7 @@
 import com.ibm.watson.developer_cloud.service.model.GenericModel;
 
 /**
- * WorkspaceSystemSettingsTooling.
+ * Workspace settings related to the Watson Assistant tool.
  */
 public class WorkspaceSystemSettingsTooling extends GenericModel {
 

compare-comply/src/test/java/com/ibm/watson/developer_cloud/compare_comply/v1/CompareComplyServiceIT.java

@@ -122,6 +122,7 @@ public void testFeedbackOperations() {
     feedbackDataInput.setText(text);
     feedbackDataInput.setOriginalLabels(originalLabelsIn);
     feedbackDataInput.setUpdatedLabels(updatedLabelsIn);
+    feedbackDataInput.setFeedbackType("element_classification");
 
     AddFeedbackOptions addFeedbackOptions = new AddFeedbackOptions.Builder()
         .userId(userId)

conversation/README.md

@@ -10,13 +10,13 @@ Conversation will be removed in the next major release. Please migrate to Assist
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>conversation</artifactId>
-  <version>6.11.2</version>
+  <version>6.11.3</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:conversation:6.11.2'
+'com.ibm.watson.developer_cloud:conversation:6.11.3'
 ```
 
 ## Usage

discovery/README.md

@@ -7,13 +7,13 @@
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>discovery</artifactId>
-  <version>6.11.2</version>
+  <version>6.11.3</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:discovery:6.11.2'
+'com.ibm.watson.developer_cloud:discovery:6.11.3'
 ```
 
 ## Usage

discovery/src/test/java/com/ibm/watson/developer_cloud/discovery/v1/DiscoveryServiceIT.java

@@ -1901,7 +1901,7 @@ public void tokenizationDictionaryOperationsAreSuccessful() throws InterruptedEx
     // collections
     CreateCollectionOptions createCollectionOptions = new CreateCollectionOptions.Builder()
         .environmentId(environmentId)
-        .name("tokenization-dict-testing-collection")
+        .name("tokenization-dict-testing-collection " + UUID.randomUUID().toString())
         .language(CreateCollectionOptions.Language.JA)
         .build();
     Collection tokenDictTestCollection = discovery.createCollection(createCollectionOptions).execute();

language-translator/README.md

@@ -7,13 +7,13 @@
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>language-translator</artifactId>
-  <version>6.11.2</version>
+  <version>6.11.3</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:language-translator:6.11.2'
+'com.ibm.watson.developer_cloud:language-translator:6.11.3'
 ```
 
 ## Usage

natural-language-classifier/README.md

@@ -7,13 +7,13 @@
 <dependency>
   <groupId>com.ibm.watson.developer_cloud</groupId>
   <artifactId>natural-language-classifier</artifactId>
-  <version>6.11.2</version>
+  <version>6.11.3</version>
 </dependency>
 ```
 
 ##### Gradle
 ```gradle
-'com.ibm.watson.developer_cloud:natural-language-classifier:6.11.2'
+'com.ibm.watson.developer_cloud:natural-language-classifier:6.11.3'
 ```
 
 ## Usage