chore(Text to Speech): Apply manual changes

This reverts commit 320c319.

Author: lpatino10

text-to-speech/src/main/java/com/ibm/watson/developer_cloud/text_to_speech/v1/TextToSpeech.java

@@ -39,9 +39,16 @@
 import com.ibm.watson.developer_cloud.text_to_speech.v1.model.VoiceModels;
 import com.ibm.watson.developer_cloud.text_to_speech.v1.model.Voices;
 import com.ibm.watson.developer_cloud.text_to_speech.v1.model.Words;
+import com.ibm.watson.developer_cloud.text_to_speech.v1.websocket.SynthesizeCallback;
+import com.ibm.watson.developer_cloud.text_to_speech.v1.websocket.TextToSpeechWebSocketListener;
 import com.ibm.watson.developer_cloud.util.GsonSingleton;
 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.io.InputStream;
 
 /**
@@ -265,6 +272,29 @@ public ServiceCall<InputStream> synthesize(SynthesizeOptions synthesizeOptions)
     return createServiceCall(builder.build(), ResponseConverterUtils.getInputStream());
   }
 
+  public WebSocket synthesizeUsingWebSocket(SynthesizeOptions synthesizeOptions, SynthesizeCallback callback) {
+    Validator.notNull(synthesizeOptions, "synthesizeOptions cannot be null");
+    Validator.notNull(callback, "callback cannot be null");
+
+    HttpUrl.Builder urlBuilder = HttpUrl.parse(getEndPoint() + "/v1/synthesize").newBuilder();
+
+    if (synthesizeOptions.voice() != null) {
+      urlBuilder.addQueryParameter("voice", synthesizeOptions.voice());
+    }
+    if (synthesizeOptions.customizationId() != null) {
+      urlBuilder.addQueryParameter("customization_id", synthesizeOptions.customizationId());
+    }
+
+    String url = urlBuilder.toString().replace("https://", "wss://");
+    Request.Builder builder = new Request.Builder().url(url);
+
+    setAuthentication(builder);
+    setDefaultHeaders(builder);
+
+    OkHttpClient client = configureHttpClient();
+    return client.newWebSocket(builder.build(), new TextToSpeechWebSocketListener(synthesizeOptions, callback));
+  }
+
   /**
    * Get pronunciation.
    *

text-to-speech/src/main/java/com/ibm/watson/developer_cloud/text_to_speech/v1/model/SynthesizeOptions.java

@@ -15,6 +15,8 @@
 import com.ibm.watson.developer_cloud.service.model.GenericModel;
 import com.ibm.watson.developer_cloud.util.Validator;
 
+import java.util.List;
+
 /**
  * The synthesize options.
  */
@@ -94,6 +96,7 @@ public interface Voice {
   private String accept;
   private String voice;
   private String customizationId;
+  private List<String> timings;
 
   /**
    * Builder.
@@ -103,12 +106,14 @@ public static class Builder {
     private String accept;
     private String voice;
     private String customizationId;
+    private List<String> timings;
 
     private Builder(SynthesizeOptions synthesizeOptions) {
       text = synthesizeOptions.text;
       accept = synthesizeOptions.accept;
       voice = synthesizeOptions.voice;
       customizationId = synthesizeOptions.customizationId;
+      timings = synthesizeOptions.timings;
     }
 
     /**
@@ -178,6 +183,17 @@ public Builder customizationId(String customizationId) {
       this.customizationId = customizationId;
       return this;
     }
+
+    /**
+     * Set the timings.
+     *
+     * @param timings the timings
+     * @return the SynthesizeOptions builder
+     */
+    public Builder timings(List<String> timings) {
+      this.timings = timings;
+      return this;
+    }
   }
 
   private SynthesizeOptions(Builder builder) {
@@ -186,6 +202,7 @@ private SynthesizeOptions(Builder builder) {
     accept = builder.accept;
     voice = builder.voice;
     customizationId = builder.customizationId;
+    timings = builder.timings;
   }
 
   /**
@@ -247,4 +264,20 @@ public String voice() {
   public String customizationId() {
     return customizationId;
   }
+
+  /**
+   * Gets the timings.
+   *
+   * An array that specifies whether the service is to return word timing information for all strings of the input
+   * text. Specify `words` as the element of the array to request word timing information. The service returns the
+   * start and end time of each word of the input. Specify an empty array or omit the parameter to receive no word
+   * timing information. Not supported for Japanese input text.
+   *
+   * NOTE: This parameter only works for the `synthesizeUsingWebSocket` method.
+   *
+   * @return the timings
+   */
+  public List<String> timings() {
+    return timings;
+  }
 }