Merge pull request #1168 from watson-developer-cloud/release-may

May Release

Author: kevinkowa

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

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019, 2020.
+ * (C) Copyright IBM Corp. 2019, 2021.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -12,7 +12,7 @@
  */
 
 /*
- * IBM OpenAPI SDK Code Generator Version: 99-SNAPSHOT-be3b4618-20201201-123423
+ * IBM OpenAPI SDK Code Generator Version: 99-SNAPSHOT-902c9336-20210513-140138
  */
 
 package com.ibm.watson.assistant.v1;
@@ -253,6 +253,9 @@ public ServiceCall<MessageResponse> message(MessageOptions messageOptions) {
           "output",
           com.ibm.cloud.sdk.core.util.GsonSingleton.getGson().toJsonTree(messageOptions.output()));
     }
+    if (messageOptions.userId() != null) {
+      contentJson.addProperty("user_id", messageOptions.userId());
+    }
     builder.bodyJson(contentJson);
     ResponseConverter<MessageResponse> responseConverter =
         ResponseConverterUtils.getValue(
@@ -267,7 +270,7 @@ public ServiceCall<MessageResponse> message(MessageOptions messageOptions) {
    * the intents and entities recognized in each input. This method is useful for testing and
    * comparing the performance of different workspaces.
    *
-   * <p>This method is available only with Premium plans.
+   * <p>This method is available only with Enterprise with Data Isolation plans.
    *
    * @param bulkClassifyOptions the {@link BulkClassifyOptions} containing the options for the call
    * @return a {@link ServiceCall} with a result of type {@link BulkClassifyResponse}
@@ -2298,40 +2301,41 @@ public ServiceCall<DialogNode> updateDialogNode(UpdateDialogNodeOptions updateDi
    * <p>If you want to update multiple dialog nodes with a single API call, consider using the
    * **[Update workspace](#update-workspace)** method instead.
    *
-   * @param UpdateDialogNodeNullableOptions the {@link UpdateDialogNodeNullableOptions} containing the
-   *     options for the call
+   * @param UpdateDialogNodeNullableOptions the {@link UpdateDialogNodeNullableOptions} containing
+   *     the options for the call
    * @return a {@link ServiceCall} with a result of type {@link DialogNode}
    */
   public ServiceCall<DialogNode> updateDialogNodeNullable(
-          UpdateDialogNodeNullableOptions UpdateDialogNodeNullableOptions) {
+      UpdateDialogNodeNullableOptions UpdateDialogNodeNullableOptions) {
     com.ibm.cloud.sdk.core.util.Validator.notNull(
-            UpdateDialogNodeNullableOptions, "UpdateDialogNodeNullableOptions cannot be null");
+        UpdateDialogNodeNullableOptions, "UpdateDialogNodeNullableOptions cannot be null");
     Map<String, String> pathParamsMap = new HashMap<String, String>();
     pathParamsMap.put("workspace_id", UpdateDialogNodeNullableOptions.workspaceId());
     pathParamsMap.put("dialog_node", UpdateDialogNodeNullableOptions.dialogNode());
     RequestBuilder builder =
-            RequestBuilder.post(
-                    RequestBuilder.resolveRequestUrl(
-                            getServiceUrl(),
-                            "/v1/workspaces/{workspace_id}/dialog_nodes/{dialog_node}",
-                            pathParamsMap));
+        RequestBuilder.post(
+            RequestBuilder.resolveRequestUrl(
+                getServiceUrl(),
+                "/v1/workspaces/{workspace_id}/dialog_nodes/{dialog_node}",
+                pathParamsMap));
     Map<String, String> sdkHeaders =
-            SdkCommon.getSdkHeaders("conversation", "v1", "testUpdateDialogNode");
+        SdkCommon.getSdkHeaders("conversation", "v1", "testUpdateDialogNode");
     for (Entry<String, String> header : sdkHeaders.entrySet()) {
       builder.header(header.getKey(), header.getValue());
     }
     builder.header("Accept", "application/json");
     builder.query("version", String.valueOf(this.version));
     if (UpdateDialogNodeNullableOptions.includeAudit() != null) {
-      builder.query("include_audit", String.valueOf(UpdateDialogNodeNullableOptions.includeAudit()));
+      builder.query(
+          "include_audit", String.valueOf(UpdateDialogNodeNullableOptions.includeAudit()));
     }
     builder.bodyContent(
-            com.ibm.cloud.sdk.core.util.GsonSingleton.getGsonWithSerializeNulls()
-                    .toJson(UpdateDialogNodeNullableOptions.body()),
-            "application/json");
+        com.ibm.cloud.sdk.core.util.GsonSingleton.getGsonWithSerializeNulls()
+            .toJson(UpdateDialogNodeNullableOptions.body()),
+        "application/json");
     ResponseConverter<DialogNode> responseConverter =
-            ResponseConverterUtils.getValue(
-                    new com.google.gson.reflect.TypeToken<DialogNode>() {}.getType());
+        ResponseConverterUtils.getValue(
+            new com.google.gson.reflect.TypeToken<DialogNode>() {}.getType());
     return createServiceCall(builder.build(), responseConverter);
   }
 
@@ -2372,6 +2376,8 @@ public ServiceCall<Void> deleteDialogNode(DeleteDialogNodeOptions deleteDialogNo
    *
    * <p>List the events from the log of a specific workspace.
    *
+   * <p>This method requires Manager access.
+   *
    * @param listLogsOptions the {@link ListLogsOptions} containing the options for the call
    * @return a {@link ServiceCall} with a result of type {@link LogCollection}
    */
@@ -2454,6 +2460,11 @@ public ServiceCall<LogCollection> listAllLogs(ListAllLogsOptions listAllLogsOpti
    * [Information
    * security](https://cloud.ibm.com/docs/assistant?topic=assistant-information-security#information-security).
    *
+   * <p>**Note:** This operation is intended only for deleting data associated with a single
+   * specific customer, not for deleting data associated with multiple customers or for any other
+   * purpose. For more information, see [Labeling and deleting data in Watson
+   * Assistant](https://cloud.ibm.com/docs/assistant?topic=assistant-information-security#information-security-gdpr-wa).
+   *
    * @param deleteUserDataOptions the {@link DeleteUserDataOptions} containing the options for the
    *     call
    * @return a {@link ServiceCall} with a void result

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

@@ -0,0 +1,89 @@
+/*
+ * (C) Copyright IBM Corp. 2021.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package com.ibm.watson.assistant.v1.model;
+
+import com.ibm.cloud.sdk.core.service.model.GenericModel;
+
+/** Information used by an integration to transfer the conversation to a different channel. */
+public class ChannelTransferInfo extends GenericModel {
+
+  protected ChannelTransferTarget target;
+
+  /** Builder. */
+  public static class Builder {
+    private ChannelTransferTarget target;
+
+    private Builder(ChannelTransferInfo channelTransferInfo) {
+      this.target = channelTransferInfo.target;
+    }
+
+    /** Instantiates a new builder. */
+    public Builder() {}
+
+    /**
+     * Instantiates a new builder with required properties.
+     *
+     * @param target the target
+     */
+    public Builder(ChannelTransferTarget target) {
+      this.target = target;
+    }
+
+    /**
+     * Builds a ChannelTransferInfo.
+     *
+     * @return the new ChannelTransferInfo instance
+     */
+    public ChannelTransferInfo build() {
+      return new ChannelTransferInfo(this);
+    }
+
+    /**
+     * Set the target.
+     *
+     * @param target the target
+     * @return the ChannelTransferInfo builder
+     */
+    public Builder target(ChannelTransferTarget target) {
+      this.target = target;
+      return this;
+    }
+  }
+
+  protected ChannelTransferInfo(Builder builder) {
+    com.ibm.cloud.sdk.core.util.Validator.notNull(builder.target, "target cannot be null");
+    target = builder.target;
+  }
+
+  /**
+   * New builder.
+   *
+   * @return a ChannelTransferInfo builder
+   */
+  public Builder newBuilder() {
+    return new Builder(this);
+  }
+
+  /**
+   * Gets the target.
+   *
+   * <p>An object specifying target channels available for the transfer. Each property of this
+   * object represents an available transfer target. Currently, the only supported property is
+   * **chat**, representing the web chat integration.
+   *
+   * @return the target
+   */
+  public ChannelTransferTarget target() {
+    return target;
+  }
+}

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

@@ -0,0 +1,81 @@
+/*
+ * (C) Copyright IBM Corp. 2021.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package com.ibm.watson.assistant.v1.model;
+
+import com.ibm.cloud.sdk.core.service.model.GenericModel;
+
+/**
+ * An object specifying target channels available for the transfer. Each property of this object
+ * represents an available transfer target. Currently, the only supported property is **chat**,
+ * representing the web chat integration.
+ */
+public class ChannelTransferTarget extends GenericModel {
+
+  protected ChannelTransferTargetChat chat;
+
+  /** Builder. */
+  public static class Builder {
+    private ChannelTransferTargetChat chat;
+
+    private Builder(ChannelTransferTarget channelTransferTarget) {
+      this.chat = channelTransferTarget.chat;
+    }
+
+    /** Instantiates a new builder. */
+    public Builder() {}
+
+    /**
+     * Builds a ChannelTransferTarget.
+     *
+     * @return the new ChannelTransferTarget instance
+     */
+    public ChannelTransferTarget build() {
+      return new ChannelTransferTarget(this);
+    }
+
+    /**
+     * Set the chat.
+     *
+     * @param chat the chat
+     * @return the ChannelTransferTarget builder
+     */
+    public Builder chat(ChannelTransferTargetChat chat) {
+      this.chat = chat;
+      return this;
+    }
+  }
+
+  protected ChannelTransferTarget(Builder builder) {
+    chat = builder.chat;
+  }
+
+  /**
+   * New builder.
+   *
+   * @return a ChannelTransferTarget builder
+   */
+  public Builder newBuilder() {
+    return new Builder(this);
+  }
+
+  /**
+   * Gets the chat.
+   *
+   * <p>Information for transferring to the web chat integration.
+   *
+   * @return the chat
+   */
+  public ChannelTransferTargetChat chat() {
+    return chat;
+  }
+}

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

@@ -0,0 +1,77 @@
+/*
+ * (C) Copyright IBM Corp. 2021.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package com.ibm.watson.assistant.v1.model;
+
+import com.ibm.cloud.sdk.core.service.model.GenericModel;
+
+/** Information for transferring to the web chat integration. */
+public class ChannelTransferTargetChat extends GenericModel {
+
+  protected String url;
+
+  /** Builder. */
+  public static class Builder {
+    private String url;
+
+    private Builder(ChannelTransferTargetChat channelTransferTargetChat) {
+      this.url = channelTransferTargetChat.url;
+    }
+
+    /** Instantiates a new builder. */
+    public Builder() {}
+
+    /**
+     * Builds a ChannelTransferTargetChat.
+     *
+     * @return the new ChannelTransferTargetChat instance
+     */
+    public ChannelTransferTargetChat build() {
+      return new ChannelTransferTargetChat(this);
+    }
+
+    /**
+     * Set the url.
+     *
+     * @param url the url
+     * @return the ChannelTransferTargetChat builder
+     */
+    public Builder url(String url) {
+      this.url = url;
+      return this;
+    }
+  }
+
+  protected ChannelTransferTargetChat(Builder builder) {
+    url = builder.url;
+  }
+
+  /**
+   * New builder.
+   *
+   * @return a ChannelTransferTargetChat builder
+   */
+  public Builder newBuilder() {
+    return new Builder(this);
+  }
+
+  /**
+   * Gets the url.
+   *
+   * <p>The URL of the target web chat.
+   *
+   * @return the url
+   */
+  public String url() {
+    return url;
+  }
+}