feat(Assistant v2): Add generated code from newest version of service

Author: lpatino10

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

@@ -25,6 +25,9 @@
 import com.ibm.watson.assistant.v2.model.MessageOptions;
 import com.ibm.watson.assistant.v2.model.MessageResponse;
 import com.ibm.watson.assistant.v2.model.SessionResponse;
+import com.ibm.watson.common.SdkCommon;
+import java.util.Map;
+import java.util.Map.Entry;
 
 /**
  * The IBM Watson™ Assistant service combines machine learning, natural language understanding, and integrated
@@ -102,8 +105,11 @@ public ServiceCall<SessionResponse> createSession(CreateSessionOptions createSes
     RequestBuilder builder = RequestBuilder.post(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments,
         pathParameters));
     builder.query("version", versionDate);
-    builder.header("X-IBMCloud-SDK-Analytics",
-        "service_name=conversation;service_version=v2;operation_id=createSession");
+    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("conversation", "v2", "createSession");
+    for (Entry<String, String> header : sdkHeaders.entrySet()) {
+      builder.header(header.getKey(), header.getValue());
+    }
+    builder.header("Accept", "application/json");
     return createServiceCall(builder.build(), ResponseConverterUtils.getObject(SessionResponse.class));
   }
 
@@ -122,8 +128,11 @@ public ServiceCall<Void> deleteSession(DeleteSessionOptions deleteSessionOptions
     RequestBuilder builder = RequestBuilder.delete(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments,
         pathParameters));
     builder.query("version", versionDate);
-    builder.header("X-IBMCloud-SDK-Analytics",
-        "service_name=conversation;service_version=v2;operation_id=deleteSession");
+    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("conversation", "v2", "deleteSession");
+    for (Entry<String, String> header : sdkHeaders.entrySet()) {
+      builder.header(header.getKey(), header.getValue());
+    }
+    builder.header("Accept", "application/json");
     return createServiceCall(builder.build(), ResponseConverterUtils.getVoid());
   }
 
@@ -144,7 +153,11 @@ public ServiceCall<MessageResponse> message(MessageOptions messageOptions) {
     RequestBuilder builder = RequestBuilder.post(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments,
         pathParameters));
     builder.query("version", versionDate);
-    builder.header("X-IBMCloud-SDK-Analytics", "service_name=conversation;service_version=v2;operation_id=message");
+    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("conversation", "v2", "message");
+    for (Entry<String, String> header : sdkHeaders.entrySet()) {
+      builder.header(header.getKey(), header.getValue());
+    }
+    builder.header("Accept", "application/json");
     final JsonObject contentJson = new JsonObject();
     if (messageOptions.input() != null) {
       contentJson.add("input", GsonSingleton.getGson().toJsonTree(messageOptions.input()));

assistant/src/main/java/com/ibm/watson/assistant/v2/model/CaptureGroup.java

@@ -12,10 +12,10 @@
  */
 package com.ibm.watson.assistant.v2.model;
 
-import com.ibm.cloud.sdk.core.service.model.GenericModel;
-
 import java.util.List;
 
+import com.ibm.cloud.sdk.core.service.model.GenericModel;
+
 /**
  * CaptureGroup.
  */

assistant/src/main/java/com/ibm/watson/assistant/v2/model/CreateSessionOptions.java

@@ -29,7 +29,7 @@ public static class Builder {
     private String assistantId;
 
     private Builder(CreateSessionOptions createSessionOptions) {
-      assistantId = createSessionOptions.assistantId;
+      this.assistantId = createSessionOptions.assistantId;
     }
 
     /**
@@ -87,7 +87,7 @@ public Builder newBuilder() {
    *
    * Unique identifier of the assistant. You can find the assistant ID of an assistant on the **Assistants** tab of the
    * Watson Assistant tool. For information about creating assistants, see the
-   * [documentation](https://console.bluemix.net/docs/services/assistant/create-assistant.html#creating-assistants).
+   * [documentation](https://console.bluemix.net/docs/services/assistant/assistant-add.html#assistant-add-task).
    *
    * **Note:** Currently, the v2 API does not support creating assistants.
    *

assistant/src/main/java/com/ibm/watson/assistant/v2/model/DeleteSessionOptions.java

@@ -31,8 +31,8 @@ public static class Builder {
     private String sessionId;
 
     private Builder(DeleteSessionOptions deleteSessionOptions) {
-      assistantId = deleteSessionOptions.assistantId;
-      sessionId = deleteSessionOptions.sessionId;
+      this.assistantId = deleteSessionOptions.assistantId;
+      this.sessionId = deleteSessionOptions.sessionId;
     }
 
     /**
@@ -105,7 +105,7 @@ public Builder newBuilder() {
    *
    * Unique identifier of the assistant. You can find the assistant ID of an assistant on the **Assistants** tab of the
    * Watson Assistant tool. For information about creating assistants, see the
-   * [documentation](https://console.bluemix.net/docs/services/assistant/create-assistant.html#creating-assistants).
+   * [documentation](https://console.bluemix.net/docs/services/assistant/assistant-add.html#assistant-add-task).
    *
    * **Note:** Currently, the v2 API does not support creating assistants.
    *

assistant/src/main/java/com/ibm/watson/assistant/v2/model/DialogNodeAction.java

@@ -12,11 +12,11 @@
  */
 package com.ibm.watson.assistant.v2.model;
 
-import java.util.Map;
-
 import com.google.gson.annotations.SerializedName;
 import com.ibm.cloud.sdk.core.service.model.GenericModel;
 
+import java.util.Map;
+
 /**
  * DialogNodeAction.
  */
@@ -39,7 +39,7 @@ public interface ActionType {
   private String name;
   @SerializedName("type")
   private String actionType;
-  private Map parameters;
+  private Map<String, Object> parameters;
   @SerializedName("result_variable")
   private String resultVariable;
   private String credentials;
@@ -73,7 +73,7 @@ public String getActionType() {
    *
    * @return the parameters
    */
-  public Map getParameters() {
+  public Map<String, Object> getParameters() {
     return parameters;
   }
 

assistant/src/main/java/com/ibm/watson/assistant/v2/model/DialogRuntimeResponseGeneric.java

@@ -131,7 +131,7 @@ public String getSource() {
   /**
    * Gets the title.
    *
-   * The title to show before the response.
+   * The title or introductory text to show before the response.
    *
    * @return the title
    */

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

@@ -12,18 +12,18 @@
  */
 package com.ibm.watson.assistant.v2.model;
 
-import java.util.Map;
-
 import com.ibm.cloud.sdk.core.service.model.GenericModel;
 
+import java.util.Map;
+
 /**
  * DialogSuggestion.
  */
 public class DialogSuggestion extends GenericModel {
 
   private String label;
   private DialogSuggestionValue value;
-  private Map output;
+  private Map<String, Object> output;
 
   /**
    * Gets the label.
@@ -57,7 +57,7 @@ public DialogSuggestionValue getValue() {
    *
    * @return the output
    */
-  public Map getOutput() {
+  public Map<String, Object> getOutput() {
     return output;
   }
 }

assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageContext.java

@@ -15,7 +15,7 @@
 import com.ibm.cloud.sdk.core.service.model.GenericModel;
 
 /**
- * State information for the conversation.
+ * MessageContext.
  */
 public class MessageContext extends GenericModel {
 
@@ -25,7 +25,7 @@ public class MessageContext extends GenericModel {
   /**
    * Gets the global.
    *
-   * Contains information that can be shared by all skills within the Assistant.
+   * Information that is shared by all skills used by the Assistant.
    *
    * @return the global
    */
@@ -36,7 +36,10 @@ public MessageContextGlobal getGlobal() {
   /**
    * Gets the skills.
    *
-   * Contains information specific to particular skills within the Assistant.
+   * Information specific to particular skills used by the Assistant.
+   *
+   * **Note:** Currently, only a single property named `main skill` is supported. This object contains variables that
+   * apply to the dialog skill used by the assistant.
    *
    * @return the skills
    */

assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageContextGlobal.java

@@ -15,7 +15,7 @@
 import com.ibm.cloud.sdk.core.service.model.GenericModel;
 
 /**
- * Contains information that can be shared by all skills within the Assistant.
+ * Information that is shared by all skills used by the Assistant.
  */
 public class MessageContextGlobal extends GenericModel {
 
@@ -24,7 +24,7 @@ public class MessageContextGlobal extends GenericModel {
   /**
    * Gets the system.
    *
-   * Properties that are shared by all skills used by the assistant.
+   * Built-in system properties that apply to all skills used by the assistant.
    *
    * @return the system
    */

assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageContextGlobalSystem.java

@@ -16,7 +16,7 @@
 import com.ibm.cloud.sdk.core.service.model.GenericModel;
 
 /**
- * Properties that are shared by all skills used by the assistant.
+ * Built-in system properties that apply to all skills used by the assistant.
  */
 public class MessageContextGlobalSystem extends GenericModel {
 
@@ -55,7 +55,8 @@ public String getUserId() {
    * Gets the turnCount.
    *
    * A counter that is automatically incremented with each turn of the conversation. A value of 1 indicates that this is
-   * the the first turn of a new conversation, which can affect the behavior of some skills.
+   * the the first turn of a new conversation, which can affect the behavior of some skills (for example, triggering the
+   * start node of a dialog).
    *
    * @return the turnCount
    */