feat(Tone Analyzer): Add generated code from newest version of service

Author: lpatino10

tone-analyzer/src/main/java/com/ibm/watson/tone_analyzer/v3/ToneAnalyzer.java

@@ -20,11 +20,14 @@
 import com.ibm.cloud.sdk.core.util.GsonSingleton;
 import com.ibm.cloud.sdk.core.util.RequestUtils;
 import com.ibm.cloud.sdk.core.util.ResponseConverterUtils;
+import com.ibm.cloud.sdk.core.util.Validator;
+import com.ibm.watson.common.SdkCommon;
 import com.ibm.watson.tone_analyzer.v3.model.ToneAnalysis;
 import com.ibm.watson.tone_analyzer.v3.model.ToneChatOptions;
 import com.ibm.watson.tone_analyzer.v3.model.ToneOptions;
 import com.ibm.watson.tone_analyzer.v3.model.UtteranceAnalyses;
-import com.ibm.cloud.sdk.core.util.Validator;
+import java.util.Map;
+import java.util.Map.Entry;
 
 /**
  * The IBM Watson™ Tone Analyzer service uses linguistic analysis to detect emotional and language tones in
@@ -120,16 +123,20 @@ public ServiceCall<ToneAnalysis> tone(ToneOptions toneOptions) {
     String[] pathSegments = { "v3/tone" };
     RequestBuilder builder = RequestBuilder.post(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments));
     builder.query("version", versionDate);
-    builder.header("X-IBMCloud-SDK-Analytics", "service_name=tone_analyzer;service_version=v3;operation_id=tone");
-    if (toneOptions.contentType() != null) {
-      builder.header("Content-Type", toneOptions.contentType());
+    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("tone_analyzer", "v3", "tone");
+    for (Entry<String, String> header : sdkHeaders.entrySet()) {
+      builder.header(header.getKey(), header.getValue());
     }
+    builder.header("Accept", "application/json");
     if (toneOptions.contentLanguage() != null) {
       builder.header("Content-Language", toneOptions.contentLanguage());
     }
     if (toneOptions.acceptLanguage() != null) {
       builder.header("Accept-Language", toneOptions.acceptLanguage());
     }
+    if (toneOptions.contentType() != null) {
+      builder.header("Content-Type", toneOptions.contentType());
+    }
     if (toneOptions.sentences() != null) {
       builder.query("sentences", String.valueOf(toneOptions.sentences()));
     }
@@ -154,8 +161,7 @@ public ServiceCall<ToneAnalysis> tone(ToneOptions toneOptions) {
    * UTF-8.
    *
    * **See also:** [Using the customer-engagement
-   * endpoint](https://cloud.ibm.com/docs/services/tone-analyzer/using-tone-chat
-   * .html#using-the-customer-engagement-endpoint).
+   * endpoint](https://cloud.ibm.com/docs/services/tone-analyzer/using-tone-chat.html#using-the-customer-engagement-endpoint).
    *
    * @param toneChatOptions the {@link ToneChatOptions} containing the options for the call
    * @return a {@link ServiceCall} with a response type of {@link UtteranceAnalyses}
@@ -165,7 +171,11 @@ public ServiceCall<UtteranceAnalyses> toneChat(ToneChatOptions toneChatOptions)
     String[] pathSegments = { "v3/tone_chat" };
     RequestBuilder builder = RequestBuilder.post(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments));
     builder.query("version", versionDate);
-    builder.header("X-IBMCloud-SDK-Analytics", "service_name=tone_analyzer;service_version=v3;operation_id=toneChat");
+    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("tone_analyzer", "v3", "toneChat");
+    for (Entry<String, String> header : sdkHeaders.entrySet()) {
+      builder.header(header.getKey(), header.getValue());
+    }
+    builder.header("Accept", "application/json");
     if (toneChatOptions.contentLanguage() != null) {
       builder.header("Content-Language", toneChatOptions.contentLanguage());
     }

tone-analyzer/src/main/java/com/ibm/watson/tone_analyzer/v3/model/ToneChatOptions.java

@@ -81,9 +81,9 @@ public static class Builder {
     private String acceptLanguage;
 
     private Builder(ToneChatOptions toneChatOptions) {
-      utterances = toneChatOptions.utterances;
-      contentLanguage = toneChatOptions.contentLanguage;
-      acceptLanguage = toneChatOptions.acceptLanguage;
+      this.utterances = toneChatOptions.utterances;
+      this.contentLanguage = toneChatOptions.contentLanguage;
+      this.acceptLanguage = toneChatOptions.acceptLanguage;
     }
 
     /**

tone-analyzer/src/main/java/com/ibm/watson/tone_analyzer/v3/model/ToneInput.java

@@ -29,7 +29,7 @@ public static class Builder {
     private String text;
 
     private Builder(ToneInput toneInput) {
-      text = toneInput.text;
+      this.text = toneInput.text;
     }
 
     /**

tone-analyzer/src/main/java/com/ibm/watson/tone_analyzer/v3/model/ToneOptions.java

@@ -23,19 +23,6 @@
  */
 public class ToneOptions extends GenericModel {
 
-  /**
-   * The type of the input. A character encoding can be specified by including a `charset` parameter. For example,
-   * 'text/plain;charset=utf-8'.
-   */
-  public interface ContentType {
-    /** application/json. */
-    String APPLICATION_JSON = "application/json";
-    /** text/plain. */
-    String TEXT_PLAIN = "text/plain";
-    /** text/html. */
-    String TEXT_HTML = "text/html";
-  }
-
   public interface Tone {
     /** emotion. */
     String EMOTION = "emotion";
@@ -90,34 +77,47 @@ public interface AcceptLanguage {
     String ZH_TW = "zh-tw";
   }
 
+  /**
+   * The type of the input. A character encoding can be specified by including a `charset` parameter. For example,
+   * 'text/plain;charset=utf-8'.
+   */
+  public interface ContentType {
+    /** application/json. */
+    String APPLICATION_JSON = "application/json";
+    /** text/plain. */
+    String TEXT_PLAIN = "text/plain";
+    /** text/html. */
+    String TEXT_HTML = "text/html";
+  }
+
   private ToneInput toneInput;
   private String body;
-  private String contentType;
   private Boolean sentences;
   private List<String> tones;
   private String contentLanguage;
   private String acceptLanguage;
+  private String contentType;
 
   /**
    * Builder.
    */
   public static class Builder {
     private ToneInput toneInput;
     private String body;
-    private String contentType;
     private Boolean sentences;
     private List<String> tones;
     private String contentLanguage;
     private String acceptLanguage;
+    private String contentType;
 
     private Builder(ToneOptions toneOptions) {
-      toneInput = toneOptions.toneInput;
-      body = toneOptions.body;
-      contentType = toneOptions.contentType;
-      sentences = toneOptions.sentences;
-      tones = toneOptions.tones;
-      contentLanguage = toneOptions.contentLanguage;
-      acceptLanguage = toneOptions.acceptLanguage;
+      this.toneInput = toneOptions.toneInput;
+      this.body = toneOptions.body;
+      this.sentences = toneOptions.sentences;
+      this.tones = toneOptions.tones;
+      this.contentLanguage = toneOptions.contentLanguage;
+      this.acceptLanguage = toneOptions.acceptLanguage;
+      this.contentType = toneOptions.contentType;
     }
 
     /**
@@ -235,11 +235,11 @@ public Builder html(String html) {
   private ToneOptions(Builder builder) {
     toneInput = builder.toneInput;
     body = builder.body;
-    contentType = builder.contentType;
     sentences = builder.sentences;
     tones = builder.tones;
     contentLanguage = builder.contentLanguage;
     acceptLanguage = builder.acceptLanguage;
+    contentType = builder.contentType;
   }
 
   /**
@@ -275,18 +275,6 @@ public String body() {
     return body;
   }
 
-  /**
-   * Gets the contentType.
-   *
-   * The type of the input. A character encoding can be specified by including a `charset` parameter. For example,
-   * 'text/plain;charset=utf-8'.
-   *
-   * @return the contentType
-   */
-  public String contentType() {
-    return contentType;
-  }
-
   /**
    * Gets the sentences.
    *
@@ -343,4 +331,16 @@ public String contentLanguage() {
   public String acceptLanguage() {
     return acceptLanguage;
   }
+
+  /**
+   * Gets the contentType.
+   *
+   * The type of the input. A character encoding can be specified by including a `charset` parameter. For example,
+   * 'text/plain;charset=utf-8'.
+   *
+   * @return the contentType
+   */
+  public String contentType() {
+    return contentType;
+  }
 }

tone-analyzer/src/main/java/com/ibm/watson/tone_analyzer/v3/model/Utterance.java

@@ -31,8 +31,8 @@ public static class Builder {
     private String user;
 
     private Builder(Utterance utterance) {
-      text = utterance.text;
-      user = utterance.user;
+      this.text = utterance.text;
+      this.user = utterance.user;
     }
 
     /**