chore(Speech to Text): Add code directly from generator

Author: lpatino10

speech-to-text/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/SpeechToText.java

@@ -70,18 +70,12 @@
 import com.ibm.watson.developer_cloud.speech_to_text.v1.model.UpgradeLanguageModelOptions;
 import com.ibm.watson.developer_cloud.speech_to_text.v1.model.Word;
 import com.ibm.watson.developer_cloud.speech_to_text.v1.model.Words;
-import com.ibm.watson.developer_cloud.speech_to_text.v1.websocket.RecognizeCallback;
-import com.ibm.watson.developer_cloud.speech_to_text.v1.websocket.SpeechToTextWebSocketListener;
 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;
-import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.WebSocket;
-
-import java.util.concurrent.TimeUnit;
+import okhttp3.MultipartBody;
+import okhttp3.RequestBody;
 
 /**
  * The IBM® Speech to Text service provides APIs that use IBM's speech-recognition capabilities to produce
@@ -200,10 +194,10 @@ public ServiceCall<SpeechModels> listModels() {
   /**
    * Recognize audio.
    *
-   * Sends audio and returns transcription results for a recognition request. Returns only the final results; to enable
-   * interim results, use the WebSocket API. The service imposes a data size limit of 100 MB. It automatically detects
-   * the endianness of the incoming audio and, for audio that includes multiple channels, downmixes the audio to
-   * one-channel mono during transcoding.
+   * Sends audio and returns transcription results for a recognition request. You can pass a maximum of 100 MB and a
+   * minimum of 100 bytes of audio with a request. The service automatically detects the endianness of the incoming
+   * audio and, for audio that includes multiple channels, downmixes the audio to one-channel mono during transcoding.
+   * The method returns only final results; to enable interim results, use the WebSocket API.
    *
    * **See also:** [Making a basic HTTP
    * request](https://console.bluemix.net/docs/services/speech-to-text/http.html#HTTP-basic).
@@ -218,7 +212,7 @@ public ServiceCall<SpeechModels> listModels() {
    *
    * **See also:**
    * * [Audio transmission](https://console.bluemix.net/docs/services/speech-to-text/input.html#transmission)
-   * * [Timeouts](https://console.bluemix.net/docs/services/speech-to-text/input.html#timeouts).
+   * * [Timeouts](https://console.bluemix.net/docs/services/speech-to-text/input.html#timeouts)
    *
    * ### Audio formats (content types)
    *
@@ -248,14 +242,13 @@ public ServiceCall<SpeechModels> listModels() {
    *
    * **See also:** [Audio formats](https://console.bluemix.net/docs/services/speech-to-text/audio-formats.html).
    *
-   * **Note:** You must pass a content type when using any of the Watson SDKs. The SDKs require the content-type
-   * parameter for all audio formats.
-   *
    * ### Multipart speech recognition
    *
-   * The method also supports multipart recognition requests. With multipart requests, you pass all audio data as
-   * multipart form data. You specify some parameters as request headers and query parameters, but you pass JSON
-   * metadata as form data to control most aspects of the transcription.
+   * **Note:** The Watson SDKs do not support multipart speech recognition.
+   *
+   * The HTTP `POST` method of the service also supports multipart speech recognition. With multipart requests, you pass
+   * all audio data as multipart form data. You specify some parameters as request headers and query parameters, but you
+   * pass JSON metadata as form data to control most aspects of the transcription.
    *
    * The multipart approach is intended for use with browsers for which JavaScript is disabled or when the parameters
    * used with the request are greater than the 8 KB limit imposed by most HTTP servers and proxies. You can encounter
@@ -324,59 +317,6 @@ public ServiceCall<SpeechRecognitionResults> recognize(RecognizeOptions recogniz
     return createServiceCall(builder.build(), ResponseConverterUtils.getObject(SpeechRecognitionResults.class));
   }
 
-  /**
-   * Sends audio and returns transcription results for recognition requests over a WebSocket connection. Requests and
-   * responses are enabled over a single TCP connection that abstracts much of the complexity of the request to offer
-   * efficient implementation, low latency, high throughput, and an asynchronous response. By default, only final
-   * results are returned for any request; to enable interim results, set the interimResults parameter to true.
-   *
-   * The service imposes a data size limit of 100 MB per utterance (per recognition request). You can send multiple
-   * utterances over a single WebSocket connection. The service automatically detects the endianness of the incoming
-   * audio and, for audio that includes multiple channels, downmixes the audio to one-channel mono during transcoding.
-   * (For the audio/l16 format, you can specify the endianness.)
-   *
-   * @param recognizeOptions the recognize options
-   * @param callback the {@link RecognizeCallback} instance where results will be sent
-   * @return the {@link WebSocket}
-   */
-  public WebSocket recognizeUsingWebSocket(RecognizeOptions recognizeOptions, RecognizeCallback callback) {
-    Validator.notNull(recognizeOptions, "recognizeOptions cannot be null");
-    Validator.notNull(recognizeOptions.audio(), "audio cannot be null");
-    Validator.notNull(callback, "callback cannot be null");
-
-    HttpUrl.Builder urlBuilder = HttpUrl.parse(getEndPoint() + "/v1/recognize").newBuilder();
-
-    if (recognizeOptions.model() != null) {
-      urlBuilder.addQueryParameter("model", recognizeOptions.model());
-    }
-    if (recognizeOptions.customizationId() != null) {
-      urlBuilder.addQueryParameter("customization_id", recognizeOptions.customizationId());
-    }
-    if (recognizeOptions.languageCustomizationId() != null) {
-      urlBuilder.addQueryParameter("language_customization_id", recognizeOptions.languageCustomizationId());
-    }
-    if (recognizeOptions.acousticCustomizationId() != null) {
-      urlBuilder.addQueryParameter("acoustic_customization_id", recognizeOptions.acousticCustomizationId());
-    }
-    if (recognizeOptions.baseModelVersion() != null) {
-      urlBuilder.addQueryParameter("base_model_version", recognizeOptions.baseModelVersion());
-    }
-    if (recognizeOptions.customizationWeight() != null) {
-      urlBuilder.addQueryParameter("customization_weight",
-          String.valueOf(recognizeOptions.customizationWeight()));
-    }
-
-    String url = urlBuilder.toString().replace("https://", "wss://");
-    Request.Builder builder = new Request.Builder().url(url);
-
-    setAuthentication(builder);
-    setDefaultHeaders(builder);
-
-    OkHttpClient client = configureHttpClient();
-    client = client.newBuilder().pingInterval(30, TimeUnit.SECONDS).build();
-    return client.newWebSocket(builder.build(), new SpeechToTextWebSocketListener(recognizeOptions, callback));
-  }
-
   /**
    * Check a job.
    *
@@ -474,8 +414,10 @@ public ServiceCall<RecognitionJobs> checkJobs() {
    * * `user_token`
    * * `results_ttl`
    *
-   * The service imposes a data size limit of 100 MB. It automatically detects the endianness of the incoming audio and,
-   * for audio that includes multiple channels, downmixes the audio to one-channel mono during transcoding.
+   * You can pass a maximum of 100 MB and a minimum of 100 bytes of audio with a request. The service automatically
+   * detects the endianness of the incoming audio and, for audio that includes multiple channels, downmixes the audio to
+   * one-channel mono during transcoding. The method returns only final results; to enable interim results, use the
+   * WebSocket API.
    *
    * **See also:** [Creating a job](https://console.bluemix.net/docs/services/speech-to-text/async.html#create).
    *
@@ -519,9 +461,6 @@ public ServiceCall<RecognitionJobs> checkJobs() {
    *
    * **See also:** [Audio formats](https://console.bluemix.net/docs/services/speech-to-text/audio-formats.html).
    *
-   * **Note:** You must pass a content type when using any of the Watson SDKs. The SDKs require the content-type
-   * parameter for all audio formats.
-   *
    * @param createJobOptions the {@link CreateJobOptions} containing the options for the call
    * @return a {@link ServiceCall} with a response type of {@link RecognitionJob}
    */
@@ -945,7 +884,11 @@ public ServiceCall<Void> addCorpus(AddCorpusOptions addCorpusOptions) {
     if (addCorpusOptions.allowOverwrite() != null) {
       builder.query("allow_overwrite", String.valueOf(addCorpusOptions.allowOverwrite()));
     }
-    builder.body(RequestUtils.inputStreamBody(addCorpusOptions.corpusFile(), "text/plain"));
+    MultipartBody.Builder multipartBuilder = new MultipartBody.Builder();
+    multipartBuilder.setType(MultipartBody.FORM);
+    RequestBody corpusFileBody = RequestUtils.inputStreamBody(addCorpusOptions.corpusFile(), "text/plain");
+    multipartBuilder.addFormDataPart("corpus_file", addCorpusOptions.corpusFilename(), corpusFileBody);
+    builder.body(multipartBuilder.build());
     return createServiceCall(builder.build(), ResponseConverterUtils.getVoid());
   }
 

speech-to-text/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/model/AddAudioOptions.java

@@ -129,19 +129,6 @@ private Builder(AddAudioOptions addAudioOptions) {
     public Builder() {
     }
 
-    /**
-     * Instantiates a new builder.
-     *
-     * @param customizationId the customizationId
-     * @param audioName the audioName
-     * @deprecated audioResource and contentType are now required, so this constructor will be removed. Please use
-     * the constructor with 4 parameters.
-     */
-    public Builder(String customizationId, String audioName) {
-      this.customizationId = customizationId;
-      this.audioName = audioName;
-    }
-
     /**
      * Instantiates a new builder with required properties.
      *

speech-to-text/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/model/AddCorpusOptions.java

@@ -200,8 +200,13 @@ public String corpusName() {
    * Gets the corpusFile.
    *
    * A plain text file that contains the training data for the corpus. Encode the file in UTF-8 if it contains non-ASCII
-   * characters; the service assumes UTF-8 encoding if it encounters non-ASCII characters. With the `curl` command, use
-   * the `--data-binary` option to upload the file for the request.
+   * characters; the service assumes UTF-8 encoding if it encounters non-ASCII characters.
+   *
+   * Make sure that you know the character encoding of the file. You must use that encoding when working with the words
+   * in the custom language model. For more information, see [Character
+   * encoding](https://console.bluemix.net/docs/services/speech-to-text/language-resource.html#charEncoding).
+   *
+   * With the `curl` command, use the `--data-binary` option to upload the file for the request.
    *
    * @return the corpusFile
    */

speech-to-text/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/model/AddWordOptions.java

@@ -179,9 +179,10 @@ public String customizationId() {
   /**
    * Gets the wordName.
    *
-   * The custom word for the custom language model. When you add or update a custom word with the **Add a custom word**
-   * method, do not include spaces in the word. Use a `-` (dash) or `_` (underscore) to connect the tokens of compound
-   * words.
+   * The custom word that is to be added to or updated in the custom language model. Do not include spaces in the word.
+   * Use a `-` (dash) or `_` (underscore) to connect the tokens of compound words. URL-encode the word if it includes
+   * non-ASCII characters. For more information, see [Character
+   * encoding](https://console.bluemix.net/docs/services/speech-to-text/language-resource.html#charEncoding).
    *
    * @return the wordName
    */
@@ -196,7 +197,7 @@ public String wordName() {
    * custom model. Do not include spaces in the word. Use a `-` (dash) or `_` (underscore) to connect the tokens of
    * compound words.
    *
-   * Omit this field for the **Add a custom word** method.
+   * Omit this parameter for the **Add a custom word** method.
    *
    * @return the word
    */

speech-to-text/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/model/CreateAcousticModelOptions.java

@@ -22,8 +22,9 @@ public class CreateAcousticModelOptions extends GenericModel {
 
   /**
    * The name of the base language model that is to be customized by the new custom acoustic model. The new custom model
-   * can be used only with the base model that it customizes. To determine whether a base model supports acoustic model
-   * customization, refer to [Language support for
+   * can be used only with the base model that it customizes.
+   *
+   * To determine whether a base model supports acoustic model customization, refer to [Language support for
    * customization](https://console.bluemix.net/docs/services/speech-to-text/custom.html#languageSupport).
    */
   public interface BaseModelName {
@@ -175,8 +176,9 @@ public String name() {
    * Gets the baseModelName.
    *
    * The name of the base language model that is to be customized by the new custom acoustic model. The new custom model
-   * can be used only with the base model that it customizes. To determine whether a base model supports acoustic model
-   * customization, refer to [Language support for
+   * can be used only with the base model that it customizes.
+   *
+   * To determine whether a base model supports acoustic model customization, refer to [Language support for
    * customization](https://console.bluemix.net/docs/services/speech-to-text/custom.html#languageSupport).
    *
    * @return the baseModelName

speech-to-text/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/model/CreateJobOptions.java

@@ -483,8 +483,6 @@ public Builder speakerLabels(Boolean speakerLabels) {
      *
      * @param customizationId the customizationId
      * @return the CreateJobOptions builder
-     * @deprecated Use the `languageCustomizationId` setter to specify the customization ID (GUID) of a custom
-     * language model that is to be used with the recognition request. Do not specify both parameters with a request.
      */
     public Builder customizationId(String customizationId) {
       this.customizationId = customizationId;
@@ -828,7 +826,7 @@ public Boolean profanityFilter() {
    * If `true`, the service converts dates, times, series of digits and numbers, phone numbers, currency values, and
    * internet addresses into more readable, conventional representations in the final transcript of a recognition
    * request. For US English, the service also converts certain keyword strings to punctuation symbols. By default, no
-   * smart formatting is performed. Applies to US English and Spanish transcription only. See [Smart
+   * smart formatting is performed. Applies to US English, Japanese, and Spanish transcription only. See [Smart
    * formatting](https://console.bluemix.net/docs/services/speech-to-text/output.html#smart_formatting).
    *
    * @return the smartFormatting
@@ -842,9 +840,10 @@ public Boolean smartFormatting() {
    *
    * If `true`, the response includes labels that identify which words were spoken by which participants in a
    * multi-person exchange. By default, no speaker labels are returned. Setting `speaker_labels` to `true` forces the
-   * `timestamps` parameter to be `true`, regardless of whether you specify `false` for the parameter. To determine
-   * whether a language model supports speaker labels, use the **Get models** method and check that the attribute
-   * `speaker_labels` is set to `true`. See [Speaker
+   * `timestamps` parameter to be `true`, regardless of whether you specify `false` for the parameter.
+   *
+   * To determine whether a language model supports speaker labels, use the **Get a model** method and check that the
+   * attribute `speaker_labels` is set to `true`. See [Speaker
    * labels](https://console.bluemix.net/docs/services/speech-to-text/output.html#speaker_labels).
    *
    * @return the speakerLabels
@@ -860,8 +859,6 @@ public Boolean speakerLabels() {
    * language model that is to be used with the recognition request. Do not specify both parameters with a request.
    *
    * @return the customizationId
-   * @deprecated Use the `languageCustomizationId` getter to get the customization ID (GUID) of a custom
-   * language model that is to be used with the recognition request.
    */
   public String customizationId() {
     return customizationId;

speech-to-text/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/model/CreateLanguageModelOptions.java

@@ -22,9 +22,10 @@ public class CreateLanguageModelOptions extends GenericModel {
 
   /**
    * The name of the base language model that is to be customized by the new custom language model. The new custom model
-   * can be used only with the base model that it customizes. To determine whether a base model supports language model
-   * customization, request information about the base model and check that the attribute `custom_language_model` is set
-   * to `true`, or refer to [Language support for
+   * can be used only with the base model that it customizes.
+   *
+   * To determine whether a base model supports language model customization, use the **Get a model** method and check
+   * that the attribute `custom_language_model` is set to `true`. You can also refer to [Language support for
    * customization](https://console.bluemix.net/docs/services/speech-to-text/custom.html#languageSupport).
    */
   public interface BaseModelName {
@@ -185,9 +186,10 @@ public String name() {
    * Gets the baseModelName.
    *
    * The name of the base language model that is to be customized by the new custom language model. The new custom model
-   * can be used only with the base model that it customizes. To determine whether a base model supports language model
-   * customization, request information about the base model and check that the attribute `custom_language_model` is set
-   * to `true`, or refer to [Language support for
+   * can be used only with the base model that it customizes.
+   *
+   * To determine whether a base model supports language model customization, use the **Get a model** method and check
+   * that the attribute `custom_language_model` is set to `true`. You can also refer to [Language support for
    * customization](https://console.bluemix.net/docs/services/speech-to-text/custom.html#languageSupport).
    *
    * @return the baseModelName

speech-to-text/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/model/CustomWord.java

@@ -35,7 +35,7 @@ public class CustomWord extends GenericModel {
    * custom model. Do not include spaces in the word. Use a `-` (dash) or `_` (underscore) to connect the tokens of
    * compound words.
    *
-   * Omit this field for the **Add a custom word** method.
+   * Omit this parameter for the **Add a custom word** method.
    *
    * @return the word
    */

speech-to-text/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/model/DeleteWordOptions.java

@@ -115,9 +115,9 @@ public String customizationId() {
   /**
    * Gets the wordName.
    *
-   * The custom word for the custom language model. When you add or update a custom word with the **Add a custom word**
-   * method, do not include spaces in the word. Use a `-` (dash) or `_` (underscore) to connect the tokens of compound
-   * words.
+   * The custom word that is to be deleted from the custom language model. URL-encode the word if it includes non-ASCII
+   * characters. For more information, see [Character
+   * encoding](https://console.bluemix.net/docs/services/speech-to-text/language-resource.html#charEncoding).
    *
    * @return the wordName
    */

speech-to-text/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/model/GetModelOptions.java

@@ -21,7 +21,7 @@
 public class GetModelOptions extends GenericModel {
 
   /**
-   * The identifier of the model in the form of its name from the output of the **Get models** method.
+   * The identifier of the model in the form of its name from the output of the **Get a model** method.
    */
   public interface ModelId {
     /** ar-AR_BroadbandModel. */
@@ -125,7 +125,7 @@ public Builder newBuilder() {
   /**
    * Gets the modelId.
    *
-   * The identifier of the model in the form of its name from the output of the **Get models** method.
+   * The identifier of the model in the form of its name from the output of the **Get a model** method.
    *
    * @return the modelId
    */