Merge branch 'develop' into codegen/language-translator

Author: lpatino10

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

@@ -130,6 +130,8 @@ public Assistant(String versionDate, String username, String password) {
   }
 
   /**
+   * Get response to user input.
+   *
    * Get a response to a user's input. There is no rate limit for this operation.
    *
    * @param messageOptions the {@link MessageOptions} containing the options for the call
@@ -278,8 +280,8 @@ public ServiceCall<WorkspaceExport> getWorkspace(GetWorkspaceOptions getWorkspac
   /**
    * List workspaces.
    *
-   * List the workspaces associated with an Assistant service instance. This operation is limited to 500 requests per 30
-   * minutes. For more information, see **Rate limiting**.
+   * List the workspaces associated with a Watson Assistant service instance. This operation is limited to 500 requests
+   * per 30 minutes. For more information, see **Rate limiting**.
    *
    * @param listWorkspacesOptions the {@link ListWorkspacesOptions} containing the options for the call
    * @return a {@link ServiceCall} with a response type of {@link WorkspaceCollection}
@@ -311,8 +313,8 @@ public ServiceCall<WorkspaceCollection> listWorkspaces(ListWorkspacesOptions lis
   /**
    * List workspaces.
    *
-   * List the workspaces associated with an Assistant service instance. This operation is limited to 500 requests per 30
-   * minutes. For more information, see **Rate limiting**.
+   * List the workspaces associated with a Watson Assistant service instance. This operation is limited to 500 requests
+   * per 30 minutes. For more information, see **Rate limiting**.
    *
    * @return a {@link ServiceCall} with a response type of {@link WorkspaceCollection}
    */

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

@@ -12,14 +12,14 @@
  */
 package com.ibm.watson.developer_cloud.assistant.v1.model;
 
-import com.google.gson.annotations.SerializedName;
-import com.ibm.watson.developer_cloud.service.model.GenericModel;
-import com.ibm.watson.developer_cloud.util.Validator;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import com.google.gson.annotations.SerializedName;
+import com.ibm.watson.developer_cloud.service.model.GenericModel;
+import com.ibm.watson.developer_cloud.util.Validator;
+
 /**
  * CreateDialogNode.
  */

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

@@ -12,13 +12,13 @@
  */
 package com.ibm.watson.developer_cloud.assistant.v1.model;
 
-import com.google.gson.annotations.SerializedName;
-import com.ibm.watson.developer_cloud.service.model.GenericModel;
-
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import com.google.gson.annotations.SerializedName;
+import com.ibm.watson.developer_cloud.service.model.GenericModel;
+
 /**
  * DialogNode.
  */

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

@@ -23,6 +23,7 @@ public class DialogNodeVisitedDetails extends GenericModel {
   @SerializedName("dialog_node")
   private String dialogNode;
   private String title;
+  private String conditions;
 
   /**
    * Gets the dialogNode.
@@ -46,6 +47,17 @@ public String getTitle() {
     return title;
   }
 
+  /**
+   * Gets the conditions.
+   *
+   * The conditions that trigger the dialog node.
+   *
+   * @return the conditions
+   */
+  public String getConditions() {
+    return conditions;
+  }
+
   /**
    * Sets the dialogNode.
    *
@@ -63,4 +75,13 @@ public void setDialogNode(final String dialogNode) {
   public void setTitle(final String title) {
     this.title = title;
   }
+
+  /**
+   * Sets the conditions.
+   *
+   * @param conditions the new conditions
+   */
+  public void setConditions(final String conditions) {
+    this.conditions = conditions;
+  }
 }

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

@@ -167,7 +167,7 @@ public Long pageLimit() {
   /**
    * Gets the cursor.
    *
-   * A token identifying the last object from the previous page of results.
+   * A token identifying the page of results to retrieve.
    *
    * @return the cursor
    */

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

@@ -205,7 +205,7 @@ public String sort() {
   /**
    * Gets the cursor.
    *
-   * A token identifying the last object from the previous page of results.
+   * A token identifying the page of results to retrieve.
    *
    * @return the cursor
    */

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

@@ -205,7 +205,7 @@ public String sort() {
   /**
    * Gets the cursor.
    *
-   * A token identifying the last object from the previous page of results.
+   * A token identifying the page of results to retrieve.
    *
    * @return the cursor
    */

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

@@ -232,7 +232,7 @@ public String sort() {
   /**
    * Gets the cursor.
    *
-   * A token identifying the last object from the previous page of results.
+   * A token identifying the page of results to retrieve.
    *
    * @return the cursor
    */

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

@@ -234,7 +234,7 @@ public String sort() {
   /**
    * Gets the cursor.
    *
-   * A token identifying the last object from the previous page of results.
+   * A token identifying the page of results to retrieve.
    *
    * @return the cursor
    */

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

@@ -232,7 +232,7 @@ public String sort() {
   /**
    * Gets the cursor.
    *
-   * A token identifying the last object from the previous page of results.
+   * A token identifying the page of results to retrieve.
    *
    * @return the cursor
    */