Added Generated SDK files for new version of Tone (#809)

Author: shubhanjan99

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

@@ -21,25 +21,23 @@
 import com.ibm.watson.developer_cloud.tone_analyzer.v3.model.ToneOptions;
 import com.ibm.watson.developer_cloud.tone_analyzer.v3.model.UtteranceAnalyses;
 import com.ibm.watson.developer_cloud.util.GsonSingleton;
-import com.ibm.watson.developer_cloud.util.RequestUtils;
 import com.ibm.watson.developer_cloud.util.ResponseConverterUtils;
 import com.ibm.watson.developer_cloud.util.Validator;
 
 /**
  * ### Service Overview
- * The IBM Watson Tone Analyzer service uses linguistic analysis to detect emotional, social, and language tones in
- * written text. The service can analyze tone at both the document and sentence levels. You can use the service to
- * understand how your written communications are perceived and then to improve the tone of your communications.
- * Businesses can use the service to learn the tone of their customers' communications and to respond to each customer
- * appropriately, or to understand and improve their customer conversations.
+ * The IBM Watson Tone Analyzer service uses linguistic analysis to detect emotional and language tones in written text.
+ * The service can analyze tone at both the document and sentence levels. You can use the service to understand how your
+ * written communications are perceived and then to improve the tone of your communications. Businesses can use the
+ * service to learn the tone of their customers' communications and to respond to each customer appropriately, or to
+ * understand and improve their customer conversations.
  * ### API Usage
  * The following information provides details about using the service to analyze tone:
  * * **The tone method:** The service offers `GET` and `POST /v3/tone` methods that use the general purpose endpoint to
- * analyze the tone of input content. The methods accept a maximum of 128 KB of content in JSON, plain text, or HTML
- * format.
+ * analyze the tone of input content. The methods accept content in JSON, plain text, or HTML format.
  * * **The tone_chat method:** The service offers a `POST /v3/tone_chat` method that uses the customer engagement
- * endpoint to analyze the tone of customer service and customer support conversations. The method accepts a maximum of
- * 128 KB of content in JSON format.
+ * endpoint to analyze the tone of customer service and customer support conversations. The method accepts content in
+ * JSON format.
  * * **Authentication:** You authenticate to the service by using your service credentials. You can use your credentials
  * to authenticate via a proxy server that resides in Bluemix, or you can use your credentials to obtain a token and
  * contact the service directly. See [Service credentials for Watson
@@ -98,17 +96,7 @@ public ToneAnalyzer(String versionDate, String username, String password) {
   /**
    * Analyze general purpose tone.
    *
-   * Uses the general purpose endpoint to analyze the tone of your input content. The service can analyze the input for
-   * several tones: emotion, language, and social. It derives various characteristics for each tone that it analyzes.
-   * The method always analyzes the tone of the full document; by default, it also analyzes the tone of each individual
-   * sentence of the input. You can submit a maximum of 128 KB of content in JSON, plain text, or HTML format.   Per
-   * the JSON specification, the default character encoding for JSON content is effectively always UTF-8; per the
-   * HTTP specification, the default encoding for plain text and HTML is ISO-8859-1 (effectively, the ASCII character
-   * set). When specifying a content type of plain text or HTML, include the `charset` parameter to indicate the
-   * character encoding of the input text; for example: `Content-Type: text/plain;charset=utf-8`. For `text/html`,
-   * the service removes HTML tags and analyzes only the textual content.   Use the `POST` request method to analyze
-   * larger amounts of content in any of the available formats. Use the `GET` request method to analyze smaller
-   * quantities of plain text content.
+   * Uses the general purpose endpoint to analyze the tone of your input content. The service analyzes the content for emotional and language tones. The method always analyzes the tone of the full document; by default, it also analyzes the tone of each individual sentence of the content.   You can submit no more than 128 KB of total input content and no more than 1000 individual sentences in JSON, plain text, or HTML format. The service analyzes the first 1000 sentences for document-level analysis and only the first 100 sentences for sentence-level analysis.   Use the `POST` request method to analyze larger amounts of content in any of the available formats. Use the `GET` request method to analyze smaller quantities of plain text content.   Per the JSON specification, the default character encoding for JSON content is effectively always UTF-8; per the HTTP specification, the default encoding for plain text and HTML is ISO-8859-1 (effectively, the ASCII character set). When specifying a content type of plain text or HTML, include the `charset` parameter to indicate the character encoding of the input text; for example: `Content-Type: text/plain;charset=utf-8`. For `text/html`, the service removes HTML tags and analyzes only the textual content.   **Note:** The `tones` query parameter is no longer supported. The service continues to accept the parameter for backward-compatibility, but the parameter no longer affects the response.
    *
    * @param toneOptions the {@link ToneOptions} containing the options for the call
    * @return the {@link ToneAnalysis} with the response
@@ -118,8 +106,11 @@ public ServiceCall<ToneAnalysis> tone(ToneOptions toneOptions) {
     RequestBuilder builder = RequestBuilder.post("/v3/tone");
     builder.query(VERSION, versionDate);
     builder.header("content-type", toneOptions.contentType());
-    if (toneOptions.tones() != null) {
-    builder.query("tones", RequestUtils.join(toneOptions.tones(), ","));
+    if (toneOptions.contentLanguage() != null) {
+      builder.header("Content-Language", toneOptions.contentLanguage());
+    }
+    if (toneOptions.acceptLanguage() != null) {
+      builder.header("Accept-Language", toneOptions.acceptLanguage());
     }
     if (toneOptions.sentences() != null) {
     builder.query("sentences", String.valueOf(toneOptions.sentences()));
@@ -135,11 +126,7 @@ public ServiceCall<ToneAnalysis> tone(ToneOptions toneOptions) {
   /**
    * Analyze customer engagement tone.
    *
-   * Uses the customer engagement endpoint to analyze the tone of customer service and customer support conversations.
-   * For each utterance of a conversation, the method reports the most prevalent subset of the following seven tones:
-   * sad, frustrated, satisfied, excited, polite, impolite, and sympathetic. You can submit a maximum of 128 KB of
-   * JSON input. Per the JSON specification, the default character encoding for JSON content is effectively always
-   * UTF-8.
+   * Use the customer engagement endpoint to analyze the tone of customer service and customer support conversations. For each utterance of a conversation, the method reports the most prevalent subset of the following seven tones: sad, frustrated, satisfied, excited, polite, impolite, and sympathetic.   If you submit more than 50 utterances, the service returns a warning for the overall content and analyzes only the first 50 utterances. If you submit a single utterance that contains more than 500 characters, the service returns an error for that utterance and does not analyze the utterance. The request fails if all utterances have more than 500 characters.   Per the JSON specification, the default character encoding for JSON content is effectively always UTF-8.
    *
    * @param toneChatOptions the {@link ToneChatOptions} containing the options for the call
    * @return the {@link UtteranceAnalyses} with the response
@@ -148,6 +135,9 @@ public ServiceCall<UtteranceAnalyses> toneChat(ToneChatOptions toneChatOptions)
     Validator.notNull(toneChatOptions, "toneChatOptions cannot be null");
     RequestBuilder builder = RequestBuilder.post("/v3/tone_chat");
     builder.query(VERSION, versionDate);
+    if (toneChatOptions.acceptLanguage() != null) {
+      builder.header("Accept-Language", toneChatOptions.acceptLanguage());
+    }
     final JsonObject contentJson = new JsonObject();
     contentJson.add("utterances", GsonSingleton.getGson().toJsonTree(toneChatOptions.utterances()));
     builder.bodyJson(contentJson);

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

@@ -14,35 +14,53 @@
 
 import java.util.List;
 
-import com.google.gson.annotations.SerializedName;
 import com.ibm.watson.developer_cloud.service.model.GenericModel;
 
 /**
  * DocumentAnalysis.
  */
 public class DocumentAnalysis extends GenericModel {
 
-  @SerializedName("tone_categories")
-  private List<ToneCategory> toneCategories;
+  private List<ToneScore> tones;
+  private String warning;
 
   /**
-   * Gets the toneCategories.
+   * Gets the tones.
    *
-   * An array of `ToneCategory` objects that provides the results of the tone analysis for the full document of the
-   * input content. The service returns results only for the tones specified with the `tones` parameter of the request.
+   * An array of `ToneScore` objects that provides the results of the analysis for each qualifying tone of the document. The array includes results for any tone whose score is at least 0.5. The array is empty if no tone has a score that meets this threshold.
    *
-   * @return the toneCategories
+   * @return the tones
    */
-  public List<ToneCategory> getToneCategories() {
-    return toneCategories;
+  public List<ToneScore> getTones() {
+    return tones;
   }
 
   /**
-   * Sets the toneCategories.
+   * Gets the warning.
    *
-   * @param toneCategories the new toneCategories
+   * A warning message if the overall content exceeds 128 KB or contains more than 1000 sentences. The service analyzes only the first 1000 sentences for document-level analysis and the first 100 sentences for sentence-level analysis.
+   *
+   * @return the warning
+   */
+  public String getWarning() {
+    return warning;
+  }
+
+  /**
+   * Sets the tones.
+   *
+   * @param tones the new tones
+   */
+  public void setTones(final List<ToneScore> tones) {
+    this.tones = tones;
+  }
+
+  /**
+   * Sets the warning.
+   *
+   * @param warning the new warning
    */
-  public void setToneCategories(final List<ToneCategory> toneCategories) {
-    this.toneCategories = toneCategories;
+  public void setWarning(final String warning) {
+    this.warning = warning;
   }
 }

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

@@ -25,18 +25,12 @@ public class SentenceAnalysis extends GenericModel {
   @SerializedName("sentence_id")
   private Long sentenceId;
   private String text;
-  @SerializedName("input_from")
-  private Long inputFrom;
-  @SerializedName("input_to")
-  private Long inputTo;
-  @SerializedName("tone_categories")
-  private List<ToneCategory> toneCategories;
+  private List<ToneScore> tones;
 
   /**
    * Gets the sentenceId.
    *
-   * The unique identifier of a sentence of the input content. The first sentence has ID 0, and the ID of each
-   * subsequent sentence is incremented by one.
+   * The unique identifier of a sentence of the input content. The first sentence has ID 0, and the ID of each subsequent sentence is incremented by one.
    *
    * @return the sentenceId
    */
@@ -56,37 +50,14 @@ public String getText() {
   }
 
   /**
-   * Gets the inputFrom.
+   * Gets the tones.
    *
-   * The offset of the first character of the sentence in the overall input content.
+   * An array of `ToneScore` objects that provides the results of the analysis for each qualifying tone of the sentence. The array includes results for any tone whose score is at least 0.5. The array is empty if no tone has a score that meets this threshold.
    *
-   * @return the inputFrom
+   * @return the tones
    */
-  public Long getInputFrom() {
-    return inputFrom;
-  }
-
-  /**
-   * Gets the inputTo.
-   *
-   * The offset of the last character of the sentence in the overall input content.
-   *
-   * @return the inputTo
-   */
-  public Long getInputTo() {
-    return inputTo;
-  }
-
-  /**
-   * Gets the toneCategories.
-   *
-   * An array of `ToneCategory` objects that provides the results for the tone analysis of the sentence. The service
-   * returns results only for the tones specified with the `tones` parameter of the request.
-   *
-   * @return the toneCategories
-   */
-  public List<ToneCategory> getToneCategories() {
-    return toneCategories;
+  public List<ToneScore> getTones() {
+    return tones;
   }
 
   /**
@@ -108,29 +79,11 @@ public void setText(final String text) {
   }
 
   /**
-   * Sets the inputFrom.
-   *
-   * @param inputFrom the new inputFrom
-   */
-  public void setInputFrom(final long inputFrom) {
-    this.inputFrom = inputFrom;
-  }
-
-  /**
-   * Sets the inputTo.
-   *
-   * @param inputTo the new inputTo
-   */
-  public void setInputTo(final long inputTo) {
-    this.inputTo = inputTo;
-  }
-
-  /**
-   * Sets the toneCategories.
+   * Sets the tones.
    *
-   * @param toneCategories the new toneCategories
+   * @param tones the new tones
    */
-  public void setToneCategories(final List<ToneCategory> toneCategories) {
-    this.toneCategories = toneCategories;
+  public void setTones(final List<ToneScore> tones) {
+    this.tones = tones;
   }
 }

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

@@ -30,7 +30,7 @@ public class ToneAnalysis extends GenericModel {
   /**
    * Gets the documentTone.
    *
-   * An object of type `DocumentAnalysis` that provides the results for the full document of the input content.
+   * An object of type `DocumentAnalysis` that provides the results of the analysis for the full input document.
    *
    * @return the documentTone
    */
@@ -41,9 +41,7 @@ public DocumentAnalysis getDocumentTone() {
   /**
    * Gets the sentencesTone.
    *
-   * An array of `SentenceAnalysis` objects that provides the results for the individual sentences of the input
-   * content. The service returns results only for the first 100 sentences of the input. The field is omitted if the
-   * `sentences` parameter of the request is set to `false`.
+   * An array of `SentenceAnalysis` objects that provides the results of the analysis for the individual sentences of the input content. The service returns results only for the first 100 sentences of the input. The field is omitted if the sentences parameter of the request is set to `false`.
    *
    * @return the sentencesTone
    */

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

@@ -23,16 +23,47 @@
  */
 public class ToneChatOptions extends GenericModel {
 
+  /**
+   * The desired language of the response. For two-character arguments, regional variants are treated as their parent language; for example, `en-US` is interpreted as `en`.
+   */
+  public interface AcceptLanguage {
+    /** ar. */
+    String AR = "ar";
+    /** de. */
+    String DE = "de";
+    /** en. */
+    String EN = "en";
+    /** es. */
+    String ES = "es";
+    /** fr. */
+    String FR = "fr";
+    /** it. */
+    String IT = "it";
+    /** ja. */
+    String JA = "ja";
+    /** ko. */
+    String KO = "ko";
+    /** pt-br. */
+    String PT_BR = "pt-br";
+    /** zh-cn. */
+    String ZH_CN = "zh-cn";
+    /** zh-tw. */
+    String ZH_TW = "zh-tw";
+  }
+
   private List<Utterance> utterances;
+  private String acceptLanguage;
 
   /**
    * Builder.
    */
   public static class Builder {
     private List<Utterance> utterances;
+    private String acceptLanguage;
 
     private Builder(ToneChatOptions toneChatOptions) {
       utterances = toneChatOptions.utterances;
+      acceptLanguage = toneChatOptions.acceptLanguage;
     }
 
     /**
@@ -85,11 +116,23 @@ public Builder utterances(List<Utterance> utterances) {
       this.utterances = utterances;
       return this;
     }
+
+    /**
+     * Set the acceptLanguage.
+     *
+     * @param acceptLanguage the acceptLanguage
+     * @return the ToneChatOptions builder
+     */
+    public Builder acceptLanguage(String acceptLanguage) {
+      this.acceptLanguage = acceptLanguage;
+      return this;
+    }
   }
 
   private ToneChatOptions(Builder builder) {
     Validator.notNull(builder.utterances, "utterances cannot be null");
     utterances = builder.utterances;
+    acceptLanguage = builder.acceptLanguage;
   }
 
   /**
@@ -111,4 +154,15 @@ public Builder newBuilder() {
   public List<Utterance> utterances() {
     return utterances;
   }
+
+  /**
+   * Gets the acceptLanguage.
+   *
+   * The desired language of the response. For two-character arguments, regional variants are treated as their parent language; for example, `en-US` is interpreted as `en`.
+   *
+   * @return the acceptLanguage
+   */
+  public String acceptLanguage() {
+    return acceptLanguage;
+  }
 }

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

@@ -29,8 +29,7 @@ public class ToneChatScore extends GenericModel {
   /**
    * Gets the score.
    *
-   * The score for the tone in the range of 0.5 to 1. A score greater than 0.75 indicates a high likelihood that the
-   * tone is perceived in the utterance.
+   * The score for the tone in the range of 0.5 to 1. A score greater than 0.75 indicates a high likelihood that the tone is perceived in the utterance.
    *
    * @return the score
    */
@@ -41,9 +40,7 @@ public Double getScore() {
   /**
    * Gets the toneId.
    *
-   * The unique, non-localized identifier of the tone for the results. The service can return results for the
-   * following tone IDs: `sad`, `frustrated`, `satisfied`, `excited`, `polite`, `impolite`, and `sympathetic`. The
-   * service returns results only for tones whose scores meet a minimum threshold of 0.5.
+   * The unique, non-localized identifier of the tone for the results. The service can return results for the following tone IDs: `sad`, `frustrated`, `satisfied`, `excited`, `polite`, `impolite`, and `sympathetic`. The service returns results only for tones whose scores meet a minimum threshold of 0.5.
    *
    * @return the toneId
    */

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

@@ -85,7 +85,7 @@ public Builder newBuilder() {
   /**
    * Gets the text.
    *
-   * The input content that the service is to analyze. Sentences with fewer than three words cannot be analyzed.
+   * The input content that the service is to analyze.
    *
    * @return the text
    */