Merge pull request #973 from watson-developer-cloud/codegen-updates

Release v6.3.0

Author: lpatino10

README.md

@@ -309,7 +309,7 @@ The example below sends the `X-Watson-Learning-Opt-Out` header in every request
 PersonalityInsights service = new PersonalityInsights("2016-10-19");
 
 Map<String, String> headers = new HashMap<String, String>();
-headers.put(HttpHeaders.X_WATSON_LEARNING_OPT_OUT, 1);
+headers.put(HttpHeaders.X_WATSON_LEARNING_OPT_OUT, "true");
 
 service.setDefaultHeaders(headers);
 

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

@@ -37,6 +37,7 @@
 import com.ibm.watson.developer_cloud.assistant.v1.model.Entity;
 import com.ibm.watson.developer_cloud.assistant.v1.model.EntityCollection;
 import com.ibm.watson.developer_cloud.assistant.v1.model.EntityExport;
+import com.ibm.watson.developer_cloud.assistant.v1.model.EntityMentionCollection;
 import com.ibm.watson.developer_cloud.assistant.v1.model.Example;
 import com.ibm.watson.developer_cloud.assistant.v1.model.ExampleCollection;
 import com.ibm.watson.developer_cloud.assistant.v1.model.GetCounterexampleOptions;
@@ -57,6 +58,7 @@
 import com.ibm.watson.developer_cloud.assistant.v1.model.ListExamplesOptions;
 import com.ibm.watson.developer_cloud.assistant.v1.model.ListIntentsOptions;
 import com.ibm.watson.developer_cloud.assistant.v1.model.ListLogsOptions;
+import com.ibm.watson.developer_cloud.assistant.v1.model.ListMentionsOptions;
 import com.ibm.watson.developer_cloud.assistant.v1.model.ListSynonymsOptions;
 import com.ibm.watson.developer_cloud.assistant.v1.model.ListValuesOptions;
 import com.ibm.watson.developer_cloud.assistant.v1.model.ListWorkspacesOptions;
@@ -235,6 +237,9 @@ public ServiceCall<Workspace> createWorkspace(CreateWorkspaceOptions createWorks
       if (createWorkspaceOptions.learningOptOut() != null) {
         contentJson.addProperty("learning_opt_out", createWorkspaceOptions.learningOptOut());
       }
+      if (createWorkspaceOptions.systemSettings() != null) {
+        contentJson.add("system_settings", GsonSingleton.getGson().toJsonTree(createWorkspaceOptions.systemSettings()));
+      }
       builder.bodyJson(contentJson);
     }
     return createServiceCall(builder.build(), ResponseConverterUtils.getObject(Workspace.class));
@@ -397,6 +402,9 @@ public ServiceCall<Workspace> updateWorkspace(UpdateWorkspaceOptions updateWorks
     if (updateWorkspaceOptions.learningOptOut() != null) {
       contentJson.addProperty("learning_opt_out", updateWorkspaceOptions.learningOptOut());
     }
+    if (updateWorkspaceOptions.systemSettings() != null) {
+      contentJson.add("system_settings", GsonSingleton.getGson().toJsonTree(updateWorkspaceOptions.systemSettings()));
+    }
     builder.bodyJson(contentJson);
     return createServiceCall(builder.build(), ResponseConverterUtils.getObject(Workspace.class));
   }
@@ -567,6 +575,9 @@ public ServiceCall<Example> createExample(CreateExampleOptions createExampleOpti
     builder.query(VERSION, versionDate);
     final JsonObject contentJson = new JsonObject();
     contentJson.addProperty("text", createExampleOptions.text());
+    if (createExampleOptions.mentions() != null) {
+      contentJson.add("mentions", GsonSingleton.getGson().toJsonTree(createExampleOptions.mentions()));
+    }
     builder.bodyJson(contentJson);
     return createServiceCall(builder.build(), ResponseConverterUtils.getObject(Example.class));
   }
@@ -618,7 +629,7 @@ public ServiceCall<Example> getExample(GetExampleOptions getExampleOptions) {
   /**
    * List user input examples.
    *
-   * List the user input examples for an intent.
+   * List the user input examples for an intent, optionally including contextual entity mentions.
    *
    * This operation is limited to 2500 requests per 30 minutes. For more information, see **Rate limiting**.
    *
@@ -672,6 +683,9 @@ public ServiceCall<Example> updateExample(UpdateExampleOptions updateExampleOpti
     if (updateExampleOptions.newText() != null) {
       contentJson.addProperty("text", updateExampleOptions.newText());
     }
+    if (updateExampleOptions.newMentions() != null) {
+      contentJson.add("mentions", GsonSingleton.getGson().toJsonTree(updateExampleOptions.newMentions()));
+    }
     builder.bodyJson(contentJson);
     return createServiceCall(builder.build(), ResponseConverterUtils.getObject(Example.class));
   }
@@ -962,6 +976,33 @@ public ServiceCall<Entity> updateEntity(UpdateEntityOptions updateEntityOptions)
     return createServiceCall(builder.build(), ResponseConverterUtils.getObject(Entity.class));
   }
 
+  /**
+   * List entity mentions.
+   *
+   * List mentions for a contextual entity. An entity mention is an occurrence of a contextual entity in the context of
+   * an intent user input example.
+   *
+   * This operation is limited to 200 requests per 30 minutes. For more information, see **Rate limiting**.
+   *
+   * @param listMentionsOptions the {@link ListMentionsOptions} containing the options for the call
+   * @return a {@link ServiceCall} with a response type of {@link EntityMentionCollection}
+   */
+  public ServiceCall<EntityMentionCollection> listMentions(ListMentionsOptions listMentionsOptions) {
+    Validator.notNull(listMentionsOptions, "listMentionsOptions cannot be null");
+    String[] pathSegments = { "v1/workspaces", "entities", "mentions" };
+    String[] pathParameters = { listMentionsOptions.workspaceId(), listMentionsOptions.entity() };
+    RequestBuilder builder = RequestBuilder.get(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments,
+        pathParameters));
+    builder.query(VERSION, versionDate);
+    if (listMentionsOptions.export() != null) {
+      builder.query("export", String.valueOf(listMentionsOptions.export()));
+    }
+    if (listMentionsOptions.includeAudit() != null) {
+      builder.query("include_audit", String.valueOf(listMentionsOptions.includeAudit()));
+    }
+    return createServiceCall(builder.build(), ResponseConverterUtils.getObject(EntityMentionCollection.class));
+  }
+
   /**
    * Add entity value.
    *
@@ -1319,6 +1360,9 @@ public ServiceCall<DialogNode> createDialogNode(CreateDialogNodeOptions createDi
     if (createDialogNodeOptions.digressOutSlots() != null) {
       contentJson.addProperty("digress_out_slots", createDialogNodeOptions.digressOutSlots());
     }
+    if (createDialogNodeOptions.userLabel() != null) {
+      contentJson.addProperty("user_label", createDialogNodeOptions.userLabel());
+    }
     builder.bodyJson(contentJson);
     return createServiceCall(builder.build(), ResponseConverterUtils.getObject(DialogNode.class));
   }
@@ -1437,6 +1481,9 @@ public ServiceCall<DialogNode> updateDialogNode(UpdateDialogNodeOptions updateDi
     if (updateDialogNodeOptions.newVariable() != null) {
       contentJson.addProperty("variable", updateDialogNodeOptions.newVariable());
     }
+    if (updateDialogNodeOptions.newUserLabel() != null) {
+      contentJson.addProperty("user_label", updateDialogNodeOptions.newUserLabel());
+    }
     if (updateDialogNodeOptions.newMetadata() != null) {
       contentJson.add("metadata", GsonSingleton.getGson().toJsonTree(updateDialogNodeOptions.newMetadata()));
     }

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

@@ -110,7 +110,7 @@ public interface DigressOutSlots {
   private String parent;
   @SerializedName("previous_sibling")
   private String previousSibling;
-  private Map output;
+  private DialogNodeOutput output;
   private Map context;
   private Map metadata;
   @SerializedName("next_step")
@@ -128,6 +128,8 @@ public interface DigressOutSlots {
   private String digressOut;
   @SerializedName("digress_out_slots")
   private String digressOutSlots;
+  @SerializedName("user_label")
+  private String userLabel;
 
   /**
    * Builder.
@@ -138,7 +140,7 @@ public static class Builder {
     private String conditions;
     private String parent;
     private String previousSibling;
-    private Map output;
+    private DialogNodeOutput output;
     private Map context;
     private Map metadata;
     private DialogNodeNextStep nextStep;
@@ -150,6 +152,7 @@ public static class Builder {
     private String digressIn;
     private String digressOut;
     private String digressOutSlots;
+    private String userLabel;
 
     private Builder(CreateDialogNode createDialogNode) {
       dialogNode = createDialogNode.dialogNode;
@@ -169,6 +172,7 @@ private Builder(CreateDialogNode createDialogNode) {
       digressIn = createDialogNode.digressIn;
       digressOut = createDialogNode.digressOut;
       digressOutSlots = createDialogNode.digressOutSlots;
+      userLabel = createDialogNode.userLabel;
     }
 
     /**
@@ -271,7 +275,7 @@ public Builder previousSibling(String previousSibling) {
      * @param output the output
      * @return the CreateDialogNode builder
      */
-    public Builder output(Map output) {
+    public Builder output(DialogNodeOutput output) {
       this.output = output;
       return this;
     }
@@ -397,6 +401,17 @@ public Builder digressOutSlots(String digressOutSlots) {
       this.digressOutSlots = digressOutSlots;
       return this;
     }
+
+    /**
+     * Set the userLabel.
+     *
+     * @param userLabel the userLabel
+     * @return the CreateDialogNode builder
+     */
+    public Builder userLabel(String userLabel) {
+      this.userLabel = userLabel;
+      return this;
+    }
   }
 
   private CreateDialogNode(Builder builder) {
@@ -418,6 +433,7 @@ private CreateDialogNode(Builder builder) {
     digressIn = builder.digressIn;
     digressOut = builder.digressOut;
     digressOutSlots = builder.digressOutSlots;
+    userLabel = builder.userLabel;
   }
 
   /**
@@ -496,7 +512,7 @@ public String previousSibling() {
    *
    * @return the output
    */
-  public Map output() {
+  public DialogNodeOutput output() {
     return output;
   }
 
@@ -622,4 +638,15 @@ public String digressOut() {
   public String digressOutSlots() {
     return digressOutSlots;
   }
+
+  /**
+   * Gets the userLabel.
+   *
+   * A label that can be displayed externally to describe the purpose of the node to users.
+   *
+   * @return the userLabel
+   */
+  public String userLabel() {
+    return userLabel;
+  }
 }

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

@@ -108,7 +108,7 @@ public interface DigressOutSlots {
   private String conditions;
   private String parent;
   private String previousSibling;
-  private Map output;
+  private DialogNodeOutput output;
   private Map context;
   private Map metadata;
   private DialogNodeNextStep nextStep;
@@ -120,6 +120,7 @@ public interface DigressOutSlots {
   private String digressIn;
   private String digressOut;
   private String digressOutSlots;
+  private String userLabel;
 
   /**
    * Builder.
@@ -131,7 +132,7 @@ public static class Builder {
     private String conditions;
     private String parent;
     private String previousSibling;
-    private Map output;
+    private DialogNodeOutput output;
     private Map context;
     private Map metadata;
     private DialogNodeNextStep nextStep;
@@ -143,6 +144,7 @@ public static class Builder {
     private String digressIn;
     private String digressOut;
     private String digressOutSlots;
+    private String userLabel;
 
     private Builder(CreateDialogNodeOptions createDialogNodeOptions) {
       workspaceId = createDialogNodeOptions.workspaceId;
@@ -163,6 +165,7 @@ private Builder(CreateDialogNodeOptions createDialogNodeOptions) {
       digressIn = createDialogNodeOptions.digressIn;
       digressOut = createDialogNodeOptions.digressOut;
       digressOutSlots = createDialogNodeOptions.digressOutSlots;
+      userLabel = createDialogNodeOptions.userLabel;
     }
 
     /**
@@ -278,7 +281,7 @@ public Builder previousSibling(String previousSibling) {
      * @param output the output
      * @return the CreateDialogNodeOptions builder
      */
-    public Builder output(Map output) {
+    public Builder output(DialogNodeOutput output) {
       this.output = output;
       return this;
     }
@@ -404,6 +407,17 @@ public Builder digressOutSlots(String digressOutSlots) {
       this.digressOutSlots = digressOutSlots;
       return this;
     }
+
+    /**
+     * Set the userLabel.
+     *
+     * @param userLabel the userLabel
+     * @return the CreateDialogNodeOptions builder
+     */
+    public Builder userLabel(String userLabel) {
+      this.userLabel = userLabel;
+      return this;
+    }
   }
 
   private CreateDialogNodeOptions(Builder builder) {
@@ -427,6 +441,7 @@ private CreateDialogNodeOptions(Builder builder) {
     digressIn = builder.digressIn;
     digressOut = builder.digressOut;
     digressOutSlots = builder.digressOutSlots;
+    userLabel = builder.userLabel;
   }
 
   /**
@@ -516,7 +531,7 @@ public String previousSibling() {
    *
    * @return the output
    */
-  public Map output() {
+  public DialogNodeOutput output() {
     return output;
   }
 
@@ -642,4 +657,15 @@ public String digressOut() {
   public String digressOutSlots() {
     return digressOutSlots;
   }
+
+  /**
+   * Gets the userLabel.
+   *
+   * A label that can be displayed externally to describe the purpose of the node to users.
+   *
+   * @return the userLabel
+   */
+  public String userLabel() {
+    return userLabel;
+  }
 }