feat(Assistant v1): Add disambiguationOptOut prop to dialog nodes

Author: lpatino10

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

@@ -285,10 +285,6 @@ public ServiceCall<Workspace> createWorkspace(CreateWorkspaceOptions createWorks
         contentJson.add("system_settings", com.ibm.cloud.sdk.core.util.GsonSingleton.getGson().toJsonTree(
             createWorkspaceOptions.systemSettings()));
       }
-      if (createWorkspaceOptions.webhooks() != null) {
-        contentJson.add("webhooks", com.ibm.cloud.sdk.core.util.GsonSingleton.getGson().toJsonTree(
-            createWorkspaceOptions.webhooks()));
-      }
       if (createWorkspaceOptions.intents() != null) {
         contentJson.add("intents", com.ibm.cloud.sdk.core.util.GsonSingleton.getGson().toJsonTree(createWorkspaceOptions
             .intents()));
@@ -305,6 +301,10 @@ public ServiceCall<Workspace> createWorkspace(CreateWorkspaceOptions createWorks
         contentJson.add("counterexamples", com.ibm.cloud.sdk.core.util.GsonSingleton.getGson().toJsonTree(
             createWorkspaceOptions.counterexamples()));
       }
+      if (createWorkspaceOptions.webhooks() != null) {
+        contentJson.add("webhooks", com.ibm.cloud.sdk.core.util.GsonSingleton.getGson().toJsonTree(
+            createWorkspaceOptions.webhooks()));
+      }
       builder.bodyJson(contentJson);
     }
     ResponseConverter<Workspace> responseConverter = ResponseConverterUtils.getValue(
@@ -414,10 +414,6 @@ public ServiceCall<Workspace> updateWorkspace(UpdateWorkspaceOptions updateWorks
       contentJson.add("system_settings", com.ibm.cloud.sdk.core.util.GsonSingleton.getGson().toJsonTree(
           updateWorkspaceOptions.systemSettings()));
     }
-    if (updateWorkspaceOptions.webhooks() != null) {
-      contentJson.add("webhooks", com.ibm.cloud.sdk.core.util.GsonSingleton.getGson().toJsonTree(updateWorkspaceOptions
-          .webhooks()));
-    }
     if (updateWorkspaceOptions.intents() != null) {
       contentJson.add("intents", com.ibm.cloud.sdk.core.util.GsonSingleton.getGson().toJsonTree(updateWorkspaceOptions
           .intents()));
@@ -434,6 +430,10 @@ public ServiceCall<Workspace> updateWorkspace(UpdateWorkspaceOptions updateWorks
       contentJson.add("counterexamples", com.ibm.cloud.sdk.core.util.GsonSingleton.getGson().toJsonTree(
           updateWorkspaceOptions.counterexamples()));
     }
+    if (updateWorkspaceOptions.webhooks() != null) {
+      contentJson.add("webhooks", com.ibm.cloud.sdk.core.util.GsonSingleton.getGson().toJsonTree(updateWorkspaceOptions
+          .webhooks()));
+    }
     builder.bodyJson(contentJson);
     ResponseConverter<Workspace> responseConverter = ResponseConverterUtils.getValue(
         new com.google.gson.reflect.TypeToken<Workspace>() {
@@ -1783,6 +1783,9 @@ public ServiceCall<DialogNode> createDialogNode(CreateDialogNodeOptions createDi
     if (createDialogNodeOptions.userLabel() != null) {
       contentJson.addProperty("user_label", createDialogNodeOptions.userLabel());
     }
+    if (createDialogNodeOptions.disambiguationOptOut() != null) {
+      contentJson.addProperty("disambiguation_opt_out", createDialogNodeOptions.disambiguationOptOut());
+    }
     builder.bodyJson(contentJson);
     ResponseConverter<DialogNode> responseConverter = ResponseConverterUtils.getValue(
         new com.google.gson.reflect.TypeToken<DialogNode>() {
@@ -1908,6 +1911,9 @@ public ServiceCall<DialogNode> updateDialogNode(UpdateDialogNodeOptions updateDi
     if (updateDialogNodeOptions.newUserLabel() != null) {
       contentJson.addProperty("user_label", updateDialogNodeOptions.newUserLabel());
     }
+    if (updateDialogNodeOptions.newDisambiguationOptOut() != null) {
+      contentJson.addProperty("disambiguation_opt_out", updateDialogNodeOptions.newDisambiguationOptOut());
+    }
     builder.bodyJson(contentJson);
     ResponseConverter<DialogNode> responseConverter = ResponseConverterUtils.getValue(
         new com.google.gson.reflect.TypeToken<DialogNode>() {

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

@@ -120,6 +120,7 @@ public interface DigressOutSlots {
   private String digressOut;
   private String digressOutSlots;
   private String userLabel;
+  private Boolean disambiguationOptOut;
 
   /**
    * Builder.
@@ -144,6 +145,7 @@ public static class Builder {
     private String digressOut;
     private String digressOutSlots;
     private String userLabel;
+    private Boolean disambiguationOptOut;
 
     private Builder(CreateDialogNodeOptions createDialogNodeOptions) {
       this.workspaceId = createDialogNodeOptions.workspaceId;
@@ -165,6 +167,7 @@ private Builder(CreateDialogNodeOptions createDialogNodeOptions) {
       this.digressOut = createDialogNodeOptions.digressOut;
       this.digressOutSlots = createDialogNodeOptions.digressOutSlots;
       this.userLabel = createDialogNodeOptions.userLabel;
+      this.disambiguationOptOut = createDialogNodeOptions.disambiguationOptOut;
     }
 
     /**
@@ -419,6 +422,17 @@ public Builder userLabel(String userLabel) {
       return this;
     }
 
+    /**
+     * Set the disambiguationOptOut.
+     *
+     * @param disambiguationOptOut the disambiguationOptOut
+     * @return the CreateDialogNodeOptions builder
+     */
+    public Builder disambiguationOptOut(Boolean disambiguationOptOut) {
+      this.disambiguationOptOut = disambiguationOptOut;
+      return this;
+    }
+
     /**
      * Set the dialogNode.
      *
@@ -444,6 +458,7 @@ public Builder dialogNode(DialogNode dialogNode) {
       this.digressOut = dialogNode.digressOut();
       this.digressOutSlots = dialogNode.digressOutSlots();
       this.userLabel = dialogNode.userLabel();
+      this.disambiguationOptOut = dialogNode.disambiguationOptOut();
       return this;
     }
   }
@@ -472,6 +487,7 @@ private CreateDialogNodeOptions(Builder builder) {
     digressOut = builder.digressOut;
     digressOutSlots = builder.digressOutSlots;
     userLabel = builder.userLabel;
+    disambiguationOptOut = builder.disambiguationOptOut;
   }
 
   /**
@@ -555,8 +571,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://cloud.ibm.com/docs/services/assistant?topic=assistant-dialog-overview#dialog-overview-responses).
+   * [documentation](https://cloud.ibm.com/docs/services/assistant?topic=assistant-dialog-overview#dialog-overview-responses).
    *
    * @return the output
    */
@@ -696,4 +711,15 @@ public String digressOutSlots() {
   public String userLabel() {
     return userLabel;
   }
+
+  /**
+   * Gets the disambiguationOptOut.
+   *
+   * Whether the dialog node should be excluded from disambiguation suggestions.
+   *
+   * @return the disambiguationOptOut
+   */
+  public Boolean disambiguationOptOut() {
+    return disambiguationOptOut;
+  }
 }

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

@@ -129,6 +129,8 @@ public interface DigressOutSlots {
   private String digressOutSlots;
   @SerializedName("user_label")
   private String userLabel;
+  @SerializedName("disambiguation_opt_out")
+  private Boolean disambiguationOptOut;
   private Boolean disabled;
   private Date created;
   private Date updated;
@@ -155,6 +157,7 @@ public static class Builder {
     private String digressOut;
     private String digressOutSlots;
     private String userLabel;
+    private Boolean disambiguationOptOut;
     private Boolean disabled;
     private Date created;
     private Date updated;
@@ -178,6 +181,7 @@ private Builder(DialogNode dialogNode) {
       this.digressOut = dialogNode.digressOut;
       this.digressOutSlots = dialogNode.digressOutSlots;
       this.userLabel = dialogNode.userLabel;
+      this.disambiguationOptOut = dialogNode.disambiguationOptOut;
       this.disabled = dialogNode.disabled;
       this.created = dialogNode.created;
       this.updated = dialogNode.updated;
@@ -422,6 +426,17 @@ public Builder userLabel(String userLabel) {
       return this;
     }
 
+    /**
+     * Set the disambiguationOptOut.
+     *
+     * @param disambiguationOptOut the disambiguationOptOut
+     * @return the DialogNode builder
+     */
+    public Builder disambiguationOptOut(Boolean disambiguationOptOut) {
+      this.disambiguationOptOut = disambiguationOptOut;
+      return this;
+    }
+
     /**
      * Set the disabled.
      *
@@ -477,6 +492,7 @@ private DialogNode(Builder builder) {
     digressOut = builder.digressOut;
     digressOutSlots = builder.digressOutSlots;
     userLabel = builder.userLabel;
+    disambiguationOptOut = builder.disambiguationOptOut;
     disabled = builder.disabled;
     created = builder.created;
     updated = builder.updated;
@@ -552,8 +568,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://cloud.ibm.com/docs/services/assistant?topic=assistant-dialog-overview#dialog-overview-responses).
+   * [documentation](https://cloud.ibm.com/docs/services/assistant?topic=assistant-dialog-overview#dialog-overview-responses).
    *
    * @return the output
    */
@@ -694,6 +709,17 @@ public String userLabel() {
     return userLabel;
   }
 
+  /**
+   * Gets the disambiguationOptOut.
+   *
+   * Whether the dialog node should be excluded from disambiguation suggestions.
+   *
+   * @return the disambiguationOptOut
+   */
+  public Boolean disambiguationOptOut() {
+    return disambiguationOptOut;
+  }
+
   /**
    * Gets the disabled.
    *

assistant/src/main/java/com/ibm/watson/assistant/v1/model/DialogSuggestion.java

@@ -136,8 +136,8 @@ public Builder newBuilder() {
   /**
    * Gets the label.
    *
-   * The user-facing label for the disambiguation option. This label is taken from the **user_label** property of the
-   * corresponding dialog node.
+   * The user-facing label for the disambiguation option. This label is taken from the **title** or **user_label**
+   * property of the corresponding dialog node, depending on the disambiguation options.
    *
    * @return the label
    */

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

@@ -121,6 +121,7 @@ public interface NewDigressOutSlots {
   private String newDigressOut;
   private String newDigressOutSlots;
   private String newUserLabel;
+  private Boolean newDisambiguationOptOut;
 
   /**
    * Builder.
@@ -146,6 +147,7 @@ public static class Builder {
     private String newDigressOut;
     private String newDigressOutSlots;
     private String newUserLabel;
+    private Boolean newDisambiguationOptOut;
 
     private Builder(UpdateDialogNodeOptions updateDialogNodeOptions) {
       this.workspaceId = updateDialogNodeOptions.workspaceId;
@@ -168,6 +170,7 @@ private Builder(UpdateDialogNodeOptions updateDialogNodeOptions) {
       this.newDigressOut = updateDialogNodeOptions.newDigressOut;
       this.newDigressOutSlots = updateDialogNodeOptions.newDigressOutSlots;
       this.newUserLabel = updateDialogNodeOptions.newUserLabel;
+      this.newDisambiguationOptOut = updateDialogNodeOptions.newDisambiguationOptOut;
     }
 
     /**
@@ -432,6 +435,17 @@ public Builder newUserLabel(String newUserLabel) {
       this.newUserLabel = newUserLabel;
       return this;
     }
+
+    /**
+     * Set the newDisambiguationOptOut.
+     *
+     * @param newDisambiguationOptOut the newDisambiguationOptOut
+     * @return the UpdateDialogNodeOptions builder
+     */
+    public Builder newDisambiguationOptOut(Boolean newDisambiguationOptOut) {
+      this.newDisambiguationOptOut = newDisambiguationOptOut;
+      return this;
+    }
   }
 
   private UpdateDialogNodeOptions(Builder builder) {
@@ -459,6 +473,7 @@ private UpdateDialogNodeOptions(Builder builder) {
     newDigressOut = builder.newDigressOut;
     newDigressOutSlots = builder.newDigressOutSlots;
     newUserLabel = builder.newUserLabel;
+    newDisambiguationOptOut = builder.newDisambiguationOptOut;
   }
 
   /**
@@ -553,8 +568,7 @@ public String newPreviousSibling() {
    * Gets the newOutput.
    *
    * The output of the dialog node. For more information about how to specify dialog node output, see the
-   * [documentation]
-   * (https://cloud.ibm.com/docs/services/assistant?topic=assistant-dialog-overview#dialog-overview-responses).
+   * [documentation](https://cloud.ibm.com/docs/services/assistant?topic=assistant-dialog-overview#dialog-overview-responses).
    *
    * @return the newOutput
    */
@@ -694,4 +708,15 @@ public String newDigressOutSlots() {
   public String newUserLabel() {
     return newUserLabel;
   }
+
+  /**
+   * Gets the newDisambiguationOptOut.
+   *
+   * Whether the dialog node should be excluded from disambiguation suggestions.
+   *
+   * @return the newDisambiguationOptOut
+   */
+  public Boolean newDisambiguationOptOut() {
+    return newDisambiguationOptOut;
+  }
 }