Merge pull request #1148 from watson-developer-cloud/fix-agent

Fix agent

Author: kevinkowa

.utility/decrypt-service-instance-apikeys.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
   echo -e "Decrypt service instance apikeys for branch $TRAVIS_BRANCH.\n"
-  openssl aes-256-cbc -K $encrypted_79638a2d7865_key -iv $encrypted_79638a2d7865_iv \
+  openssl aes-256-cbc -K $encrypted_5b4197fb87e6_key -iv $encrypted_5b4197fb87e6_iv \
   -in config.properties.enc -out common/src/test/resources/config.properties -d
 else
   echo -e "Not Decrypt service instance apikeys for branch $TRAVIS_BRANCH.\n"

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

@@ -259,6 +259,47 @@ public ServiceCall<MessageResponse> message(MessageOptions messageOptions) {
     return createServiceCall(builder.build(), responseConverter);
   }
 
+  /**
+   * Identify intents and entities in multiple user utterances.
+   *
+   * <p>Send multiple user inputs to a workspace in a single request and receive information about
+   * 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.
+   *
+   * @param bulkClassifyOptions the {@link BulkClassifyOptions} containing the options for the call
+   * @return a {@link ServiceCall} with a result of type {@link BulkClassifyResponse}
+   */
+  public ServiceCall<BulkClassifyResponse> bulkClassify(BulkClassifyOptions bulkClassifyOptions) {
+    com.ibm.cloud.sdk.core.util.Validator.notNull(
+        bulkClassifyOptions, "bulkClassifyOptions cannot be null");
+    Map<String, String> pathParamsMap = new HashMap<String, String>();
+    pathParamsMap.put("workspace_id", bulkClassifyOptions.workspaceId());
+    RequestBuilder builder =
+        RequestBuilder.post(
+            RequestBuilder.resolveRequestUrl(
+                getServiceUrl(), "/v1/workspaces/{workspace_id}/bulk_classify", pathParamsMap));
+    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("conversation", "v1", "bulkClassify");
+    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));
+    final JsonObject contentJson = new JsonObject();
+    if (bulkClassifyOptions.input() != null) {
+      contentJson.add(
+          "input",
+          com.ibm.cloud.sdk.core.util.GsonSingleton.getGson()
+              .toJsonTree(bulkClassifyOptions.input()));
+    }
+    builder.bodyJson(contentJson);
+    ResponseConverter<BulkClassifyResponse> responseConverter =
+        ResponseConverterUtils.getValue(
+            new com.google.gson.reflect.TypeToken<BulkClassifyResponse>() {}.getType());
+    return createServiceCall(builder.build(), responseConverter);
+  }
+
   /**
    * List workspaces.
    *
@@ -2387,45 +2428,4 @@ public ServiceCall<Void> deleteUserData(DeleteUserDataOptions deleteUserDataOpti
     ResponseConverter<Void> responseConverter = ResponseConverterUtils.getVoid();
     return createServiceCall(builder.build(), responseConverter);
   }
-
-  /**
-   * Identify intents and entities in multiple user utterances.
-   *
-   * <p>Send multiple user inputs to a workspace in a single request and receive information about
-   * 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.
-   *
-   * @param bulkClassifyOptions the {@link BulkClassifyOptions} containing the options for the call
-   * @return a {@link ServiceCall} with a result of type {@link BulkClassifyResponse}
-   */
-  public ServiceCall<BulkClassifyResponse> bulkClassify(BulkClassifyOptions bulkClassifyOptions) {
-    com.ibm.cloud.sdk.core.util.Validator.notNull(
-        bulkClassifyOptions, "bulkClassifyOptions cannot be null");
-    Map<String, String> pathParamsMap = new HashMap<String, String>();
-    pathParamsMap.put("workspace_id", bulkClassifyOptions.workspaceId());
-    RequestBuilder builder =
-        RequestBuilder.post(
-            RequestBuilder.resolveRequestUrl(
-                getServiceUrl(), "/v1/workspaces/{workspace_id}/bulk_classify", pathParamsMap));
-    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("conversation", "v1", "bulkClassify");
-    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));
-    final JsonObject contentJson = new JsonObject();
-    if (bulkClassifyOptions.input() != null) {
-      contentJson.add(
-          "input",
-          com.ibm.cloud.sdk.core.util.GsonSingleton.getGson()
-              .toJsonTree(bulkClassifyOptions.input()));
-    }
-    builder.bodyJson(contentJson);
-    ResponseConverter<BulkClassifyResponse> responseConverter =
-        ResponseConverterUtils.getValue(
-            new com.google.gson.reflect.TypeToken<BulkClassifyResponse>() {}.getType());
-    return createServiceCall(builder.build(), responseConverter);
-  }
 }

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

@@ -0,0 +1,77 @@
+/*
+ * (C) Copyright IBM Corp. 2020.
+ *
+ * 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;
+
+/** AgentAvailabilityMessage. */
+public class AgentAvailabilityMessage extends GenericModel {
+
+  protected String message;
+
+  /** Builder. */
+  public static class Builder {
+    private String message;
+
+    private Builder(AgentAvailabilityMessage agentAvailabilityMessage) {
+      this.message = agentAvailabilityMessage.message;
+    }
+
+    /** Instantiates a new builder. */
+    public Builder() {}
+
+    /**
+     * Builds a AgentAvailabilityMessage.
+     *
+     * @return the new AgentAvailabilityMessage instance
+     */
+    public AgentAvailabilityMessage build() {
+      return new AgentAvailabilityMessage(this);
+    }
+
+    /**
+     * Set the message.
+     *
+     * @param message the message
+     * @return the AgentAvailabilityMessage builder
+     */
+    public Builder message(String message) {
+      this.message = message;
+      return this;
+    }
+  }
+
+  protected AgentAvailabilityMessage(Builder builder) {
+    message = builder.message;
+  }
+
+  /**
+   * New builder.
+   *
+   * @return a AgentAvailabilityMessage builder
+   */
+  public Builder newBuilder() {
+    return new Builder(this);
+  }
+
+  /**
+   * Gets the message.
+   *
+   * <p>The text of the message.
+   *
+   * @return the message
+   */
+  public String message() {
+    return message;
+  }
+}

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

@@ -104,10 +104,10 @@ public interface QueryType {
   protected String messageToHumanAgent;
 
   @SerializedName("agent_available")
-  protected String agentAvailable;
+  protected AgentAvailabilityMessage agentAvailable;
 
   @SerializedName("agent_unavailable")
-  protected String agentUnavailable;
+  protected AgentAvailabilityMessage agentUnavailable;
 
   @SerializedName("transfer_info")
   protected DialogNodeOutputConnectToAgentTransferInfo transferInfo;
@@ -267,7 +267,7 @@ public String messageToHumanAgent() {
    *
    * @return the agentAvailable
    */
-  public String agentAvailable() {
+  public AgentAvailabilityMessage agentAvailable() {
     return agentAvailable;
   }
 
@@ -279,7 +279,7 @@ public String agentAvailable() {
    *
    * @return the agentUnavailable
    */
-  public String agentUnavailable() {
+  public AgentAvailabilityMessage agentUnavailable() {
     return agentUnavailable;
   }
 

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

@@ -29,8 +29,8 @@ public interface ResponseType {
   public static class Builder {
     private String responseType;
     private String messageToHumanAgent;
-    private String agentAvailable;
-    private String agentUnavailable;
+    private AgentAvailabilityMessage agentAvailable;
+    private AgentAvailabilityMessage agentUnavailable;
     private DialogNodeOutputConnectToAgentTransferInfo transferInfo;
 
     public Builder(
@@ -96,7 +96,7 @@ public Builder messageToHumanAgent(String messageToHumanAgent) {
      * @param agentAvailable the agentAvailable
      * @return the DialogNodeOutputGenericDialogNodeOutputResponseTypeConnectToAgent builder
      */
-    public Builder agentAvailable(String agentAvailable) {
+    public Builder agentAvailable(AgentAvailabilityMessage agentAvailable) {
       this.agentAvailable = agentAvailable;
       return this;
     }
@@ -107,7 +107,7 @@ public Builder agentAvailable(String agentAvailable) {
      * @param agentUnavailable the agentUnavailable
      * @return the DialogNodeOutputGenericDialogNodeOutputResponseTypeConnectToAgent builder
      */
-    public Builder agentUnavailable(String agentUnavailable) {
+    public Builder agentUnavailable(AgentAvailabilityMessage agentUnavailable) {
       this.agentUnavailable = agentUnavailable;
       return this;
     }

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

@@ -319,10 +319,9 @@ public List<CaptureGroup> groups() {
    * Gets the interpretation.
    *
    * <p>An object containing detailed information about the entity recognized in the user input.
-   * This property is included only if the new system entities are enabled for the workspace.
    *
-   * <p>For more information about how the new system entities are interpreted, see the
-   * [documentation](https://cloud.ibm.com/docs/assistant?topic=assistant-beta-system-entities).
+   * <p>For more information about how system entities are interpreted, see the
+   * [documentation](https://cloud.ibm.com/docs/assistant?topic=assistant-system-entities).
    *
    * @return the interpretation
    */

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

@@ -76,10 +76,10 @@ public interface Preference {
   protected String messageToHumanAgent;
 
   @SerializedName("agent_available")
-  protected String agentAvailable;
+  protected AgentAvailabilityMessage agentAvailable;
 
   @SerializedName("agent_unavailable")
-  protected String agentUnavailable;
+  protected AgentAvailabilityMessage agentUnavailable;
 
   @SerializedName("transfer_info")
   protected DialogNodeOutputConnectToAgentTransferInfo transferInfo;
@@ -212,7 +212,7 @@ public String messageToHumanAgent() {
    *
    * @return the agentAvailable
    */
-  public String agentAvailable() {
+  public AgentAvailabilityMessage agentAvailable() {
     return agentAvailable;
   }
 
@@ -224,7 +224,7 @@ public String agentAvailable() {
    *
    * @return the agentUnavailable
    */
-  public String agentUnavailable() {
+  public AgentAvailabilityMessage agentUnavailable() {
     return agentUnavailable;
   }
 

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

@@ -29,8 +29,8 @@ public interface ResponseType {
   public static class Builder {
     private String responseType;
     private String messageToHumanAgent;
-    private String agentAvailable;
-    private String agentUnavailable;
+    private AgentAvailabilityMessage agentAvailable;
+    private AgentAvailabilityMessage agentUnavailable;
     private DialogNodeOutputConnectToAgentTransferInfo transferInfo;
     private String topic;
     private String dialogNode;
@@ -96,7 +96,7 @@ public Builder messageToHumanAgent(String messageToHumanAgent) {
      * @param agentAvailable the agentAvailable
      * @return the RuntimeResponseGenericRuntimeResponseTypeConnectToAgent builder
      */
-    public Builder agentAvailable(String agentAvailable) {
+    public Builder agentAvailable(AgentAvailabilityMessage agentAvailable) {
       this.agentAvailable = agentAvailable;
       return this;
     }
@@ -107,7 +107,7 @@ public Builder agentAvailable(String agentAvailable) {
      * @param agentUnavailable the agentUnavailable
      * @return the RuntimeResponseGenericRuntimeResponseTypeConnectToAgent builder
      */
-    public Builder agentUnavailable(String agentUnavailable) {
+    public Builder agentUnavailable(AgentAvailabilityMessage agentUnavailable) {
       this.agentUnavailable = agentUnavailable;
       return this;
     }